Changeset 461 in dev for trunk/ab5.0/abdev/BasicCompiler32

Timestamp:

Mar 23, 2008, 11:35:33 AM (16 years ago)

Author:

dai_9181

Message:

smoothieプロジェクトが不要になったため、破棄。

Location:

trunk/ab5.0/abdev/BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (5 diffs)
• Compile_Calc.cpp (modified) (7 diffs)
• Compile_CallProc.cpp (modified) (1 diff)
• Compile_Func.cpp (modified) (1 diff)
• Compile_ProcOp.cpp (modified) (1 diff)
• Compile_Set_Var.cpp (modified) (4 diffs)
• Compile_Var.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (3 diffs)
• NumOpe_TypeOperation.cpp (modified) (1 diff)
• stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -76 +76 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib commond.lib smoothied.lib imagehlp.lib shlwapi.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib commond.lib imagehlp.lib shlwapi.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="2"
@@ -180 +180 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib psapi.lib common.lib smoothie.lib imagehlp.lib shlwapi.lib"
+                AdditionalDependencies="comctl32.lib psapi.lib common.lib imagehlp.lib shlwapi.lib"
                 OutputFile="../ActiveBasic/BasicCompiler32.exe"
                 LinkIncremental="1"
@@ -1354 +1354 @@
                     </File>
                     <File
-                        RelativePath="..\BasicCompiler_Common\src\SmoothieImpl.cpp"
-                        >
-                    </File>
-                    <File
                         RelativePath="..\BasicCompiler_Common\src\Source.cpp"
                         >
@@ -1389 +1385 @@
             </File>
             <File
+                RelativePath="..\BasicCompiler_Common\BasicFixed.h"
+                >
+            </File>
+            <File
                 RelativePath="CommandValue.h"
                 >
@@ -1540 +1540 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                        >
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\include\SmoothieImpl.h"
                         >
                     </File>

trunk/ab5.0/abdev/BasicCompiler32/Compile_Calc.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>
@@ -82 +80 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (compiler.IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 compiler.codeGenerator.op_pop(REG_EAX);
@@ -92 +90 @@
                 compiler.codeGenerator.op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (compiler.IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 compiler.codeGenerator.op_pop(REG_EAX);
@@ -166 +164 @@
             //符号あり
 
-            if(OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)){
+            if(OldType==DEF_INTEGER || (compiler.IsUnicode()&&OldType==DEF_CHAR)){
                 //pop eax
                 compiler.codeGenerator.op_pop(REG_EAX);
@@ -176 +174 @@
                 compiler.codeGenerator.op_push(REG_EAX);
             }
-            else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
+            else if(OldType==DEF_SBYTE || (compiler.IsUnicode()==false&&OldType==DEF_CHAR)){
                 //pop eax
                 compiler.codeGenerator.op_pop(REG_EAX);
@@ -294 +292 @@
     if(OldType==DEF_BOOLEAN||
         OldType==DEF_BYTE||
-        OldType==DEF_WORD||OldType==DEF_INTEGER || (Smoothie::IsUnicode()&&OldType==DEF_CHAR)) return;
-    else if(OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)){
+        OldType==DEF_WORD||OldType==DEF_INTEGER || (compiler.IsUnicode()&&OldType==DEF_CHAR)) return;
+    else if(OldType==DEF_SBYTE || (compiler.IsUnicode()==false&&OldType==DEF_CHAR)){
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -320 +318 @@
 void ChangeTypeToByte(int OldType){
     //現在のスタックの内容をbyte型に変換する
-    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (Smoothie::IsUnicode()==false&&OldType==DEF_CHAR)) return;
+    if(OldType==DEF_BYTE||OldType==DEF_SBYTE || (compiler.IsUnicode()==false&&OldType==DEF_CHAR)) return;
 
     ChangeTypeToLong(OldType);

trunk/ab5.0/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>

trunk/ab5.0/abdev/BasicCompiler32/Compile_Func.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>

trunk/ab5.0/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Program.h>

trunk/ab5.0/abdev/BasicCompiler32/Compile_Set_Var.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>
@@ -212 +210 @@
 }
 void ExtendTypeTo32(int type,int reg){
-    if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
+    if(type==DEF_INTEGER || (compiler.IsUnicode()&&type==DEF_CHAR)){
         //movsx reg32,reg16
         compiler.codeGenerator.op_movsx_R32R16(reg,reg);
@@ -220 +218 @@
         compiler.codeGenerator.op_and_RV(reg,(int)0x0000FFFF);
     }
-    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (compiler.IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg32,reg8
         compiler.codeGenerator.op_movsx_R32R8(reg,reg);
@@ -230 +228 @@
 }
 void ExtendTypeTo16(int type,int reg){
-    if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
+    if(type==DEF_SBYTE || (compiler.IsUnicode()==false&&type==DEF_CHAR)){
         //movsx reg16,reg8
         compiler.codeGenerator.op_movsx_R16R8(reg,reg);

trunk/ab5.0/abdev/BasicCompiler32/Compile_Var.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <LexicalScope.h>

trunk/ab5.0/abdev/BasicCompiler32/NumOpe.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>
@@ -41 +39 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
+    else if(type==DEF_INTEGER || (compiler.IsUnicode()&&type==DEF_CHAR)){
         //movsx ebx,ax
         compiler.codeGenerator.op_movsx_R32R16( REG_EBX, REG_EAX );
@@ -48 +46 @@
         compiler.codeGenerator.op_push(REG_EBX);
     }
-    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
+    else if(type==DEF_SBYTE || (compiler.IsUnicode()==false&&type==DEF_CHAR)){
         //movsx ebx,al
         compiler.codeGenerator.op_movsx_R32R8( REG_EBX, REG_EAX );

trunk/ab5.0/abdev/BasicCompiler32/NumOpe_TypeOperation.cpp

@@ -1 +1 @@
 #include "stdafx.h"
-
-#include <jenga/include/smoothie/Smoothie.h>
 
 #include <Compiler.h>

trunk/ab5.0/abdev/BasicCompiler32/stdafx.h

@@ -24 +24 @@
 
 #include "../BasicCompiler_Common/common.h"
+#include "../BasicCompiler_Common/BasicFixed.h"
 
 #include <Hashmap.h>