Changeset 18 in dev for BasicCompiler64/Compile_CallProc.cpp

Timestamp:

Dec 24, 2006, 4:46:12 AM (17 years ago)

Author:

dai_9181

Message:

オブジェクト定数に対応。

File:

• BasicCompiler64/Compile_CallProc.cpp (modified) (4 diffs)

BasicCompiler64/Compile_CallProc.cpp

@@ -233 +233 @@
 
     BOOL bStatic=0;
-    CClass *pobj_c;
+    CClass *pobj_c = NULL;
+    CMethod *pMethod = NULL;
     if(psi->pobj_ParentClass){
         //クラスのメンバ関数を呼び出す場合はアクセスチェックを行う
@@ -264 +265 @@
         }
 
-        DWORD dwAccess;
-        for(i=0;i<pobj_c->iMethodNum;i++){
-            if(psi==pobj_c->ppobj_Method[i]->psi) break;
-        }
-        if(i==pobj_c->iMethodNum){
-            for(i=0;i<pobj_c->iStaticMethodNum;i++){
-                if(psi==pobj_c->ppobj_StaticMethod[i]->psi) break;
-            }
-            dwAccess=pobj_c->ppobj_StaticMethod[i]->dwAccess;
-
-            bStatic=1;
-        }
-        else dwAccess=pobj_c->ppobj_Method[i]->dwAccess;
+
+        /////////////////////////////////
+        // メソッド情報を取得
+        /////////////////////////////////
+        pMethod = pobj_c->GetMethodInfo( psi );
+        if( !pMethod ){
+            //動的メソッドが取得できなかったときは静的メソッドを当たる
+            pMethod = pobj_c->GetStaticMethodInfo( psi );
+            if( !pMethod ){
+                SetError(300,NULL,cp);
+                return -1;
+            }
+        }
 
 
@@ -282 +283 @@
         // アクセスエラーチェック
         //////////////////////////////
+        DWORD dwAccess = pMethod->dwAccess;
 
         if(ObjectName[0]){
@@ -408 +410 @@
             else{
                 RELATIVE_VAR RelativeVar;
-                if(!GetVarOffsetReadOnly(ObjectName,&i2,&RelativeVar,0)) return -1;
+                if( pMethod->isConst ){
+                    //Constアクセスが可能なメソッドの場合
+                    if( !GetVarOffsetReadOnly( ObjectName, &i2, &RelativeVar, 0 ) ) return -1;
+                }
+                else{
+                    //Constアクセスが不可能なメソッドの場合
+                    if( !GetVarOffsetReadWrite( ObjectName, &i2, &RelativeVar, 0 ) ) return -1;
+                }
+
                 SetVarPtrToReg(REG_RCX,&RelativeVar);