Changeset 416 in dev for trunk

Timestamp:

Mar 6, 2008, 11:28:05 PM (16 years ago)

Author:

dai_9181

Message:

[415]を64bit版にマージ。

Location:

trunk/abdev/BasicCompiler64

Files:

• Compile_Calc.cpp (modified) (2 diffs)
• Compile_CallProc.cpp (modified) (2 diffs)
• Compile_Statement.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (13 diffs)
• Opcode.h (modified) (2 diffs)

trunk/abdev/BasicCompiler64/Compile_Calc.cpp

@@ -177 +177 @@
 
     //型を識別
-    if( !GetVarType(variable,varType,false) ){
+    if( !GetTermTypeOnlyVariable(variable,varType) ){
 
         // プロパティ用のメソッドを呼び出す
@@ -205 +205 @@
 
     //変数アドレスを取得
-    RELATIVE_VAR VarRelativeVar;
-    bool result = GetVarOffsetReadWrite(
-        variable,
-        &VarRelativeVar,
-        varType);
+    if( !TermOpeOnlyVariable( variable, varType, VarRelativeVar, true ) )
+    {
+        SetError();
+        return;
+    }
 
     //レジスタのブロッキングを解除

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -128 +128 @@
                 //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
                 Type varType;
-                GetVarType( ObjectName, varType, false );
-                if( NATURAL_TYPE( varType.GetBasicType() ) == DEF_OBJECT )
+                if( GetTermType( ObjectName, varType ) )
                 {
-                    pobj_c = &varType.GetClass();
-                    leftType = varType;
+                    if( varType.IsObject() )
+                    {
+                        pobj_c = &varType.GetClass();
+                        leftType = varType;
+                    }
                 }
-                else
+
+                if( !pobj_c )
                 {
                     pobj_c=compiler.GetObjectModule().meta.GetClasses().Find(ObjectName);
@@ -319 +322 @@
             if(lstrcmpi(ObjectName,"Super")==0) goto InClassMember;
             else{
-                RELATIVE_VAR RelativeVar;
-                if( pMethod->IsConst() ){
-                    //Constアクセスが可能なメソッドの場合
-                    if( !GetVarOffsetReadOnly( ObjectName, &RelativeVar, Type() ) ){
-                        return false;
-                    }
+                bool isLiteral;
+                if( !TermOpe( ObjectName, Type(), Type(), isLiteral, NULL, NULL, false, !pMethod->IsConst() ) )
+                {
+                    return false;
                 }
-                else{
-                    //Constアクセスが不可能なメソッドの場合
-                    if( !GetVarOffsetReadWrite( ObjectName, &RelativeVar, Type() ) ){
-                        return false;
-                    }
-                }
-
-                SetVarPtrToReg(REG_RCX,&RelativeVar);
-
-                // 参照を実体ポインタにする
-                //mov rcx,qword ptr[rcx]
-                compiler.codeGenerator.op_mov_RM(sizeof(_int64),REG_RCX,REG_RCX,0,MOD_BASE);
+
+                // 実態ポインタをraxにコピー
+                compiler.codeGenerator.op_mov_RR( REG_RCX, REG_RAX );
             }
         }

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -97 +97 @@
     bool isLiteral;
     BOOL bUseHeap;
-    bool result = TermOpe( leftTerm, Type(), resultType, isLiteral, &bUseHeap, false, NULL, true );
+    bool result = TermOpe( leftTerm, Type(), resultType, isLiteral, &bUseHeap, NULL, true );
 
     delete pobj_reg;

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -1647 +1647 @@
     //リロケーション情報を解放
     delete pobj_Reloc;
-
-    //クラスに関するメモリを解放
-    compiler.GetObjectModule().meta.GetClasses().Clear();
 }

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -130 +130 @@
     return true;
 }
-bool TermMemberOpe( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member )
+bool TermMemberOpe( const Type &leftType, const Type &baseType, Type &resultType, const char *termFull, const char *termLeft, const char *member, bool &isVariable, RELATIVE_VAR &relativeVar )
 {
     const CClass &objClass = leftType.GetClass();
@@ -166 +166 @@
                 compiler.codeGenerator.op_mov_RR( REG_R11, useReg );
 
-                RELATIVE_VAR relativeVar;
-                relativeVar.dwKind=VAR_DIRECTMEM;
+                RELATIVE_VAR tempRelativeVar;
+                tempRelativeVar.dwKind=VAR_DIRECTMEM;
 
                 if( !_member_offset(
@@ -173 +173 @@
                     false,  //読み込み専用
                     leftType,
-                    VarName,&relativeVar,classType,0))
-                {
-                    return false;
+                    VarName,&tempRelativeVar,classType,0)){
+                        return false;
                 }
 
                 // オブジェクトメンバのポインタをraxにコピー
-                if( !VarToReg( relativeVar, baseType, resultType ) ){
+                if( !VarToReg( tempRelativeVar, baseType, resultType ) ){
                     SetError(11,termFull,cp);
                 }
@@ -222 +221 @@
         compiler.codeGenerator.op_mov_RR( REG_R11, useReg );
 
-        RELATIVE_VAR relativeVar;
         relativeVar.dwKind=VAR_DIRECTMEM;
 
@@ -233 +231 @@
         }
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         return true;
@@ -268 +265 @@
 
                 // まずはプロパティ値を取得
-                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName );
+                bool dummyIsVariable;
+                RELATIVE_VAR dummyRelativeVar;
+                TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, methodName, dummyIsVariable, dummyRelativeVar );
 
                 // 戻り値のオブジェクトインスタンスのインデクサを呼び出す
