Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/Debug.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler_Common/Debug.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ +1 @@
+#include "stdafx.h"
+
+#include <Compiler.h>
+
 #include "../BasicCompiler_Common/common.h"
+#include "../BasicCompiler_Common/DebugSection.h"
 
 //デバッグ用
@@ -224 +229 @@
     SendDlgItemMessage(hMainDlg,IDC_DEBUGLIST,EM_REPLACESEL,0,(LPARAM)buffer);
 }
-GlobalProc *GetSubFromObp(ULONG_PTR pos){
-    extern GlobalProc **ppSubHash;
-    GlobalProc *pUserProc;
-    int i2;
-
-    for(i2=0;i2<MAX_HASH;i2++){
-        pUserProc=ppSubHash[i2];
-        while(pUserProc){
-            if(rva_to_real(pUserProc->beginOpAddress) <= pos  &&
-                pos < rva_to_real(pUserProc->endOpAddress))
-                return pUserProc;
-
-            pUserProc=pUserProc->pNextData;
-        }
-    }
-    return 0;
+UserProc *GetSubFromObp(ULONG_PTR pos){
+    compiler.GetMeta().GetUserProcs().Iterator_Reset();
+    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    {
+        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+
+        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pos  &&
+            pos < rva_to_real(pUserProc->GetEndOpAddress()))
+        {
+            return pUserProc;
+        }
+    }
+    return NULL;
 }
 void ReleaseSingleStep(DWORD dwBeforeStepRun,HANDLE hThread,CONTEXT *pContext){
@@ -447 +449 @@
     pobj_dti=new CDebugThreadInfo();
 
-    GlobalProc *pUserProc;
+    UserProc *pUserProc;
 
     extern DWORD dwStepRun;
@@ -681 +683 @@
                         if(!bRet) MessageBox(hMainDlg,"プロセスメモリーの読み込みに失敗","error",MB_OK);
 
-                        extern UserProc *pSub_DebugSys_EndProc;
+                        extern const UserProc *pSub_DebugSys_EndProc;
                         if((BYTE)temporary[0]==0xE8&&
-                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->beginOpAddress)-(long)EIP_RIP(Context)){
+                            *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->GetBeginOpAddress())-(long)EIP_RIP(Context)){
                             //プロシージャの終端位置の場合はステップインを行う
                             goto StepIn;
@@ -704 +706 @@
                             //シングルステップON
                             WriteProcessMemory(hDebugProcess,
-                                (void *)rva_to_real(pUserProc->beginOpAddress),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->beginOpAddress,
-                                pUserProc->endOpAddress-pUserProc->beginOpAddress,
+                                (void *)rva_to_real(pUserProc->GetBeginOpAddress()),
+                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->GetBeginOpAddress(),
+                                pUserProc->GetEndOpAddress()-pUserProc->GetBeginOpAddress(),
                                 &lpAccBytes);
                         }