Changeset 740 in dev

Timestamp:

Sep 6, 2008, 11:53:33 PM (16 years ago)

Author:

dai

Message:

ppobj_dsを、debugSectionsに書き直した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• CDebugThreadInfo.cpp (modified) (2 diffs)
• Debug.cpp (modified) (1 diff)
• DebugMiddleFile.cpp (modified) (4 diffs)
• DebugSection.h (modified) (1 diff)

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

@@ -27 +27 @@
 
     DWORD dwRWSectionPos;
-    dwRWSectionPos=pobj_DBDebugSection->ppobj_ds[0]->dwImageBase+
-                        pobj_DBDebugSection->ppobj_ds[0]->dwRVA_RWSection;
+    dwRWSectionPos=pobj_DBDebugSection->debugSections[0]->dwImageBase+
+                        pobj_DBDebugSection->debugSections[0]->dwRVA_RWSection;
 
     ReadProcessMemory(hDebugProcess,
@@ -80 +80 @@
     extern DWORD ImageBase;
     if((HMODULE)(ULONG_PTR)ImageBase!=hTargetModule){
-        for(i=0;i<pobj_DBDebugSection->num;i++){
-            if((HMODULE)(ULONG_PTR)pobj_DBDebugSection->ppobj_ds[i]->dwImageBase==hTargetModule){
+        for(i=0;i<pobj_DBDebugSection->debugSections.size();i++){
+            if((HMODULE)(ULONG_PTR)pobj_DBDebugSection->debugSections[i]->dwImageBase==hTargetModule){
                 pobj_DBDebugSection->choice(i);
                 break;

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

@@ -338 +338 @@
 }
 
-void Set_DebugSys_dwThreadID(){
-    int i;
-    for(i=0;i<pobj_DBDebugSection->num;i++){
+void Set_DebugSys_dwThreadID()
+{
+    BOOST_FOREACH( CDebugSection *pDebugSection, pobj_DBDebugSection->debugSections )
+    {
         ULONG_PTR lpAccBytes;
         WriteProcessMemory(hDebugProcess,
-            (void *)(ULONG_PTR)(pobj_DBDebugSection->ppobj_ds[i]->dwImageBase + pobj_DBDebugSection->ppobj_ds[i]->dwRVA_RWSection),
+            (void *)(ULONG_PTR)(pDebugSection->dwImageBase + pDebugSection->dwRVA_RWSection),
             _DebugSys_dwThreadID,
             sizeof(DWORD)*MAX_DEBUG_THREAD,

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

@@ -437 +437 @@
 
 
-CDBDebugSection::CDBDebugSection(){
-    ppobj_ds=(CDebugSection **)HeapAlloc(hHeap,0,1);
-    num=0;
-}
-CDBDebugSection::~CDBDebugSection(){
-    int i;
-    for(i=0;i<num;i++){
-        delete ppobj_ds[i];
-    }
-    HeapDefaultFree(ppobj_ds);
+CDBDebugSection::CDBDebugSection()
+{
+}
+CDBDebugSection::~CDBDebugSection()
+{
+    BOOST_FOREACH( CDebugSection *pDebugSection, debugSections )
+    {
+        delete pDebugSection;
+    }
+    debugSections.clear();
 }
 
@@ -458 +458 @@
     }
 
-    ppobj_ds=(CDebugSection **)HeapReAlloc(hHeap,0,ppobj_ds,(num+1)*sizeof(CDebugSection *));
-    ppobj_ds[num]=pobj_d;
-    num++;
+    debugSections.push_back( pobj_d );
 
     return 1;
@@ -466 +464 @@
 
 void CDBDebugSection::del(HMODULE hModule){
-    int i;
-    for(i=0;i<num;i++){
-        if((HMODULE)(ULONG_PTR)ppobj_ds[i]->dwImageBase==hModule){
-            delete ppobj_ds[i];
-
-            num--;
-            for(;i<num;i++){
-                ppobj_ds[i]=ppobj_ds[i+1];
-            }
+    for( int i=0; i<static_cast<int>(this->debugSections.size()); i++ )
+    {
+        if( (HMODULE)(ULONG_PTR)this->debugSections[i]->dwImageBase == hModule )
+        {
+            delete debugSections[i];
+            Jenga::Common::EraseVectorItem<std::vector<CDebugSection *>>( debugSections, i );
             break;
         }
@@ -480 +475 @@
 }
 
-void CDBDebugSection::choice(int index){
-    pobj_now=ppobj_ds[index];
+void CDBDebugSection::choice( int index )
+{
+    pobj_now = debugSections[index];
     pobj_now->choice();
 }

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

@@ -81 +81 @@
 class CDBDebugSection{
 public:
-    CDebugSection **ppobj_ds;
-    int num;
+    std::vector<CDebugSection *> debugSections;
 
     CDebugSection *pobj_now;