Changeset 278 in dev for trunk

Timestamp:

Aug 12, 2007, 3:57:57 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler_Common/include/NativeCode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -238 +238 @@
     char temporary[VN_SIZE];
 
-    if( pUserProc->IsUsing() == false || pUserProc->IsCompiled() ) return;
-
     if( pUserProc->GetLocalVars().size() ){
         SetError();
@@ -262 +260 @@
     else bDebugSupportProc=0;
 
-    if( pUserProc->GetCodeSize() != 0 )
+    if( pUserProc->GetCodeSize() != 0 || pUserProc->GetNativeCode().GetSize() != 0 )
     {
         // 既にコード生成が行われている場合はエラー

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -422 +422 @@
         if(bDebugCompile){
             //デバッグ用の変数を定義
-            DebugVariable();
+            // TODO: 暫定処理なので下のif文は正しくない
+            //if( compiler.IsStaticLibrary() )
+            {
+                DebugVariable();
+            }
         }
 
@@ -517 +521 @@
     trace( "コード生成が終了しました。" );
 
-    compiler.linker.Link( compiler.GetObjectModule() );
-
-    oldSourceLines = compiler.linker.GetNativeCode().GetSourceLines();
-
 
     if( compiler.IsStaticLibrary() )
@@ -532 +532 @@
         return;
     }
+
+
+    compiler.linker.Link( compiler.GetObjectModule() );
+
+    oldSourceLines = compiler.linker.GetNativeCode().GetSourceLines();
+
 /*
     int t,t2;

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -47 +47 @@
         case UserProc:
         case AddressOf:
-            ar & BOOST_SERIALIZATION_NVP( const_cast<::UserProc *&>(pUserProc) );
+            ar & boost::serialization::make_nvp("pUserProc", const_cast<::UserProc *&>(pUserProc));
             break;
         case DllProc:
-            ar & BOOST_SERIALIZATION_NVP( const_cast<::DllProc *&>(pDllProc) );
+            ar & boost::serialization::make_nvp("pDllProc", const_cast<::DllProc *&>(pDllProc));
             break;
         default: