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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicCompiler.h (modified) (1 diff)
• Compile.cpp (modified) (1 diff)
• Debug.cpp (modified) (1 diff)
• include/CodeGenerator.h (modified) (1 diff)
• src/Compiler.cpp (modified) (1 diff)
• src/LexicalAnalyzer_Procedure.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -28 +28 @@
 //デバッグ
 BOOL bDebugSupportProc;
-BOOL bSystemProc;
 DWORD dwStepRun;
 double width_ratio_VarList=0.3;

trunk/ab5.0/abdev/BasicCompiler_Common/Compile.cpp

@@ -747 +747 @@
             }
 
-            compiler.codeGenerator.NextSourceLine( SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), cp ) );
+            if( basbuf[cp] != '\0' )
+            {
+                compiler.codeGenerator.NextSourceLine(
+                    SourceCodePosition( compiler.GetCurrentRelationalObjectModuleIndexForSource(), cp ),
+                    compiler.GetCompilingUserProc().IsSystem()
+                );
+            }
 
             if(Command[0]==1){

trunk/ab5.0/abdev/BasicCompiler_Common/Debug.cpp

@@ -262 +262 @@
     SendDlgItemMessage(hMainDlg,IDC_DEBUGLIST,EM_REPLACESEL,0,(LPARAM)buffer);
 }
-UserProc *GetSubFromObp(ULONG_PTR pos){
+UserProc *GetSubFromObp(ULONG_PTR pos)
+{
     compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
     while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )

trunk/ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -241 +241 @@
     }
 
-    void NextSourceLine( const SourceCodePosition &sourceCodePosition )
-    {
-        pNativeCode->NextSourceLine( sourceCodePosition );
+    void NextSourceLine( const SourceCodePosition &sourceCodePosition, bool isInSystemProc )
+    {
+        pNativeCode->NextSourceLine( sourceCodePosition, isInSystemProc );
     }
 

trunk/ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -402 +402 @@
 bool Compiler::IsGlobalAreaCompiling()
 {
-    return ( pCompilingUserProc == NULL );
+    if( pCompilingUserProc == NULL )
+    {
+        return true;
+    }
+    return ( pCompilingUserProc->GetName() == this->globalAreaProcName );
 }
 bool Compiler::IsLocalAreaCompiling()
 {
-    return ( pCompilingUserProc != NULL );
+    return !IsGlobalAreaCompiling();
 }
 const UserProc &Compiler::GetCompilingUserProc()
 {
-    if( !this->IsGlobalAreaCompiling() )
-    {
-        return *pCompilingUserProc;
+    if( pCompilingUserProc == NULL )
+    {
+        _ASSERTE( false );
+        throw;
+    }
+    return *pCompilingUserProc;
+}
+
+bool Compiler::IsCompilingClass()
+{
+    return ( pCompilingClass != NULL );
+}
+const CClass &Compiler::GetCompilingClass()
+{
+    if( this->IsCompilingClass() )
+    {
+        return *pCompilingClass;
     }
 
     throw;
 }
-
-bool Compiler::IsCompilingClass()
-{
-    return ( pCompilingClass != NULL );
-}
-const CClass &Compiler::GetCompilingClass()
-{
-    if( this->IsCompilingClass() )
-    {
-        return *pCompilingClass;
-    }
-
-    throw;
-}

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp

@@ -915 +915 @@
     importedNamespaces.clear();
 
-    compiler.globalAreaProcName = "_System_GlobalArea_" + compiler.GetModuleName();
+    compiler.globalAreaProcName = "_GlobalArea_" + compiler.GetModuleName();
     sprintf(temporary,"%c%c%s()",1,ESC_SUB,compiler.globalAreaProcName.c_str());
     UserProc *pUserProc = ParseUserProc( namespaceScopes, importedNamespaces, temporary, 0, false, NULL, false );