Changeset 417 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev

Files:

• BasicCompiler64/Compile_Calc.cpp (modified) (2 diffs)
• BasicCompiler64/NumOpe.cpp (modified) (6 diffs)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (3 diffs)
• BasicCompiler_Common/src/DataTable.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler64/Compile_Calc.cpp

@@ -205 +205 @@
 
     //変数アドレスを取得
+    RELATIVE_VAR VarRelativeVar;
     if( !TermOpeOnlyVariable( variable, varType, VarRelativeVar, true ) )
     {
@@ -213 +214 @@
     //レジスタのブロッキングを解除
     pobj_BlockReg->clear();
-
-    if( !result )
-    {
-        return;
-    }
 
     if(varType.GetBasicType()&FLAG_PTR){

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

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -565 +565 @@
     std::string GetStaticDefiningStringAsMemberTypeInfoNames() const;
     std::string GetStaticDefiningStringAsMemberOffsets() const;
+    void GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset = 0 ) const;
 
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1292 +1292 @@
             // 未使用のクラスは無視する
             continue;
-        }   
-
-        char referenceOffsetsBuffer[1024] = "";
+        }
+
+        std::string referenceOffsetsBuffer;
         int numOfReference = 0;
-        BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
-            if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() ){
-                if( referenceOffsetsBuffer[0] ){
-                    lstrcat( referenceOffsetsBuffer, "," );
-                }
-
-                sprintf( referenceOffsetsBuffer + lstrlen( referenceOffsetsBuffer ),
-                    "%d",
-                    objClass.GetMemberOffset( pMember->GetName().c_str() ) );
-
-                numOfReference++;
-            }
-        }
+        objClass.GetReferenceOffsetsInitializeBuffer( referenceOffsetsBuffer, numOfReference );
 
         sprintf( temporary
@@ -1317 +1305 @@
             , objClass.GetName().c_str()                            // クラス名
             , objClass.GetFullName().c_str()                        // フルネーム
-            , referenceOffsetsBuffer                                // 参照メンバオフセット配列
+            , referenceOffsetsBuffer.c_str()                        // 参照メンバオフセット配列
             , numOfReference                                        // 参照メンバの個数
             );
@@ -1577 +1565 @@
     return result;
 }
+
+void CClass::GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset ) const
+{
+    const CClass &thisClass = *this;
+    BOOST_FOREACH( const CMember *pMember, thisClass.GetDynamicMembers() )
+    {
+        if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() )
+        {
+            if( referenceOffsetsBuffer.size() )
+            {
+                referenceOffsetsBuffer += ",";
+            }
+
+            char temp[255];
+            sprintf( temp, "%d", baseOffset + thisClass.GetMemberOffset( pMember->GetName().c_str() ) );
+            referenceOffsetsBuffer += temp;
+
+            numOfReference++;
+        }
+        if( pMember->GetType().IsStruct() && !pMember->GetType().IsPointer() )
+        {
+            // 構造体の実体をメンバに持つとき
+            int baseOffset = thisClass.GetMemberOffset( pMember->GetName().c_str() );
+
+            // 構造体メンバでGCによるチェックが必要な参照位置を追加
+            pMember->GetType().GetClass().GetReferenceOffsetsInitializeBuffer( referenceOffsetsBuffer, numOfReference, baseOffset );
+        }
+    }
+}

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -293 +293 @@
     BOOST_FOREACH( const std::string &paramStr, parameters )
     {
+        if( paramStr.size() == 0 )
+        {
+            throw;
+        }
         if( paramStr[0] == '\"' )
         {