Changeset 263 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 5, 2007, 3:47:49 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_Object.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (9 diffs)
• MakePeHdr.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/Compile_Object.cpp

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

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -121 +121 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allrem, 178 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allrem, 178, false ) );
     }
     else if( userProc.GetName() == "_aullrem" ){
@@ -137 +137 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aullrem, 117 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aullrem, 117, false ) );
     }
     else if( userProc.GetName() == "_allmul" ){
@@ -145 +145 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allmul, 52 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allmul, 52, false ) );
     }
     else if( userProc.GetName() == "_alldiv" ){
@@ -153 +153 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_alldiv, 170 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_alldiv, 170, false ) );
     }
     else if( userProc.GetName() == "_aulldiv" ){
@@ -168 +168 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aulldiv, 104 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aulldiv, 104, false ) );
     }
     else if( userProc.GetName() == "_allshl" ){
@@ -176 +176 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allshl, 31 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allshl, 31, false ) );
     }
     else if( userProc.GetName() == "_allshr" ){
@@ -184 +184 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allshr, 33 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_allshr, 33, false ) );
     }
     else if( userProc.GetName() == "_aullshr" ){
@@ -208 +208 @@
         };
 
-        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aullshr, 31 ) );
+        compiler.codeGenerator.PutOld( NativeCode( (const char *)Buffer_aullshr, 31, false ) );
     }
     else{
@@ -744 +744 @@
 
     _compile_proc( &userProc );
+
 /*
     // ログを履く

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -239 +239 @@
 
     //コードと行番号の関係
-    extern LINEINFO *pLineInfo;
-    extern int MaxLineInfoNum;
-    pLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,1);
-    MaxLineInfoNum=0;
+    extern SourceLines oldSourceLines;
+    oldSourceLines.clear();
 
 
@@ -887 +885 @@
 
     //機械語コードとBasicコードの関係を整理
-    extern LINEINFO *pLineInfo;
-    extern int MaxLineInfoNum;
+    extern SourceLines oldSourceLines;
     int MinObp,MaxObp;
-    LINEINFO *pTempLineInfo;
-    pTempLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,MaxLineInfoNum*sizeof(LINEINFO));
-    i2=0;
+    SourceLines tempSourceLines;
     MaxObp=0;
     while(1){
-        for(i3=0,MinObp=0x0FFFFFFF;i3<MaxLineInfoNum;i3++){
-            if(pLineInfo[i3].TopObp<MinObp&&MaxObp<pLineInfo[i3].TopObp){
-                MinObp=pLineInfo[i3].TopObp;
+        for(i3=0,MinObp=0x0FFFFFFF;i3<(int)oldSourceLines.size();i3++){
+            if(oldSourceLines[i3].GetNativeCodePos()<MinObp&&MaxObp<oldSourceLines[i3].GetNativeCodePos()){
+                MinObp=oldSourceLines[i3].GetNativeCodePos();
                 i4=i3;
             }
         }
         if(MinObp==0x0FFFFFFF) break;
-        pTempLineInfo[i2]=pLineInfo[i4];
-        MaxObp=pTempLineInfo[i2].TopObp;
-        i2++;
-    }
-    HeapDefaultFree(pLineInfo);
-    pLineInfo=(LINEINFO *)HeapAlloc(hHeap,0,i2*sizeof(LINEINFO));
-    memcpy(pLineInfo,pTempLineInfo,i2*sizeof(LINEINFO));
-    MaxLineInfoNum=i2;
-    HeapDefaultFree(pTempLineInfo);
+        tempSourceLines.push_back( oldSourceLines[i4] );
+        MaxObp=tempSourceLines.back().GetNativeCodePos();
+    }
+    oldSourceLines = tempSourceLines;
 
     //デバッグセクションを生成
@@ -1216 +1206 @@
     delete pobj_GlobalVarSchedule;
 
-/*
+
     compiler.linker.SetImageBase( ImageBase );
     compiler.linker.ResolveDataTableSchedules( MemPos_DataSection );
     compiler.linker.ResolveDllProcSchedules( MemPos_CodeSection, MemPos_ImportSection, LookupSize, HintSize );
     compiler.linker.ResolveUserProcSchedules( MemPos_CodeSection );
-    compiler.linker.ResolveDataTableSchedules( MemPos_RWSection );
-*/
+    compiler.linker.ResolveGlobalVarSchedules( MemPos_RWSection );
+
+    if( obp == compiler.linker.GetNativeCode().GetSize() )
+    {
+        //memcpy( OpBuffer, compiler.linker.GetNativeCode().GetCodeBuffer(), compiler.linker.GetNativeCode().GetSize() );
+    }
+    else
+    {
+        SetError();
+    }
+