Changeset 254 in dev for trunk/abdev/BasicCompiler32/NumOpe.cpp

Timestamp:

Jul 31, 2007, 4:30:31 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler32/NumOpe.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -532 +532 @@
             const Type &baseType,
             Type &resultType,
-            BOOL *pbUseHeap ){
-
+            BOOL *pbUseHeap )
+{
     int i,i2,i3;
     char temporary[1024],temp2[1024];
@@ -540 +540 @@
         SetError(1,NULL,cp);
         return false;
-    }
-
-    if(expression[0]==1&& expression[1]==ESC_NEW ){
-        //New演算子（オブジェクト生成）
-
-        if( !Operator_New( expression+2, baseType, resultType ) ){
-            return false;
-        }
-
-        return true;
     }
 
@@ -603 +593 @@
         //push eax
         compiler.codeGenerator.op_push( REG_EAX );
+
+        return true;
+    }
+
+    bool isLiteralCalculation;
+    if( !NumOpe_GetType( expression, baseType, resultType, &isLiteralCalculation ) )
+    {
+        return false;
+    }
+    if( isLiteralCalculation )
+    {
+        //右辺値が数値の定数式の場合
+        _int64 i64data;
+        StaticCalculation(true, expression,baseType.GetBasicType(),&i64data,resultType);
+
+        if( resultType.GetBasicSize() == sizeof(_int64) ){
+            //64ビット（符号有り整数/実数）
+
+            //push HILONG(i64data)
+            compiler.codeGenerator.op_push_V((long)*(long *)(((char *)(&i64data))+4));
+
+            //push LOLONG(i64data)
+            compiler.codeGenerator.op_push_V(*(long *)(&i64data));
+        }
+        else if( resultType.IsSingle() ){
+            //single実数
+
+            double dbl;
+            memcpy(&dbl,&i64data,sizeof(_int64));
+
+            float flt;
+            flt=(float)dbl;
+            long l;
+            memcpy(&l,&flt,sizeof(long));
+
+            //push flt
+            compiler.codeGenerator.op_push_V(l);
+        }
+        else{
+            //整数（符号有り/無し）
+
+            long l = (long)i64data;
+
+            if(resultType.GetBasicSize()==sizeof(char)) l = l & 0x000000FF;
+            if(resultType.GetBasicSize()==sizeof(short)) l = l & 0x0000FFFF;
+
+            //push term
+            compiler.codeGenerator.op_push_V(l);
+        }
+        return true;
+    }
+
+    if(expression[0]==1&& expression[1]==ESC_NEW ){
+        //New演算子（オブジェクト生成）
+
+        if( !Operator_New( expression+2, baseType, resultType ) ){
+            return false;
+        }
 
         return true;
@@ -1056 +1104 @@
     if(bLiteralCalculation){
         //右辺値が数値の定数式の場合
-        Type resultType;
-        StaticCalculation(true, expression,baseType.GetBasicType(),&i64data,resultType);
-
-        obp=BeforeObp;
-        pobj_SubAddrSchedule->num=Before_ProcAddrScheduleNum;
-        pobj_DataTableSchedule->num=Before_DataTableScheduleNum;
-        pobj_Reloc->copy(pobj_BackReloc);
-
-        if( resultType.GetBasicSize() == sizeof(_int64) ){
-            //64ビット（符号有り整数/実数）
-
-            //push HILONG(i64data)
-            compiler.codeGenerator.op_push_V((long)*(long *)(((char *)(&i64data))+4));
-
-            //push LOLONG(i64data)
-            compiler.codeGenerator.op_push_V(*(long *)(&i64data));
-        }
-        else if( resultType.IsSingle() ){
-            //single実数
-
-            memcpy(&dbl,&i64data,sizeof(_int64));
-
-            float flt;
-            flt=(float)dbl;
-            memcpy(&i3,&flt,sizeof(long));
-
-            //push flt
-            compiler.codeGenerator.op_push_V(i3);
-        }
-        else{
-            //整数（符号有り/無し）
-
-            i3=(long)i64data;
-
-            if(resultType.GetBasicSize()==sizeof(char)) i3=i3&0x000000FF;
-            if(resultType.GetBasicSize()==sizeof(short)) i3=i3&0x0000FFFF;
-
-            //push term
-            compiler.codeGenerator.op_push_V(i3);
-        }
-
-        type_stack[0]=resultType.GetBasicType();
-        index_stack[0]=resultType.GetIndex();
+        SetError();
     }
     else{