Changeset 265 in dev for trunk/abdev/BasicCompiler_Common/VarList.cpp

Timestamp:

Aug 6, 2007, 11:44:42 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/VarList.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ -275 +275 @@
     extern int MemPos_RWSection;
 
-    BOOST_FOREACH( Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
+    BOOST_FOREACH( Variable *pVar, compiler.GetObjectModule().meta.GetGlobalVars() ){
 
         //スコープ外の場合は無視
@@ -358 +358 @@
 
     UserProc *pUserProc = NULL;
-    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
-    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
+    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
+    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
     {
-        pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
-        if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
-            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld)){
+        pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
             break;
         }
@@ -604 +604 @@
 
         UserProc *pUserProc = NULL;
-        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
-        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
+        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
+        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
         {
-            pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld))
+            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+
+            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress()))
             {
                 lstrcpy(temporary,pUserProc->GetName().c_str());
@@ -717 +717 @@
 
         UserProc *pUserProc = NULL;
-        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
-        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
+        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
+        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
         {
-            pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->_beginOpAddressOld) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->_endOpAddressOld)){
+            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+
+            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
                 break;
             }