Changeset 223 in dev for trunk/abdev

Timestamp:

Jul 19, 2007, 3:38:13 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/PESchedule.cpp (modified) (6 diffs)
• BasicCompiler_Common/PESchedule.h (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• BasicCompiler_Common/gc.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -1053 +1053 @@
 
 
-    /////////////////////////////
-    // GC用の変数スケジュール
-    /////////////////////////////
-    PerformedGcVarSchedule();
-
-
-
     ////////////////////////////
     // エクスポート情報の再配置

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -1057 +1057 @@
 
 
-    /////////////////////////////
-    // GC用の変数スケジュール
-    /////////////////////////////
-    PerformedGcVarSchedule();
-
-
     ////////////////////////////
     // エクスポート情報の再配置

trunk/abdev/BasicCompiler_Common/PESchedule.cpp

@@ -25 +25 @@
     length=0;
     NowPageRVAToReloc=0;
-
-    pdwData_CodeSection=(DWORD *)HeapAlloc(hHeap,0,1);
-    iNum_CodeSection=0;
-    pdwData_DataSection=(DWORD *)HeapAlloc(hHeap,0,1);
-    iNum_DataSection=0;
 }
 CReloc::~CReloc(){
@@ -39 +34 @@
         buffer=0;
     }
-
-    HeapDefaultFree(pdwData_CodeSection);
-    HeapDefaultFree(pdwData_DataSection);
 }
 void CReloc::copy(CReloc *por){
@@ -57 +49 @@
     NowCountAddrToReloc=por->NowCountAddrToReloc;
 
-    iNum_CodeSection=por->iNum_CodeSection;
-    pdwData_CodeSection=(DWORD *)HeapAlloc(hHeap,0,iNum_CodeSection*sizeof(DWORD));
-    memcpy(pdwData_CodeSection,por->pdwData_CodeSection,iNum_CodeSection*sizeof(DWORD));
-
-    iNum_DataSection=por->iNum_DataSection;
-    pdwData_DataSection=(DWORD *)HeapAlloc(hHeap,0,iNum_DataSection*sizeof(DWORD));
-    memcpy(pdwData_DataSection,por->pdwData_DataSection,iNum_DataSection*sizeof(DWORD));
+    codeSectionAddresses = por->codeSectionAddresses;
+
+    dataSectionAddresses = por->dataSectionAddresses;
 }
 
@@ -70 +58 @@
     if(!bDll) return;
 
-    pdwData_CodeSection=(DWORD *)HeapReAlloc(hHeap,0,pdwData_CodeSection,(iNum_CodeSection+1)*sizeof(DWORD));
-    pdwData_CodeSection[iNum_CodeSection]=addr;
-    iNum_CodeSection++;
+    codeSectionAddresses.push_back( addr );
 }
 void CReloc::AddSchedule_DataSection(DWORD addr){
@@ -78 +64 @@
     if(!bDll) return;
 
-    pdwData_DataSection=(DWORD *)HeapReAlloc(hHeap,0,pdwData_DataSection,(iNum_DataSection+1)*sizeof(DWORD));
-    pdwData_DataSection[iNum_DataSection]=addr;
-    iNum_DataSection++;
+    dataSectionAddresses.push_back( addr );
 }
 
@@ -136 +120 @@
     NowPageRVAToReloc=0;
 
-    int i;
-    for(i=0;i<iNum_CodeSection;i++){
+    BOOST_FOREACH( DWORD addr, codeSectionAddresses )
+    {
         extern int MemPos_CodeSection;
-        __add(MemPos_CodeSection + pdwData_CodeSection[i]);
-    }
-
-    for(i=0;i<iNum_DataSection;i++){
+        __add(MemPos_CodeSection + addr);
+    }
+
+    BOOST_FOREACH( DWORD addr, dataSectionAddresses )
+    {
         extern int MemPos_DataSection;
-        __add(MemPos_DataSection + pdwData_DataSection[i]);
+        __add(MemPos_DataSection + addr);
     }
 }

trunk/abdev/BasicCompiler_Common/PESchedule.h

@@ -22 +22 @@
 
 private:
-    DWORD *pdwData_CodeSection;
-    int iNum_CodeSection;
+    std::vector<DWORD> codeSectionAddresses;
 public:
     void AddSchedule_CodeSection(DWORD addr);
 
 private:
-    DWORD *pdwData_DataSection;
-    int iNum_DataSection;
+    std::vector<DWORD> dataSectionAddresses;
 public:
     void AddSchedule_DataSection(DWORD addr);

trunk/abdev/BasicCompiler_Common/common.h

@@ -389 +389 @@
 //gc.cpp
 void InitGCVariables(void);
-void PerformedGcVarSchedule(void);
 
 

trunk/abdev/BasicCompiler_Common/gc.cpp

@@ -9 +9 @@
 #endif
 
-int Schedule_GlobalRoot_StartPtr;
-int Schedule_GlobalRoot_Size;
-
 void InitGCVariables(void){
     char temporary[255];
-
-
-    ///////////////////////////////
-    // グローバル変数の開始位置
-    ///////////////////////////////
-
-    sprintf(temporary,"_System_gc_GlobalRoot_StartPtr%c%cVoidPtr",1,ESC_AS);
-    OpcodeDim(temporary,0);
-
     Type type;
     RELATIVE_VAR RelativeVar;
-    GetVarOffsetReadWrite("_System_gc_GlobalRoot_StartPtr",&RelativeVar,type);
-
-    //mov rax,ptr
-    op_mov_RV(PTR_SIZE,REG_RAX,0);
-    Schedule_GlobalRoot_StartPtr=obp-sizeof(long);
-
-    //mov ptr[offset],rax/eax
-    op_mov_MR(PTR_SIZE,REG_RAX,0,(int)RelativeVar.offset,MOD_DISP32);
-    obp-=sizeof(long);
-    pobj_GlobalVarSchedule->add();
-    obp+=sizeof(long);
-
-
-    ///////////////////////////////
-    // グローバル変数の大きさ
-    ///////////////////////////////
-
-    sprintf(temporary,"_System_gc_GlobalRoot_Size%c%cLong",1,ESC_AS);
-    OpcodeDim(temporary,0);
-
-    GetVarOffsetReadWrite("_System_gc_GlobalRoot_Size",&RelativeVar,type);
-
-    //mov rax,ptr
-    op_mov_RV(PTR_SIZE,REG_RAX,0);
-    Schedule_GlobalRoot_Size=obp-sizeof(long);
-
-    //mov ptr[offset],rax/eax
-    op_mov_MR(PTR_SIZE,REG_RAX,0,(int)RelativeVar.offset,MOD_DISP32);
-    obp-=sizeof(long);
-    pobj_GlobalVarSchedule->add();
-    obp+=sizeof(long);
-
 
 
@@ -78 +34 @@
 
 }
-
-void PerformedGcVarSchedule(void){
-    //グローバル変数領域の開始位置
-    extern DWORD ImageBase;
-    extern int MemPos_RWSection;
-    *((long *)(OpBuffer+Schedule_GlobalRoot_StartPtr))=ImageBase+MemPos_RWSection;
-    pobj_Reloc->AddSchedule_CodeSection(Schedule_GlobalRoot_StartPtr);
-
-    //グローバル変数領域のサイズ
-    extern int AllInitGlobalVarSize;
-    extern int AllGlobalVarSize;
-    *((long *)(OpBuffer+Schedule_GlobalRoot_Size))=AllInitGlobalVarSize+AllGlobalVarSize;
-}