Changeset 350 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Oct 14, 2007, 9:41:03 PM (17 years ago)

Author:

dai_9181

Message:

インターフェイスを実装

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_CallProc.cpp (modified) (6 diffs)
• Compile_Func.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)
• OperatorProc.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -156 +156 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOfInterfaceMethod( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOrInterfaceMethod( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる
@@ -280 +280 @@
         //////////////////////////////////////////////////////
         // メンバ関数の場合
-        // ※_System_LocalThis パラメータをセット
+        // ※_System_LocalThis パラメータをecxにセット
         //////////////////////////////////////////////////////
 
@@ -319 +319 @@
             }
         }
-
-        //push ecx
-        compiler.codeGenerator.op_push(REG_ECX);
-    }
-
-    if( pUserProc->IsVirtual() && !isFixedClass ){
-        //仮想関数（オブジェクトメソッド）呼び出し
-        //pObj->func_table->func1
-        //                ->func2
-        //                ->func3
-
+    }
+
+    if( pUserProc->IsVirtual() && !isFixedClass )
+    {
         int vtblIndex;
         if( pobj_c->IsInterface() )
@@ -347 +340 @@
 
             // インターフェイスの場合は更に__thisを取得する
-            //mov rcx,qword ptr[rcx+offset_this]
+            //mov ecx,qword ptr[ecx+offset_this]
             compiler.codeGenerator.op_mov_RM( sizeof(long), REG_ECX, REG_ECX, offset_this, MOD_BASE_DISP8 );
 
@@ -376 +369 @@
             // vtblのポインタを取得
             //mov edx,dword ptr[edx+vtblMasterListIndex]
-            compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex, MOD_BASE_DISP32 );
-        }
+            compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex*PTR_SIZE, MOD_BASE_DISP32 );
+        }
+
+        //push ecx
+        compiler.codeGenerator.op_push(REG_ECX);    
 
         //call dword ptr[edx+func_index]
@@ -399 +395 @@
         //通常呼び出し
 
+        if( pUserProc->GetParentClassPtr() && isStatic == false )
+        {
+            //push ecx
+            compiler.codeGenerator.op_push(REG_ECX);
+        }
+
         //call ProcAddr
         compiler.codeGenerator.op_call(pUserProc);

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -315 +315 @@
             // vtblのポインタを取得
             //mov edx,dword ptr[edx+vtblMasterListIndex]
-            compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex, MOD_BASE_DISP32 );
+            compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EDX, vtblMasterListIndex*PTR_SIZE, MOD_BASE_DISP32 );
         }
 

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -258 +258 @@
         UserProc::CompileStartForUserProc( pBackUserProc );
         cp=BackCp;
+    }
+    else if( userProc.HasParentClass()
+        && userProc.IsCastOperator()
+        && userProc.ReturnType().IsInterface() )
+    {
+        // インターフェイス型にキャストするためのメソッド
+
+        int vtblMasterListIndex = userProc.GetParentClass().GetVtblMasterListIndex( &userProc.ReturnType().GetClass() );
+
+        char temporary[1024];
+        sprintf( temporary,
+            "Return New %s(ObjPtr( This ),Get_LONG_PTR( (Get_LONG_PTR( ObjPtr(This) ) + SizeOf(LONG_PTR)*%d) As VoidPtr ) As VoidPtr )",
+            userProc.ReturnType().GetClass().GetName().c_str(),
+            vtblMasterListIndex
+        );
+        MakeMiddleCode( temporary );
+
+        ChangeOpcode( temporary );
     }
     else{

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -1214 +1214 @@
 
     //New呼び出し
-    if( type.IsObject() &&(dwFlags&DIMFLAG_NONCALL_CONSTRACTOR)==0&&InitBuf[0]=='\0'){
+    if( type.IsObject()
+        && !type.IsInterface()
+        &&(dwFlags&DIMFLAG_NONCALL_CONSTRACTOR)==0
+        &&InitBuf[0]=='\0')
+    {
         char objectSize[255];
         if( subscripts.size() == 0 ){

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -232 +232 @@
     GetVarFormatString(methodName,parameter,lpPtrOffset,dummy,refType);
 
-    objClass.EnumDynamicMethodsOfInterfaceMethods( methodName, userProcs );
+    objClass.EnumDynamicMethodsOrInterfaceMethods( methodName, userProcs );
     if(userProcs.size()){
         //オーバーロードを解決
@@ -819 +819 @@
                     || term[0] == '\"' )
                 {
-                    if( baseType.IsObject() || baseType.IsNull() )
+                    if( !baseType.IsPointer() )
                     {
                         //要求タイプがオブジェクト、または未定のとき

trunk/abdev/BasicCompiler32/Opcode.h

@@ -220 +220 @@
 //OperatorProc.cpp
 void FreeTempObject(int reg,const CClass *pobj_c);
-int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
+int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack, LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
 void CallCastOperatorProc(Type &calcType,BOOL bCalcUseHeap,const Type &toType);
 void CallIndexerGetterProc( const Type &classType, const char *ObjectName, char *Parameter,Type &resultType, DWORD dwProcFlags = 0 );

trunk/abdev/BasicCompiler32/OperatorProc.cpp

@@ -28 +28 @@
 }
 
-int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
+int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack, LONG_PTR *index_stack,BOOL *bUseHeap,int &sp)
+{
+    Type leftType( type_stack[sp-2], index_stack[sp-2] );
+    Type rightType( type_stack[sp-1] & (~FLAG_CAST), index_stack[sp-1] );
+
     //オーバーロードされたオペレータ関数を呼び出す
-    CClass *pobj_c;
-    pobj_c=(CClass *)index_stack[sp-2];
+    const CClass *pobj_c = &leftType.GetClass();
 
     std::vector<const UserProc *> subs;
@@ -52 +55 @@
 
     if(bTwoTerm){
-        params.push_back( new Parameter( "", Type( type_stack[sp-1], index_stack[sp-1] ) ) );
+        params.push_back( new Parameter( "", rightType ) );
     }
 
@@ -89 +92 @@
     }
 
-    int right_side_size = Type(type_stack[sp-1],index_stack[sp-1]).GetSize();
+    int right_side_size = rightType.GetSize();
 
     if(bTwoTerm){