Changeset 131 in dev for BasicCompiler64

Timestamp:

Jun 4, 2007, 7:49:17 AM (17 years ago)

Author:

dai_9181

Message:

Prototypeクラスを用意した。

Location:

BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (2 diffs)
• Compile_Object.cpp (modified) (3 diffs)
• Compile_ProcOp.cpp (modified) (4 diffs)
• Compile_Var.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (1 diff)
• Opcode.h (modified) (2 diffs)
• Register.cpp (modified) (1 diff)

BasicCompiler64/BasicCompiler.vcproj

@@ -492 +492 @@
                     </File>
                     <File
+                        RelativePath="..\BasicCompiler_Common\include\Prototype.h"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\Type.h"
                         >
@@ -1127 +1131 @@
                     >
                     <File
+                        RelativePath=".\Compile_Interface.cpp"
+                        >
+                    </File>
+                    <File
                         RelativePath=".\Compile_Object.cpp"
                         >

BasicCompiler64/Compile_Object.cpp

@@ -34 +34 @@
 
     std::vector<UserProc *> subs;
-    pobj_c->EnumMethod( pobj_c->name, subs );
+    pobj_c->EnumMethod( pobj_c->GetName().c_str(), subs );
 
     UserProc *pUserProc;
     if( subs.size() > 0 ){
         //オーバーロードを解決
-        pUserProc=OverloadSolutionWithStrParam(pobj_c->name,
+        pUserProc=OverloadSolutionWithStrParam(pobj_c->GetName().c_str(),
             subs,CreateParameter,"");
 
@@ -57 +57 @@
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
-            sprintf( temporary, "_System_TypeBase.Search(\"\",\"%s\"))", pobj_c->name );
+            sprintf( temporary, "_System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
 
             Opcode_CallProc(temporary,
@@ -97 +97 @@
     if(classObj.IsAbstract()){
         //抽象クラスだったとき
-        SetError(125,classObj.name,cp);
+        SetError(125,classObj.GetName().c_str(),cp);
     }
 

BasicCompiler64/Compile_ProcOp.cpp

@@ -206 +206 @@
     if( userProc.GetName() == "InitializeUserTypes"
         && userProc.HasParentClass()
-        && (string)userProc.GetParentClass().name == "_System_TypeBase" ){
+        && userProc.GetParentClass().GetName() == "_System_TypeBase" ){
 
             pobj_DBClass->Compile_System_InitializeUserTypes();
@@ -212 +212 @@
     else if( userProc.GetName() == "RegisterGlobalRoots"
         && userProc.HasParentClass()
-        && (string)userProc.GetParentClass().name == "_System_CGarbageCollection" ){
+        && userProc.GetParentClass().GetName() == "_System_CGarbageCollection" ){
 
             Compile_AddGlobalRootsForGc();
@@ -503 +503 @@
 
     if(pobj_CompilingClass){
-        if( pUserProc->GetName() == pobj_CompilingClass->name ){
+        if( pUserProc->GetName() == pobj_CompilingClass->GetName() ){
             ////////////////////////////////////
             // コンストラクタをコンパイルするとき
@@ -534 +534 @@
                     temporary[i4]=basbuf[i3];
                 }
-                if(lstrcmp(temporary,
-                    pobj_CompilingClass->pobj_InheritsClass->name)==0){
+                if( pobj_CompilingClass->pobj_InheritsClass->GetName() == temporary ){
                     //基底クラスのコンストラクタを呼び出す
                     cp=i3;

BasicCompiler64/Compile_Var.cpp

@@ -558 +558 @@
             //自身のクラスから静的メンバを参照する場合
             char temp2[VN_SIZE];
-            sprintf(temp2,"%s.%s",pobj_CompilingClass->name,VarName);
+            sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
             pVar = globalVars.Find( temp2 );
             if( pVar ){

BasicCompiler64/NumOpe.cpp

@@ -678 +678 @@
                     )){
                         // ダウンキャストを許可する
+                }
+                else if( idCalc == CALC_AS
+                    && type_stack[sp-1] == ( DEF_OBJECT | FLAG_CAST ) && ((CClass *)index_stack[sp-1])->IsInterface()
+                    ){
+                        // インターフェイスへのキャスト
+                        // TODO: 実装
+                        CastToInterface( pobj_reg->GetLockingReg(), REG_R15, *(CClass *)index_stack[sp-2], *(CClass *)index_stack[sp-1] );
                 }
                 else{

BasicCompiler64/Opcode.h

@@ -245 +245 @@
 BOOL IsXmmReg(int reg);
 BOOL IsVolatileReg(int reg);
+void IfR14Push( int reg );
 
 //Compile_Calc.cpp
@@ -311 +312 @@
 void SetXmmReg_SingleVariable(RELATIVE_VAR *pRelativeVar,int xmm_reg);
 void SetReg_WholeVariable(int type,RELATIVE_VAR *pRelativeVar,int reg);
+
+//Compile_Interface.cpp
+bool CastToInterface( int reg, int vtblReg, const CClass &baseClass, const CClass &interfaceClass );
 
 //Compile_Object.cpp

BasicCompiler64/Register.cpp

@@ -308 +308 @@
     }
 }
+
+void IfR14Push( int reg ){
+    if( reg == REG_R14 ){
+        //mov qword ptr[rsp+offset],r14     ※スタックフレームを利用
+        pobj_sf->push( REG_R14 );
+    }
+}