Changeset 281 in dev for trunk

Timestamp:

Aug 14, 2007, 8:58:57 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Source.h (modified) (1 diff)
• BasicCompiler_Common/src/Source.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -106 +106 @@
 void DebugVariable(void){
     char temporary[255];
-    sprintf(temporary,"_DebugSys_dwThreadID[255]%c%cDWord",1,ESC_AS);
-    OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
-    sprintf(temporary,"_DebugSys_ProcNum[255]%c%cDWord",1,ESC_AS);
-    OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
-    sprintf(temporary,"_DebugSys_lplpObp[255]%c%c*ULONG_PTR",1,ESC_AS);
-    OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
-    sprintf(temporary,"_DebugSys_lplpSpBase[255]%c%c*ULONG_PTR",1,ESC_AS);
-    OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
+    if( compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( "_DebugSys_dwThreadID" ) ) == NULL )
+    {
+        // 未定義の場合は定義する
+        sprintf(temporary,"_DebugSys_dwThreadID[255]%c%cDWord",1,ESC_AS);
+        OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
+        sprintf(temporary,"_DebugSys_ProcNum[255]%c%cDWord",1,ESC_AS);
+        OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
+        sprintf(temporary,"_DebugSys_lplpObp[255]%c%c*ULONG_PTR",1,ESC_AS);
+        OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
+        sprintf(temporary,"_DebugSys_lplpSpBase[255]%c%c*ULONG_PTR",1,ESC_AS);
+        OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
+    }
 }
 

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -172 +172 @@
 
 private:
-    void Realloc( int newLength ){
+    void Realloc( int newLength )
+    {
+        bool isEqualBasbuf = false;
+        extern char *basbuf;
+        if( basbuf == buffer )
+        {
+            isEqualBasbuf = true;
+        }
+
         buffer = (char *)realloc( buffer, newLength + 255 );
 
         length = newLength;
 
-        extern char *basbuf;
-        basbuf = buffer + 2;
+        if( isEqualBasbuf )
+        {
+            basbuf = buffer + 2;
+        }
     }
 

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -815 +815 @@
 
     // basic.sbpをインクルード
-    const char *headCode = "#include <basic.sbp>\n";
-    //const char *headCode = "\n";
+    //const char *headCode = "#include <basic.sbp>\n";
+    const char *headCode = "\n";
     Realloc( length + lstrlen(headCode) );
     Text::SlideString( buffer, lstrlen(headCode) );