Changeset 290 in dev for trunk/abdev/BasicCompiler32/NumOpe_TypeOperation.cpp

Timestamp:

Aug 21, 2007, 11:00:25 PM (17 years ago)

Author:

dai_9181

Message:

ジェネリクスのベースを実装

File:

• trunk/abdev/BasicCompiler32/NumOpe_TypeOperation.cpp (modified) (12 diffs)

trunk/abdev/BasicCompiler32/NumOpe_TypeOperation.cpp

@@ -8 +8 @@
 #include "Opcode.h"
 
-void ExtendStackTo32(int type);
-void ExtendStackTo64(int type){
-    if(Is64Type(type)) return;
+void ExtendStackTo32( const Type &oldType );
+
+void ExtendStackTo64( const Type &oldType )
+{
+    if( oldType.Is64() )
+    {
+        return;
+    }
 
     //32ビットに拡張
-    ExtendStackTo32(type);
+    ExtendStackTo32( oldType );
 
     //64ビットに拡張
-    if(IsSignedType(type)){
+    if( oldType.IsSigned() )
+    {
         //符号あり
 
@@ -44 +50 @@
     }
 }
-void ExtendStackTo32(int type){
-    if(GetTypeSize(type,-1)==sizeof(long)) return;
-
-    if(Is64Type(type)){
+void ExtendStackTo32( const Type &oldType )
+{
+    if( oldType.GetSize() == sizeof(long) )
+    {
+        return;
+    }
+
+    if( oldType.Is64() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -57 +68 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_INTEGER || (Smoothie::IsUnicode()&&type==DEF_CHAR)){
+    else if( oldType.IsInteger() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -67 +79 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_WORD){
+    else if( oldType.IsWord() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -77 +90 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
+    else if( oldType.IsSByte() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -87 +101 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_BYTE||type==DEF_BOOLEAN){
+    else if( oldType.IsByte() || oldType.IsBoolean() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -98 +113 @@
     }
 }
-void ExtendStackTo16(int type){
-    if(type==DEF_SBYTE || (Smoothie::IsUnicode()==false&&type==DEF_CHAR)){
+void ExtendStackTo16( const Type &oldType ){
+    if( oldType.IsSByte() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -109 +125 @@
         compiler.codeGenerator.op_push(REG_EAX);
     }
-    else if(type==DEF_BYTE){
+    else if( oldType.IsByte() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -120 +137 @@
     }
 }
-void ExtendStackTo8(int type){
-    if(Is64Type(type)){
+void ExtendStackTo8( const Type &oldType )
+{
+    if( oldType.Is64() )
+    {
         //pop eax
         compiler.codeGenerator.op_pop(REG_EAX);
@@ -134 +153 @@
 
 
-void ChangeTypeToWhole(int OldType,int NewType){
-    if(OldType==DEF_DOUBLE){
-        if(Is64Type(NewType)){
+void ChangeTypeToWhole( const Type &oldType, const Type &newType ){
+    if( oldType.IsDouble() )
+    {
+        if( newType.Is64() )
+        {
             //fld qword ptr[esp]
             compiler.codeGenerator.op_fld_ptr_esp(DEF_DOUBLE);
@@ -154 +175 @@
         }
     }
-    else if(OldType==DEF_SINGLE){
-        if(Is64Type(NewType)){
+    else if( oldType.IsSingle() )
+    {
+        if( newType.Is64() )
+        {
             //fld dword ptr[esp]
             compiler.codeGenerator.op_fld_ptr_esp(DEF_SINGLE);
@@ -176 +199 @@
         //整数から整数へ変換
 
-        if(Is64Type(NewType)){
-            ExtendStackTo64(OldType);
-        }
-        else if(GetTypeSize(NewType,-1)==sizeof(long)){
-            ExtendStackTo32(OldType);
-        }
-        else if(GetTypeSize(NewType,-1)==sizeof(short)){
-            ExtendStackTo16(OldType);
-        }
-        else if(GetTypeSize(NewType,-1)==sizeof(char)){
-            ExtendStackTo8(OldType);
-        }
-    }
-}
+        if( newType.Is64() )
+        {
+            ExtendStackTo64( oldType );
+        }
+        else if( newType.GetSize()==sizeof(long)){
+            ExtendStackTo32( oldType );
+        }
+        else if( newType.GetSize()==sizeof(short)){
+            ExtendStackTo16( oldType );
+        }
+        else if( newType.GetSize()==sizeof(char)){
+            ExtendStackTo8( oldType );
+        }
+    }
+}