paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-09 18:19:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed passing of registers on x86-64_linux, should fix #7613

Browse Source 
git-svn-id: trunk@4951 -
This commit is contained in:
florian 2006-10-17 20:58:16 +00:00
parent 908c9741d3
commit 5eef73c1ab
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/x86_64/cgcpu.pas
View File

@ -26,7 +26,7 @@ unit cgcpu;
interface interface
uses uses
cgbase,cgobj,cgx86, cgbase,cgutils,cgobj,cgx86,
aasmbase,aasmtai,aasmdata,aasmcpu, aasmbase,aasmtai,aasmdata,aasmcpu,
cpubase,cpuinfo,cpupara,parabase, cpubase,cpuinfo,cpupara,parabase,
symdef, symdef,
@ -37,6 +37,8 @@ unit cgcpu;
procedure init_register_allocators;override; procedure init_register_allocators;override;
procedure g_proc_exit(list : TAsmList;parasize:longint;nostackframe:boolean);override; procedure g_proc_exit(list : TAsmList;parasize:longint;nostackframe:boolean);override;
procedure g_intf_wrapper(list: TAsmList; procdef: tprocdef; const labelname: string; ioffset: longint);override; procedure g_intf_wrapper(list: TAsmList; procdef: tprocdef; const labelname: string; ioffset: longint);override;
procedure a_param_ref(list : TAsmList;size : tcgsize;const r : treference;const paraloc : TCGPara);override;
end; end;
@ -44,7 +46,7 @@ unit cgcpu;
uses uses
globtype,globals,verbose,systems,cutils, globtype,globals,verbose,systems,cutils,
symsym,defutil,paramgr,fmodule,cgutils, symsym,defutil,paramgr,fmodule,
rgobj,tgobj,rgcpu; rgobj,tgobj,rgcpu;
@ -59,6 +61,35 @@ unit cgcpu;
end; end;
procedure tcgx86_64.a_param_ref(list : TAsmList;size : tcgsize;const r : treference;const paraloc : TCGPara);
var
tmpref, ref: treference;
location: pcgparalocation;
sizeleft: aint;
begin
location := paraloc.location;
tmpref := r;
sizeleft := paraloc.intsize;
while assigned(location) do
begin
case location^.loc of
LOC_REGISTER,LOC_CREGISTER:
a_load_ref_reg(list,location^.size,location^.size,tmpref,location^.register);
LOC_REFERENCE:
begin
reference_reset_base(ref,location^.reference.index,location^.reference.offset);
g_concatcopy(list,tmpref,ref,sizeleft);
end;
else
internalerror(2002081103);
end;
inc(tmpref.offset,tcgsize2size[location^.size]);
dec(sizeleft,tcgsize2size[location^.size]);
location := location^.next;
end;
end;
procedure tcgx86_64.g_proc_exit(list : TAsmList;parasize:longint;nostackframe:boolean); procedure tcgx86_64.g_proc_exit(list : TAsmList;parasize:longint;nostackframe:boolean);
var var
stacksize : longint; stacksize : longint;

33
compiler/x86_64/cpupara.pas
View File

@ -96,14 +96,11 @@ unit cpupara;
end; end;
recorddef: recorddef:
begin begin
if p.size<=16 then { win64 abi }
begin if ((target_info.system=system_x86_64_win64) and (p.size<=8)) or
if (target_info.system=system_x86_64_win64) and { linux abi }
(p.size<=8) then ((target_info.system<>system_x86_64_win64) and (p.size<=16)) then
loc1:=LOC_REGISTER loc1:=LOC_REGISTER
else
loc1:=LOC_REFERENCE;
end
else else
loc1:=LOC_REFERENCE; loc1:=LOC_REFERENCE;
end; end;
@ -111,8 +108,10 @@ unit cpupara;
begin begin
if is_object(p) then if is_object(p) then
begin begin
if (target_info.system=system_x86_64_win64) and { win64 abi }
(p.size<=8) then if ((target_info.system=system_x86_64_win64) and (p.size<=8)) or
{ linux abi }
((target_info.system<>system_x86_64_win64) and (p.size<=16)) then
loc1:=LOC_REGISTER loc1:=LOC_REGISTER
else else
loc1:=LOC_REFERENCE; loc1:=LOC_REFERENCE;
@ -122,15 +121,21 @@ unit cpupara;
end; end;
arraydef: arraydef:
begin begin
if (target_info.system=system_x86_64_win64) and if not(is_special_array(p)) and
not(is_special_array(p)) and { win64 abi }
(p.size<=8) then ((target_info.system=system_x86_64_win64) and (p.size<=8)) or
{ linux abi }
((target_info.system<>system_x86_64_win64) and (p.size<=16)) then
loc1:=LOC_REGISTER loc1:=LOC_REGISTER
else else
loc1:=LOC_REFERENCE; loc1:=LOC_REFERENCE;
end; end;
variantdef: variantdef:
loc1:=LOC_REFERENCE; { linux abi }
if target_info.system<>system_x86_64_win64 then
loc1:=LOC_REGISTER
else
loc1:=LOC_REFERENCE;
stringdef: stringdef:
if is_shortstring(p) or is_longstring(p) then if is_shortstring(p) or is_longstring(p) then
loc1:=LOC_REFERENCE loc1:=LOC_REFERENCE