Changeset 641 in dev for trunk/ab5.0/abdev/compiler_x86

Timestamp:

Jun 15, 2008, 11:59:46 PM (16 years ago)

Author:

dai_9181

Message:

・デバッグトレース時、グローバル領域の終端行でステップインまたはステップアウトしたときにデバッグ情報の取得に失敗して強制終了してしまう不具合を修正。
・グローバル領域のデバッグ実行ができなくなっている不具合を修正。

Location:

trunk/ab5.0/abdev/compiler_x86

Files:

• Compile_ProcOp.cpp (modified) (8 diffs)
• Compile_Var.cpp (modified) (2 diffs)
• MakePeHdr.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp

@@ -24 +24 @@
         }
 
-        const UserProc *pBackUserProc;
-        pBackUserProc = &compiler.GetCompilingUserProc();
-        compiler.StartGlobalAreaCompile();
-
         int BackCp;
         BackCp=cp;
@@ -52 +48 @@
         GetGlobalDataForDll();
 
-        compiler.SetCompilingUserProc( pBackUserProc );
         cp=BackCp;
 
@@ -81 +76 @@
         compiler.codeGenerator.op_ret();
     }
-    else if( userProc.GetName() == "_System_Call_Destructor_of_GlobalObject" ){
-
-        const UserProc *pBackUserProc;
-        pBackUserProc = &compiler.GetCompilingUserProc();
-        compiler.StartGlobalAreaCompile();
-
+    else if( userProc.GetName() == "_System_Call_Destructor_of_GlobalObject" )
+    {
         compiler.codeGenerator.lexicalScopes.CallDestructorsOfScopeEnd();
 
         compiler.SetCompilingUserProc( pBackUserProc );
-
 
         //ret
@@ -213 +203 @@
     else if( userProc.GetName() == "RegisterGlobalRoots"
         && userProc.HasParentClass()
-        && userProc.GetParentClass().GetName() == "_System_CGarbageCollection" ){
-
-            Compile_AddGlobalRootsForGc();
-    }
-    else if( userProc.GetName() == compiler.globalAreaProcName ){
+        && userProc.GetParentClass().GetName() == "_System_CGarbageCollection" )
+    {
+        Compile_AddGlobalRootsForGc();
+    }
+    else if( userProc.GetName() == compiler.globalAreaProcName )
+    {
         ////////////////////////////////////////
         // グローバル領域をコンパイル
@@ -223 +214 @@
 
         UserProc::pGlobalProc = &userProc;
-
-        const UserProc *pBackUserProc = &compiler.GetCompilingUserProc();
-        compiler.StartGlobalAreaCompile();
 
         int BackCp = cp;
@@ -251 +239 @@
         }
 
-        compiler.SetCompilingUserProc( pBackUserProc );
         cp=BackCp;
     }
@@ -293 +280 @@
     pUserProc->CompleteCompile();
 
-    extern BOOL bSystemProc;
-    if(memcmp(pUserProc->GetName().c_str(),"_System_",8)==0) bSystemProc=1;
-    else bSystemProc=0;
-
     extern BOOL bDebugSupportProc;
     if(memcmp(pUserProc->GetName().c_str(),"_DebugSys_",10)==0)
@@ -316 +299 @@
     compiler.StartProcedureCompile( pUserProc );
 
-    if(pUserProc->IsSystem()){
+    if(pUserProc->IsAutoGenerationSystem()){
         ////////////////////
         // 特殊関数

trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

@@ -1329 +1329 @@
     }
 }
-void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar){
+void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar)
+{
     if( reg != REG_EAX ){
         compiler.errorMessenger.OutputFatalError();
@@ -1337 +1338 @@
 }
 
-bool Compile_AddGlobalRootsForGc(){
+bool Compile_AddGlobalRootsForGc()
+{
     const UserProc *pUserProc_AddGlobalRootPtr = GetClassMethod( "_System_CGarbageCollection", "AddGlobalRootPtr" );
-    if( !pUserProc_AddGlobalRootPtr ){
+    if( !pUserProc_AddGlobalRootPtr )
+    {
         compiler.errorMessenger.Output(3, "_System_CGarbageCollection.AddGlobalRootPtr", -1 );
         return false;

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -260 +260 @@
     if(pSub_System_GetEip=GetSubHash("_System_GetEip",1)){
         pSub_System_GetEip->Using();
-        pSub_System_GetEip->ThisIsSystemProc();
+        pSub_System_GetEip->ThisIsAutoGenerationSystemProc();
     }
 
     if(pSub_System_InitDllGlobalVariables=GetSubHash("_System_InitDllGlobalVariables",1)){
         pSub_System_InitDllGlobalVariables->Using();
-        pSub_System_InitDllGlobalVariables->ThisIsSystemProc();
+        pSub_System_InitDllGlobalVariables->ThisIsAutoGenerationSystemProc();
     }
 
     if(pSub_System_InitStaticLocalVariables=GetSubHash("_System_InitStaticLocalVariables",1)){
         pSub_System_InitStaticLocalVariables->Using();
-        pSub_System_InitStaticLocalVariables->ThisIsSystemProc();
+        pSub_System_InitStaticLocalVariables->ThisIsAutoGenerationSystemProc();
     }
 
     if(pSub_System_Call_Destructor_of_GlobalObject=GetSubHash("_System_Call_Destructor_of_GlobalObject",1)){
         pSub_System_Call_Destructor_of_GlobalObject->Using();
-        pSub_System_Call_Destructor_of_GlobalObject->ThisIsSystemProc();
+        pSub_System_Call_Destructor_of_GlobalObject->ThisIsAutoGenerationSystemProc();
     }
 
@@ -329 +329 @@
     pSub_allrem=GetSubHash("_allrem");
     pSub_allrem->Using();
-    pSub_allrem->ThisIsSystemProc();
+    pSub_allrem->ThisIsAutoGenerationSystemProc();
 
     pSub_aullrem=GetSubHash("_aullrem");
     pSub_aullrem->Using();
-    pSub_aullrem->ThisIsSystemProc();
+    pSub_aullrem->ThisIsAutoGenerationSystemProc();
 
     pSub_allmul=GetSubHash("_allmul");
     pSub_allmul->Using();
-    pSub_allmul->ThisIsSystemProc();
+    pSub_allmul->ThisIsAutoGenerationSystemProc();
 
     pSub_alldiv=GetSubHash("_alldiv");
     pSub_alldiv->Using();
-    pSub_alldiv->ThisIsSystemProc();
+    pSub_alldiv->ThisIsAutoGenerationSystemProc();
 
     pSub_aulldiv=GetSubHash("_aulldiv");
     pSub_aulldiv->Using();
-    pSub_aulldiv->ThisIsSystemProc();
+    pSub_aulldiv->ThisIsAutoGenerationSystemProc();
 
     pSub_allshl=GetSubHash("_allshl");
     pSub_allshl->Using();
-    pSub_allshl->ThisIsSystemProc();
+    pSub_allshl->ThisIsAutoGenerationSystemProc();
 
     pSub_allshr=GetSubHash("_allshr");
     pSub_allshr->Using();
-    pSub_allshr->ThisIsSystemProc();
+    pSub_allshr->ThisIsAutoGenerationSystemProc();
 
     pSub_aullshr=GetSubHash("_aullshr");
     pSub_aullshr->Using();
-    pSub_aullshr->ThisIsSystemProc();
+    pSub_aullshr->ThisIsAutoGenerationSystemProc();
 
     pSub_esp_error=GetSubHash("_esp_error");