Changeset 51 in dev for BasicCompiler32

Timestamp:

Feb 10, 2007, 8:30:19 PM (18 years ago)

Author:

dai_9181

Message:

ppobj_Member及びppobj_StaticMemberを廃止し、vectorに統一した（methods及びstaticMethods）。

Location:

BasicCompiler32

Files:

• CParameter.cpp (modified) (5 diffs)
• Compile_CallProc.cpp (modified) (2 diffs)
• Compile_Func.cpp (modified) (1 diff)
• Compile_Object.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (10 diffs)
• Compile_Statement.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (1 diff)
• OperatorProc.cpp (modified) (1 diff)

BasicCompiler32/CParameter.cpp

@@ -109 +109 @@
 
             //call destructor
-            int i5 = types[i2].u.pobj_Class->DestructorMemberSubIndex;
-            if( i5 != -1 ){
-                op_call( types[i2].u.pobj_Class->ppobj_Method[i5]->psi );
+            CMethod *method = types[i2].u.pobj_Class->GetDestructorMethod();
+            if( method ){
+                op_call( method->psi );
             }
 
@@ -148 +148 @@
     CalcType.type=NumOpe_GetType(Parameter,&BaseType,&CalcType.u.lpIndex);
 
-    if(pobj_Class->CopyConstructorMemberSubIndex!=-1&&
-        CalcType.type==DEF_OBJECT&&CalcType.u.pobj_Class==pobj_Class){
+    if( pobj_Class->GetCopyConstructorMethod()
+        && CalcType.type==DEF_OBJECT&&CalcType.u.pobj_Class==pobj_Class){
         ////////////////////////////////////
         // コピーコンストラクタを呼び出す
@@ -179 +179 @@
 
         //call constructor
-        op_call(pobj_Class->ppobj_Method[pobj_Class->CopyConstructorMemberSubIndex]->psi);
+        op_call(pobj_Class->GetCopyConstructorMethod()->psi);
 
 
@@ -191 +191 @@
 
 
-            if(pobj_Class->ConstructorMemberSubIndex!=-1){
+            if( pobj_Class->GetConstructorMethod() ){
                 ////////////////////////////////
                 // コンストラクタを呼び出す
@@ -200 +200 @@
 
                 //call constructor
-                op_call(pobj_Class->ppobj_Method[pobj_Class->ConstructorMemberSubIndex]->psi);
+                op_call(pobj_Class->GetConstructorMethod()->psi);
             }
 

BasicCompiler32/Compile_CallProc.cpp

@@ -95 +95 @@
 
 void Opcode_CallProc(char *Parameter,SUBINFO *psi,DWORD dwFlags,char *ObjectName,int RefType){
-    int i,i2;
+    int i2;
 
     if(psi->dwType==SUBTYPE_MACRO){
@@ -338 +338 @@
         OpBuffer[obp++]=(char)0x11;
 
-        for(i=0,i2=0;i<pobj_c->iMethodNum;i++){
-            if(pobj_c->ppobj_Method[i]->psi==psi) break;
-            if(pobj_c->ppobj_Method[i]->psi->bVirtual) i2++;
-        }
+        i2 = pobj_c->GetFuncNumInVtbl( psi );
 
         //call dword ptr[edx+func_index]

BasicCompiler32/Compile_Func.cpp

@@ -324 +324 @@
         OpBuffer[obp++]=(char)0x11;
 
-        int i,i2;
-        for(i=0,i2=0;i<pobj_c->iMethodNum;i++){
-            if(pobj_c->ppobj_Method[i]->psi==psi) break;
-            if(pobj_c->ppobj_Method[i]->psi->bVirtual) i2++;
-        }
+        int i2 = pobj_c->GetFuncNumInVtbl( psi );
 
         //mov eax,dword ptr[edx+func_index]

BasicCompiler32/Compile_Object.cpp

@@ -220 +220 @@
 
 
+    CMethod *method = pobj_c->GetDestructorMethod();
+    if( method == NULL ) return 0;
+
     //mov ecx,DestructorProcAddr
-    i2=pobj_c->DestructorMemberSubIndex;
-    if(i2==-1) return -1;
     OpBuffer[obp++]=(char)0xB9;
-    pobj_SubAddrSchedule->add(pobj_c->ppobj_Method[i2]->psi,0);
-    pobj_c->ppobj_Method[i2]->psi->bUse=1;
+    pobj_SubAddrSchedule->add(method->psi,0);
+    method->psi->bUse=1;
     obp+=sizeof(long);
 

BasicCompiler32/Compile_ProcOp.cpp

@@ -219 +219 @@
     extern SUBINFO **ppSubHash;
     extern BOOL bDebugCompile;
-    int i3,i4,i5,VarSize,LocalVarSchedule,EspOffsetSchedule,BufferSize,BaseOffset;
+    int i3,i4,VarSize,LocalVarSchedule,EspOffsetSchedule,BufferSize,BaseOffset;
     char temporary[VN_SIZE];
 
@@ -379 +379 @@
         if(psi->ReturnType==DEF_OBJECT && psi->isReturnRef == false){
             //戻り値用オブジェクトのコンストラクタを呼び出す
-            if(psi->u.Return_pobj_c->ConstructorMemberSubIndex!=-1){
+            if( psi->u.Return_pobj_c->GetConstructorMethod() ){
                 sprintf(temporary,"%s.%s()",temp,psi->u.Return_pobj_c->name);
                 OpcodeOthers(temporary);
@@ -462 +462 @@
             BOOL bThisIsSuperClass;
             if(pobj_CompilingClass->pobj_InheritsClass==0) bThisIsSuperClass=1;
-            else if(pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex==-1){
+            else if( pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod() == NULL ){
                 //インターフェイスを継承したときはコンストラクタを持たない
                 bThisIsSuperClass=1;
@@ -497 +497 @@
                     RemoveStringPare(temporary);
 
-                    i3=pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex;
                     Opcode_CallProc(temporary,
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->psi,
                         0,
                         "",
@@ -506 +505 @@
                 else{
                     //基底クラスのコンストラクタを暗黙的に呼び出す
-                    i3=pobj_CompilingClass->pobj_InheritsClass->ConstructorMemberSubIndex;
                     Opcode_CallProc("",
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        pobj_CompilingClass->pobj_InheritsClass->GetConstructorMethod()->psi,
                         0,
                         "",
@@ -524 +522 @@
             for(i3=0;i3<pobj_CompilingClass->iMemberNum;i3++){
                 CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
+                MemberTypeSize=
+                    GetTypeSize(pMember->TypeInfo.type,
+                        pMember->TypeInfo.u.lpIndex);
+
+                MemberObjectNum=
+                    JumpSubScripts(pMember->SubScripts);
 
                 offset=GetSizeOfClassMember(pobj_CompilingClass,pMember->name,NULL);
 
-                if(pMember->TypeInfo.type==DEF_OBJECT){
-                    if(pMember->TypeInfo.u.pobj_Class->ConstructorMemberSubIndex!=-1){
-                        i5=pMember->TypeInfo.u.pobj_Class->ConstructorMemberSubIndex;
-                        if(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi->RealParmNum==1){  //Thisポインタを第一引数に持ち合わせるため、引数なしの場合はこの値が1になる
-
-                            MemberTypeSize=
-                                GetTypeSize(pMember->TypeInfo.type,
-                                    pMember->TypeInfo.u.lpIndex);
-
-                            MemberObjectNum=
-                                JumpSubScripts(pMember->SubScripts);
-
+                if(pMember->TypeInfo.type==DEF_OBJECT && pMember->IsRef() == false){
+                    CMethod *method = pMember->TypeInfo.u.pobj_Class->GetConstructorMethod();
+                    if( method ){
+                        if( method->psi->RealParmNum == 1 ){    //Thisポインタを第一引数に持ち合わせるため、引数なしの場合はこの値が1になる
                             for(i4=0;i4<MemberObjectNum;i4++){
                                 //Thisポインタをecxにコピー
@@ -553 +549 @@
 
                                 //call constructor
-                                op_call(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi);
+                                op_call( method->psi );
                             }
                         }
@@ -618 +614 @@
                     基底クラスのデストラクタを呼び出す */
 
-                i3=pobj_CompilingClass->pobj_InheritsClass->DestructorMemberSubIndex;
-                if(i3!=-1){
+                CMethod *method = pobj_CompilingClass->pobj_InheritsClass->GetDestructorMethod();
+                if( method ){
                     Opcode_CallProc("",
-                        pobj_CompilingClass->ppobj_Method[i3]->psi,
+                        method->psi,
                         0,
                         "",
@@ -647 +643 @@
 
                 if(pMember->TypeInfo.type==DEF_OBJECT){
-                    if(pMember->TypeInfo.u.pobj_Class->DestructorMemberSubIndex!=-1){
+                    CMethod *method = pMember->TypeInfo.u.pobj_Class->GetDestructorMethod();
+                    if( method ){
                         for(i4=MemberObjectNum-1;i4>=0;i4--){
                             //Thisポインタをecxにコピー
@@ -662 +659 @@
 
                             //call destructor
-                            i5=pMember->TypeInfo.u.pobj_Class->DestructorMemberSubIndex;
-                            op_call(pMember->TypeInfo.u.pobj_Class->ppobj_Method[i5]->psi);
+                            op_call( method->psi );
                         }
                     }

BasicCompiler32/Compile_Statement.cpp

@@ -106 +106 @@
         }
         if(i2==DEF_OBJECT){
-            CClass *pobj_Class;
-            pobj_Class=(CClass *)lp;
-            if(pobj_Class->DestructorMemberSubIndex!=-1){
-                //デストラクタの呼び出し
-
-                //push eax
-                op_push(REG_EAX);
-
-                //push eax
-                op_push(REG_EAX);
-
-                //call destructor
-                int i5;
-                i5=pobj_Class->DestructorMemberSubIndex;
-                op_call(pobj_Class->ppobj_Method[i5]->psi);
-            }
-            else{
-                //push eax
-                op_push(REG_EAX);
-            }
-
-            //call free
-            extern SUBINFO *pSub_free;
-            op_call(pSub_free);
+            //mov ebx,eax
+            op_mov_RR(REG_EBX,REG_EAX);
+
+            FreeTempObject(REG_EBX,(CClass *)lp);
         }
         return;

BasicCompiler32/MakePeHdr.cpp

@@ -1049 +1049 @@
     // プロシージャポインタスケジュール
     for(i=0;i<pobj_SubAddrSchedule->num;i++){
+        if(pobj_SubAddrSchedule->ppsi[i]->CompileAddress==0
+            &&pobj_SubAddrSchedule->ppsi[i]->EndOpAddr==0){
+            SetError(300,NULL,-1);
+        }
+
         if(pobj_SubAddrSchedule->pbCall[i]){
             *((long *)(OpBuffer+pobj_SubAddrSchedule->pObpValues[i]))=

BasicCompiler32/NumOpe.cpp

@@ -96 +96 @@
 
         //call constructor
-        op_call(pobj_StringClass->ppobj_Method[pobj_StringClass->ConstructorMemberSubIndex]->psi);
+        op_call(pobj_StringClass->GetConstructorMethod()->psi);
     }
 

BasicCompiler32/OperatorProc.cpp

@@ -5 +5 @@
     if(!IsSafeReg(reg)) SetError(300,NULL,cp);
 
-    if(pobj_c->DestructorMemberSubIndex!=-1){
+    CMethod *method = pobj_c->GetDestructorMethod();
+    if( method ){
         //push reg
         op_push(reg);
 
         //call DestructorProcAddr
-        op_call(pobj_c->ppobj_Method[pobj_c->DestructorMemberSubIndex]->psi);
+        op_call( method->psi );
     }