diff options
author | Björn Gustavsson <bjorn@erlang.org> | 2010-09-07 10:42:34 +0200 |
---|---|---|
committer | Björn Gustavsson <bjorn@erlang.org> | 2010-09-07 10:42:34 +0200 |
commit | a83b493d40f7c2e0303037d67cecde301668ef79 (patch) | |
tree | 88f79a34a128f3e2c1d462e8dbdb1fd5240a6b37 /erts/emulator/hipe/hipe_x86_glue.S | |
parent | 03997d5a1c166e8470dd9c888a5dba121144986a (diff) | |
parent | 8bbcecd938f46127bc40ff7aed91d4e519d0cd5b (diff) | |
download | otp-a83b493d40f7c2e0303037d67cecde301668ef79.tar.gz otp-a83b493d40f7c2e0303037d67cecde301668ef79.tar.bz2 otp-a83b493d40f7c2e0303037d67cecde301668ef79.zip |
Merge branch 'pg/fix-hipe-crash-in-gc_after_bif' into dev
* pg/fix-hipe-crash-in-gc_after_bif:
Fix call to erts_gc_after_bif_call in hipe glue
Diffstat (limited to 'erts/emulator/hipe/hipe_x86_glue.S')
-rw-r--r-- | erts/emulator/hipe/hipe_x86_glue.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_x86_glue.S b/erts/emulator/hipe/hipe_x86_glue.S index 2f7dff39f5..43392111fe 100644 --- a/erts/emulator/hipe/hipe_x86_glue.S +++ b/erts/emulator/hipe/hipe_x86_glue.S @@ -320,11 +320,13 @@ nbif_3_gc_after_bif: .align 4 .gc_after_bif: movl %edx, P_NARITY(P) - subl $(16-4), %esp + subl $(32-4), %esp movl P, (%esp) movl %eax, 4(%esp) + movl $0, 8(%esp) # Pass NULL in regs + movl $0, 12(%esp) # Pass 0 in arity call CSYM(erts_gc_after_bif_call) - addl $(16-4), %esp + addl $(32-4), %esp movl $0, P_NARITY(P) ret |