@@ -275 +274 @@
                 sprintf( temp2, "%s.%s", termLeft, methodName );
                 Type classType = resultType;
-                return TermMemberOpe( classType, baseType, resultType, termFull, temp2, temporary );
+                return TermMemberOpe( classType, baseType, resultType, termFull, temp2, temporary, isVariable, relativeVar );
             }
 
@@ -333 +332 @@
     return false;
 }
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool isWantObject, bool *pIsClassName, bool isProcedureCallOnly ){
+bool _TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly, bool &isVariable, RELATIVE_VAR &relativeVar, bool isWriteAccess )
+{
     char parameter[VN_SIZE];
 
@@ -373 +373 @@
         }
 
-        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, true, &isClassName ) ){
+        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
             goto globalArea;
         }
@@ -391 +391 @@
         }
 
-        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member );
+        return TermMemberOpe( leftType, baseType, resultType, termFull, termLeft, member, isVariable, relativeVar );
     }
 globalArea:
@@ -554 +554 @@
     ////////////////////////////////
 
-    RELATIVE_VAR relativeVar;
     if(GetVarOffset(
         false,  //エラー表示なし
-        false,  //読み込み専用
+        isWriteAccess,
         termFull,
         &relativeVar,resultType)){
@@ -564 +563 @@
         //////////
 
-        if( !VarToReg( relativeVar, baseType, resultType ) ){
-            SetError(11,termFull,cp);
-        }
+        // 変数として扱う
+        isVariable = true;
 
         isLiteral = false;
@@ -637 +635 @@
     return false;
 }
+
+bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly, bool isWriteAccess )
+{
+    RELATIVE_VAR relativeVar;
+    bool isVariable = false;
+    bool result = _TermOpe( term, baseType, resultType, isLiteral, pbUseHeap, pIsClassName, isProcedureCallOnly, isVariable, relativeVar, isWriteAccess );
+
+    if( isVariable )
+    {
+        // 変数の場合はeaxに変数ポインタを格納する
+        if( !VarToReg( relativeVar, baseType, resultType ) ){
+            SetError(11,term,cp);
+        }
+    }
+
+    return result;
+}
+bool TermOpeOnlyVariable( const char *term, Type &resultType, RELATIVE_VAR &relativeVar, bool isWriteAccess )
+{
+    bool isLiteral, isVariable = false;
+    bool result = _TermOpe( term, Type(), resultType, isLiteral, NULL, NULL, false, isVariable, relativeVar, isWriteAccess );
+
+    if( !isVariable )
+    {
+        SetError();
+    }
+
+    return result;
+}
+
 
 bool _numope( int *pReg,

trunk/abdev/BasicCompiler64/Opcode.h

@@ -185 +185 @@
 
 //NumOpe.cpp
+bool TermOpeOnlyVariable( const char *term, Type &resultType, RELATIVE_VAR &relativeVar, bool isWriteAccess );
 bool TermOpe(
              const char *term,
@@ -191 +192 @@
              bool &isLiteral,
              BOOL *pbUseHeap,
-             bool isWantObject = false,
              bool *pIsClassName = NULL,
-             bool isProcedureCallOnly = false );
+             bool isProcedureCallOnly = false,
+             bool isWriteAccess = false );
 bool NumOpe( int *pReg,
            const char *Command,