Changeset 128 in dev for BasicCompiler64

Timestamp:

May 18, 2007, 4:42:36 AM (18 years ago)

Author:

dai_9181

Message:

Blittable型を導入した。

Location:

BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (2 diffs)
• Compile_Calc.cpp (modified) (1 diff)
• Compile_Statement.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (3 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler64/BasicCompiler.vcproj

@@ -157 +157 @@
                 RuntimeLibrary="1"
                 UsePrecompiledHeader="0"
-                PrecompiledHeaderFile=".\Debug/BasicCompiler.pch"
-                AssemblerListingLocation=".\Debug/"
-                ObjectFile=".\Debug/"
-                ProgramDataBaseFileName=".\Debug/"
+                PrecompiledHeaderFile=".\SmallDebug/BasicCompiler.pch"
+                AssemblerListingLocation=".\SmallDebug/"
+                ObjectFile=".\SmallDebug/"
+                ProgramDataBaseFileName=".\SmallDebug/"
                 BrowseInformation="0"
                 WarningLevel="3"
@@ -188 +188 @@
                 IgnoreDefaultLibraryNames=""
                 GenerateDebugInformation="false"
-                ProgramDatabaseFile=".\Debug/BasicCompiler64.pdb"
+                ProgramDatabaseFile=".\SmallDebug/BasicCompiler64.pdb"
                 SubSystem="2"
                 TargetMachine="0"

BasicCompiler64/Compile_Calc.cpp

@@ -227 +227 @@
     }
 
+    if( varType.IsObject() && Smoothie::Meta::blittableTypes.IsExist( calcType ) ){
+        // Blittable型をオブジェクトとして扱う
+        vector<UserProc *> userProcs;
+        Smoothie::Meta::blittableTypes.GetClass( calcType ).EnumStaticMethod( "_Create", userProcs );
+        if( userProcs.size() != 1 ){
+            SetError();
+            return;
+        }
+        UserProc *pUserProc = userProcs[0];
+
+        // mov rcx, rax
+        op_mov_RR( REG_RCX, REG_RAX );
+
+        // call System.[TypeClass]._Create
+        op_call( pUserProc );
+
+        calcType = pUserProc->ReturnType();
+    }
 
     /////////////////////////////////

BasicCompiler64/Compile_Statement.cpp

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

BasicCompiler64/NumOpe.cpp

@@ -224 +224 @@
     return false;
 }
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName, bool isProcedureCallOnly ){
+bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool isWantObject, bool *pIsClassName, bool isProcedureCallOnly ){
     char parameter[VN_SIZE];
 
@@ -252 +252 @@
         bool isClassName = false;
         Type leftType;
-        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, &isClassName ) ){
+        if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+            if( isClassName == false && Smoothie::Meta::blittableTypes.IsExist( leftType ) ){
+                // 左側のオブジェクト部分がBlittable型のとき
+
+                char temporary[VN_SIZE];
+                lstrcpy( temporary, termLeft );
+                sprintf( termLeft, "%s(%s)",
+                    Smoothie::Meta::blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    temporary );
+            }
+        }
+
+        if( !TermOpe( termLeft, baseType, leftType, isLiteral, pbUseHeap, true, &isClassName ) ){
             goto globalArea;
         }
@@ -705 +717 @@
                     //型名
                     if( Type::StringToType( term, resultType ) ){
+
+                        if( resultType.IsObject() ){
+                            if( resultType.GetClass().IsBlittableType() ){
+                                // Blittable型のときは基本型として扱う
+                                // ※ただし、コンパイル中のメソッドがBlittable型クラスに属していないこと
+                                if( UserProc::IsLocalAreaCompiling()
+                                    && UserProc::CompilingUserProc().HasParentClass()
+                                    && UserProc::CompilingUserProc().GetParentClass().IsBlittableType() )
+                                {
+                                    // コンパイル中のメソッドがBlittable型クラスに属している
+                                }
+                                else{
+                                    resultType = resultType.GetClass().GetBlittableType();
+                                }
+                            }
+                        }
+
                         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );
                     }

BasicCompiler64/Opcode.h

@@ -251 +251 @@
 
 //NumOpe.cpp
-bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool *pIsClassName = NULL, bool isProcedureCallOnly = false );
+bool TermOpe(
+             const char *term,
+             const Type &baseType,
+             Type &resultType,
+             bool &isLiteral,
+             BOOL *pbUseHeap,
+             bool isWantObject = false,
+             bool *pIsClassName = NULL,
+             bool isProcedureCallOnly = false );
 bool NumOpe( int *pReg,
            const char *Command,