paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 10:30:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

move currentregloc setting to ncgutil to avoid sysym unit ependency in aasmtai unit

Browse Source 
git-svn-id: trunk@22513 -
This commit is contained in:
pierre 2012-10-02 09:25:49 +00:00
parent 420cd9bd27
commit 4b7a6ecc14
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/aasmtai.pas
View File

@ -833,7 +833,6 @@ implementation
uses uses
SysUtils, SysUtils,
verbose, verbose,
symsym,
globals; globals;
const const
@ -926,9 +925,7 @@ implementation
newlocation:=loc; newlocation:=loc;
newlocationhi:=NR_NO; newlocationhi:=NR_NO;
varsym:=sym; varsym:=sym;
oldlocation:=tabstractnormalvarsym(sym).currentregloc.register;
oldlocationhi:=NR_NO; oldlocationhi:=NR_NO;
tabstractnormalvarsym(sym).currentregloc.register:=newlocation;
end; end;
@ -939,10 +936,6 @@ implementation
newlocation:=loc; newlocation:=loc;
newlocationhi:=lochi; newlocationhi:=lochi;
varsym:=sym; varsym:=sym;
oldlocation:=tabstractnormalvarsym(sym).currentregloc.register;
oldlocationhi:=tabstractnormalvarsym(sym).currentregloc.registerhi;
tabstractnormalvarsym(sym).currentregloc.register:=newlocation;
tabstractnormalvarsym(sym).currentregloc.registerHI:=newlocationHI;
end; end;
@ -954,10 +947,6 @@ implementation
newlocation:=loc; newlocation:=loc;
newlocationhi:=lochi; newlocationhi:=lochi;
varsym:=sym; varsym:=sym;
oldlocation:=tabstractnormalvarsym(sym).currentregloc.register;
oldlocationhi:=tabstractnormalvarsym(sym).currentregloc.registerhi;
tabstractnormalvarsym(sym).currentregloc.register:=newlocation;
tabstractnormalvarsym(sym).currentregloc.registerHI:=newlocationHI;
end; end;
{$endif cpu64bitalu} {$endif cpu64bitalu}

26
compiler/ncgutil.pas
View File

@ -1814,6 +1814,7 @@ implementation
procedure maybechangeloadnodereg(list: TAsmList; var n: tnode; reload: boolean); procedure maybechangeloadnodereg(list: TAsmList; var n: tnode; reload: boolean);
var var
rr: treplaceregrec; rr: treplaceregrec;
varloc : tai_varloc;
begin begin
{$ifdef jvm} {$ifdef jvm}
exit; exit;
@ -1906,7 +1907,14 @@ implementation
if assigned(rr.sym) and if assigned(rr.sym) and
((rr.sym.currentregloc.register<>rr.new) or ((rr.sym.currentregloc.register<>rr.new) or
(rr.sym.currentregloc.registerhi<>rr.newhi)) then (rr.sym.currentregloc.registerhi<>rr.newhi)) then
list.concat(tai_varloc.create128(rr.sym,rr.new,rr.newhi)); begin
varloc:=tai_varloc.create128(rr.sym,rr.new,rr.newhi);
varloc.oldlocation:=rr.sym.currentregloc.register;
varloc.oldlocationhi:=rr.sym.currentregloc.registerhi;
rr.sym.currentregloc.register:=rr.new;
rr.sym.currentregloc.registerHI:=rr.newhi;
list.concat(varloc);
end;
end end
else else
{$else cpu64bitalu} {$else cpu64bitalu}
@ -1917,14 +1925,26 @@ implementation
if assigned(rr.sym) and if assigned(rr.sym) and
((rr.sym.currentregloc.register<>rr.new) or ((rr.sym.currentregloc.register<>rr.new) or
(rr.sym.currentregloc.registerhi<>rr.newhi)) then (rr.sym.currentregloc.registerhi<>rr.newhi)) then
list.concat(tai_varloc.create64(rr.sym,rr.new,rr.newhi)); begin
varloc:=tai_varloc.create64(rr.sym,rr.new,rr.newhi);
varloc.oldlocation:=rr.sym.currentregloc.register;
varloc.oldlocationhi:=rr.sym.currentregloc.registerhi;
rr.sym.currentregloc.register:=rr.new;
rr.sym.currentregloc.registerHI:=rr.newhi;
list.concat(varloc);
end;
end end
else else
{$endif cpu64bitalu} {$endif cpu64bitalu}
begin begin
n.location.register := rr.new; n.location.register := rr.new;
if assigned(rr.sym) and (rr.sym.currentregloc.register<>rr.new) then if assigned(rr.sym) and (rr.sym.currentregloc.register<>rr.new) then
list.concat(tai_varloc.create(rr.sym,rr.new)); begin
varloc:=tai_varloc.create(rr.sym,rr.new);
varloc.oldlocation:=rr.sym.currentregloc.register;
rr.sym.currentregloc.register:=rr.new;
list.concat(varloc);
end;
end; end;
end; end;