diff options
author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-03-05 20:32:15 +0000 |
---|---|---|
committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-03-05 20:32:15 +0000 |
commit | 56c65dd0b08f770f506883b836b009697c515e9f (patch) | |
tree | 5f0de90a8b89e4cc3f6501a3ef233ae9c3ae8091 /compiler/avr/cpupara.pas | |
parent | 3349f4c65362bb26931dfafc6bce81c43cc906a1 (diff) | |
parent | 91c97f8061c4fe069c0c5b38de78ae75708e3fd0 (diff) | |
download | fpc-56c65dd0b08f770f506883b836b009697c515e9f.tar.gz |
* synchronized with privatetrunk till r30095
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/hlcgllvm@30101 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/avr/cpupara.pas')
-rw-r--r-- | compiler/avr/cpupara.pas | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/avr/cpupara.pas b/compiler/avr/cpupara.pas index 3a92c9fe5f..4e4483e5c4 100644 --- a/compiler/avr/cpupara.pas +++ b/compiler/avr/cpupara.pas @@ -201,13 +201,13 @@ unit cpupara; begin { In case of po_delphi_nested_cc, the parent frame pointer is always passed on the stack. } - if (nextintreg>RS_R8) and + if (nextintreg>RS_R7) and (not(vo_is_parentfp in hp.varoptions) or not(po_delphi_nested_cc in p.procoptions)) then begin paraloc^.loc:=LOC_REGISTER; paraloc^.register:=newreg(R_INTREGISTER,nextintreg,R_SUBWHOLE); - inc(nextintreg); + dec(nextintreg); end else begin @@ -251,8 +251,8 @@ unit cpupara; begin paradef:=getpointerdef(paradef); loc:=LOC_REGISTER; - paracgsize := OS_ADDR; - paralen := tcgsize2size[OS_ADDR]; + paracgsize:=OS_ADDR; + paralen:=tcgsize2size[OS_ADDR]; end else begin |