Changeset 417 in dev for trunk/abdev/BasicCompiler64/NumOpe.cpp

Timestamp:

Mar 7, 2008, 5:32:29 AM (17 years ago)

Author:

dai_9181

Message:

[416]のコミットによって発生した64bit版での不具合を修正。

File:

• trunk/abdev/BasicCompiler64/NumOpe.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -638 +638 @@
 bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly, bool isWriteAccess )
 {
+    bool isInitRegSwitch = false;
+    if( !pobj_reg )
+    {
+        isInitRegSwitch = true;
+
+        //作業用レジスタを取得
+        pobj_reg = new CRegister( REG_RAX );
+    }
+
+    //エラー時の復旧用
+    CRegister objReg_Backup = *pobj_reg;
+
+
     RELATIVE_VAR relativeVar;
     bool isVariable = false;
@@ -650 +663 @@
     }
 
+
+    if( !result )
+    {
+        *pobj_reg = objReg_Backup;
+    }
+
+    if( isInitRegSwitch ){
+        //整合性をチェック（バグ回避）
+        if( result )
+        {
+            pobj_reg->bug_check();
+        }
+
+        //作業レジスタを解放
+        delete pobj_reg;
+        pobj_reg = NULL;
+    }
+
     return result;
 }
 bool TermOpeOnlyVariable( const char *term, Type &resultType, RELATIVE_VAR &relativeVar, bool isWriteAccess )
 {
+    if( pobj_reg )
+    {
+        SetError();
+    }
+
+    //作業用レジスタを取得
+    pobj_reg = new CRegister( REG_NON );
+
     bool isLiteral, isVariable = false;
     bool result = _TermOpe( term, Type(), resultType, isLiteral, NULL, NULL, false, isVariable, relativeVar, isWriteAccess );
@@ -661 +700 @@
         SetError();
     }
+
+    //整合性をチェック（バグ回避）
+    if( result )
+    {
+        pobj_reg->bug_check();
+    }
+
+    //作業レジスタを解放
+    delete pobj_reg;
+    pobj_reg=0;
 
     return result;
@@ -1327 +1376 @@
             BOOL *pbUseHeap )
 {
-    BOOL bInitRegSwitch=0;
-    if(!pobj_reg){
-        bInitRegSwitch=1;
+    bool isInitRegSwitch = false;
+    if( !pobj_reg )
+    {
+        isInitRegSwitch = true;
 
         //作業用レジスタを取得
-        pobj_reg=new CRegister(*pReg);
+        pobj_reg = new CRegister( *pReg );
     }
 
     //エラー時の復旧用
-    CRegister objReg_Backup;
-    objReg_Backup=*pobj_reg;
+    CRegister objReg_Backup = *pobj_reg;
 
     *pReg = pobj_reg->GetNextReg();
@@ -1347 +1396 @@
     if( !result )
     {
-        *pobj_reg=objReg_Backup;
-    }
-
-    if(bInitRegSwitch){
+        *pobj_reg = objReg_Backup;
+    }
+
+    if( isInitRegSwitch ){
         //整合性をチェック（バグ回避）
         if( result )
@@ -1359 +1408 @@
         //作業レジスタを解放
         delete pobj_reg;
-        pobj_reg=0;
+        pobj_reg = NULL;
     }