Changeset 741 in dev for trunk

Timestamp:

Sep 7, 2008, 12:05:40 AM (16 years ago)

Author:

dai

Message:

デバッグセクション情報周りをリファクタリング

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/CDebugThreadInfo.cpp (modified) (3 diffs)
• BasicCompiler_Common/Debug.cpp (modified) (14 diffs)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (12 diffs)
• BasicCompiler_Common/DebugSection.h (modified) (5 diffs)
• compiler_x86/MakePeHdr.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp

@@ -10 +10 @@
 
 extern HANDLE hDebugProcess;
+extern DebugSectionCollection debugSectionCollection;
 
 CDebugThreadInfo *pobj_dti;
@@ -27 +28 @@
 
     DWORD dwRWSectionPos;
-    dwRWSectionPos=pobj_DBDebugSection->debugSections[0]->dwImageBase+
-                        pobj_DBDebugSection->debugSections[0]->dwRVA_RWSection;
+    dwRWSectionPos=debugSectionCollection.debugSections[0]->dwImageBase+
+                        debugSectionCollection.debugSections[0]->dwRVA_RWSection;
 
     ReadProcessMemory(hDebugProcess,
@@ -80 +81 @@
     extern DWORD ImageBase;
     if((HMODULE)(ULONG_PTR)ImageBase!=hTargetModule){
-        for(i=0;i<pobj_DBDebugSection->debugSections.size();i++){
-            if((HMODULE)(ULONG_PTR)pobj_DBDebugSection->debugSections[i]->dwImageBase==hTargetModule){
-                pobj_DBDebugSection->choice(i);
+        for(i=0;i<debugSectionCollection.debugSections.size();i++){
+            if((HMODULE)(ULONG_PTR)debugSectionCollection.debugSections[i]->dwImageBase==hTargetModule){
+                debugSectionCollection.choice(i);
                 break;
             }

trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

@@ -23 +23 @@
 int NextStepThreadNum;
 
+DebugSectionCollection debugSectionCollection;
 
 void Debugger_StepIn(void){
@@ -129 +130 @@
 
             StepCursorObpSchedule=oldSourceLines[i3].GetNativeCodePos();
-            StepCursor_BackupChar=pobj_DBDebugSection->pobj_now->BreakStepCodeBuffer[StepCursorObpSchedule];
-
-            pobj_DBDebugSection->pobj_now->BreakStepCodeBuffer[StepCursorObpSchedule]=(char)0xCC;
+            StepCursor_BackupChar=debugSectionCollection.GetCurrent().BreakStepCodeBuffer[StepCursorObpSchedule];
+
+            debugSectionCollection.GetCurrent().BreakStepCodeBuffer[StepCursorObpSchedule]=(char)0xCC;
 
             break;
@@ -292 +293 @@
     WriteProcessMemory(hDebugProcess,
         (void *)(ULONG_PTR)(ImageBase+MemPos_CodeSection),
-        pobj_DBDebugSection->pobj_now->BreakStepCodeBuffer,
+        debugSectionCollection.GetCurrent().BreakStepCodeBuffer,
         FileSize_CodeSection,&lpAccBytes);
 
@@ -298 +299 @@
     if(ImageBase+MemPos_CodeSection<=EIP_RIP(*pContext)&&EIP_RIP(*pContext)<ImageBase+MemPos_CodeSection+FileSize_CodeSection){
         if(OpBuffer[EIP_RIP(*pContext)-ImageBase-MemPos_CodeSection-1]!=
-            pobj_DBDebugSection->pobj_now->BreakStepCodeBuffer[EIP_RIP(*pContext)-ImageBase-MemPos_CodeSection-1]){
+            debugSectionCollection.GetCurrent().BreakStepCodeBuffer[EIP_RIP(*pContext)-ImageBase-MemPos_CodeSection-1]){
             //直前のブレークポイントがユーザー指定によるものだったとき
 
@@ -312 +313 @@
             if(StepCursorObpSchedule==(int)(EIP_RIP(*pContext)-ImageBase-MemPos_CodeSection)){
                 //カーソル行までのステップ実行の場合
-                pobj_DBDebugSection->pobj_now->BreakStepCodeBuffer[StepCursorObpSchedule]=StepCursor_BackupChar;
+                debugSectionCollection.GetCurrent().BreakStepCodeBuffer[StepCursorObpSchedule]=StepCursor_BackupChar;
                 StepCursorObpSchedule=-1;
             }
@@ -340 +341 @@
 void Set_DebugSys_dwThreadID()
 {
-    BOOST_FOREACH( CDebugSection *pDebugSection, pobj_DBDebugSection->debugSections )
+    BOOST_FOREACH( DebugSection *pDebugSection, debugSectionCollection.debugSections )
     {
         ULONG_PTR lpAccBytes;
@@ -483 +484 @@
 
 
-    //デバッグ情報データベースを生成
-    pobj_DBDebugSection=new CDBDebugSection();
-
     //デバッグスレッド情報（プロシージャの階層構造を管理）を生成
     pobj_dti=new CDebugThreadInfo();
@@ -538 +536 @@
 
             //可能であればデバッグ情報を読みとる
-            if(pobj_DBDebugSection->add((HMODULE)de.u.LoadDll.lpBaseOfDll)){
-                pobj_DBDebugSection->choice(0);
+            if(debugSectionCollection.add((HMODULE)de.u.LoadDll.lpBaseOfDll)){
+                debugSectionCollection.choice(0);
                 Set_DebugSys_dwThreadID();
             }
@@ -553 +551 @@
             //DLLのアンロード
 
-            pobj_DBDebugSection->del((HMODULE)de.u.UnloadDll.lpBaseOfDll);
+            debugSectionCollection.del((HMODULE)de.u.UnloadDll.lpBaseOfDll);
         }
         else if(de.dwDebugEventCode==CREATE_PROCESS_DEBUG_EVENT){
@@ -559 +557 @@
             hMainThread=de.u.CreateProcessInfo.hThread;
 
-            if(pobj_DBDebugSection->add((HMODULE)de.u.CreateProcessInfo.lpBaseOfImage)){
-                pobj_DBDebugSection->choice(0);
+            if(debugSectionCollection.add((HMODULE)de.u.CreateProcessInfo.lpBaseOfImage)){
+                debugSectionCollection.choice(0);
             }
 
@@ -716 +714 @@
                         //シングルステップON
                         WriteProcessMemory(hDebugProcess,(void *)(ULONG_PTR)(ImageBase+MemPos_CodeSection),
-                            pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer,
+                            debugSectionCollection.GetCurrent().SingleStepCodeBuffer,
                             FileSize_CodeSection,&lpAccBytes);
 
@@ -754 +752 @@
                             WriteProcessMemory(hDebugProcess,
                                 (void *)(ULONG_PTR)(ImageBase+MemPos_CodeSection),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer,
+                                debugSectionCollection.GetCurrent().SingleStepCodeBuffer,
                                 GlobalOpBufferSize,
                                 &lpAccBytes);
@@ -765 +763 @@
                             WriteProcessMemory(hDebugProcess,
                                 (void *)rva_to_real(pUserProc->GetBeginOpAddress()),
-                                pobj_DBDebugSection->pobj_now->SingleStepCodeBuffer+pUserProc->GetBeginOpAddress(),
+                                debugSectionCollection.GetCurrent().SingleStepCodeBuffer+pUserProc->GetBeginOpAddress(),
                                 pUserProc->GetEndOpAddress()-pUserProc->GetBeginOpAddress(),
                                 &lpAccBytes);
@@ -812 +810 @@
     if(hDebugWnd) SendMessage(hDebugWnd,WM_COMMAND,IDCANCEL,0);
 
-    //デバッグに利用した情報を解放
-    delete pobj_DBDebugSection;
-
     //デバッグスレッド情報を解放
     delete pobj_dti;

trunk/ab5.0/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -44 +44 @@
 
 
-CDebugSection::~CDebugSection(){
+DebugSection::~DebugSection(){
     if(dwImageBase) DeleteDebugInfo();
     if(buffer){
@@ -51 +51 @@
     }
 }
-void CDebugSection::make(void){
+void DebugSection::make(void){
     int i2,BufferSize;
 
@@ -168 +168 @@
 }
 
-char *CDebugSection::MakeSingleStepCode(void){
+char *DebugSection::MakeSingleStepCode(void){
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
@@ -187 +187 @@
     return buffer;
 }
-BOOL CDebugSection::__load(void){
+BOOL DebugSection::__load(void){
     int i2,i3;
 
@@ -311 +311 @@
 }
 
-BOOL CDebugSection::load(HMODULE hModule){
+BOOL DebugSection::load(HMODULE hModule){
     if(buffer){
         HeapDefaultFree(buffer);
@@ -389 +389 @@
 }
 
-void CDebugSection::choice(void){
+void DebugSection::choice(void){
     //イメージベース
     extern DWORD ImageBase;
@@ -423 +423 @@
 }
 
-void CDebugSection::DeleteDebugInfo(void){
+void DebugSection::DeleteDebugInfo(void){
     //コードバッファを解放
     free(OpBuffer);
@@ -437 +437 @@
 
 
-CDBDebugSection::CDBDebugSection()
+DebugSectionCollection::DebugSectionCollection()
 {
 }
-CDBDebugSection::~CDBDebugSection()
+DebugSectionCollection::~DebugSectionCollection()
 {
-    BOOST_FOREACH( CDebugSection *pDebugSection, debugSections )
+    BOOST_FOREACH( DebugSection *pDebugSection, debugSections )
     {
         delete pDebugSection;
@@ -449 +449 @@
 }
 
-BOOL CDBDebugSection::add(HMODULE hModule){
-    CDebugSection *pobj_d;
-    pobj_d=new CDebugSection();
+BOOL DebugSectionCollection::add(HMODULE hModule){
+    DebugSection *pobj_d;
+    pobj_d=new DebugSection();
     if(!pobj_d->load(hModule)){
         //デバッグ情報が存在しないとき
@@ -463 +463 @@
 }
 
-void CDBDebugSection::del(HMODULE hModule){
+void DebugSectionCollection::del(HMODULE hModule){
     for( int i=0; i<static_cast<int>(this->debugSections.size()); i++ )
     {
@@ -469 +469 @@
         {
             delete debugSections[i];
-            Jenga::Common::EraseVectorItem<std::vector<CDebugSection *>>( debugSections, i );
+            Jenga::Common::EraseVectorItem<std::vector<DebugSection *>>( debugSections, i );
             break;
         }
@@ -475 +475 @@
 }
 
-void CDBDebugSection::choice( int index )
+void DebugSectionCollection::choice( int index )
 {
-    pobj_now = debugSections[index];
-    pobj_now->choice();
-}
-
-
-
-CDBDebugSection *pobj_DBDebugSection;
+    pCurrent = debugSections[index];
+    pCurrent->choice();
+}

trunk/ab5.0/abdev/BasicCompiler_Common/DebugSection.h

@@ -1 +1 @@
 #pragma once
 
-class CDebugSection{
+class DebugSection{
 public:
     char szNowFilePath[MAX_PATH];
@@ -49 +49 @@
 
 
-    CDebugSection()
+    DebugSection()
         : buffer( NULL )
         , length( 0 )
@@ -64 +64 @@
         szNowFilePath[0]=0;
     }
-    ~CDebugSection();
+    ~DebugSection();
 
     void make(void);
@@ -79 +79 @@
 };
 
-class CDBDebugSection{
+class DebugSectionCollection{
+    DebugSection *pCurrent;
 public:
-    std::vector<CDebugSection *> debugSections;
+    std::vector<DebugSection *> debugSections;
 
-    CDebugSection *pobj_now;
-
-    CDBDebugSection();
-    ~CDBDebugSection();
+    DebugSectionCollection();
+    ~DebugSectionCollection();
 
     BOOL add(HMODULE hModule);
@@ -93 +92 @@
     void choice(int index);
 
+    DebugSection &GetCurrent()
+    {
+        MyAssert( pCurrent != NULL );
+        return *pCurrent;
+    }
 };
-
-extern CDBDebugSection *pobj_DBDebugSection;

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -853 +853 @@
 
     //デバッグセクションを生成
-    CDebugSection *pobj_DebugSection;
-    pobj_DebugSection=new CDebugSection();
+    DebugSection *pobj_DebugSection;
+    pobj_DebugSection=new DebugSection();
     if( compiler.IsDebug() && !compiler.errorMessenger.HasError() )
     {