Changeset 308 in dev for trunk/abdev/BasicCompiler64/Compile_Var.cpp

Timestamp:

Aug 29, 2007, 9:05:22 AM (17 years ago)

Author:

dai_9181

Message:

静的リンクライブラリにより、複数のグローバル領域が存在することになったのでそれぞれを関数ベースに分けた

File:

• trunk/abdev/BasicCompiler64/Compile_Var.cpp (modified) (9 diffs)

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -24 +24 @@
     /////////////////////////////////////////////
 
-    SetReg_WholeVariable(DEF_INT64,pRelativeVar,REG_R11);
+    SetReg_WholeVariable(Type(DEF_INT64),pRelativeVar,REG_R11);
 
     //mov qword ptr[rsp+offset],r11     ※スタックフレームを利用
@@ -376 +376 @@
     RelativeVar.offset=-LocalVar_ThisPtrOffset;
 
-    SetReg_WholeVariable(DEF_PTR_VOID,&RelativeVar,reg);
+    SetReg_WholeVariable(Type(DEF_PTR_VOID),&RelativeVar,reg);
 }
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts ){
@@ -742 +742 @@
 
 bool SetInitGlobalData(int offset,const Type &type,const Subscripts &subscripts,const char *lpszInitBuf){
-    extern BYTE *initGlobalBuf;
     int i2,i3;
     char temporary[VN_SIZE];
@@ -846 +845 @@
 
     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() || type.IsPointer() ){
@@ -867 +875 @@
         }
         else{
-            *(_int64 *)(initGlobalBuf+offset)=i64data;
+            compiler.GetObjectModule().meta.GetGlobalVars().initAreaBuffer.Overwrite(
+                offset,
+                (const char *)&i64data,
+                sizeof(_int64)
+            );
         }
     }
     else if( type.IsDWord() || type.IsLong() ){
-        *(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)
+        );
     }
 
@@ -1057 +1084 @@
 }
 
-void dim( char *VarName, const Subscripts &subscripts, Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlags){
+void dim( char *VarName, const Subscripts &subscripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlags)
+{
     if( UserProc::IsGlobalAreaCompiling() ){
         /////////////////////////
@@ -1078 +1106 @@
         bool isConst = ( dwFlags & DIMFLAG_CONST ) ? true:false;
 
-        Variable *pVar = new Variable( VarName, type, isConst, false, ConstractParameter );
+        Variable *pVar = new Variable( VarName, type, isConst, false, ConstractParameter, false );
 
         if( subscripts.size() > 0 ){
@@ -1194 +1222 @@
             SetError();
         }
-        SetVariableFromRax( DEF_OBJECT, DEF_OBJECT, &RelativeVar );
+        SetVariableFromRax( Type( DEF_OBJECT, *compiler.GetObjectModule().meta.GetClasses().GetObjectClassPtr() ), DEF_OBJECT, &RelativeVar );
     }
 }
@@ -1296 +1324 @@
             // call AddGlobalRootPtr
             compiler.codeGenerator.op_call( pUserProc_AddGlobalRootPtr );
-
-            ReallocNativeCodeBuffer();
         }
     }