Changeset 140 in dev for BasicCompiler64

Timestamp:

Jun 15, 2007, 4:00:25 AM (17 years ago)

Author:

dai_9181

Message:

traceログ機能を搭載
動的メンバをstl::vectorにまとめた
シンボルをクラス化した

Location:

BasicCompiler64

Files:

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

BasicCompiler64/BasicCompiler.vcproj

@@ -350 +350 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
+                InlineFunctionExpansion="2"
+                FavorSizeOrSpeed="1"
                 AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
@@ -480 +482 @@
                     >
                     <File
+                        RelativePath="..\BasicCompiler_Common\include\logger.h"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\include\Namespace.h"
                         >
@@ -489 +495 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\Procedure.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
                         >
                     </File>
@@ -1592 +1602 @@
                     </File>
                     <File
+                        RelativePath="..\BasicCompiler_Common\src\Symbol.cpp"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\Type.cpp"
                         >

BasicCompiler64/Compile_Object.cpp

@@ -57 +57 @@
         if( subs.size() == 1 ){
             char temporary[VN_SIZE];
-            sprintf( temporary, "_System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
+            sprintf( temporary, "ActiveBasic.Core._System_TypeBase.Search(\"\",\"%s\"))", pobj_c->GetName().c_str() );
 
             Opcode_CallProc(temporary,

BasicCompiler64/Compile_ProcOp.cpp

@@ -566 +566 @@
             }
 
-            //新しいオブジェクト領域は0で初期化されているため、Nothingを明示的に代入する必要はない
-/*
-            //実体クラスを持つメンバのコンストラクタ（引数有りを除く）を呼び出す
-            for(i3=0;i3<pobj_CompilingClass->iMemberNum;i3++){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                if(pMember->IsObject()){
-                    // オブジェクトメンバを発見したとき
-
-                    sprintf(temporary, "This.%s=Nothing",
-                        pMember->name );
-                    OpcodeCalc( temporary );
-                }
-            }
-*/
-
             //仮想関数テーブルを初期化
             if(pobj_CompilingClass->vtbl_num&&
@@ -659 +644 @@
                 }
             }
-
-            //実体クラスを持つメンバのデストラクタ呼び出しはGCに任せる
-            /*
-            //※コンストラクタと逆順序で呼び出す
-            for(i3=pobj_CompilingClass->iMemberNum-1;i3>=0;i3--){
-                CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                int MemberTypeSize=
-                    GetTypeSize(pMember->TypeInfo.type,
-                        pMember->TypeInfo.u.lpIndex);
-
-                int MemberObjectNum=
-                    JumpSubScripts(pMember->SubScripts);
-
-                int offset = pobj_CompilingClass->GetMemberOffset( pMember->name, NULL );
-
-                if(pMember->IsObject()){
-                    CMethod *method = pMember->GetClass().GetDestructorMethod();
-                    if( method ){
-                        for(i4=MemberObjectNum-1;i4>=0;i4--){
-                            //Thisポインタをrcxにコピー
-                            SetThisPtrToReg(REG_RCX);
-
-                            //add rcx,offset
-                            op_add_RV(REG_RCX,offset+i4*MemberTypeSize);
-
-                            //call destructor
-                            op_call(method->pUserProc);
-                        }
-                    }
-                }
-            }*/
         }
     }

BasicCompiler64/Compile_Var.cpp

@@ -187 +187 @@
 }
 bool _member_offset(bool isErrorEnabled, bool isWriteAccess, const CClass &objClass, const char *member, RELATIVE_VAR *pRelativeVar, Type &resultType, BOOL bPrivateAccess){
-    int i;
-
 
     //////////////////////////////////////
@@ -207 +205 @@
     ////////////////////////////
 
-    int offset = objClass.GetMemberOffset( VarName, &i );
-    if(i==objClass.iMemberNum){
+    int memberIndex;
+    int offset = objClass.GetMemberOffset( VarName, &memberIndex );
+    if( memberIndex == objClass.GetDynamicMembers().size() ){
         if(isErrorEnabled) SetError(103,VarName,cp);
         return false;
     }
 
-    CMember *pMember=objClass.ppobj_Member[i];
+    CMember *pMember = objClass.GetDynamicMembers()[memberIndex];
 
 
@@ -379 +378 @@
 }
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss){
-    int i;
     char variable[VN_SIZE];
 
@@ -471 +469 @@
             //クラス内メンバを参照するとき（通常）
 
-            for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
-                if( pobj_CompilingClass->ppobj_Member[i]->GetName() == VarName ){
+            bool isFound = false;
+            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+                if( pMember->GetName() == VarName ){
+                    isFound = true;
                     break;
                 }
             }
-            if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
+            if( !isFound ) goto NonClassMember;
         }
 
