diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-02-28 15:32:58 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-02-28 15:55:25 +0100 |
| commit | 3e638439e80e388aa66a2047735a47c954cd70c8 (patch) | |
| tree | 75f5eba123a29ecccca0cee62af19dd8753178b5 /erts/emulator/beam/erl_gc.h | |
| parent | 6b51f402e4e656776565233021edcea8f4d1590b (diff) | |
| download | otp-3e638439e80e388aa66a2047735a47c954cd70c8.tar.gz otp-3e638439e80e388aa66a2047735a47c954cd70c8.tar.bz2 otp-3e638439e80e388aa66a2047735a47c954cd70c8.zip | |
erts: Refactor MOVE_CONS to inline function
Diffstat (limited to 'erts/emulator/beam/erl_gc.h')
| -rw-r--r-- | erts/emulator/beam/erl_gc.h | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h index 8e09904766..414aff1e06 100644 --- a/erts/emulator/beam/erl_gc.h +++ b/erts/emulator/beam/erl_gc.h @@ -33,23 +33,27 @@ #define IS_MOVED_BOXED(x) (!is_header((x))) #define IS_MOVED_CONS(x) (is_non_value((x))) +void erts_sub_binary_to_heap_binary(Eterm **pp, Eterm **hpp, Eterm *orig); + +ERTS_GLB_INLINE void move_cons(Eterm **pp, Eterm car, Eterm **hpp, Eterm *orig); +#if ERTS_GLB_INLINE_INCL_FUNC_DEF +ERTS_GLB_INLINE void move_cons(Eterm **pp, Eterm car, Eterm **hpp, Eterm *orig) +{ + Eterm *ptr = *pp; + Eterm *htop = *hpp; + Eterm gval; -#define MOVE_CONS(PTR,CAR,HTOP,ORIG) \ -do { \ - Eterm gval; \ - \ - HTOP[0] = CAR; /* copy car */ \ - HTOP[1] = PTR[1]; /* copy cdr */ \ - gval = make_list(HTOP); /* new location */ \ - *ORIG = gval; /* redirect original reference */ \ - PTR[0] = THE_NON_VALUE; /* store forwarding indicator */ \ - PTR[1] = gval; /* store forwarding address */ \ - HTOP += 2; /* update tospace htop */ \ -} while(0) + htop[0] = car; /* copy car */ + htop[1] = ptr[1]; /* copy cdr */ + gval = make_list(htop); /* new location */ + *orig = gval; /* redirect original reference */ + ptr[0] = THE_NON_VALUE; /* store forwarding indicator */ + ptr[1] = gval; /* store forwarding address */ + *hpp += 2; /* update tospace htop */ +} +#endif -void erts_sub_binary_to_heap_binary(Eterm **pp, Eterm **hpp, Eterm *orig); ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig); - #if ERTS_GLB_INLINE_INCL_FUNC_DEF ERTS_GLB_INLINE void move_boxed(Eterm **pp, Eterm hdr, Eterm **hpp, Eterm *orig) { |