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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -267 +267 @@
 
     //コンパイル中の関数が属するクラス
-    compiler.pCompilingClass=pUserProc->GetParentClassPtr();
+    compiler.pCompilingClass = pUserProc->GetParentClassPtr();
 
     //コンパイルスタートをクラス管理クラスに追加
@@ -495 +495 @@
                         &compiler.pCompilingClass->GetSuperClass().GetConstructorMethod()->GetUserProc(),
                         0,
-                        "",
-                        0);
+                        ""
+                    );
                 }
             }
@@ -587 +587 @@
                         &method->GetUserProc(),
                         0,
-                        "",
-                        0);
+                        ""
+                    );
                 }
             }
@@ -629 +629 @@
         GetVarOffsetReadWrite(temp,&RelativeVar,Type());
 
-        i3=pUserProc->ReturnType().GetBasicType();
-
-        if(i3==DEF_OBJECT || i3==DEF_STRUCT){
+        const Type &returnType = pUserProc->ReturnType();
+        if( returnType.IsObject() || returnType.IsStruct() )
+        {
             SetVarPtrToEax(&RelativeVar);
-            if( i3==DEF_OBJECT ){
+            if( returnType.IsObject() )
+            {
                 //mov eax,dword ptr[eax]
                 compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
             }
         }
-        else if( i3==DEF_DOUBLE
-            || i3 == DEF_SINGLE )
+        else if( returnType.IsReal() )
         {
             //fld qword ptr[ebp+offset]
             compiler.codeGenerator.localVarPertialSchedules.push_back(
-                compiler.codeGenerator.op_fld_base_offset( i3, REG_EBP, RelativeVar.offset, Schedule::None, true )
+                compiler.codeGenerator.op_fld_base_offset( returnType.GetBasicType(), REG_EBP, RelativeVar.offset, Schedule::None, true )
             );
         }
-        else if(i3==DEF_INT64||i3==DEF_QWORD){
-            //mov eax,dword ptr[ebp+offset]
-            compiler.codeGenerator.localVarPertialSchedules.push_back(
-                compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EBP, RelativeVar.offset, MOD_BASE_DISP32, Schedule::None, true )
-            );
-
-            //mov edx,dword ptr[ebp+offset+sizeof(long)]
-            compiler.codeGenerator.localVarPertialSchedules.push_back(
-                compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EBP, RelativeVar.offset+sizeof(long), MOD_BASE_DISP32, Schedule::None, true )
-            );
-        }
-        else if(i3==DEF_LONG||i3==DEF_DWORD||
-            IsPtrType(i3))
+        else if( returnType.Is64() )
         {
             //mov eax,dword ptr[ebp+offset]
@@ -664 +652 @@
                 compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EBP, RelativeVar.offset, MOD_BASE_DISP32, Schedule::None, true )
             );
-        }
-        else if(i3==DEF_INTEGER||i3==DEF_WORD || (Smoothie::IsUnicode()&&i3==DEF_CHAR)){
+
+            //mov edx,dword ptr[ebp+offset+sizeof(long)]
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EDX, REG_EBP, RelativeVar.offset+sizeof(long), MOD_BASE_DISP32, Schedule::None, true )
+            );
+        }
+        else if( returnType.GetSize() == sizeof(long) )
+        {
+            //mov eax,dword ptr[ebp+offset]
+            compiler.codeGenerator.localVarPertialSchedules.push_back(
+                compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EBP, RelativeVar.offset, MOD_BASE_DISP32, Schedule::None, true )
+            );
+        }
+        else if( returnType.GetSize() == sizeof(short) )
+        {
             //xor eax,eax（eaxを0に初期化する）
             compiler.codeGenerator.op_zero_reg(REG_EAX);
@@ -674 +675 @@
             );
         }
-        else if(i3==DEF_SBYTE||i3==DEF_BYTE||i3==DEF_BOOLEAN || (Smoothie::IsUnicode()==false&&i3==DEF_CHAR)){
+        else if( returnType.GetSize() == sizeof(char) )
+        {
             //xor eax,eax（eaxを0に初期化する）
             compiler.codeGenerator.op_zero_reg(REG_EAX);
@@ -682 +684 @@
                 compiler.codeGenerator.op_mov_RM( sizeof(char), REG_EAX, REG_EBP, RelativeVar.offset, MOD_BASE_DISP32, Schedule::None, true )
             );
+        }
+        else
+        {
+            SetError();
         }
     }