Changeset 262 in dev for trunk

Timestamp:

Aug 4, 2007, 4:36:34 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler64/CodeGenerator.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Func.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Object.cpp (modified) (4 diffs)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (1 diff)

trunk/abdev/BasicCompiler64/CodeGenerator.cpp

@@ -1695 +1695 @@
 
 void CodeGenerator::op_call( const UserProc *pUserProc ){
-    pUserProc->Using();
-
-    pNativeCode->Put(  (char)0xE8 );
-    pobj_SubAddrSchedule->add( pUserProc, 1 );
-    pNativeCode->Put( (long)0 );
+    pNativeCode->Put( (char)0xE8 );
+    pNativeCode->PutUserProcSchedule( pUserProc, true );
 }
 void CodeGenerator::op_call( const DllProc *pDllProc ){
-    pDllProc->Using();
-
-    pNativeCode->Put(  (char)0xFF );
-    pNativeCode->Put(  (char)0x15 );
-    pobj_ImportAddrSchedule->add(pDllProc);
-    pNativeCode->Put( (long)0 );
+    pNativeCode->Put( (char)0xFF );
+    pNativeCode->Put( (char)0x15 );
+    pNativeCode->PutDllProcSchedule( pDllProc );
 }
 void CodeGenerator::op_ret(){
     pNativeCode->Put( (char)0xC3 );
 }
+void CodeGenerator::op_addressof( int reg, const UserProc *pUserProc )
+{
+    //mov reg,userProcAddress
+
+    //オペコード、レジスタ
+    pNativeCode->Put( (char)(0xB8|REGISTER_OPERAND(reg)) );
+
+    //DISP32
+    pNativeCode->PutUserProcSchedule( pUserProc, false );
+}

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -159 +159 @@
 
         //mov rax,ProcAddr
-        compiler.codeGenerator.op_mov_RV(sizeof(_int64),REG_RAX,0);
-        obp-=sizeof(long);
-        pobj_SubAddrSchedule->add(pUserProc,0);
-        obp+=sizeof(long);
+        compiler.codeGenerator.op_addressof( REG_RAX, pUserProc );
     }
 

trunk/abdev/BasicCompiler64/Compile_Object.cpp

@@ -16 +16 @@
     //をセットしておかなければならない
 
-    int jnz_back;
-
 
     //jnzの番地
-    jnz_back=obp;
+    /*extern int obp;
+    int jnz_back = obp;*/
 
     if(bSomeObjects){
         SetError();
         //mov qword ptr[rsp+offset],rbx     ※スタックフレームを利用
-        pobj_sf->push(REG_RBX);
+        //pobj_sf->push(REG_RBX);
 
         // ※ここでプッシュされた値はコンストラクタのthisポインタとなる
         //mov qword ptr[rsp+offset],rax     ※スタックフレームを利用
-        pobj_sf->push(REG_RAX);
+        //pobj_sf->push(REG_RAX);
     }
 
@@ -73 +72 @@
 
     if(bSomeObjects){
+        /*
         //mov rax,qword ptr[rsp+offset]     ※スタックフレームを利用
         pobj_sf->pop(REG_RAX);
@@ -87 +87 @@
         //jnz ↑
         compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
+        */
     }
 }
@@ -180 +181 @@
 
     //mov rcx,DestructorProcAddr（デストラクタの関数ポインタ）
-    compiler.codeGenerator.op_mov_RV(sizeof(_int64),REG_RCX,0);
-    obp-=sizeof(long);
-    pobj_SubAddrSchedule->add(&method->GetUserProc(),0);
-    method->GetUserProc().Using();
-    obp+=sizeof(long);
+    compiler.codeGenerator.op_addressof( REG_RCX, &method->GetUserProc() );
 
     //mov qword ptr[rax],rcx

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -237 +237 @@
 
     //ラベル用のメモリを確保
-    extern LABEL *pLabelNames;
-    extern int MaxLabelNum;
-    pLabelNames=(LABEL *)HeapAlloc(hHeap,0,1);
-    MaxLabelNum=0;
+    compiler.codeGenerator.gotoLabels.clear();
 
     //Gotoラベルスケジュール
@@ -565 +562 @@
     }
 
-    //ラベル用のメモリを解放
-    for(i3=0;i3<MaxLabelNum;i3++){
-        if(pLabelNames[i3].pName) HeapDefaultFree(pLabelNames[i3].pName);
-    }
-    HeapDefaultFree(pLabelNames);
-
     //With情報のメモリを解放
     for(i3=0;i3<WithInfo.num;i3++){

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -236 +236 @@
 
 int GetLabelAddress(char *LabelName,int LineNum){
-    extern int MaxLabelNum;
-    extern LABEL *pLabelNames;
-    int i;
-
     if(LabelName){
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName){
-                if(lstrcmp(LabelName,pLabelNames[i].pName)==0) return pLabelNames[i].address;
+        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
+        {
+            if( label.name.size() > 0 )
+            {
+                if( label.name == LabelName )
+                {
+                    return label.address;
+                }
             }
         }
     }
     else{
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName==0){
-                if(LineNum==pLabelNames[i].line) return pLabelNames[i].address;
+        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
+        {
+            if( label.name.size() == 0 )
+            {
+                if( label.line == LineNum )
+                {
+                    return label.address;
+                }
             }
         }

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -361 +361 @@
         }
 
-        //ラベル用のメモリを確保
-        extern LABEL *pLabelNames;
-        extern int MaxLabelNum;
-        pLabelNames=(LABEL *)HeapAlloc(hHeap,0,1);
-        MaxLabelNum=0;
+        //ラベル管理オブジェクトを初期化
+        compiler.codeGenerator.gotoLabels.clear();
 
         //Gotoラベルスケジュール
@@ -411 +408 @@
         //グローバル実行領域をコンパイル開始
         CompileBuffer(0,0);
-
-        //ラベル用のメモリを解放
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName) HeapDefaultFree(pLabelNames[i].pName);
-        }
-        HeapDefaultFree(pLabelNames);
 
         //Goto未知ラベルスケジュールが存在したらエラーにする

trunk/abdev/BasicCompiler64/Opcode.h

@@ -20 +20 @@
 
 #define breakpoint compiler.codeGenerator.PutOld( (char)0xCC );
-
-
-//ラベルアドレス
-struct LABEL{
-    char *pName;
-    int line;
-    DWORD address;
-};
 
 

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -382 +382 @@
     void op_call( const DllProc *pDllProc );
     void op_ret();
+    void op_addressof( int reg, const UserProc *pUserProc );
 
 #else