Changeset 325 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Sep 25, 2007, 8:56:38 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_CallProc.cpp (modified) (1 diff)
• Compile_Func.cpp (modified) (3 diffs)
• FunctionValue.h (modified) (1 diff)
• Opcode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -424 +424 @@
     return true;
 }
+
+void Opcode_CallDelegate( const Delegate &dg, const char *methodPtrValueStr, const char *objPtrValueStr, const char *params )
+{
+    ///////////////////////////////////////////////////////////////
+    // _System_LocalThisのダミーをセット
+    ///////////////////////////////////////////////////////////////
+
+    char temporary[VN_SIZE]={0};
+    if( objPtrValueStr && objPtrValueStr[0] ){
+        //_System_LocalThis（第一パラメータ）のダミーを作成
+        lstrcpy(temporary,"0,");
+    }
+    if( dg.ReturnType().IsStruct() ){
+        // ※ByRef _System_ReturnValue パラメータのダミーをセット
+        lstrcat(temporary,"0,");
+    }
+
+    if(params[0]=='\0'&&temporary[0])
+        temporary[lstrlen(temporary)-1]=0;
+    else lstrcat(temporary,params);
+
+
+    ParamImpl *pobj_parameter = new ParamImpl( params );
+
+    //一時オブジェクトを生成
+    pobj_parameter->NewTempParameters( dg.GetName(), dg.Params() );
+
+    //レジスタ、スタックフレームにセット
+    int ParmSize = pobj_parameter->SetParameter( dg.GetName(), dg.Params() );
+
+
+    if( objPtrValueStr && objPtrValueStr[0] )
+    {
+        RELATIVE_VAR RelativeVar;
+        //Constアクセスが不可能なメソッドの場合
+        if( !GetVarOffsetReadWrite( objPtrValueStr, &RelativeVar, Type() ) ){
+            Jenga::Throw( "Opcode_CallDelegate関数内で呼ばれるGetVarOffsetReadWrite関数に失敗" );
+            return;
+        }
+
+        SetVarPtrToEax(&RelativeVar);
+
+        // 参照を実体ポインタにする
+        compiler.codeGenerator.op_mov_RM( sizeof(long), REG_ECX, REG_EAX, 0, MOD_BASE );
+
+        //push ecx
+        compiler.codeGenerator.op_push(REG_ECX);
+    }
+
+
+    {
+        ////////////////////////
+        // call
+        ////////////////////////
+        RELATIVE_VAR RelativeVar;
+        GetVarOffsetReadOnly( methodPtrValueStr, &RelativeVar, Type() );
+        SetVarPtrToEax( &RelativeVar );
+
+        //mov eax,dword ptr[eax]
+        compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
+
+        //call eax
+        compiler.codeGenerator.op_call_R( REG_EAX );
+    }
+
+
+    //一時オブジェクトを破棄
+    pobj_parameter->DeleteTempParameters();
+
+    //パラメータオブジェクトを破棄
+    delete pobj_parameter;
+}

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -9 +9 @@
 
 int GetFunctionFromName(char *FuncName){
-    if(lstrcmpi(FuncName,"CUDbl")==0)       return FUNC_CUDBL;
-    if(lstrcmpi(FuncName,"Fix")==0)         return FUNC_FIX;
-    if(lstrcmpi(FuncName,"Len")==0)         return FUNC_LEN;
-    if(lstrcmpi(FuncName,"AddressOf")==0)   return FUNC_ADDRESSOF;
-    if(lstrcmpi(FuncName,"SizeOf")==0)      return FUNC_SIZEOF;
-    if(lstrcmpi(FuncName,"VarPtr")==0)      return FUNC_VARPTR;
-    if(lstrcmpi(FuncName,"ObjPtr")==0)      return FUNC_OBJPTR;
-    if(lstrcmpi(FuncName,"GetDouble")==0)   return FUNC_GETDOUBLE;
-    if(lstrcmpi(FuncName,"GetSingle")==0)   return FUNC_GETSINGLE;
-    if(lstrcmpi(FuncName,"GetQWord")==0)    return FUNC_GETQWORD;
-    if(lstrcmpi(FuncName,"GetDWord")==0)    return FUNC_GETDWORD;
-    if(lstrcmpi(FuncName,"GetWord")==0)     return FUNC_GETWORD;
-    if(lstrcmpi(FuncName,"GetByte")==0)     return FUNC_GETBYTE;
+    if( lstrcmpi( FuncName, "CUDbl" ) == 0 )            return FUNC_CUDBL;
+    if( lstrcmpi( FuncName, "Fix" ) == 0 )              return FUNC_FIX;
+    if( lstrcmpi( FuncName, "Len" ) == 0 )              return FUNC_LEN;
+    if( lstrcmpi( FuncName, "AddressOf" ) == 0 )        return FUNC_ADDRESSOF;
+    if( lstrcmpi( FuncName, "SizeOf" ) == 0 )           return FUNC_SIZEOF;
+    if( lstrcmpi( FuncName, "VarPtr" ) == 0 )           return FUNC_VARPTR;
+    if( lstrcmpi( FuncName, "ObjPtr" ) == 0 )           return FUNC_OBJPTR;
+    if( lstrcmpi( FuncName, "__delegate_dynamicmethod_call" ) == 0 )    return FUNC_DELEGATE_DYNAMICMETHOD_CALL;
+    if( lstrcmpi( FuncName, "__delegate_staticmethod_call" ) == 0 )     return FUNC_DELEGATE_STATICMETHOD_CALL;
+    if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
+    if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
+    if( lstrcmpi( FuncName, "GetQWord" ) == 0 )         return FUNC_GETQWORD;
+    if( lstrcmpi( FuncName, "GetDWord" ) == 0 )         return FUNC_GETDWORD;
+    if( lstrcmpi( FuncName, "GetWord" ) == 0 )          return FUNC_GETWORD;
+    if( lstrcmpi( FuncName, "GetByte" ) == 0 )          return FUNC_GETBYTE;
     return 0;
 }
