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

* fixed most calling convention trouble on arm-linux

Browse Source 
git-svn-id: trunk@5091 -
This commit is contained in:
florian 2006-10-30 10:45:26 +00:00
parent 1406181aa5
commit e9a1dff46a
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/arm/cpupara.pas
View File

@ -37,6 +37,7 @@ unit cpupara;
function get_volatile_registers_int(calloption : tproccalloption):tcpuregisterset;override;
function get_volatile_registers_fpu(calloption : tproccalloption):tcpuregisterset;override;
function push_addr_param(varspez:tvarspez;def : tdef;calloption : tproccalloption) : boolean;override;
function ret_in_param(def : tdef;calloption : tproccalloption) : boolean;override;
procedure getintparaloc(calloption : tproccalloption; nr : longint;var cgpara:TCGPara);override;
function create_paraloc_info(p : tabstractprocdef; side: tcallercallee):longint;override;
function create_varargs_paraloc_info(p : tabstractprocdef; varargspara:tvarargsparalist):longint;override;
@ -177,6 +178,26 @@ unit cpupara;
end;
function tarmparamanager.ret_in_param(def : tdef;calloption : tproccalloption) : boolean;
begin
case def.deftype of
recorddef:
{ this is how gcc 4.0.4 on linux seems to do it, it doesn't look like being
ARM ABI standard compliant
}
result:=not((trecorddef(def).symtable.symindex.count=1) and
not(ret_in_param(tabstractvarsym(trecorddef(def).symtable.symindex.search(1)).vardef,calloption)));
{
objectdef
arraydef:
result:=not(def.size in [1,2,4]);
}
else
result:=inherited ret_in_param(def,calloption);
end;
end;
procedure tarmparamanager.init_values(var curintreg, curfloatreg, curmmreg: tsuperregister; var cur_stack_offset: aword);
begin
curintreg:=RS_R0;
@ -413,7 +434,7 @@ unit cpupara;
retcgsize:=OS_ADDR
else
retcgsize:=def_cgsize(p.returndef);
location_reset(p.funcretloc[side],LOC_INVALID,OS_NO);
p.funcretloc[side].size:=retcgsize;
@ -427,7 +448,7 @@ unit cpupara;
{ Return in FPU register? }
if p.returndef.deftype=floatdef then
begin
if (p.proccalloption in [pocall_cdecl,pocall_cppdecl,pocall_softfloat]) or (cs_fp_emulation in aktmoduleswitches) then
if (p.proccalloption in [pocall_softfloat]) or (cs_fp_emulation in aktmoduleswitches) then
begin
case retcgsize of
OS_64,

1
compiler/arm/narmadd.pas
View File

@ -243,7 +243,6 @@ interface
procedure tarmaddnode.second_cmp64bit;
var
unsigned : boolean;
tmpreg : tregister;
oldnodetype : tnodetype;
begin
pass_left_right;