From 015f034904d5d9f31b9e5bbc812f21e4f7443396 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 11 Feb 2017 21:21:44 +0000 Subject: [PATCH] * reverted r35424, wasn't ready for commit yet git-svn-id: trunk@35426 - --- compiler/aarch64/racpugas.pas | 5 ++--- compiler/arm/raarmgas.pas | 5 ++--- compiler/avr/raavrgas.pas | 5 ++--- compiler/mips/racpugas.pas | 5 ++--- compiler/powerpc/rappcgas.pas | 5 ++--- compiler/powerpc64/rappcgas.pas | 5 ++--- compiler/sparc/racpugas.pas | 5 ++--- compiler/x86/rax86att.pas | 5 ++--- compiler/x86/rax86int.pas | 5 ++--- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/compiler/aarch64/racpugas.pas b/compiler/aarch64/racpugas.pas index d98790d427..c67be52b16 100644 --- a/compiler/aarch64/racpugas.pas +++ b/compiler/aarch64/racpugas.pas @@ -58,7 +58,7 @@ Unit racpugas; symconst,symsym, procinfo, rabase,rautils, - cgbase,cgutils,paramgr; + cgbase,cgutils; function taarch64attreader.is_register(const s:string):boolean; @@ -609,8 +609,7 @@ Unit racpugas; if hasdot and (not oper.hastype) and (tabstractnormalvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/arm/raarmgas.pas b/compiler/arm/raarmgas.pas index 1cc0b84f37..fc1a1638fe 100644 --- a/compiler/arm/raarmgas.pas +++ b/compiler/arm/raarmgas.pas @@ -68,7 +68,7 @@ Unit raarmgas; symconst,symsym, procinfo, rabase,rautils, - cgbase,cgutils,paramgr; + cgbase,cgutils; function tarmunifiedattreader.is_unified: boolean; @@ -636,8 +636,7 @@ Unit raarmgas; if hasdot and (not oper.hastype) and (tabstractnormalvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/avr/raavrgas.pas b/compiler/avr/raavrgas.pas index c53f10363b..21f8c1ff4e 100644 --- a/compiler/avr/raavrgas.pas +++ b/compiler/avr/raavrgas.pas @@ -59,7 +59,7 @@ Unit raavrgas; procinfo, itcpugas, rabase,rautils, - cgbase,cgutils,cgobj,paramgr + cgbase,cgutils,cgobj ; @@ -260,8 +260,7 @@ Unit raavrgas; if hasdot and (not oper.hastype) and (tabstractnormalvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/mips/racpugas.pas b/compiler/mips/racpugas.pas index cbe9c6d69e..8b4f9a2a9f 100644 --- a/compiler/mips/racpugas.pas +++ b/compiler/mips/racpugas.pas @@ -60,7 +60,7 @@ Interface rabase, rgbase, itcpugas, - cgobj,paramgr + cgobj ; @@ -169,8 +169,7 @@ Interface if hasdot and (not oper.hastype) and (tabstractnormalvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/powerpc/rappcgas.pas b/compiler/powerpc/rappcgas.pas index 25820aac85..e0d6c1ccba 100644 --- a/compiler/powerpc/rappcgas.pas +++ b/compiler/powerpc/rappcgas.pas @@ -56,7 +56,7 @@ Unit rappcgas; { parser } procinfo, rabase,rautils, - cgbase,cgobj,cgppc,paramgr + cgbase,cgobj,cgppc ; procedure tppcattreader.ReadSym(oper : tppcoperand); @@ -341,8 +341,7 @@ Unit rappcgas; if hasdot and (not oper.hastype) and (tabstractvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/powerpc64/rappcgas.pas b/compiler/powerpc64/rappcgas.pas index ced11c6255..6d29ee49fa 100644 --- a/compiler/powerpc64/rappcgas.pas +++ b/compiler/powerpc64/rappcgas.pas @@ -58,7 +58,7 @@ uses { parser } procinfo, rabase, rautils, - cgbase, cgobj, cgppc, paramgr + cgbase, cgobj, cgppc ; procedure tppcattreader.ReadSym(oper: tppcoperand); @@ -352,8 +352,7 @@ var (not oper.hastype) and (tabstractvarsym(oper.opr.localsym).owner.symtabletype = parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption <> pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs, l) end; diff --git a/compiler/sparc/racpugas.pas b/compiler/sparc/racpugas.pas index 5a8eb76e45..59fff03580 100644 --- a/compiler/sparc/racpugas.pas +++ b/compiler/sparc/racpugas.pas @@ -57,7 +57,7 @@ Interface scanner, procinfo, rabase,rautils, - cgobj,paramgr + cgobj ; @@ -222,8 +222,7 @@ Interface if hasdot and (not oper.hastype) and (tabstractnormalvarsym(oper.opr.localsym).owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l) end; diff --git a/compiler/x86/rax86att.pas b/compiler/x86/rax86att.pas index 9da9876861..80464b38c9 100644 --- a/compiler/x86/rax86att.pas +++ b/compiler/x86/rax86att.pas @@ -68,7 +68,7 @@ Implementation scanner, procinfo, itcpugas, - rabase,paramgr, + rabase, cgbase ; @@ -461,8 +461,7 @@ Implementation if hasdot and (not oper.hastype) and (oper.opr.localsym.owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); inc(oper.opr.localsymofs,l); inc(oper.opr.localconstoffset,l); diff --git a/compiler/x86/rax86int.pas b/compiler/x86/rax86int.pas index 128019438e..5069dd32ea 100644 --- a/compiler/x86/rax86int.pas +++ b/compiler/x86/rax86int.pas @@ -91,7 +91,7 @@ Unit Rax86int; { register allocator } rabase,rautils,itx86int, { codegen } - cgbase,cgobj,procinfo,paramgr + cgbase,cgobj,procinfo ; type @@ -1722,8 +1722,7 @@ Unit Rax86int; and when the parameter is in a register (delphi compatible) } if (not oper.hastype) and (oper.opr.localsym.owner.symtabletype=parasymtable) and - ((oper.opr.localsym.localloc.loc<>LOC_REGISTER) or - not paramanager.push_addr_param(oper.opr.localsym.varspez,oper.opr.localsym.vardef,current_procinfo.procdef.proccalloption)) then + (current_procinfo.procdef.proccalloption<>pocall_register) then Message(asmr_e_cannot_access_field_directly_for_parameters); oper.opr.localforceref:=true;