@@ -773 +773 @@
             const CClass &objClass = type.GetClass();
 
-            for(i=0,i2=0;i2<objClass.iMemberNum;i2++){
+            int i = 0;
+            BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
+                if(InitBuf[i]=='\0'){
+                    SetError(41,0,cp);
+                    return false;
+                }
+
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
 
                 if(!SetInitGlobalData(offset+i3,
-                    objClass.ppobj_Member[i2]->GetType(),
-                    objClass.ppobj_Member[i2]->SubScripts,
+                    pMember->GetType(),
+                    pMember->SubScripts,
                     temporary)) return false;
-
-                if(InitBuf[i]=='\0') break;
-            }
-            if(i2+1!=objClass.iMemberNum){
-                SetError(41,0,cp);
-                return false;
             }
             return true;
@@ -911 +911 @@
             const CClass &objClass = type.GetClass();
 
-            for(i=0,i2=0;i2<objClass.iMemberNum;i2++){
+            int i = 0;
+            BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
+                if(InitBuf[i]=='\0'){
+                    SetError(41,0,cp);
+                    return false;
+                }
+
                 i=GetOneParameter(InitBuf,i,temporary);
 
-                i3=objClass.GetMemberOffset( objClass.ppobj_Member[i2]->GetName().c_str(), NULL );
+                i3=objClass.GetMemberOffset( pMember->GetName().c_str(), NULL );
 
                 if(!InitLocalVar(offset+i3,
-                    objClass.ppobj_Member[i2]->GetType(),
-                    objClass.ppobj_Member[i2]->SubScripts,
+                    pMember->GetType(),
+                    pMember->SubScripts,
                     temporary)) return false;
 
                 if(InitBuf[i]=='\0') break;
-            }
-            if(i2+1!=objClass.iMemberNum){
-                SetError(41,0,cp);
-                return 0;
             }
             return true;

BasicCompiler64/MakePeHdr.cpp

@@ -240 +240 @@
         pSub_System_GC_free_for_SweepingDelete->Using();
 
-    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "_System_TypeBase.InitializeUserTypes",1 ) ){
+    if( pSubStaticMethod_System_TypeBase_InitializeUserTypes = GetSubHash( "ActiveBasic.Core._System_TypeBase.InitializeUserTypes",1 ) ){
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->Using();
         pSubStaticMethod_System_TypeBase_InitializeUserTypes->ThisIsAutoGenerationProc();

BasicCompiler64/NumOpe.cpp

@@ -524 +524 @@
         //New演算子（オブジェクト生成）
 
-        if( !Operator_New( expression+2, baseType, resultType ) ){
-            return false;
-        }
+        if( pobj_BlockReg->check(REG_RAX) ){
+            SetError();
+        }
+
+        //////////////////////////////////////////////////////
+        /////    レジスタ資源のバックアップ
+        {   BACKUP_REGISTER_RESOURCE
+        //////////////////////////////////////////////////////
+
+            if( !Operator_New( expression+2, baseType, resultType ) ){
+                return false;
+            }
+
+        /////////////////////////////////////////////
+        //////   レジスタ資源を復元
+            RESTORE_REGISTER_RESOURCE
+        }////////////////////////////////////////////
 
         //mov reg,rax

BasicCompiler64/Opcode.h

@@ -353 +353 @@
 
 private:
-    bool _overload_check( int level, const Parameters &params, const Type &returnType );
-    UserProc *OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs );
+    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType );
+
 public:
-    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
+    UserProc *_OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
+    UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs, bool isEnabledReturnType = false );
 
     void ApplyDefaultParameters( const Parameters &params );