Changeset 288 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 17, 2007, 7:36:51 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (1 diff)
• Compile_Var.cpp (modified) (4 diffs)
• MakePeHdr.cpp (modified) (8 diffs)
• stdafx.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -1252 +1252 @@
                     RelativePath="..\BasicCompiler_Common\src\BoostSerializationSupport.cpp"
                     >
+                    <FileConfiguration
+                        Name="Debug|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="Release|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            UsePrecompiledHeader="0"
+                        />
+                    </FileConfiguration>
                 </File>
             </Filter>

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -716 +716 @@
 
 bool SetInitGlobalData(int offset,const Type &type,const Subscripts &subscripts,const char *lpszInitBuf){
-    extern BYTE *initGlobalBuf;
     int i2,i3;
     char temporary[VN_SIZE];
@@ -820 +819 @@
 
     if( type.IsDouble() ){
-        *(double *)(initGlobalBuf+offset)=(double)dbl;
+        compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+            offset,
+            (const char *)&dbl,
+            sizeof(double)
+        );
     }
     else if( type.IsSingle() ){
-        *(float *)(initGlobalBuf+offset)=(float)dbl;
+        float flt = (float)dbl;
+        compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+            offset,
+            (const char *)&flt,
+            sizeof(float)
+        );
     }
     else if( type.Is64() ){
-        *(_int64 *)(initGlobalBuf+offset)=i64data;
+        compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+            offset,
+            (const char *)&i64data,
+            sizeof(_int64)
+        );
     }
     else if( type.IsLong() || type.IsDWord() || type.IsPointer() ){
@@ -844 +856 @@
         }
         else{
-            *(DWORD *)(initGlobalBuf+offset)=(DWORD)i64data;
+            long l = (long)i64data;
+            compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+                offset,
+                (const char *)&l,
+                sizeof(long)
+            );
         }
     }
     else if( type.IsWord() || type.IsInteger() ){
-        *(WORD *)(initGlobalBuf+offset)=(WORD)i64data;
+        short s = (short)i64data;
+        compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+            offset,
+            (const char *)&s,
+            sizeof(short)
+        );
     }
     else if( type.IsSByte() || type.IsByte() || type.IsBoolean() ){
-        *(BYTE *)(initGlobalBuf+offset)=(BYTE)i64data;
+        char c = (char)i64data;
+        compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+            offset,
+            (const char *)&c,
+            sizeof(char)
+        );
     }
 
@@ -1093 +1120 @@
                 // 呼び出し側のオフセットズレを考慮する
 
-                if( 0 == ( UserProc::CompilingUserProc().RealParams().GetMemorySize() + PTR_SIZE/*ret分*/ ) % alignment ){
+                if( 0 == ( UserProc::CompilingUserProc().RealParams().GetMemorySize() + PTR_SIZE /* ret分 */ ) % alignment ){
                     AllLocalVarSize += PTR_SIZE;
                 }

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -323 +323 @@
 
 
-    //グローバル変数の初期バッファ
-    extern BYTE *initGlobalBuf;
-    initGlobalBuf=(BYTE *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,1);
-
     //リロケーション情報
     pobj_Reloc=new CReloc();
@@ -401 +397 @@
         InitGCVariables();
 
-        if( compiler.IsStaticLibrary() ){
+        if( compiler.IsStaticLibrary() )
+        {
             //_System_StartupProgramの呼び出し
             compiler.codeGenerator.op_call(pSub_System_StartupProgram);
@@ -812 +809 @@
             pVar->SetOffsetAddress(
                 (pVar->GetOffsetAddress()&0x7FFFFFFF)
-                + compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize()
+                + compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()
             );
         }
@@ -885 +882 @@
 
     //リライタブルセクションのファイル上のサイズ（グローバル変数の初期情報のみを格納）
-    if( compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize() % FILE_ALIGNMENT )
+    if( compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize() % FILE_ALIGNMENT )
     {
         FileSize_RWSection =
-            compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize()
-            + (FILE_ALIGNMENT-compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize()%FILE_ALIGNMENT);
+            compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()
+            + (FILE_ALIGNMENT-compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()%FILE_ALIGNMENT);
     }
     else{
-        if( compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize() )
+        if( compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize() )
         {
-            FileSize_RWSection = compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize();
+            FileSize_RWSection = compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize();
         }
         else FileSize_RWSection=FILE_ALIGNMENT;
@@ -957 +954 @@
 
     //リライタブルセクションのメモリ上のサイズ
-    i = compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize()
+    i = compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()
         + compiler.GetObjectModule().meta.GetGlobalVars().GetAllSize();
     if(i%MEM_ALIGNMENT) MemSize_RWSection=i+(MEM_ALIGNMENT-i%MEM_ALIGNMENT);
@@ -1344 +1341 @@
     memset((char *)RWSectionHeader.Name,0,IMAGE_SIZEOF_SHORT_NAME);
     lstrcpy((char *)RWSectionHeader.Name,".data");
-    RWSectionHeader.Misc.VirtualSize=           compiler.GetObjectModule().meta.GetGlobalVars().GetAllInitSize()
+    RWSectionHeader.Misc.VirtualSize=           compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()
                                                 + compiler.GetObjectModule().meta.GetGlobalVars().GetAllSize();
     RWSectionHeader.VirtualAddress=             MemPos_RWSection;
@@ -1564 +1561 @@
     if(bUse_RWSection){
         //リライタブル データ テーブル（グローバル変数の初期バッファ）
-        initGlobalBuf=(BYTE *)HeapReAlloc(hHeap,
-            HEAP_ZERO_MEMORY,
-            initGlobalBuf,
-            FileSize_RWSection);
-        WriteFile(hFile,initGlobalBuf,FileSize_RWSection,(DWORD *)&i2,NULL);
-        i+=i2;
+
+        char *temp = (char *)calloc( FileSize_RWSection, 1 );
+        memcpy(
+            temp,
+            compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetBuffer(),
+            compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.GetSize()
+        );
+
+        WriteFile(hFile,temp,FileSize_RWSection,(DWORD *)&i2,NULL);
+        i+=i2;
+
+        free( temp );
     }
 
@@ -1644 +1647 @@
     HeapDefaultFree(pHintTable);
 
-    //グローバル変数の初期バッファを解放
-    HeapDefaultFree(initGlobalBuf);
-
     //リソースセクションバッファを解放
     HeapDefaultFree(RSrcSectionBuffer);

trunk/abdev/BasicCompiler32/stdafx.h

@@ -18 +18 @@
 
 #include "../BasicCompiler_Common/common.h"
+
+#include <Compiler.h>