Changeset 710 in dev for trunk

Timestamp:

Jul 26, 2008, 8:30:56 PM (16 years ago)

Author:

dai_9181

Message:

• #182への対応。シンボル名として使えない文字列を含んだファイル名のビルドができない不具合を修正。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/Compiler.h (modified) (1 diff)
• BasicCompiler_Common/src/Compiler.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp (modified) (1 diff)
• compiler_x86/Compile_ProcOp.cpp (modified) (1 diff)
• compiler_x86/MakePeHdr.cpp (modified) (1 diff)

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

@@ -178 +178 @@
 
     // グローバルエリアが置かれる関数名
-    std::string globalAreaProcName;
+    const std::string &GetGlobalAreaProcName() const;
 
     // 列挙型

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

@@ -52 +52 @@
         this->GetObjectModule().StaticLink( *pStaticLibrary, this->IsSll() );
     }
+}
+
+const std::string &Compiler::GetGlobalAreaProcName() const
+{
+    static std::string globalAreaProcName;
+
+    if( globalAreaProcName.empty() )
+    {
+        // 初期化
+        _ASSERTE( !this->GetModuleName().empty() );
+
+        std::string originalName = this->GetModuleName();
+
+        // モジュール名がシンボル名として使えない場合があるので、16進数文字列に変換する
+        char temporary[VN_SIZE*2] = "";
+        for( int i=0; i<originalName.size(); i++ )
+        {
+            sprintf( temporary + strlen(temporary), "%2x", originalName[i] );
+        }
+
+        globalAreaProcName = (std::string)"_GlobalArea_" + temporary;
+    }
+
+    return globalAreaProcName;
 }
 
@@ -442 +466 @@
         return true;
     }
-    return ( pCompilingUserProc->GetName() == this->globalAreaProcName );
+    return ( pCompilingUserProc->GetName() == this->GetGlobalAreaProcName() );
 }
 bool Compiler::IsLocalAreaCompiling()

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

@@ -1027 +1027 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    compiler.globalAreaProcName = "_GlobalArea_" + compiler.GetModuleName();
-    sprintf(temporary,"%c%c%s()",1,ESC_SUB,compiler.globalAreaProcName.c_str());
+    sprintf(temporary,"%c%c%s()",1,ESC_SUB,compiler.GetGlobalAreaProcName().c_str());
     UserProc *pUserProc = ParseUserProc( namespaceScopes, compiler.GetNamespaceSupporter().GetImportedNamespaces(), temporary, 0, false, NULL, false );
 

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

@@ -205 +205 @@
         Compile_AddGlobalRootsForGc();
     }
-    else if( userProc.GetName() == compiler.globalAreaProcName )
+    else if( userProc.GetName() == compiler.GetGlobalAreaProcName() )
     {
         ////////////////////////////////////////

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

@@ -243 +243 @@
         pSub_System_StartupProgram->Using();
 
-    if(pSub_System_GlobalArea=GetSubHash(compiler.globalAreaProcName.c_str(),1))
+    if(pSub_System_GlobalArea=GetSubHash(compiler.GetGlobalAreaProcName().c_str(),1))
     {
         pSub_System_GlobalArea->Using();