Changeset 260 in dev for trunk

Timestamp:

Aug 3, 2007, 11:28:19 AM (17 years ago)

Author:

dai_9181

Message:

Labelクラスをリファクタリング

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (2 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Statement.cpp (modified) (3 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -1253 +1253 @@
                     >
                 </File>
-                <Filter
-                    Name="CoreClasses"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp"
-                        >
-                    </File>
-                </Filter>
             </Filter>
             <Filter
@@ -1267 +1259 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\src\CodeGenerator.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp"
                     >
                 </File>

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -402 +402 @@
     compiler.codeGenerator._exitSubCodePositions_ObpOld.clear();
 
-    //ラベル用のメモリを確保
-    extern LABEL *pLabelNames;
-    extern int MaxLabelNum;
-    pLabelNames=(LABEL *)HeapAlloc(hHeap,0,1);
-    MaxLabelNum=0;
+    //ラベル管理オブジェクトを初期化
+    extern Labels labels;
+    labels.clear();
 
     //Gotoラベルスケジュール
@@ -581 +579 @@
     }
 
-    //ラベル用のメモリを解放
-    for(i3=0;i3<MaxLabelNum;i3++){
-        if(pLabelNames[i3].pName) HeapDefaultFree(pLabelNames[i3].pName);
-    }
-    HeapDefaultFree(pLabelNames);
-
     //With情報のメモリを解放
     for(i3=0;i3<WithInfo.num;i3++){

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -279 +279 @@
 
 int GetLabelAddress(char *LabelName,int LineNum){
-    extern int MaxLabelNum;
-    extern LABEL *pLabelNames;
-    int i;
+    extern Labels labels;
 
     if(LabelName){
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName){
-                if(lstrcmp(LabelName,pLabelNames[i].pName)==0) return pLabelNames[i].address;
+        BOOST_FOREACH( const Label &label, labels )
+        {
+            if( label.name.size() > 0 )
+            {
+                if( label.name == LabelName )
+                {
+                    return label.address;
+                }
             }
         }
     }
     else{
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName==0){
-                if(LineNum==pLabelNames[i].line) return pLabelNames[i].address;
+        BOOST_FOREACH( const Label &label, labels )
+        {
+            if( label.name.size() == 0 )
+            {
+                if( label.line == LineNum )
+                {
+                    return label.address;
+                }
             }
         }
@@ -309 +317 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( (const std::string)(Parameter + 1), 0, cp );
         }
@@ -326 +333 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( "", LineNum, cp );
         }

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -417 +417 @@
         }
 
-        //ラベル用のメモリを確保
-        extern LABEL *pLabelNames;
-        extern int MaxLabelNum;
-        pLabelNames=(LABEL *)HeapAlloc(hHeap,0,1);
-        MaxLabelNum=0;
+        //ラベル管理オブジェクトを初期化
+        extern Labels labels;
+        labels.clear();
 
         //Gotoラベルスケジュール
@@ -465 +463 @@
         //グローバル実行領域をコンパイル開始
         CompileBuffer(0,0);
-
-        //ラベル用のメモリを解放
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName) HeapDefaultFree(pLabelNames[i].pName);
-        }
-        HeapDefaultFree(pLabelNames);
 
         //Goto未知ラベルスケジュールが存在したらエラーにする

trunk/abdev/BasicCompiler32/Opcode.h

@@ -21 +21 @@
 
 //ラベルアドレス
-struct LABEL{
-    char *pName;
+class Label
+{
+public:
+    std::string name;
     int line;
     DWORD address;
-};
+
+    Label( const std::string &name, long nativeCodePos )
+        : name( name )
+        , line( -1 )
+        , address( nativeCodePos )
+    {
+    }
+    Label( int line, long nativeCodePos )
+        : name( "" )
+        , line( line )
+        , address( nativeCodePos )
+    {
+    }
+};
+typedef std::vector<Label> Labels;
 
 //プロシージャの種類

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -21 +21 @@
 
 //ラベルアドレス
-LABEL *pLabelNames;
-int MaxLabelNum;
+Labels labels;
 
 //グローバル変数初期バッファ
@@ -122 +121 @@
     if(Command[0]=='*'&&IsVariableTopChar(Command[1])){
         //Goto先ラベル
-        pLabelNames=(LABEL *)HeapReAlloc(hHeap,0,pLabelNames,(MaxLabelNum+1)*sizeof(LABEL));
-        pLabelNames[MaxLabelNum].pName=(char *)HeapAlloc(hHeap,0,lstrlen(Command+1)+1);
-        lstrcpy(pLabelNames[MaxLabelNum].pName,Command+1);
         extern int obp;
-        pLabelNames[MaxLabelNum].address=obp;
-        MaxLabelNum++;
+        labels.push_back( Label( Command + 1, obp ) );
 
         //書き込みスケジュール
@@ -538 +533 @@
 
                 //Goto先ラベル
-                pLabelNames=(LABEL *)HeapReAlloc(hHeap,0,pLabelNames,(MaxLabelNum+1)*sizeof(LABEL));
-                pLabelNames[MaxLabelNum].pName=0;
-                pLabelNames[MaxLabelNum].line=i3;
                 extern int obp;
-                pLabelNames[MaxLabelNum].address=obp;
-                MaxLabelNum++;
+                labels.push_back( Label( (long)i3, obp ) );
 
                 //書き込みスケジュール