Changeset 75 in dev for BasicCompiler32/VarList.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler32/VarList.cpp (modified) (6 diffs)

BasicCompiler32/VarList.cpp

@@ -348 +348 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    extern SubInfo **ppSubHash;
-    SubInfo *psi;
+    extern UserProc **ppSubHash;
+    UserProc *pUserProc;
     for(i3=0,sw=0;i3<MAX_HASH;i3++){
-        psi=ppSubHash[i3];
-        while(psi){
-            if(rva_to_real(psi->CompileAddress) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(psi->EndOpAddr)){
+        pUserProc=ppSubHash[i3];
+        while(pUserProc){
+            if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
+                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
                 sw=1;
                 break;
             }
 
-            psi=psi->pNextData;
+            pUserProc=pUserProc->pNextData;
         }
         if(sw) break;
     }
-    if(!psi) return;
-
-    for(i=0;i<psi->VarNum;i++){
-        VARIABLE *pVar=&psi->pVar[i];
+    if(!pUserProc) return;
+
+    for(i=0;i<pUserProc->VarNum;i++){
+        VARIABLE *pVar=&pUserProc->pVar[i];
 
         //スコープ外の場合は無視
@@ -416 +416 @@
 
     TreeView_DeleteAllItems(hVarTree_This);
-    if(!psi->pobj_ParentClass) return;
+    if(!pUserProc->GetParentClassPtr()) return;
 
     //Thisポインタを取得
     LONG_PTR pThis;
-    for(i=0;i<psi->VarNum;i++){
-        if(lstrcmp(psi->pVar[i].name,"_System_LocalThis")==0) break;
-    }
-    if(i==psi->VarNum) return;
-    lpData=pobj_dti->lplpSpBase[i2]+psi->pVar[i].offset;
+    for(i=0;i<pUserProc->VarNum;i++){
+        if(lstrcmp(pUserProc->pVar[i].name,"_System_LocalThis")==0) break;
+    }
+    if(i==pUserProc->VarNum) return;
+    lpData=pobj_dti->lplpSpBase[i2]+pUserProc->pVar[i].offset;
     ReadProcessMemory(hDebugProcess,(void *)lpData,&pThis,sizeof(LONG_PTR),&lpAccBytes);
 
-    for(i=0;i<psi->pobj_ParentClass->iMemberNum;i++){
-        offset = psi->pobj_ParentClass->GetMemberOffset( psi->pobj_ParentClass->ppobj_Member[i]->name, &i2 );
-
-        if(psi->pobj_ParentClass->ppobj_Member[i]->SubScripts[0]!=-1){
+    for(i=0;i<pUserProc->GetParentClassPtr()->iMemberNum;i++){
+        offset = pUserProc->GetParentClassPtr()->GetMemberOffset( pUserProc->GetParentClassPtr()->ppobj_Member[i]->name, &i2 );
+
+        if(pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts[0]!=-1){
             //配列
             sprintf(temporary,"%s %s(&H%X)",
-                psi->pobj_ParentClass->ppobj_Member[i]->name,
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->name,
                 STRING_ARRAY,
                 offset);
@@ -442 +442 @@
             VarList_Array(hVarTree_This,hParent,
                 pThis+offset,
-                psi->pobj_ParentClass->ppobj_Member[i]->TypeInfo.type,
-                psi->pobj_ParentClass->ppobj_Member[i]->SubScripts,
-                psi->pobj_ParentClass->ppobj_Member[i]->TypeInfo.u.lpIndex);
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->TypeInfo.type,
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->SubScripts,
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->TypeInfo.u.lpIndex);
         }
         else{
             VarList_Insert(hVarTree_This,&tv,
-                psi->pobj_ParentClass->ppobj_Member[i]->name,
-                psi->pobj_ParentClass->ppobj_Member[i]->TypeInfo.type,
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->name,
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->TypeInfo.type,
                 pThis+offset,
-                psi->pobj_ParentClass->ppobj_Member[i]->TypeInfo.u.lpIndex);
+                pUserProc->GetParentClassPtr()->ppobj_Member[i]->TypeInfo.u.lpIndex);
         }
     }
@@ -583 +583 @@
 
     //プロシージャ コンボボックス
-    extern SubInfo **ppSubHash;
-    SubInfo *psi;
+    extern UserProc **ppSubHash;
+    UserProc *pUserProc;
     int sw;
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
     for(i2=pobj_dti->iProcLevel;i2>=0;i2--){
         for(i3=0,sw=0;i3<MAX_HASH;i3++){
-            psi=ppSubHash[i3];
-            while(psi){
-                if(rva_to_real(psi->CompileAddress) <= pobj_dti->lplpObp[i2]  &&
-                    pobj_dti->lplpObp[i2] < rva_to_real(psi->EndOpAddr)){
-                    lstrcpy(temporary,psi->name);
+            pUserProc=ppSubHash[i3];
+            while(pUserProc){
+                if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
+                    pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
+                    lstrcpy(temporary,pUserProc->GetName().c_str());
                     sw=1;
                     break;
                 }
-                psi=psi->pNextData;
+                pUserProc=pUserProc->pNextData;
             }
             if(sw) break;
         }
-        if(!psi){
+        if(!pUserProc){
             if(i2==0){
                 lstrcpy(temporary,"Global");
@@ -706 +706 @@
 
     if(pobj_dti->lplpSpBase[i2]){
-        extern SubInfo **ppSubHash;
-        SubInfo *psi;
+        extern UserProc **ppSubHash;
+        UserProc *pUserProc;
         for(i3=0,sw=0;i3<MAX_HASH;i3++){
-            psi=ppSubHash[i3];
-            while(psi){
-                if(rva_to_real(psi->CompileAddress) <= pobj_dti->lplpObp[i2]  &&
-                    pobj_dti->lplpObp[i2] < rva_to_real(psi->EndOpAddr)){
+            pUserProc=ppSubHash[i3];
+            while(pUserProc){
+                if(rva_to_real(pUserProc->beginOpAddress) <= pobj_dti->lplpObp[i2]  &&
+                    pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->endOpAddress)){
                     sw=1;
                     break;
                 }
 
-                psi=psi->pNextData;
+                pUserProc=pUserProc->pNextData;
             }
             if(sw) break;
@@ -723 +723 @@
 
 
-        if(psi){
-            LocalVar=psi->pVar;
-            MaxLocalVarNum=psi->VarNum;
-
-            pobj_CompilingClass=psi->pobj_ParentClass;
+        if(pUserProc){
+            LocalVar=pUserProc->pVar;
+            MaxLocalVarNum=pUserProc->VarNum;
+
+            pobj_CompilingClass=pUserProc->GetParentClassPtr();
         }
     }