Changeset 334 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Sep 28, 2007, 12:05:10 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_Func.cpp (modified) (6 diffs)
• Compile_Object.cpp (modified) (2 diffs)
• Compile_Var.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (2 diffs)
• NumOpe.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)
• OperatorProc.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -296 +296 @@
     userProc.Using();
 }
-void Opcode_CreateSimpleDelegate( const char *methodInstanceName, const UserProc &userProc )
+void Opcode_CreateSimpleDelegate( const CClass &dgClass, const char *methodInstanceName, const UserProc &userProc )
 {
     /////////////////////////////////////////////////////////////////
@@ -339 +339 @@
     compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
 
-    //push this
+    //push eax
     compiler.codeGenerator.op_push( REG_EAX );
 
@@ -347 +347 @@
     /////////////////////////////////////////////////////////////////
 
+    std::vector<const UserProc *> subs;
+    dgClass.GetStaticMethods().Enum( "_CreateDelegate", subs );
+
     // call _System_CreateSimpleDynamicDelegate
-    extern const UserProc *pSub_System_CreateSimpleDynamicDelegate;
-    compiler.codeGenerator.op_call( pSub_System_CreateSimpleDynamicDelegate );
+    compiler.codeGenerator.op_call( subs[0] );
 }
 void Opcode_Func_AddressOf( const char *name, const Type &baseType, bool isCallOn, Type &resultType ){
@@ -356 +358 @@
 
     const Parameters *pBaseParams = NULL;
-    bool isDelegate = false;
     if( baseType.IsProcPtr() )
     {
@@ -362 +363 @@
         pBaseParams = &compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params();
     }
-    else if( baseType.IsObject() && baseType.GetClass().GetName() == "_SimpleDelegate" )
-    {
-        extern const Delegate *pConstructingDelegate;
-        if( !pConstructingDelegate )
-        {
-            SetError();
-        }
+    else if( baseType.IsDelegate() )
+    {
         // 左辺でデリゲートを要求されているとき
-        pBaseParams = &pConstructingDelegate->Params();
-
-        isDelegate = true;
+        pBaseParams = &baseType.GetClass().GetDelegate().Params();
     }
 
@@ -402 +396 @@
     }
 
-    if( isDelegate )
+    if( baseType.IsDelegate() )
     {
         if( isCallOn )
         {
             // デリゲートのとき
-            Opcode_CreateSimpleDelegate( name, *pUserProc );
+            Opcode_CreateSimpleDelegate( baseType.GetClass(), name, *pUserProc );
         }
         resultType = baseType;

trunk/abdev/BasicCompiler32/Compile_Object.cpp

@@ -17 +17 @@
 
 
-    const Delegate *pBackConstructingDelegate;
-    if( pobj_c->IsDelegate() )
-    {
-        // デリゲートの場合はオーバーロード解決用のグローバル変数をセットする
-        extern const Delegate *pConstructingDelegate;
-        pBackConstructingDelegate = pConstructingDelegate;
-        pConstructingDelegate = &pobj_c->GetDelegate();
-    }
-
-
 /*  //jnzのジャンプ先番地
     extern int obp;
@@ -106 +96 @@
         */
     }
-
-    if( pobj_c->IsDelegate() )
-    {
-        // デリゲートの場合はオーバーロード解決用のグローバル変数を元に戻す
-        extern const Delegate *pConstructingDelegate;
-        pConstructingDelegate = pBackConstructingDelegate;
-    }
 }
 void Operator_New( const CClass &classObj, const char *objectSizeStr, const char *parameter, const Type &baseType ){

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -250 +250 @@
         if(!GetArrayOffset(pMember->GetSubscripts(),array,pMember->GetType())){
             if(isErrorEnabled) SetError(14,member,cp);
+            return false;
         }
     }

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -42 +42 @@
     *pSub_System_GC_free_for_SweepingDelete,
     *pSubStaticMethod_System_TypeBase_InitializeUserTypes,
-    *pSub_System_CreateSimpleDynamicDelegate,
 
     *pSub_allrem,
@@ -284 +283 @@
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();
     }
-
-    pSub_System_CreateSimpleDynamicDelegate = GetSubHash( "_System_CreateSimpleDynamicDelegate", TRUE );
 
     if( pUserProc_System_CGarbageCollection_RegisterGlobalRoots = GetClassMethod( "_System_CGarbageCollection", "RegisterGlobalRoots" ) ){

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -147 +147 @@
     const int useReg = REG_EAX;
 
+
+    ////////////////////////////////
+    // インデクサ（getアクセサ）
+    ////////////////////////////////
+    char VarName[VN_SIZE],ArrayElements[VN_SIZE];
+    GetArrayElement(member,VarName,ArrayElements);
+    if(ArrayElements[0]){
+        Type classType;
+        GetMemberType( leftType, VarName, classType, 0, false );
+        if( classType.IsObject() )
+        {
+            //オブジェクトポインタをecxにコピー
+            compiler.codeGenerator.op_mov_RR( REG_ECX, useReg );
+
+            RELATIVE_VAR relativeVar;
+            relativeVar.dwKind=VAR_DIRECTMEM;
+
+            if( !_member_offset(
+                true,   //エラー表示あり
+                false,  //読み込み専用
+                leftType,
+                VarName,&relativeVar,classType,0)){
+                    return false;
+            }
+
+            // オブジェクトメンバのポインタをeaxにコピー
+            if( !VarToReg( relativeVar, baseType, resultType ) ){
+                SetError(11,termFull,cp);
+            }
+
+
+            //オブジェクトポインタをスタックに入れておく
+            //push eax
+            compiler.codeGenerator.op_push( REG_EAX );
+
+            char objectFullName[VN_SIZE], dummyArrayElements[VN_SIZE];
+            GetArrayElement(termFull,objectFullName,dummyArrayElements);
+
+            CallIndexerGetterProc(/*UseReg,*/classType,objectFullName, ArrayElements,resultType, PROCFLAG_NEW );
+
+            compiler.codeGenerator.op_pop();
+
+            return true;
+        }
+    }
+
+
+    ///////////////////////////////////////////////////////////////////
+    // メンバを検索
+    ///////////////////////////////////////////////////////////////////
     if( GetMemberType( leftType, member, resultType, 0, false ) ){
         // メンバが見つかったとき

trunk/abdev/BasicCompiler32/Opcode.h

@@ -222 +222 @@
 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, char *ObjectName, char *Parameter,Type &resultType);
+void CallIndexerGetterProc( const Type &classType, const char *ObjectName, char *Parameter,Type &resultType, DWORD dwProcFlags = 0 );
 
 //Compile_Statement.cpp

trunk/abdev/BasicCompiler32/OperatorProc.cpp

@@ -252 +252 @@
     SetError(-1,"キャスト演算子がオーバーロードされていません。",cp);
 }
-void CallIndexerGetterProc( const Type &classType, char *ObjectName, char *Parameter,Type &resultType){
+void CallIndexerGetterProc( const Type &classType, const char *ObjectName, char *Parameter,Type &resultType, DWORD dwProcFlags ){
     std::vector<const UserProc *> subs;
     classType.GetClass().GetMethods().Enum( CALC_ARRAY_GET, subs );
@@ -261 +261 @@
     const UserProc *pUserProc = subs[0];
 
-    Opcode_CallProc(Parameter,pUserProc,0,ObjectName);
+    Opcode_CallProc(Parameter,pUserProc,dwProcFlags,ObjectName);
     resultType = pUserProc->ReturnType();