Changeset 259 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 3, 2007, 3:24:22 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_Object.cpp (modified) (6 diffs)
• Compile_ProcOp.cpp (modified) (3 diffs)
• MakePeHdr.cpp (modified) (4 diffs)
• NumOpe.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_Object.cpp

@@ -16 +16 @@
     //をセットしておかなければならない
 
-    //jnzのジャンプ先番地
+/*  //jnzのジャンプ先番地
     extern int obp;
-    int jnz_back = obp;
+    int jnz_back = obp;*/
 
     if(bSomeObjects){
@@ -24 +24 @@
 
         //push ebx
-        compiler.codeGenerator.op_push(REG_EBX);
+        //compiler.codeGenerator.op_push(REG_EBX);
     }
 
@@ -78 +78 @@
 
     if(bSomeObjects){
+        /*
         //pop ebx
         compiler.codeGenerator.op_pop(REG_EBX);
@@ -89 +90 @@
         //jne ↑
         compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
+        */
     }
 }
@@ -261 +263 @@
 
     //jnzの番地
-    extern int obp;
-    int jnz_back = obp;
+    /*extern int obp;
+    int jnz_back = obp;*/
 
     //push ecx
@@ -289 +291 @@
 
     //jne ↑
-    compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
+    //compiler.codeGenerator.op_jne( jnz_back-obp, sizeof(long), false, true );
 
 

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -264 +264 @@
 
     extern int obp;
-    pUserProc->SetBeginOpAddress( obp );
+    pUserProc->_beginOpAddressOld = obp;
 
     //コンパイル中の関数が属するクラス
@@ -294 +294 @@
         SystemProc(*pUserProc);
 
-        pUserProc->SetEndOpAddress( obp );
+        pUserProc->_endOpAddressOld = obp;
         return;
     }
@@ -737 +737 @@
 
 
-    pUserProc->SetEndOpAddress( obp );
+    pUserProc->_endOpAddressOld = obp;
 
 

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -554 +554 @@
     vector<ObjectModule *> masterObjectModules;
     masterObjectModules.push_back( &compiler.objectModule );
-    //compiler.linker.Link( masterObjectModules );
+    compiler.linker.Link( masterObjectModules );
 
 
@@ -704 +704 @@
 
             if( pUserProc->GetName() == "DllMain" ){
-                DllMain_EntryPoint=pUserProc->GetBeginOpAddress();
+                DllMain_EntryPoint=pUserProc->_beginOpAddressOld;
             }
 
             lpdwExportAddressTable=(DWORD *)HeapReAlloc(hHeap,0,lpdwExportAddressTable,(ExportNum+1)*sizeof(DWORD));
-            lpdwExportAddressTable[ExportNum]=pUserProc->GetBeginOpAddress();
+            lpdwExportAddressTable[ExportNum]=pUserProc->_beginOpAddressOld;
 
             lpdwExportNamePointerTable=(DWORD *)HeapReAlloc(hHeap,0,lpdwExportNamePointerTable,(ExportNum+1)*sizeof(DWORD));
@@ -1177 +1177 @@
     // プロシージャポインタスケジュール
     for(i=0;i<pobj_SubAddrSchedule->num;i++){
-        if(pobj_SubAddrSchedule->ppsi[i]->GetBeginOpAddress()==0
-            &&pobj_SubAddrSchedule->ppsi[i]->GetEndOpAddress()==0){
+        if(pobj_SubAddrSchedule->ppsi[i]->_beginOpAddressOld==0
+            &&pobj_SubAddrSchedule->ppsi[i]->_endOpAddressOld==0){
             SetError(300,NULL,-1);
         }
@@ -1184 +1184 @@
         if(pobj_SubAddrSchedule->pbCall[i]){
             *((long *)(OpBuffer+pobj_SubAddrSchedule->pObpValues[i]))=
-                pobj_SubAddrSchedule->ppsi[i]->GetBeginOpAddress()-(pobj_SubAddrSchedule->pObpValues[i]+sizeof(long));
+                pobj_SubAddrSchedule->ppsi[i]->_beginOpAddressOld-(pobj_SubAddrSchedule->pObpValues[i]+sizeof(long));
         }
         else{
             *((long *)(OpBuffer+pobj_SubAddrSchedule->pObpValues[i]))=
-                pobj_SubAddrSchedule->ppsi[i]->GetBeginOpAddress()+ImageBase+MemPos_CodeSection;
+                pobj_SubAddrSchedule->ppsi[i]->_beginOpAddressOld+ImageBase+MemPos_CodeSection;
         }
     }

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -677 +677 @@
     //リテラル値のみの計算かどうかを判別するためのフラグ
     BOOL bLiteralCalculation=1;
-
-    //リテラル演算の場合を考慮した演算前のバッファ位置
-    extern int obp;
-    int BeforeObp = obp;
 
     //リテラル演算の場合を考慮した演算前のプロシージャスケジュール位置