Changeset 288 in dev for trunk/abdev/BasicCompiler32/Compile_Var.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/Compile_Var.cpp (modified) (4 diffs)

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;
                 }