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_amd64_asm.m4 | |
| 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_amd64_asm.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_asm.m4 | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_asm.m4 b/erts/emulator/hipe/hipe_amd64_asm.m4 index 2c0fbbee2d..409fd0ef89 100644 --- a/erts/emulator/hipe/hipe_amd64_asm.m4 +++ b/erts/emulator/hipe/hipe_amd64_asm.m4 @@ -121,6 +121,22 @@ define(NSP,%rsp)dnl /* + * Debugging macros + * + * Keeps track of whether context has been saved in the debug build, allowing us + * to detect when the garbage collector is called when it shouldn't. + */ +`#ifdef DEBUG +# define SET_GC_UNSAFE \ + movq $1, P_GCUNSAFE(P) +# define SET_GC_SAFE \ + movq $0, P_GCUNSAFE(P) +#else +# define SET_GC_UNSAFE +# define SET_GC_SAFE +#endif' + +/* * Context switching macros. */ `#define SWITCH_C_TO_ERLANG_QUICK \ @@ -133,12 +149,14 @@ define(NSP,%rsp)dnl `#define SAVE_CACHED_STATE \ SAVE_HP; \ - SAVE_FCALLS' + SAVE_FCALLS; \ + SET_GC_SAFE' `#define RESTORE_CACHED_STATE \ RESTORE_HP; \ RESTORE_HEAP_LIMIT; \ - RESTORE_FCALLS' + RESTORE_FCALLS; \ + SET_GC_UNSAFE' `#define SWITCH_C_TO_ERLANG \ RESTORE_CACHED_STATE; \ |