Changeset 78 in dev for BasicCompiler_Common/VarList.cpp

Timestamp:

Mar 25, 2007, 2:47:49 AM (17 years ago)

Author:

dai_9181

Message:

CTypeDef → TypeDef
Houseクラスを追加。
オーバーロードレベルの種類を追加（レベル1に挿入）

File:

• BasicCompiler_Common/VarList.cpp (modified) (7 diffs)

BasicCompiler_Common/VarList.cpp

@@ -29 +29 @@
         }
 
-        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_OBJECT,(DWORD64)offset);
+        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_OBJECT,(ULONG_PTR)offset);
         lptv->item.iImage=1;
         lptv->item.iSelectedImage=1;
@@ -40 +40 @@
         i2=ReadProcessMemory(hDebugProcess,(void *)offset,&pData,sizeof(void *),&accessBytes);
 
-        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_POINTEROFOBJECT,(DWORD64)pData);
+        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_POINTEROFOBJECT,(ULONG_PTR)pData);
         lptv->item.iImage=4;
         lptv->item.iSelectedImage=4;
@@ -62 +62 @@
                     }
                 }
-                if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(DWORD64)pData,(DWORD64)pData);
-                else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(DWORD64)pData,(DWORD64)pData,temporary);
+                if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData);
+                else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData,temporary);
             }
             else sprintf(lptv->item.pszText,"%s %s",VarName,STRING_CANNOTACCESS);
@@ -361 +361 @@
     if(!pUserProc) return;
 
-    foreach( Variable *pVar, UserProc::CompilingUserProc().localVars ){
+    foreach( Variable *pVar, pUserProc->localVars ){
 
         //スコープ外の場合は無視
@@ -413 +413 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( "_System_LocalThis" );
+    const Variable *pVar = pUserProc->localVars.Find( "_System_LocalThis" );
     if( !pVar ){
         return;
@@ -428 +428 @@
                 pUserProc->GetParentClassPtr()->ppobj_Member[i]->name,
                 STRING_ARRAY,
-                (DWORD64)offset);
+                (ULONG_PTR)offset);
             tv.item.iImage=0;
             tv.item.iSelectedImage=0;
@@ -559 +559 @@
     for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++){
         for(i2=0;i2<MaxLineInfoNum-1;i2++){
-            if((DWORD64)(pLineInfo[i2].TopObp+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
-                pobj_dti->lplpObp[i3]<=(DWORD64)(pLineInfo[i2+1].TopObp+ImageBase+MemPos_CodeSection)) break;
+            if((ULONG_PTR)(pLineInfo[i2].TopObp+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
+                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(pLineInfo[i2+1].TopObp+ImageBase+MemPos_CodeSection)) break;
         }
         if(i2==MaxLineInfoNum) pobj_dti->lpdwCp[i3]=-1;