Changeset 348 in dev for trunk/abdev/BasicCompiler64

Timestamp:

Oct 12, 2007, 3:25:54 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler64

Files:

• Compile_CallProc.cpp (modified) (2 diffs)
• Compile_Func.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -361 +361 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( pUserProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
@@ -367 +370 @@
         // vtblのポインタを取得
         //mov r11,dword ptr[r11+vtblMasterListIndex]
-        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( pUserProc );
-        compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex, MOD_BASE_DISP32 );
-
-        int vtblIndex = pobj_c->GetFuncNumInVtbl( pUserProc );
+        compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex*PTR_SIZE, MOD_BASE_DISP32 );
 
         //call qword ptr[r11+func_index]

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -121 +121 @@
         //                ->func3
 
+        int vtblMasterListIndex, vtblIndex;
+        pobj_c->GetVtblMasterListIndexAndVtblIndex( &userProc, vtblMasterListIndex, vtblIndex );
+
         // vtblマスターリストのポインタを取得
         //mov r11,qword ptr[rcx]
@@ -127 +130 @@
         // vtblのポインタを取得
         //mov r11,dword ptr[r11+vtblMasterListIndex]
-        int vtblMasterListIndex = pobj_c->GetVtblMasterListIndex( &userProc );
         compiler.codeGenerator.op_mov_RM( sizeof(_int64), REG_R11, REG_R11, vtblMasterListIndex, MOD_BASE_DISP32 );
-
-        int vtblIndex = pobj_c->GetFuncNumInVtbl( &userProc );
 
         //mov rax,qword ptr[r11+func_index]