Changeset 95 in dev

Timestamp:

Apr 15, 2007, 1:34:02 AM (18 years ago)

Author:

dai_9181

Message:

RegisterGlobalRootsの自動生成に対応

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• BasicCompiler_Common/hash.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Smoothie.h (modified) (3 diffs)

BasicCompiler32/Compile_ProcOp.cpp

@@ -214 +214 @@
 
             pobj_DBClass->Compile_System_InitializeUserTypes();
+    }
+    else if( userProc.GetName() == "RegisterGlobalRoots"
+        && userProc.HasParentClass()
+        && (string)userProc.GetParentClass().name == "_System_CGarbageCollection" ){
+
+            Compile_AddGlobalRootsForGc();
     }
     else{

BasicCompiler32/Compile_Var.cpp

@@ -1318 +1318 @@
     }
 }
+
+bool Compile_AddGlobalRootsForGc(){
+    UserProc *pUserProc_AddGlobalRootPtr = GetClassMethod( "_System_CGarbageCollection", "AddGlobalRootPtr" );
+    if( !pUserProc_AddGlobalRootPtr ){
+        SetError(3, "_System_CGarbageCollection.AddGlobalRootPtr", -1 );
+        return false;
+    }
+
+    BOOST_FOREACH( const Variable *pVar, globalVars ){
+        if( pVar->IsObject() || pVar->IsPointer() || pVar->IsStruct() ){
+            // オブジェクトまたはポインタだったとき
+            // ※構造体も含む（暫定対応）
+
+            // 変数領域に要するLONG_PTR単位の個数を引き渡す
+            op_push_V( pVar->GetMemorySize()/PTR_SIZE );
+
+
+            /////////////////////////////
+            // ルートポインタを引き渡す
+
+            //mov eax,offset
+            op_mov_RV(REG_EAX,(int)pVar->offset);
+            obp-=sizeof(long);
+            pobj_GlobalVarSchedule->add();
+            obp+=sizeof(long);
+
+            //push eax
+            op_push( REG_EAX );
+
+            //
+            /////////////////////////////
+
+
+            /////////////////////////////
+            // Thisポインタを引き渡す
+
+            SetThisPtrToReg(REG_EAX);
+
+            //push eax
+            op_push( REG_EAX );
+
+            //
+            /////////////////////////////
+
+
+            // call AddGlobalRootPtr
+            op_call( pUserProc_AddGlobalRootPtr );
+
+            ReallocNativeCodeBuffer();
+        }
+    }
+
+    return true;
+}

BasicCompiler32/MakePeHdr.cpp

@@ -8 +8 @@
 // 特殊関数の構造体ポインタ
 ////////////////////////////
+
+// グローバル関数、静的メソッド
 UserProc
     *pSub_System_StartupProgram,
@@ -38 +40 @@
     
     *pSub_esp_error;
+
+// 動的メソッド
+UserProc
+    *pUserProc_System_CGarbageCollection_RegisterGlobalRoots;
 
 
@@ -250 +256 @@
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();
+    }
+
+    if( pUserProc_System_CGarbageCollection_RegisterGlobalRoots = GetClassMethod( "_System_CGarbageCollection", "RegisterGlobalRoots" ) ){
+        pUserProc_System_CGarbageCollection_RegisterGlobalRoots->Using();
+        pUserProc_System_CGarbageCollection_RegisterGlobalRoots->ThisIsAutoGenerationProc();
     }
 

BasicCompiler32/Opcode.h

@@ -192 +192 @@
 void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToEax(RELATIVE_VAR *pRelativeVar);
+bool Compile_AddGlobalRootsForGc();
 
 //ParamImpl.cpp

BasicCompiler64/Compile_ProcOp.cpp

@@ -205 +205 @@
 
             pobj_DBClass->Compile_System_InitializeUserTypes();
+    }
+    else if( userProc.GetName() == "RegisterGlobalRoots"
+        && userProc.HasParentClass()
+        && (string)userProc.GetParentClass().name == "_System_CGarbageCollection" ){
+
+            Compile_AddGlobalRootsForGc();
     }
     else{

BasicCompiler64/Compile_Var.cpp

@@ -1314 +1314 @@
     }
 }
