Changeset 56 in dev for BasicCompiler32

Timestamp:

Feb 15, 2007, 3:39:40 AM (18 years ago)

Author:

dai_9181

Message:

・[Unicode]リテラル文字列のスイッチング
・[Unicode]Char型を文字型として扱うようにする
・[Unicode]SByte型を追加する
に対応。

/unicodeコマンドオプションに対応。

Location:

BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (3 diffs)
• Compile_Var.cpp (modified) (2 diffs)
• MakePeHdr.cpp (modified) (5 diffs)
• NumOpe.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler32/BasicCompiler.vcproj

@@ -147 +147 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
+                AdditionalIncludeDirectories="..\cpplibs\boost"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN"
                 StringPooling="true"
@@ -244 +245 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
+                AdditionalIncludeDirectories="..\cpplibs\boost"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENG"
                 StringPooling="true"
@@ -828 +830 @@
                     Name="Parts"
                     >
+                    <File
+                        RelativePath="..\BasicCompiler_Common\DataTable.cpp"
+                        >
+                    </File>
                     <File
                         RelativePath="..\BasicCompiler_Common\LoopRefCheck.cpp"

BasicCompiler32/Compile_Var.cpp

@@ -853 +853 @@
             char *temp;
             temp=(char *)i64data;
-            i2=AddDataTable(temp,lstrlen(temp));
+            i2=dataTable.AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1043 +1043 @@
             char *temp;
             temp=(char *)i64data;
-            i2=AddDataTable(temp,lstrlen(temp));
+            i2=dataTable.AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 

BasicCompiler32/MakePeHdr.cpp

@@ -77 +77 @@
 
 
-int AddDataTable(char *buffer,int length){
-    extern HANDLE hHeap;
-    extern char *DataTable;
-    extern int DataTableSize;
-    int RetNum;
-
-    DataTable=(char *)HeapReAlloc(hHeap,0,DataTable,DataTableSize+length+1);
-    memcpy(DataTable+DataTableSize,buffer,length);
-    DataTable[DataTableSize+length]=0;
-
-    RetNum=DataTableSize; //ImageBase+MemPos_DataSectionが後に足される
-
-    DataTableSize+=length+1;
-
-    return RetNum;
-}
-
 void DebugVariable(void){
     char temporary[255];
@@ -136 +119 @@
     //////////////////
     // データテーブル
-    extern char *DataTable;
-    extern int DataTableSize;
+    dataTable.Init();
     if(bDebugCompile){
-        DataTable=(char *)HeapAlloc(hHeap,0,2);
-        DataTable[0]=2;
-        DataTable[1]=0;
-        DataTableSize=2;
-    }
-    else{
-        DataTable=(char *)HeapAlloc(hHeap,0,1);
-        DataTableSize=0;
+        dataTable.Add( (long)0x00000002 );
     }
 
@@ -828 +803 @@
 
     //データセクションのファイル上のサイズ
-    if(DataTableSize%FILE_ALIGNMENT) FileSize_DataSection=DataTableSize+(FILE_ALIGNMENT-DataTableSize%FILE_ALIGNMENT);
-    else FileSize_DataSection=DataTableSize;
+    if(dataTable.GetSize()%FILE_ALIGNMENT) FileSize_DataSection=dataTable.GetSize()+(FILE_ALIGNMENT-dataTable.GetSize()%FILE_ALIGNMENT);
+    else FileSize_DataSection=dataTable.GetSize();
     if(FileSize_DataSection) bUse_DataSection=1;
     else bUse_DataSection=0;
@@ -1556 +1531 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,DataTable,DataTableSize,(DWORD *)&i2,NULL);
+        WriteFile(hFile,dataTable.GetPtr(),dataTable.GetSize(),(DWORD *)&i2,NULL);
         i+=i2;
     }
@@ -1648 +1623 @@
     HeapDefaultFree(pHintTable);
 
-    //データテーブルに関する情報を解放
-    HeapDefaultFree(DataTable);
-
     //グローバル変数の初期バッファを解放
     HeapDefaultFree(initGlobalBuf);

BasicCompiler32/NumOpe.cpp

@@ -99 +99 @@
     }
 
-    int i2;
-    i2=AddDataTable(lpszText,lstrlen(lpszText));
+    // TODO: Ex表記による文字列長に対応する
+    int i2 = dataTable.AddString( lpszText );
 
     //push lpszPtr
@@ -244 +244 @@
                     bLiteralCalculation=0;
 
-                    i2=AddDataTable(term,i3);
+                    i2=dataTable.AddString(term,i3);
 
                     //push DataSize

BasicCompiler32/Opcode.h

@@ -78 +78 @@
 };
 
-
-//MakePeHdr.cpp
-int AddDataTable(char *buffer,int length);
 
 //RSrcSection.cpp