Changeset 431 in dev for trunk

Timestamp:

Mar 11, 2008, 4:02:38 PM (17 years ago)

Author:

dai_9181

Message:

_System_Newに対応（32bit版のみ）。

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Func.cpp (modified) (4 diffs)
• BasicCompiler32/FunctionValue.h (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -7 +7 @@
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
+
+#ifdef _AMD64_
+#include "../BasicCompiler64/FunctionValue.h"
+#else
+#include "../BasicCompiler32/FunctionValue.h"
+#endif
 
 int GetFunctionFromName(char *FuncName){
@@ -22 +28 @@
     if( lstrcmpi( FuncName, "_System_GetBp" ) == 0 )    return FUNC_SYSTEM_GET_BP;
     if( lstrcmpi( FuncName, "_System_GetSp" ) == 0 )    return FUNC_SYSTEM_GET_SP;
-    if( lstrcmp( FuncName, "_System_New" ) == 0 )       return FUNC_SYSTEM_NEW;
+    if( lstrcmp( FuncName, "_System_GetComVtbl" ) == 0 )        return FUNC_SYSTEM_GET_COM_VTBL;
+    if( lstrcmp( FuncName, "_System_GetVtblList" ) == 0 )       return FUNC_SYSTEM_GET_VTBL_LIST;
+    if( lstrcmp( FuncName, "_System_GetDefaultConstructor" ) == 0 ) return FUNC_SYSTEM_GET_DEFAULT_CONSTRUCTOR;
+    if( lstrcmp( FuncName, "_System_GetDestructor" ) == 0 )         return FUNC_SYSTEM_GET_DESTRUCTOR;
     if( lstrcmpi( FuncName, "GetDouble" ) == 0 )        return FUNC_GETDOUBLE;
     if( lstrcmpi( FuncName, "GetSingle" ) == 0 )        return FUNC_GETSINGLE;
@@ -607 +616 @@
 }
 
-void Opcode_Func_System_New( const char *parameter, Type &resultType, bool isCallOn )
-{
-    if( !compiler.StringToType( parameter, resultType ) )
-    {
-        SetError();
-        return;
-    }
-    if( !resultType.IsObject() )
-    {
-        SetError();
-        return;
-    }
-
-    if( isCallOn )
-    {
-        Type tempResultType;
-        if( !Operator_New( parameter, resultType, tempResultType ) )
-        {
-            return;
-        }
-
-        if( !resultType.Equals( tempResultType ) )
-        {
-            SetError();
-        }
-
-        //pop eax
-        compiler.codeGenerator.op_pop( REG_EAX );
-    }
+void Opcode_Func_System_GetComVtbl( const char *parameter )
+{
+    Type classType;
+    compiler.StringToType( parameter, classType );
+
+    // mov eax,com_vtbl
+    compiler.codeGenerator.op_mov_RV_com_vtbl( REG_EAX, &classType.GetClass() );
+}
+void Opcode_Func_System_GetVtblList( const char *parameter )
+{
+    Type classType;
+    compiler.StringToType( parameter, classType );
+
+    // mov eax,com_vtbl
+    compiler.codeGenerator.op_mov_RV_vtbl( REG_EAX, &classType.GetClass() );
+}
+void Opcode_Func_System_GetDefaultConstructor( const char *parameter )
+{
+    Type classType;
+    compiler.StringToType( parameter, classType );
+
+    if( classType.GetClass().GetConstructorMethod() )
+    {
+        //mov eax,ProcAddr
+        compiler.codeGenerator.op_addressof( REG_EAX, &classType.GetClass().GetConstructorMethod()->GetUserProc() );
+    }
+    else
+    {
+        // デフォルトコンストラクタを持たない
+
+        //xor eax,eax
+        compiler.codeGenerator.op_zero_reg( REG_EAX );
+    }
+}
+void Opcode_Func_System_GetDestructor( const char *parameter )
+{
+    Type classType;
+    compiler.StringToType( parameter, classType );
+
+    //mov eax,ProcAddr
+    compiler.codeGenerator.op_addressof( REG_EAX, &classType.GetClass().GetDestructorMethod()->GetUserProc() );
 }
 
@@ -748 +769 @@
             resultType.SetBasicType( DEF_LONG );
             break;
-        case FUNC_SYSTEM_NEW:
-            Opcode_Func_System_New( Parameter, resultType, isCallOn );
+        case FUNC_SYSTEM_GET_COM_VTBL:
+            if( isCallOn ) Opcode_Func_System_GetComVtbl( Parameter );
+            resultType.SetBasicType( DEF_PTR_VOID );
+            break;
+        case FUNC_SYSTEM_GET_VTBL_LIST:
+            if( isCallOn ) Opcode_Func_System_GetVtblList( Parameter );
+            resultType.SetBasicType( DEF_PTR_VOID );
+            break;
+        case FUNC_SYSTEM_GET_DEFAULT_CONSTRUCTOR:
+            if( isCallOn ) Opcode_Func_System_GetDefaultConstructor( Parameter );
+            resultType.SetBasicType( DEF_PTR_VOID );
+            break;
+        case FUNC_SYSTEM_GET_DESTRUCTOR:
+            if( isCallOn ) Opcode_Func_System_GetDestructor( Parameter );
+            resultType.SetBasicType( DEF_PTR_VOID );
             break;
 

trunk/abdev/BasicCompiler32/FunctionValue.h

@@ -21 +21 @@
 #define FUNC_SYSTEM_GET_BP  0x0625
 #define FUNC_SYSTEM_GET_SP  0x0626
-#define FUNC_SYSTEM_NEW     0x0627
+#define FUNC_SYSTEM_GET_COM_VTBL    0x0627
+#define FUNC_SYSTEM_GET_VTBL_LIST   0x0628
+#define FUNC_SYSTEM_GET_DEFAULT_CONSTRUCTOR     0x0629
+#define FUNC_SYSTEM_GET_DESTRUCTOR              0x062A
 
 //ポインタ

trunk/abdev/BasicCompiler_Common/common.h

@@ -11 +11 @@
 #include "../BasicCompiler64/resource.h"
 #include "../BasicCompiler64/CommandValue.h"
-#include "../BasicCompiler64/FunctionValue.h"
 #define OPCODE_H_PATH "../BasicCompiler64/opcode.h"
 #else
 #include "../BasicCompiler32/resource.h"
 #include "../BasicCompiler32/CommandValue.h"
-#include "../BasicCompiler32/FunctionValue.h"
 #define OPCODE_H_PATH "../BasicCompiler32/opcode.h"
 #endif

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1326 +1326 @@
 
     char temporary[8192];
-    sprintf(temporary, "%c%ctempType=Nothing%c%cTypeBaseImpl"
+    sprintf(temporary, "%c%ctempType=Nothing%c%c_System_TypeForClass"
         , HIBYTE( COM_DIM )
         , LOBYTE( COM_DIM )
@@ -1347 +1347 @@
         if( objClass.HasSuperClass() || objClass.GetDynamicMembers().size() ){
             sprintf( temporary
-                , "tempType=Search(\"%s\")"
+                , "tempType=Search(\"%s\") As ActiveBasic.Core._System_TypeForClass"
                 , objClass.GetFullName().c_str()
+            );
+
+            // コンパイル
+            MakeMiddleCode( temporary );
+            ChangeOpcode( temporary );
+
+            sprintf( temporary
+                , "tempType.SetClassInfo(%d,_System_GetComVtbl(%s),_System_GetVtblList(%s),_System_GetDefaultConstructor(%s),_System_GetDestructor(%s))"
+                , objClass.GetSize()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetFullName().c_str()
+                , objClass.GetName().c_str()
             );