Changeset 677 in dev

Timestamp:

Jun 30, 2008, 12:38:54 AM (16 years ago)

Author:

dai_9181

Message:

値渡しの構造体パラメータが正常に引き渡されない不具合を修正。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/VarList.cpp (modified) (1 diff)
• BasicCompiler_Common/src/LexicalScope.cpp (modified) (1 diff)
• ab_common/include/Lexical/Variable.h (modified) (1 diff)
• compiler_x64/Compile_ProcOp.cpp (modified) (1 diff)
• compiler_x64/Compile_Var.cpp (modified) (1 diff)
• compiler_x86/Compile_ProcOp.cpp (modified) (1 diff)
• compiler_x86/Compile_Var.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

@@ -425 +425 @@
         else{
             offset=pobj_dti->lplpSpBase[i2]+pVar->GetOffsetAddress();
-            if(pVar->IsRef()){
+            if( pVar->IsRef() || pVar->IsByValStructParameter() )
+            {
                 ReadProcessMemory(hDebugProcess,(void *)offset,&lpData,sizeof(LONG_PTR),&accessBytes);
                 offset=lpData;

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -120 +120 @@
         if( pVar->GetScopeLevel() != GetNowLevel() ) continue;
 
-        if( pVar->GetType().IsStruct() && pVar->IsParameter() ){
+        if( pVar->IsByValStructParameter() ){
             //構造体パラメータを持つとき
 

trunk/ab5.0/abdev/ab_common/include/Lexical/Variable.h

@@ -99 +99 @@
     }
 
-    void ThisIsParameter(){
+    void ThisIsByValStructParameter(){
         isParameter = true;
     }
-    bool IsParameter() const
+    bool IsByValStructParameter() const
     {
         return isParameter;

trunk/ab5.0/abdev/compiler_x64/Compile_ProcOp.cpp

@@ -299 +299 @@
         if( param.IsRef() == false && param.IsStruct() ){
             //構造体のByValパラメータ
-            pVar->ThisIsParameter();
+            pVar->ThisIsByValStructParameter();
             varSize=PTR_SIZE;
         }

trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp

@@ -434 +434 @@
             pRelativeVar->offset=-pVar->GetOffsetAddress();
             pRelativeVar->bOffsetOffset=0;
-            if( pVar->IsRef() ){
+            if( pVar->IsRef() || pVar->IsByValStructParameter() )
+            {
                 // 参照型
                 pRelativeVar->dwKind = VAR_REFLOCAL;

trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp

@@ -347 +347 @@
         if( param.IsRef() == false && param.IsStruct() ){
             //構造体のByValパラメータ
-            pVar->ThisIsParameter();
+            pVar->ThisIsByValStructParameter();
             varSize=PTR_SIZE;
         }

trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

@@ -409 +409 @@
             pRelativeVar->offset=-pVar->GetOffsetAddress();
             pRelativeVar->bOffsetOffset=0;
-            if( pVar->IsRef() ){
+            if( pVar->IsRef() || pVar->IsByValStructParameter() ){
                 // 参照型
                 pRelativeVar->dwKind = VAR_REFLOCAL;