diff options
| author | Magnus Lång <[email protected]> | 2016-04-12 13:08:02 +0200 |
|---|---|---|
| committer | Magnus Lång <[email protected]> | 2016-06-30 12:01:57 +0200 |
| commit | 1dd81185dfb2fd6ac30b6eb44c905128c8958cb4 (patch) | |
| tree | 4455256dd37472db1188f4c0dce79db658a0e58e /erts/emulator/hipe/hipe_arm_glue.S | |
| parent | c2157dc06a8c997c207dd82cd6fa11dbcb508f11 (diff) | |
| download | otp-1dd81185dfb2fd6ac30b6eb44c905128c8958cb4.tar.gz otp-1dd81185dfb2fd6ac30b6eb44c905128c8958cb4.tar.bz2 otp-1dd81185dfb2fd6ac30b6eb44c905128c8958cb4.zip | |
hipe: Add assertion for gc in bif without wrapper
An easy source of tricky bugs is to start calling the garbage collector
from a built-in function without adding that bif to hipe_bif_list.m4.
With this change we, in the debug build, keep track of whether the
canonical stack and heap pointers are stored in the PCB or in
registers/stack, allowing us to catch this class of mistakes with an
assertion.
Diffstat (limited to 'erts/emulator/hipe/hipe_arm_glue.S')
| -rw-r--r-- | erts/emulator/hipe/hipe_arm_glue.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/hipe/hipe_arm_glue.S b/erts/emulator/hipe/hipe_arm_glue.S index 49ffa8b1d8..5b7f8ad52d 100644 --- a/erts/emulator/hipe/hipe_arm_glue.S +++ b/erts/emulator/hipe/hipe_arm_glue.S @@ -342,6 +342,7 @@ nbif_4_gc_after_bif: str r1, [P, #P_NARITY] str TEMP_LR, [P, #P_NRA] str NSP, [P, #P_NSP] + SET_GC_SAFE(TEMP_LR) mov TEMP_LR, lr mov r3, #0 /* Pass 0 in arity */ mov r2, #0 /* Pass NULL in regs */ @@ -349,6 +350,7 @@ nbif_4_gc_after_bif: mov r0, P bl erts_gc_after_bif_call mov lr, TEMP_LR + SET_GC_UNSAFE(TEMP_LR) ldr TEMP_LR, [P, #P_NRA] mov r1, #0 str r1, [P, #P_NARITY] @@ -404,6 +406,7 @@ nbif_4_simple_exception: str NSP, [P, #P_NSP] str TEMP_LR, [P, #P_NRA] str r1, [P, #P_NARITY] + SET_GC_SAFE(r0) /* find and prepare to invoke the handler */ mov r0, P bl hipe_handle_exception /* Note: hipe_handle_exception() conses */ @@ -423,6 +426,7 @@ nbif_4_simple_exception: str NSP, [P, #P_NSP] str r1, [P, #P_NARITY] str TEMP_LR, [P, #P_NRA] + SET_GC_SAFE(NSP) b .nosave_exit /* |