Changeset 75 in dev for BasicCompiler_Common/Debug.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (18 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler_Common/Debug.cpp (modified) (4 diffs)

BasicCompiler_Common/Debug.cpp

@@ -224 +224 @@
     SendDlgItemMessage(hMainDlg,IDC_DEBUGLIST,EM_REPLACESEL,0,(LPARAM)buffer);
 }
-SubInfo *GetSubFromObp(ULONG_PTR pos){
-    extern SubInfo **ppSubHash;
-    SubInfo *psi;
+UserProc *GetSubFromObp(ULONG_PTR pos){
+    extern UserProc **ppSubHash;
+    UserProc *pUserProc;
     int i2;
 
     for(i2=0;i2<MAX_HASH;i2++){
-        psi=ppSubHash[i2];
-        while(psi){
-            if(rva_to_real(psi->CompileAddress) <= pos  &&
-                pos < rva_to_real(psi->EndOpAddr))
-                return psi;
-
-            psi=psi->pNextData;
+        pUserProc=ppSubHash[i2];
+        while(pUserProc){
+            if(rva_to_real(pUserProc->beginOpAddress) <= pos  &&
+                pos < rva_to_real(pUserProc->endOpAddress))
+                return pUserProc;
+
+            pUserProc=pUserProc->pNextData;
         }
     }
@@ -447 +447 @@
     pobj_dti=new CDebugThreadInfo();
 
-    SubInfo *psi;
+    UserProc *pUserProc;
 
     extern DWORD dwStepRun;
@@ -681 +681 @@
                         if(!bRet) MessageBox(hMainDlg,"プロセスメモリーの読み込みに失敗","error",MB_OK);
 
-                        extern SubInfo *pSub_DebugSys_EndProc;
+                        extern UserProc *pSub_DebugSys_EndProc;
                         if((BYTE)temporary[0]==0xE8&&
-                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->CompileAddress)-(long)EIP_RIP(Context)){
+                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->beginOpAddress)-(long)EIP_RIP(Context)){
                             //プロシージャの終端位置の場合はステップインを行う
                             goto StepIn;
@@ -700 +700 @@
                         else{
                             //プロシージャを識別
-                            psi=GetSubFromObp(pobj_dti->lplpObp[pobj_dti->iProcLevel]);
+                            pUserProc=GetSubFromObp(pobj_dti->lplpObp[pobj_dti->iProcLevel]);
 
                             //シングルステップON
                             WriteProcessMemory(hDebugProcess,
-                                (void *)rva_to_real(psi->CompileAddress),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+psi->CompileAddress,
-                                psi->EndOpAddr-psi->CompileAddress,
+                                (void *)rva_to_real(pUserProc->beginOpAddress),
+                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->beginOpAddress,
+                                pUserProc->endOpAddress-pUserProc->beginOpAddress,
                                 &lpAccBytes);
                         }