Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-15 14:30:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 594611 - Fix stack allocation for ffi function calls on x86-64. r=dwitte, a=bsmedberg

Browse Source
This commit is contained in:
Mike Hommey 2010-09-15 14:34:37 +02:00
parent e54cde18a1
commit b2f567d565
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/ctypes/libffi.patch
View File

@ -1,4 +1,4 @@
Patch libffi to fix bug 550602 and bug 538216.
Patch libffi to fix bug 550602, bug 538216 and bug 594611.
diff --git a/js/src/ctypes/libffi/Makefile.in b/js/src/ctypes/libffi/Makefile.in
--- a/js/src/ctypes/libffi/Makefile.in
@ -108,3 +108,26 @@ diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure
archive_cmds_need_lc=no
hardcode_direct=no
diff --git a/js/src/ctypes/libffi/src/x86/ffi64.c b/js/src/ctypes/libffi/src/x86/ffi64.c
--- a/js/src/ctypes/libffi/src/x86/ffi64.c
+++ b/js/src/ctypes/libffi/src/x86/ffi64.c
@@ -373,18 +373,18 @@ ffi_prep_cif_machdep (ffi_cif *cif)
|| gprcount + ngpr > MAX_GPR_REGS
|| ssecount + nsse > MAX_SSE_REGS)
{
long align = cif->arg_types[i]->alignment;
if (align < 8)
align = 8;
+ bytes += cif->arg_types[i]->size;
bytes = ALIGN(bytes, align);
- bytes += cif->arg_types[i]->size;
}
else
{
gprcount += ngpr;
ssecount += nsse;
}
}
if (ssecount)

2
js/src/ctypes/libffi/src/x86/ffi64.c
View File

@ -378,8 +378,8 @@ ffi_prep_cif_machdep (ffi_cif *cif)
if (align < 8)
align = 8;
bytes = ALIGN(bytes, align);
bytes += cif->arg_types[i]->size;
bytes = ALIGN(bytes, align);
}
else
{