Changeset 332 in dev for trunk/abdev

Timestamp:

Sep 27, 2007, 3:37:06 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Func.cpp (modified) (5 diffs)
• BasicCompiler32/Compile_Object.cpp (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler_Common/BasicCompiler.h (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Type.h (modified) (1 diff)
• BasicCompiler_Common/src/Type.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -427 +427 @@
 void Opcode_CallDelegate( const Delegate &dg, const char *methodPtrValueStr, const char *objPtrValueStr, const char *params )
 {
+    extern BOOL bDebugCompile;
+    extern BOOL bDebugSupportProc;
+    if(bDebugCompile&&bDebugSupportProc==0)
+        Call_DebugSys_SaveContext();
+
+
     ///////////////////////////////////////////////////////////////
     // _System_LocalThisのダミーをセット

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -221 +221 @@
     compiler.codeGenerator.op_mov_RV( REG_EAX, typeSize );
 }
-void Opcode_Func_AddressOf( const char *name, const Type &baseType ){
-    extern int cp;
-    const UserProc *pUserProc;
-
-    if( baseType.IsProcPtr() )
-    {
-        //左辺の型にのっとり、オーバーロードを解決
-
-        std::vector<const UserProc *> subs;
-        GetOverloadSubHash( name, subs );
-        if( subs.size() == 0 ){
-            SetError(27,name,cp);
-            return;
-        }
-
-        //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params(), Type() );
-
-        if(!pUserProc){
-            SetError(27,name,cp);
-            return;
-        }
-    }
-    else{
-        pUserProc=GetSubHash(name);
-        if(!pUserProc){
-            SetError(27,name,cp);
-            return;
-        }
-    }
-
-    if( pUserProc->IsVirtual() ){
+
+void _Opcode_Func_AddressOf( const char *methodInstanceName, const UserProc &userProc )
+{
+    if( userProc.IsVirtual() ){
         ///////////////////////////////
         // 仮想関数の場合
@@ -262 +234 @@
         char ObjectName[VN_SIZE];
         ReferenceKind referenceKind;
-        SplitObjectName(name,ObjectName, referenceKind );
+        SplitObjectName( methodInstanceName, ObjectName, referenceKind );
 
         if(ObjectName[0]){
@@ -305 +277 @@
         compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_ECX, 0, MOD_BASE );
 
-        int i2 = pobj_c->GetFuncNumInVtbl( pUserProc );
+        int i2 = pobj_c->GetFuncNumInVtbl( &userProc );
 
         //mov eax,dword ptr[edx+func_index]
@@ -319 +291 @@
 
         //mov eax,ProcAddr
-        compiler.codeGenerator.op_addressof( REG_EAX, pUserProc );
-    }
-
-    pUserProc->Using();
+        compiler.codeGenerator.op_addressof( REG_EAX, &userProc );
+    }
+
+    userProc.Using();
+}
+void Opcode_CreateSimpleDelegate( const char *methodInstanceName, const UserProc &userProc )
+{
+    /////////////////////////////////////////////////////////////////
+    // 関数ポインタをpush
+    /////////////////////////////////////////////////////////////////
+
+    //push AddressOf(userProc)
+    _Opcode_Func_AddressOf( methodInstanceName, userProc );
+    compiler.codeGenerator.op_push( REG_EAX );
+
+
+    /////////////////////////////////////////////////////////////////
+    // オブジェクト ポインタをpush
+    /////////////////////////////////////////////////////////////////
+
+    // オブジェクト名を取得
+    char objectName[VN_SIZE];
+    char memberName[VN_SIZE];
+    char *thisPtrName = "This";
+    Type type;
+    if( SplitMemberName( methodInstanceName, objectName, memberName ) )
+    {
+        if( GetVarType( objectName, type, false ) )
+        {
+            thisPtrName = objectName;
+        }
+    }
+
+    // オブジェクト ポインタを取得
+    RELATIVE_VAR relativeVar;
+    GetVarOffsetReadOnly( thisPtrName, &relativeVar, type );
+    if( !type.IsObject() )
+    {
+        extern int cp;
+        SetError(1,NULL,cp);
+        return;
+    }
+
+    SetVarPtrToEax( &relativeVar );
+
+    //mov eax,dword ptr[eax]
+    compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
+
+    //push this
+    compiler.codeGenerator.op_push( REG_EAX );
+
+
+    /////////////////////////////////////////////////////////////////
+    // call _System_CreateSimpleDynamicDelegate
+    /////////////////////////////////////////////////////////////////
+
+    // call _System_CreateSimpleDynamicDelegate
+    extern const UserProc *pSub_System_CreateSimpleDynamicDelegate;
+    compiler.codeGenerator.op_call( pSub_System_CreateSimpleDynamicDelegate );
+}
+void Opcode_Func_AddressOf( const char *name, const Type &baseType, bool isCallOn, Type &resultType ){
+    extern int cp;
+    const UserProc *pUserProc;
+
+    const Parameters *pBaseParams = NULL;
+    bool isDelegate = false;
+    if( baseType.IsProcPtr() )
+    {
+        // 左辺で関数ポインタを要求されているとき
+        pBaseParams = &compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params();
+    }
+    else if( baseType.IsObject() && baseType.GetClass().GetName() == "_SimpleDelegate" )
+    {
+        extern const Delegate *pConstructingDelegate;
+        if( !pConstructingDelegate )
+        {
+            SetError();
+        }
+        // 左辺でデリゲートを要求されているとき
+        pBaseParams = &pConstructingDelegate->Params();
+
+        isDelegate = true;
+    }
+
+    if( pBaseParams )
+    {
+        //左辺の型にのっとり、オーバーロードを解決
+
+        std::vector<const UserProc *> subs;
+        GetOverloadSubHash( name, subs );
+        if( subs.size() == 0 ){
+            SetError(27,name,cp);
+            return;
+        }
+
+        //オーバーロードを解決
+        pUserProc=OverloadSolution( name, subs, *pBaseParams, Type() );
+
+        if(!pUserProc){
+            SetError(27,name,cp);
+            return;
+        }
+    }
+    else{
+        pUserProc=GetSubHash(name);
+        if(!pUserProc){
+            SetError(27,name,cp);
+            return;
+        }
+    }
+
+    if( isDelegate )
+    {
+        if( isCallOn )
+        {
+            // デリゲートのとき
+            Opcode_CreateSimpleDelegate( name, *pUserProc );
+        }
+        resultType = baseType;
+    }
+    else
+    {
+        if( isCallOn )
+        {
+            // 関数ポインタのとき
+            _Opcode_Func_AddressOf( name, *pUserProc );
+        }
+        resultType.SetBasicType( DEF_PTR_VOID );
+    }
 }
 void Opcode_Func_SizeOf( const string &typeName ){
@@ -493 +590 @@
             break;
         case FUNC_ADDRESSOF:
-            if( isCallOn ) Opcode_Func_AddressOf( Parameter, baseType );
-            resultType.SetBasicType( DEF_PTR_VOID );
+            Opcode_Func_AddressOf( Parameter, baseType, isCallOn, resultType );
             break;
         case FUNC_SIZEOF:

trunk/abdev/BasicCompiler32/Compile_Object.cpp

@@ -16 +16 @@
     //をセットしておかなければならない
 
+
+    const Delegate *pBackConstructingDelegate;
+    if( pobj_c->IsDelegate() )
+    {
+        // デリゲートの場合はオーバーロード解決用のグローバル変数をセットする
+        extern const Delegate *pConstructingDelegate;
+        pBackConstructingDelegate = pConstructingDelegate;
+        pConstructingDelegate = &pobj_c->GetDelegate();
+    }
+
+
 /*  //jnzのジャンプ先番地
     extern int obp;
@@ -95 +106 @@
         */
     }
+
+    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/MakePeHdr.cpp

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

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -61 +61 @@
 
 
+//デリゲートのベース タイプ インデックス（コンストラクトされるデリゲートのパラメータを参考に、オーバーロードを解決）
+const Delegate *pConstructingDelegate;
+
+
 int cp;
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -8 +8 @@
 #include "../BasicCompiler_Common/common.h"
 
-void ChangeReturnCode(char *buffer){
+void ChangeReturnCode(char *buffer)
+{
+    int i;
+
+    bool isMustChange = false;
+    for( i=0; ; i++ ){
+        if( buffer[i] == '\0' ){
+            break;
+        }
+        if( buffer[i]=='\n' )
+        {
+            if( i>0 )
+            {
+                if( buffer[i-1] == '\r' )
+                {
+                    isMustChange = true;
+                }
+            }
+        }
+    }
+
+    if( !isMustChange )
+    {
+        // 改行コードの変換は必要ない
+        return;
+    }
 
 #ifdef _DEBUG

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -77 +77 @@
     }
 
-    if( type.IsObject() && type.GetClass().IsDelegate() )
+    if( type.IsDelegate() )
     {
         // デリゲート

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -188 +188 @@
     bool IsVoidPtr() const;
     bool IsAny() const;
+    bool IsDelegate() const;
 
     // オブジェクトや構造体など、メンバを持つ型かどうかを判別する

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -442 +442 @@
     }
     return false;
+}
+
+bool Type::IsDelegate() const
+{
+    return ( IsObject() && GetClass().IsDelegate() );
 }