Changeset 584 in dev for trunk/ab5.0/abdev/compiler_x64/Compile_Func.cpp

Timestamp:

May 10, 2008, 12:19:15 PM (16 years ago)

Author:

dai_9181

Message:

[530]～[583]を64bit版にマージ。

File:

• trunk/ab5.0/abdev/compiler_x64/Compile_Func.cpp (modified) (3 diffs)

trunk/ab5.0/abdev/compiler_x64/Compile_Func.cpp

@@ -120 +120 @@
             SetThisPtrToReg(REG_RCX);
 
-            pobj_c=compiler.pCompilingClass;
+            pobj_c = &compiler.GetCompilingClass();
         }
 
@@ -295 +295 @@
     {
         // 左辺でデリゲートを要求されているとき
-        const Delegate *pTempDelegate = &baseType.GetClass().GetDelegate();
+        const Delegate *pTempDelegate = &compiler.GetObjectModule().meta.ToDelegate( baseType.GetClass() );
         pBaseParams = &pTempDelegate->Params();
         pBaseReturnType = &pTempDelegate->ReturnType();
@@ -474 +474 @@
         }
 
-        Opcode_CallDelegate( compiler.pCompilingClass->GetDelegate(), methodPtrParamStr, objPtrValueStr, paramsStr + i );
-    }
-
-    resultType = UserProc::CompilingUserProc().ReturnType();
+        Opcode_CallDelegate( compiler.GetObjectModule().meta.ToDelegate( compiler.GetCompilingClass() ), methodPtrParamStr, objPtrValueStr, paramsStr + i );
+    }
+
+    resultType = compiler.GetCompilingUserProc().ReturnType();
 }