Skip to content

change gas64 internal checks for structs returned in registers on linux #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2020
Merged

change gas64 internal checks for structs returned in registers on linux #260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
350fd28
gas64: fix check
jayrm Oct 20, 2020
4d177a8
gas64: fix internal check
jayrm Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/compiler/ir-gas64.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4821,8 +4821,7 @@ private sub _emitstore( byval v1 as IRVREG ptr, byval v2 as IRVREG ptr )
asm_error("store 01")
end select

if v2->subtype<>0 andalso typeIsPtr( v2->dtype )=false andalso v2->subtype->udt.retin2regs<>FB_STRUCT_NONE then
'' for Linux structures can be returned in 2 registers so needs a special handling
if( typeGetDtAndPtrOnly( v1->dtype ) = FB_DATATYPE_STRUCT ) then
emitStoreStruct(v1,v2,op1,op3)
exit sub
end if
Expand Down Expand Up @@ -5090,7 +5089,7 @@ private sub _emitloadres(byval v1 as IRVREG ptr,byval vr as IRVREG Ptr)
asm_error("in loadres typ not handled")
end select

if v1->sym<>0 andalso typeIsPtr( v1->dtype )=false andalso v1->sym->subtype<>0 andalso v1->sym->subtype->udt.retin2regs<>FB_STRUCT_NONE then
if( typeGetDtAndPtrOnly( v1->dtype ) = FB_DATATYPE_STRUCT ) then
''Structure returned in 2 registers, linux only
''assuming in this case fb$result is always defined like xxx[rbp]
if v1->typ<>IR_VREGTYPE_VAR orelse ( symbIsStatic(v1->sym) Or symbisshared(v1->sym) )then
Expand Down Expand Up @@ -5852,7 +5851,7 @@ private sub hdocall(byval proc as FBSYMBOL ptr,byref pname as string,byref first
ctx.proccalling=false

if( vr ) then ''return value
if vr->subtype<>0 andalso typeIsPtr( vr->dtype )=false andalso vr->subtype->udt.retin2regs<>FB_STRUCT_NONE then
if( typeGetDtAndPtrOnly( vr->dtype ) = FB_DATATYPE_STRUCT ) then
''Structure returned in 2 registers
vr->typ=IR_VREGTYPE_VAR ''for use when argument
ctx.stk+=typeGetSize( FB_DATATYPE_LONGINT )*2 ''reserving 16 bytes
Expand Down