Changeset 254 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

Jul 31, 2007, 4:30:31 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• CommonCodeGenerator.cpp (modified) (1 diff)
• Const.cpp (modified) (4 diffs)
• LexicalScope.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/src/CommonCodeGenerator.cpp

@@ -301 +301 @@
 void CodeGenerator::op_jmp_continue()
 {
-    //op_jmp( GetContinueCodePos()-(pNativeCode->GetSize()+sizeof(long)), sizeof(long) );
-
-    // TODO: 未完成（OpBuffer/obp廃止が整ったら上記のコードを有効にすべし）
-
-    if( GetContinueCodePosOld() == -1 )
+    ////////////////////////////////////
+    // エラー検出（必要なくなったら消す）
+    extern int obp;
+    if( GetContinueCodePosOld()-obp != GetContinueCodePos()-pNativeCode->GetSize() )
+    {
+        int continueCodePosOld = GetContinueCodePosOld();
+        int continueCodePos = GetContinueCodePos();
+        int size = pNativeCode->GetSize();
+        int test=0;
+        SetError();
+    }
+    ////////////////////////////////////
+
+
+    if( GetContinueCodePos() == -1 )
     {
         SetError(12,"Continue",cp);
         return;
     }
-
-    extern int obp;
-    op_jmp( GetContinueCodePosOld()-obp, sizeof(long), false, true );
+    op_jmp( GetContinueCodePos() - pNativeCode->GetSize(), sizeof(long), false, true );
 }
 void CodeGenerator::op_jmp_exitsub()

trunk/abdev/BasicCompiler_Common/src/Const.cpp

@@ -92 +92 @@
 
 
-int Consts::GetBasicType(char *Name){
+int Consts::GetBasicType(const char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -99 +99 @@
     return pConst->GetType().GetBasicType();
 }
-_int64 Consts::GetWholeData(char *Name){
+_int64 Consts::GetWholeData(const char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -106 +106 @@
     return pConst->GetWholeData();
 }
-double Consts::GetDoubleData(char *Name){
+double Consts::GetDoubleData(const char *Name){
     CConst *pConst = GetObjectPtr(Name);
 
@@ -113 +113 @@
     return pConst->GetDoubleData();
 }
-bool Consts::IsStringPtr( char *Name ){
+bool Consts::IsStringPtr( const char *Name ){
     CConst *pConst = GetObjectPtr(Name);
 

trunk/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -128 +128 @@
 
             //mov rcx,qword ptr[rsp+offset]
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
             compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RCX,REG_RSP,
                 -pVar->GetOffsetAddress(),
                 MOD_BASE_DISP32,
-                Schedule::LocalVar);
+                Schedule::None, true)
+            );
 #else
             //x86コード