Changeset 331 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Sep 27, 2007, 1:47:46 AM (17 years ago)

Author:

dai_9181

Message:

AddressOfの左辺値を加味した処理を簡潔にした

Location:

trunk/abdev/BasicCompiler32

Files:

• CParameter.cpp (modified) (2 diffs)
• Compile_Calc.cpp (modified) (2 diffs)
• Compile_Func.cpp (modified) (4 diffs)
• Compile_ProcOp.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/CParameter.cpp

@@ -233 +233 @@
             }
 
-            extern LONG_PTR ProcPtr_BaseIndex;
-            LONG_PTR back_ProcPtr_BaseIndex = ProcPtr_BaseIndex;
-            if( dummyType.IsProcPtr() ){
-                ProcPtr_BaseIndex = dummyType.GetIndex();
-            }
-            else{
-                ProcPtr_BaseIndex=-1;
-            }
-
             BOOL bCalcUseHeap;
             Type calcType;
@@ -247 +238 @@
                 break;
             }
-
-            ProcPtr_BaseIndex=back_ProcPtr_BaseIndex;
 
             if( calcType.IsObject() ){

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ -517 +517 @@
             void *pProc;
             idProc=GetProc(temporary,(void **)&pProc);
-            if(idProc){
-                CallProc(idProc,pProc,temporary,temp2,Type());
+            if( idProc )
+            {
+                CallProc(
+                    idProc,
+                    pProc,
+                    temporary,
+                    temp2,
+                    Type(),         // ベースタイプはなし
+                    Type()
+                );
                 return;
             }
@@ -548 +556 @@
         return;
     }
-
-    extern LONG_PTR ProcPtr_BaseIndex;
-    if(varType.IsProcPtr()) ProcPtr_BaseIndex=varType.GetIndex();
-    else ProcPtr_BaseIndex=-1;
 
     RELATIVE_VAR VarRelativeVar;

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -221 +221 @@
     compiler.codeGenerator.op_mov_RV( REG_EAX, typeSize );
 }
-void Opcode_Func_AddressOf( const char *name ){
+void Opcode_Func_AddressOf( const char *name, const Type &baseType ){
     extern int cp;
     const UserProc *pUserProc;
 
-    extern LONG_PTR ProcPtr_BaseIndex;
-    if(ProcPtr_BaseIndex!=-1){
+    if( baseType.IsProcPtr() )
+    {
         //左辺の型にのっとり、オーバーロードを解決
 
@@ -237 +237 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,compiler.GetObjectModule().meta.GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,compiler.GetObjectModule().meta.GetProcPointers()[baseType.GetIndex()]->Params(), Type() );
 
         if(!pUserProc){
@@ -477 +477 @@
 }
 
-bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &resultType, bool isCallOn ){
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, const Type &baseType, Type &resultType, bool isCallOn )
+{
     switch(FuncNum){
         case FUNC_FIX:
@@ -492 +493 @@
             break;
         case FUNC_ADDRESSOF:
-            if( isCallOn ) Opcode_Func_AddressOf(Parameter);
+            if( isCallOn ) Opcode_Func_AddressOf( Parameter, baseType );
             resultType.SetBasicType( DEF_PTR_VOID );
             break;

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -525 +525 @@
                         , compiler.pCompilingClass->GetSuperClass().GetConstructorMethod()->GetUserProc().GetName().c_str()
                         , temporary
-                        , dummyType );
+                        , Type()        // baseTypeはなし
+                        , dummyType
+                    );
                 }
                 else{

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -258 +258 @@
         bool isClassName = false;
         Type leftType;
-        if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
+        if( GetTermType( termLeft, Type(), leftType, isLiteral, &isClassName ) ){
             if( isClassName == false && compiler.GetObjectModule().meta.GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
@@ -347 +347 @@
                 ////////////////
 
-                CallProc(idProc,pInfo,procName,parameter,resultType);
+                CallProc(idProc,pInfo,procName,parameter, baseType,resultType);
 
 

trunk/abdev/BasicCompiler32/Opcode.h

@@ -216 +216 @@
 //Compile_Func.cpp
 int GetFunctionFromName(char *FuncName);
-bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &resultType, bool isCallOn = true );
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, const Type &baseType, Type &resultType, bool isCallOn = true );
 
 //OperatorProc.cpp