Changeset 73 in dev for BasicCompiler32/Compile_ProcOp.cpp

Timestamp:

Mar 16, 2007, 11:07:14 PM (18 years ago)

Author:

dai_9181

Message:

Parameterクラスを適用。32bit側は動くようになったので、64bitのほうを調整する。

File:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (10 diffs)

BasicCompiler32/Compile_ProcOp.cpp

@@ -214 +214 @@
 }
 
-void CompileBufferInProcedure(SUBINFO *psi){
+void CompileBufferInProcedure(SubInfo *psi){
     extern char *basbuf;
     extern HANDLE hHeap;
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern BOOL bDebugCompile;
     int i3,i4,VarSize,LocalVarSchedule,EspOffsetSchedule,BufferSize,BaseOffset;
@@ -280 +280 @@
 
     //パラメータ用の変数データを考慮
-    for(i3=psi->RealParmNum-1;i3>=0;i3--){
+    for(i3=psi->realParams.size()-1;i3>=0;i3--){
+        Parameter &param = *psi->realParams[i3];
+
         //変数データを追加
         LocalVar=(VARIABLE *)HeapReAlloc(hHeap,0,LocalVar,(MaxLocalVarNum+1)*sizeof(VARIABLE));
 
-        lstrcpy(LocalVar[MaxLocalVarNum].name,psi->pRealParmInfo[i3].name);
+        lstrcpy( LocalVar[MaxLocalVarNum].name,param.GetVarName().c_str() );
 
         // TODO: パラメータのConst定義の指定が未完成
         LocalVar[MaxLocalVarNum].bConst=false;
 
-        LocalVar[MaxLocalVarNum].bArray=psi->pRealParmInfo[i3].bArray;
-        memcpy(LocalVar[MaxLocalVarNum].SubScripts,psi->pRealParmInfo[i3].SubScripts,MAX_ARRAYDIM*sizeof(int));
-
-        LocalVar[MaxLocalVarNum].type=psi->pRealParmInfo[i3].type;
+        LocalVar[MaxLocalVarNum].bArray=param.IsArray()?TRUE:FALSE;
+        memcpy(LocalVar[MaxLocalVarNum].SubScripts,param.GetSubScriptsPtr(),MAX_ARRAYDIM*sizeof(int));
+
+        LocalVar[MaxLocalVarNum].type=param.GetBasicType();
         if(LocalVar[MaxLocalVarNum].type==DEF_OBJECT
             ||LocalVar[MaxLocalVarNum].type==DEF_STRUCT){
@@ -299 +301 @@
         }
 
-        LocalVar[MaxLocalVarNum].u.index=psi->pRealParmInfo[i3].u.index;
-
-        if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].type==DEF_STRUCT){
+        LocalVar[MaxLocalVarNum].u.index=param.GetIndex();
+
+        if( param.IsRef() == false && param.IsStruct() ){
             //構造体のByValパラメータ
             LocalVar[MaxLocalVarNum].fRef=REF_PARAMETER | OBJECT_PARAMETER;
@@ -307 +309 @@
         }
         else{
-            if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].bArray==0){
+            if( param.IsRef() == false && param.IsArray() == false ){
                 LocalVar[MaxLocalVarNum].fRef=0;
                 VarSize=GetTypeSize(LocalVar[MaxLocalVarNum].type,LocalVar[MaxLocalVarNum].u.index);
@@ -344 +346 @@
 
     //コンパイル中の関数
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     pCompilingSubInfo=psi;
 
@@ -442 +444 @@
 
         //call _DebugSys_StartProc
-        extern SUBINFO *pSub_DebugSys_StartProc;
+        extern SubInfo *pSub_DebugSys_StartProc;
         op_call(pSub_DebugSys_StartProc);
     }
@@ -684 +686 @@
 
         //call _DebugSys_EndProc
-        extern SUBINFO *pSub_DebugSys_EndProc;
+        extern SubInfo *pSub_DebugSys_EndProc;
         op_call(pSub_DebugSys_EndProc);
     }
@@ -806 +808 @@
 
         //call _esp_error
-        extern SUBINFO *pSub_esp_error;
+        extern SubInfo *pSub_esp_error;
         op_call( pSub_esp_error );
 
@@ -840 +842 @@
 }
 void CompileLocal(){
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     int i2;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern BOOL bDll;
@@ -856 +858 @@
     //_System_InitStaticLocalVariablesは一番最後にコンパイル
     //※一般関数内の静的変数オブジェクトをすべて収集しなければならない
-    extern SUBINFO *pSub_System_InitStaticLocalVariables;
+    extern SubInfo *pSub_System_InitStaticLocalVariables;
     pSub_System_InitStaticLocalVariables->bCompile=1;
 
     //_System_Call_Destructor_of_GlobalObjectは一番最後にコンパイル
-    extern SUBINFO *pSub_System_Call_Destructor_of_GlobalObject;
+    extern SubInfo *pSub_System_Call_Destructor_of_GlobalObject;
     pSub_System_Call_Destructor_of_GlobalObject->bCompile=1;