@@ -394 +396 @@
     }
 }
+
+void Opcode_Func_delegate_call( const char *paramsStr, Type &resultType, bool isDynamicCall, bool isCallOn )
+{
+    if( isCallOn )
+    {
+        int i = 0;
+        char methodPtrParamStr[VN_SIZE];
+        i = GetOneParameter( paramsStr, i, methodPtrParamStr );
+
+        char objPtrValueStr[VN_SIZE];
+        if( isDynamicCall )
+        {
+            i = GetOneParameter( paramsStr, i, objPtrValueStr );
+        }
+
+        Opcode_CallDelegate( compiler.pCompilingClass->GetDelegate(), methodPtrParamStr, objPtrValueStr, paramsStr + i );
+    }
+
+    resultType = UserProc::CompilingUserProc().ReturnType();
+}
+
 void Opcode_Func_GetPtrData(const char *Parameter,const int type){
     Type tempType;
@@ -482 +505 @@
             Opcode_Func_ObjPtr( Parameter, resultType, isCallOn );
             break;
+        case FUNC_DELEGATE_DYNAMICMETHOD_CALL:
+            Opcode_Func_delegate_call( Parameter, resultType, true, isCallOn );
+            break;
+        case FUNC_DELEGATE_STATICMETHOD_CALL:
+            Opcode_Func_delegate_call( Parameter, resultType, false, isCallOn );
+            break;
 
         case FUNC_GETDOUBLE:

trunk/abdev/BasicCompiler32/FunctionValue.h

@@ -13 +13 @@
 
 //その他
-#define FUNC_ADDRESSOF  0x0619
-#define FUNC_SIZEOF     0x0620
+#define FUNC_ADDRESSOF      0x0619
+#define FUNC_SIZEOF         0x0620
+#define FUNC_DELEGATE_DYNAMICMETHOD_CALL    0x0621
+#define FUNC_DELEGATE_STATICMETHOD_CALL     0x0622
 
 //ポインタ
-#define FUNC_GETDOUBLE  0x0630
-#define FUNC_GETSINGLE  0x0631
-#define FUNC_GETQWORD   0x0632
-#define FUNC_GETDWORD   0x0633
-#define FUNC_GETWORD    0x0634
-#define FUNC_GETBYTE    0x0635
+#define FUNC_GETDOUBLE      0x0630
+#define FUNC_GETSINGLE      0x0631
+#define FUNC_GETQWORD       0x0632
+#define FUNC_GETDWORD       0x0633
+#define FUNC_GETWORD        0x0634
+#define FUNC_GETBYTE        0x0635

trunk/abdev/BasicCompiler32/Opcode.h

@@ -215 +215 @@
 bool Opcode_CallProc(const char *Parameter,const UserProc *pUserProc,DWORD dwFlags,const char *ObjectName );
 bool Opcode_CallDllProc( const char *lpszParms, const DllProc *pDllProc );
+void Opcode_CallDelegate( const Delegate &dg, const char *methodPtrValueStr, const char *objPtrValueStr, const char *params );
 
 //Compile_ProcOp.cpp