+
+bool Compile_AddGlobalRootsForGc(){
+    UserProc *pUserProc_AddGlobalRootPtr = GetClassMethod( "_System_CGarbageCollection", "AddGlobalRootPtr" );
+    if( !pUserProc_AddGlobalRootPtr ){
+        SetError(3, "_System_CGarbageCollection.AddGlobalRootPtr", -1 );
+        return false;
+    }
+
+    BOOST_FOREACH( const Variable *pVar, globalVars ){
+        if( pVar->IsObject() || pVar->IsPointer() || pVar->IsStruct() ){
+            // オブジェクトまたはポインタだったとき
+            // ※構造体も含む（暫定対応）
+
+            // 変数領域に要するLONG_PTR単位の個数を引き渡す
+            //mov r8,count
+            op_mov_RV(sizeof(_int64), REG_R8,pVar->GetMemorySize()/PTR_SIZE);
+
+            // ルートポインタを引き渡す
+            //mov rdx,offset
+            op_mov_RV(sizeof(_int64), REG_RDX,(int)pVar->offset);
+            obp-=sizeof(long);
+            pobj_GlobalVarSchedule->add();
+            obp+=sizeof(long);
+
+            // Thisポインタを引き渡す
+            SetThisPtrToReg(REG_RCX);
+
+            // call AddGlobalRootPtr
+            op_call( pUserProc_AddGlobalRootPtr );
+
+            ReallocNativeCodeBuffer();
+        }
+    }
+
+    return true;
+}

BasicCompiler64/MakePeHdr.cpp

@@ -6 +6 @@
 // 特殊関数の構造体ポインタ
 ////////////////////////////
+
+// グローバル関数、静的メソッド
 UserProc
     *pSub_System_StartupProgram,
@@ -24 +26 @@
     *pSub_System_GC_free_for_SweepingDelete,
     *pSubStaticMethod_System_TypeBase_InitializeUserTypes;
+
+// 動的メソッド
+UserProc
+    *pUserProc_System_CGarbageCollection_RegisterGlobalRoots;
 
 
@@ -231 +237 @@
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();
+    }
+
+    if( pUserProc_System_CGarbageCollection_RegisterGlobalRoots = GetClassMethod( "_System_CGarbageCollection", "RegisterGlobalRoots" ) ){
+        pUserProc_System_CGarbageCollection_RegisterGlobalRoots->Using();
+        pUserProc_System_CGarbageCollection_RegisterGlobalRoots->ThisIsAutoGenerationProc();
     }
 

BasicCompiler64/Opcode.h

@@ -325 +325 @@
 void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar);
+bool Compile_AddGlobalRootsForGc();
 
 //ParamImpl.cpp

BasicCompiler_Common/common.h

@@ -296 +296 @@
 CONSTINFO *GetConstHash(char *name);
 DllProc *GetDeclareHash(char *name);
+void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs );
 UserProc *GetSubHash(const char *name,BOOL bError=0);
 UserProc *GetMethodHash(const char *ObjectName,const char *MethodName,const char *Parameter,BOOL bError=0);
-void GetOverloadSubHash( const char *lpszName, std::vector<UserProc *> &subs );
+UserProc *GetClassMethod( const char *className, const char *methodName );
 
 //Object.cpp

BasicCompiler_Common/hash.cpp

@@ -184 +184 @@
     return pUserProc;
 }
+
+UserProc *GetClassMethod( const char *className, const char *methodName ){
+    CClass *pClass = pobj_DBClass->check( className );
+    if( pClass ){
+        vector<UserProc *> userProcs;
+        pClass->EnumMethod( methodName, userProcs );
+        if( userProcs.size() == 1 ){
+            return userProcs[0];
+        }
+    }
+
+    char temporary[VN_SIZE];
+    sprintf( temporary, "%s.%s", className, methodName );
+    SetError(3, temporary, -1 );
+
+    return NULL;
+}

BasicCompiler_Common/include/Smoothie.h

@@ -14 +14 @@
             log = "";
 
-            ofstream ofs( ( (string)BasicSystemDir + "compile.log" ).c_str(), ios_base::trunc );
+            ofstream ofs( ( (string)BasicSystemDir + "Log\\compile.log" ).c_str(), ios_base::trunc );
             ofs.close();
 #endif
@@ -23 +23 @@
 
             {
-                ofstream ofs( ( (string)BasicSystemDir + "compile.log" ).c_str(), ios_base::app );
+                ofstream ofs( ( (string)BasicSystemDir + "Log\\compile.log" ).c_str(), ios_base::app );
                 ofs << text << endl;
                 ofs.close();
@@ -30 +30 @@
         }
         static void PutFile( const string &fileName, const string &buffer ){
-            ofstream ofs( ( (string)BasicSystemDir + fileName ).c_str() );
+            ofstream ofs( ( (string)BasicSystemDir + "Log\\" + fileName ).c_str() );
             ofs << buffer << endl;
             ofs.close();