Changeset 56 in dev for BasicCompiler64

Timestamp:

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

Author:

dai_9181

Message:

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

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

Location:

BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (4 diffs)
• Compile_Statement.cpp (modified) (2 diffs)
• Compile_Var.cpp (modified) (2 diffs)
• MakePeHdr.cpp (modified) (5 diffs)
• NumOpe.cpp (modified) (6 diffs)
• NumOpe_Arithmetic.cpp (modified) (2 diffs)
• NumOpe_TypeOperation.cpp (modified) (2 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler64/BasicCompiler.vcproj

@@ -152 +152 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\cpplibs\Base"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 StringPooling="true"
@@ -252 +253 @@
                 Optimization="2"
                 InlineFunctionExpansion="1"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\cpplibs\Base"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;ENG"
                 StringPooling="true"
@@ -346 +348 @@
                 Name="VCCLCompilerTool"
                 Optimization="2"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\cpplibs\Base"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="false"
@@ -1403 +1406 @@
                     >
                     <File
+                        RelativePath="..\BasicCompiler_Common\DataTable.cpp"
+                        >
+                    </File>
+                    <File
                         RelativePath="..\BasicCompiler_Common\LoopRefCheck.cpp"
                         >

BasicCompiler64/Compile_Statement.cpp

@@ -123 +123 @@
     if(type==DEF_DOUBLE){
         double dbl=0;
-        offset=AddDataTable((char *)&dbl,sizeof(double));
+        offset=dataTable.Add( dbl );
 
         //comisd xmm0,qword ptr[data table offset]
@@ -137 +137 @@
     else if(type==DEF_SINGLE){
         float flt=0;
-        offset=AddDataTable((char *)&flt,sizeof(float));
+        offset=dataTable.Add( flt );
 
         //comiss xmm0,dword ptr[data table offset]

BasicCompiler64/Compile_Var.cpp

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

BasicCompiler64/MakePeHdr.cpp

@@ -65 +65 @@
     bUse_DebugSection;
 
-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){
@@ -124 +107 @@
     //////////////////
     // データテーブル
-    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 );
     }
 
@@ -841 +816 @@
 
     //データセクションのファイル上のサイズ
-    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;
@@ -1577 +1552 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,DataTable,DataTableSize,(DWORD *)&i2,NULL);
+        WriteFile(hFile,dataTable.GetPtr(),dataTable.GetSize(),(DWORD *)&i2,NULL);
         i+=i2;
     }
@@ -1669 +1644 @@
     HeapDefaultFree(pHintTable);
 
-    //データテーブルに関する情報を解放
-    HeapDefaultFree(DataTable);
-
     //グローバル変数の初期バッファを解放
     HeapDefaultFree(initGlobalBuf);

BasicCompiler64/NumOpe.cpp

@@ -37 +37 @@
         op_call(pobj_StringClass->GetConstructorMethod()->psi);
 
-        int i2;
-        i2=AddDataTable(lpszText,lstrlen(lpszText));
+        // TODO: Ex表記による文字列長に対応する
+        int i2 = dataTable.AddString( lpszText );
 
         //mov rax,i2
@@ -269 +269 @@
                     bLiteralCalculation=0;
 
-                    i2=AddDataTable(term,i3);
+                    i2 = dataTable.AddString( term, i3 );
 
                     //mov reg,i2
@@ -622 +622 @@
                         }
                         else{
-                            i3=AddDataTable((char *)&i64data,sizeof(_int64));
+                            i3 = dataTable.Add( i64data );
 
                             //movlpd xmm_reg,qword ptr[data table offset]
@@ -650 +650 @@
                         }
                         else{
-                            i3=AddDataTable((char *)&i32data,sizeof(long));
+                            i3=dataTable.Add( i32data );
 
                             //movss xmm_reg,dword ptr[data table offset]
@@ -789 +789 @@
 
             if(i2==DEF_DOUBLE){
-                i3=AddDataTable((char *)&i64data,sizeof(_int64));
+                i3 = dataTable.Add( i64data );
 
                 //movlpd xmm_reg,qword ptr[data table offset]
@@ -809 +809 @@
                 memcpy(&i32data,&flt,sizeof(long));
 
-                i3=AddDataTable((char *)&i32data,sizeof(long));
+                i3 = dataTable.Add( i32data );
 
                 //movss xmm_reg,dword ptr[data table offset]

BasicCompiler64/NumOpe_Arithmetic.cpp

@@ -452 +452 @@
         double dbl;
         dbl=-1;
-        i32data=AddDataTable((char *)&dbl,sizeof(double));
+        i32data = dataTable.Add( dbl );
 
         //mulsd xmm_reg,qword ptr[data table offset]   ※data = -1
@@ -474 +474 @@
         float flt;
         flt=-1;
-        i32data=AddDataTable((char *)&flt,sizeof(float));
+        i32data = dataTable.Add( flt );
 
         //mulss xmm_reg,dword ptr[data table offset]   ※data = -1

BasicCompiler64/NumOpe_TypeOperation.cpp

@@ -85 +85 @@
             int temp;
             _int64 i64data=0x43f0000000000000;
-            temp=AddDataTable((char *)&i64data,sizeof(_int64));
+            temp=dataTable.Add( i64data );
             OpBuffer[obp++]=(char)0xF2;
             OpBuffer[obp++]=(char)0x0F;
@@ -144 +144 @@
             int temp;
             long i32data=0x5f800000;
-            temp=AddDataTable((char *)&i32data,sizeof(long));
+            temp=dataTable.Add( i32data );
             OpBuffer[obp++]=(char)0xF3;
             OpBuffer[obp++]=(char)0x0F;

BasicCompiler64/Opcode.h

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