Changeset 64 in dev for BasicCompiler32/WatchList.cpp

Timestamp:

Mar 8, 2007, 2:49:34 AM (18 years ago)

Author:

dai_9181

Message:

すべてのオブジェクトを参照型に切り替えた。

File:

• BasicCompiler32/WatchList.cpp (modified) (9 diffs)

BasicCompiler32/WatchList.cpp

@@ -78 +78 @@
     if(PTR_LEVEL(*pType)){
         *pType=MAKE_PTR_TYPE(NATURAL_TYPE(*pType),PTR_LEVEL(*pType)-1);
-        if((*pType)==DEF_OBJECT){
-            CClass *pClass = (CClass *)lpIndex;
-            array_num *= pClass->GetSize();
-        }
-        else{
-            array_num *= GetTypeSize(*pType,-1);
-        }
+        array_num *= GetTypeSize(*pType,-1);
     }
     else{
@@ -114 +108 @@
     char lpPtrOffset[VN_SIZE];  //第2次配列
     char NestMember[VN_SIZE];   //入れ子メンバ
-    int RefType;                //"."参照のときは0、"->"参照のときは1
+    CClass::RefType refType;
     lstrcpy(VarName,member);
-    if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember,&RefType)) return 0;
+    if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember,refType)) return 0;
 
 
@@ -175 +169 @@
         //入れ子構造の場合
 
-        if(*pType==DEF_OBJECT){
-            if(RefType!=DEF_OBJECT) return 0;
-        }
-        else if(*pType==DEF_PTR_OBJECT){
+        if(*pType==DEF_OBJECT || *pType==DEF_STRUCT){
+            if( refType != CClass::Dot ) return 0;
+
+            if( *pType==DEF_OBJECT ){
+                extern HANDLE hDebugProcess;
+                LONG_PTR lpData;
+                SIZE_T stAccBytes;
+                lpData=Debugging_GetVarPtr(pRelativeVar);
+                if(!ReadProcessMemory(hDebugProcess,(void *)lpData,&pRelativeVar->offset,sizeof(LONG_PTR),&stAccBytes)) return -1;
+                pRelativeVar->dwKind=VAR_DIRECTMEM;
+            }
+        }
+        else if(*pType==DEF_PTR_OBJECT || *pType==DEF_PTR_STRUCT){
             //構造体ポインタ型メンバ変数
 
             if(lpPtrOffset[0]){
-                if(RefType!=DEF_OBJECT) return 0;
+                if( refType != CClass::Dot ) return 0;
 
                 //直接参照に切り替え
@@ -190 +193 @@
             }
             else{
-                if(RefType!=DEF_PTR_OBJECT) return 0;
+                if( refType != CClass::Pointer ) return 0;
 
                 extern HANDLE hDebugProcess;
@@ -319 +322 @@
 int Debugging_GetVarOffset(char *variable,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
     extern HANDLE hDebugProcess;
-    int i,i2,i3,RefType;
+    int i,i2,i3;
     char member[VN_SIZE],VarName[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
     ULONG_PTR lpData;
@@ -325 +328 @@
 
     lstrcpy(VarName,variable);
-    GetVarFormatString(VarName,array,lpPtrOffset,member,&RefType);
+    CClass::RefType refType;
+    GetVarFormatString(VarName,array,lpPtrOffset,member,refType);
 
     LONG_PTR lpIndex;
@@ -470 +474 @@
     }
     if(member[0]){
-        if(*pType==DEF_OBJECT){
+        if(*pType==DEF_OBJECT || *pType==DEF_STRUCT){
             //実態オブジェクトのメンバを参照（obj.member）
-            if(RefType!=DEF_OBJECT){
+            if( refType != CClass::Dot ){
                 return 0;
             }
@@ -489 +493 @@
             *plpIndex=lp2;
         }
-        else if(*pType==DEF_PTR_OBJECT){
+        else if(*pType==DEF_PTR_OBJECT || *pType==DEF_PTR_STRUCT){
             //ポインタオブジェクトが示すメンバを参照
             if(lpPtrOffset[0]){
                 //pObj[n].member
-                if(RefType!=DEF_OBJECT) return 0;
+                if( refType != CClass::Dot ) return 0;
                 Debugging_SetRelativeOffset(pType,lpIndex,pRelativeVar,lpPtrOffset);
 
@@ -511 +515 @@
             else{
                 //pObj->member
-                if(RefType!=DEF_PTR_OBJECT) return 0;
+                if( refType != CClass::Pointer ) return 0;
 
                 pRelativeVar->offset=Debugging_GetVarPtr(pRelativeVar);