diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-05-21 18:09:55 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-01-28 15:56:26 +0100 |
| commit | 03d5bb0d1bd5d7c4e09ee793a680f2d538fe0122 (patch) | |
| tree | 31901126a576691551cfb030cb2aef89243b4089 /erts/emulator/beam/erl_gc.h | |
| parent | 345bf9d4634f81ad0343e8c60442bdd293e41835 (diff) | |
| download | otp-03d5bb0d1bd5d7c4e09ee793a680f2d538fe0122.tar.gz otp-03d5bb0d1bd5d7c4e09ee793a680f2d538fe0122.tar.bz2 otp-03d5bb0d1bd5d7c4e09ee793a680f2d538fe0122.zip | |
erts: Initial Map instructions, type and structure
Diffstat (limited to 'erts/emulator/beam/erl_gc.h')
| -rw-r--r-- | erts/emulator/beam/erl_gc.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h index 1801df359a..5203dda263 100644 --- a/erts/emulator/beam/erl_gc.h +++ b/erts/emulator/beam/erl_gc.h @@ -20,6 +20,8 @@ #ifndef __ERL_GC_H__ #define __ERL_GC_H__ +#include "erl_map.h" + /* GC declarations shared by beam/erl_gc.c and hipe/hipe_gc.c */ #if defined(DEBUG) && !ERTS_GLB_INLINE_INCL_FUNC_DEF @@ -42,23 +44,24 @@ do { \ HTOP += 2; /* update tospace htop */ \ } while(0) -#define MOVE_BOXED(PTR,HDR,HTOP,ORIG) \ -do { \ - Eterm gval; \ - Sint nelts; \ - \ - ASSERT(is_header(HDR)); \ - gval = make_boxed(HTOP); \ - *ORIG = gval; \ - *HTOP++ = HDR; \ - *PTR++ = gval; \ - nelts = header_arity(HDR); \ - switch ((HDR) & _HEADER_SUBTAG_MASK) { \ - case SUB_BINARY_SUBTAG: nelts++; break; \ - case FUN_SUBTAG: nelts+=((ErlFunThing*)(PTR-1))->num_free+1; break; \ - } \ - while (nelts--) \ - *HTOP++ = *PTR++; \ +#define MOVE_BOXED(PTR,HDR,HTOP,ORIG) \ +do { \ + Eterm gval; \ + Sint nelts; \ + \ + ASSERT(is_header(HDR)); \ + nelts = header_arity(HDR); \ + switch ((HDR) & _HEADER_SUBTAG_MASK) { \ + case SUB_BINARY_SUBTAG: nelts++; break; \ + case MAP_SUBTAG: nelts+=map_get_size(PTR) + 1; break; \ + case FUN_SUBTAG: nelts+=((ErlFunThing*)(PTR))->num_free+1; break; \ + } \ + gval = make_boxed(HTOP); \ + *ORIG = gval; \ + *HTOP++ = HDR; \ + *PTR++ = gval; \ + while (nelts--) *HTOP++ = *PTR++; \ + \ } while(0) #define in_area(ptr,start,nbytes) \ |