Changeset 259 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Aug 3, 2007, 3:24:22 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Debug.cpp (modified) (3 diffs)
• DebugMiddleFile.cpp (modified) (2 diffs)
• VarList.cpp (modified) (3 diffs)
• include/Procedure.h (modified) (1 diff)
• src/Class.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -235 +235 @@
         UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
-        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pos  &&
-            pos < rva_to_real(pUserProc->GetEndOpAddress()))
+        if(rva_to_real(pUserProc->_beginOpAddressOld) <= pos  &&
+            pos < rva_to_real(pUserProc->_endOpAddressOld))
         {
             return pUserProc;
@@ -694 +694 @@
                         extern const UserProc *pSub_DebugSys_EndProc;
                         if((BYTE)temporary[0]==0xE8&&
-                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->GetBeginOpAddress())-(long)EIP_RIP(Context)){
+                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->_beginOpAddressOld)-(long)EIP_RIP(Context)){
                             //プロシージャの終端位置の場合はステップインを行う
                             goto StepIn;
@@ -715 +715 @@
                             //シングルステップON
                             WriteProcessMemory(hDebugProcess,
-                                (void *)rva_to_real(pUserProc->GetBeginOpAddress()),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->GetBeginOpAddress(),
-                                pUserProc->GetEndOpAddress()-pUserProc->GetBeginOpAddress(),
+                                (void *)rva_to_real(pUserProc->_beginOpAddressOld),
+                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->_beginOpAddressOld,
+                                pUserProc->_endOpAddressOld-pUserProc->_beginOpAddressOld,
                                 &lpAccBytes);
                         }

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -236 +236 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        *(long *)(buffer+i2)=pUserProc->GetBeginOpAddress();
-        i2+=sizeof(long);
-        *(long *)(buffer+i2)=pUserProc->GetEndOpAddress();
+        *(long *)(buffer+i2)=pUserProc->_beginOpAddressOld;
+        i2+=sizeof(long);
+        *(long *)(buffer+i2)=pUserProc->_endOpAddressOld;
         i2+=sizeof(long);
 
@@ -620 +620 @@
         pUserProc->SetParentClass( pClass );
 
-        pUserProc->SetBeginOpAddress( *(long *)(buffer+i2) );
-        i2+=sizeof(long);
-        pUserProc->SetEndOpAddress( *(long *)(buffer+i2) );
+        pUserProc->_beginOpAddressOld = *(long *)(buffer+i2);
+        i2+=sizeof(long);
+        pUserProc->_endOpAddressOld = *(long *)(buffer+i2);
         i2+=sizeof(long);
 

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ -362 +362 @@
     {
         pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
-        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
+        if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
+            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld)){
             break;
         }
@@ -610 +610 @@
             pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress()))
+            if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld))
             {
                 lstrcpy(temporary,pUserProc->GetName().c_str());
@@ -723 +723 @@
             pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
+            if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld)){
                 break;
             }

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -375 +375 @@
         return *pCompilingUserProc;
     }
+
+
+
+    mutable long _beginOpAddressOld;
+    mutable long _endOpAddressOld;
 };
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -737 +737 @@
         pUserProc=(UserProc *)pVtbl[i];
         if(!pUserProc) continue;
-        pVtbl[i]=pUserProc->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
+        pVtbl[i]=pUserProc->_beginOpAddressOld+ImageBase+MemPos_CodeSection;
     }
 }