Changeset 294 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 22, 2007, 11:23:28 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (2 diffs)
• Compile_CallProc.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -76 +76 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib imagehlp.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="2"
@@ -179 +179 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib imagehlp.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="1"

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -135 +135 @@
         else{
             if(dwFlags&PROCFLAG_NEW){
+                GetVarType( ObjectName, leftType, false );
+
                 //New演算子によるコンストラクタ呼び出し
                 pobj_c=pUserProc->GetParentClassPtr();

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -507 +507 @@
                 compiler.codeGenerator.op_mov_RV_vtbl( REG_EAX, compiler.pCompilingClass );
 
-                /* TODO: 消す
-                //関数テーブルに値をセット
-                int offset = (int)compiler.pCompilingClass->GetVtblGlobalOffset();
-
-                //mov eax,offset
-                compiler.codeGenerator.op_mov_RV( REG_EAX, offset, Schedule::DataTable );
-                */
-
                 //Thisポインタをecxにコピー
                 SetThisPtrToReg(REG_ECX);

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -2 +2 @@
 
 #include <jenga/include/common/Environment.h>
+#include <jenga/include/common/Path.h>
+#include <jenga/include/common/Directory.h>
 
 #include <jenga/include/smoothie/Smoothie.h>
@@ -381 +383 @@
 
 
-
-        //push ebp
-        compiler.codeGenerator.op_push(REG_EBP);
-
-        if(bDebugCompile){
-            //デバッグ用の変数を定義
-            // TODO: 暫定処理なので下のif文は正しくない
-            //if( compiler.IsStaticLibrary() )
+        if( compiler.IsCore() )
+        {
+            // コアモジュール（basic.sbp）をコンパイルするとき
+
+            //push ebp
+            compiler.codeGenerator.op_push(REG_EBP);
+
+            if(bDebugCompile)
             {
+                //デバッグ用の変数を定義
                 DebugVariable();
             }
-        }
-
-        //GC用の変数を定義
-        InitGCVariables();
-
-        //if( compiler.IsStaticLibrary() )
-        {
+
+            //GC用の変数を定義
+            InitGCVariables();
+
             //_System_StartupProgramの呼び出し
             compiler.codeGenerator.op_call(pSub_System_StartupProgram);
@@ -497 +497 @@
         // 静的リンクライブラリ
 
+        // 格納先ディレクトリを作る
+        Jenga::Common::Path path( OutputFileName );
+        Jenga::Common::Directory dir( path.GetDriveName() + path.GetDirName(), true );
+
+        // 書き込む
         if( !compiler.GetObjectModule().Write( OutputFileName ) )
         {