diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-18 11:20:53 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-24 16:22:30 +0200 |
| commit | f3a0dc2a3b2ef161b83994a374ef2a447328098e (patch) | |
| tree | f90f2d7f9d5e2273d8d3f1c2f3fed753bcda22b7 /erts | |
| parent | 16b83562b0d2e9f9892744dcbf7894ef7d18a82a (diff) | |
| download | otp-f3a0dc2a3b2ef161b83994a374ef2a447328098e.tar.gz otp-f3a0dc2a3b2ef161b83994a374ef2a447328098e.tar.bz2 otp-f3a0dc2a3b2ef161b83994a374ef2a447328098e.zip | |
erts: Remove halfword in lib_src
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/include/erl_int_sizes_config.h.in | 3 | ||||
| -rw-r--r-- | erts/include/internal/erl_printf_format.h | 9 | ||||
| -rw-r--r-- | erts/lib_src/common/erl_printf_format.c | 12 |
3 files changed, 2 insertions, 22 deletions
diff --git a/erts/include/erl_int_sizes_config.h.in b/erts/include/erl_int_sizes_config.h.in index b18f5ebc00..88c74cdeff 100644 --- a/erts/include/erl_int_sizes_config.h.in +++ b/erts/include/erl_int_sizes_config.h.in @@ -35,6 +35,3 @@ /* The size of a pointer. */ #undef SIZEOF_VOID_P - -/* Define if building a halfword-heap 64bit emulator (needed for NIF's) */ -#undef HALFWORD_HEAP_EMULATOR diff --git a/erts/include/internal/erl_printf_format.h b/erts/include/internal/erl_printf_format.h index efd926be99..c41c5ba820 100644 --- a/erts/include/internal/erl_printf_format.h +++ b/erts/include/internal/erl_printf_format.h @@ -44,7 +44,6 @@ typedef long long ErlPfSWord; #error Found no appropriate type to use for 'Eterm', 'Uint' and 'Sint' #endif - typedef int (*fmtfn_t)(void*, char*, size_t); extern int erts_printf_format(fmtfn_t, void*, char*, va_list); @@ -57,17 +56,9 @@ extern int erts_printf_uword(fmtfn_t, void*, char, int, int, ErlPfUWord); extern int erts_printf_sword(fmtfn_t, void*, char, int, int, ErlPfSWord); extern int erts_printf_double(fmtfn_t, void *, char, int, int, double); -#ifdef HALFWORD_HEAP_EMULATOR -# if SIZEOF_INT != 4 -# error Unsupported integer size for HALFWORD_HEAP_EMULATOR -# endif -typedef unsigned int ErlPfEterm; -#else typedef ErlPfUWord ErlPfEterm; -#endif extern int (*erts_printf_eterm_func)(fmtfn_t, void*, ErlPfEterm, long, ErlPfEterm*); - #endif /* ERL_PRINTF_FORMAT_H__ */ diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c index 307680505c..9e70f4e882 100644 --- a/erts/lib_src/common/erl_printf_format.c +++ b/erts/lib_src/common/erl_printf_format.c @@ -78,15 +78,7 @@ #endif #ifndef ERTS_SIZEOF_ETERM -# ifdef HALFWORD_HEAP_EMULATOR -# if SIZEOF_VOID_P == 8 -# define ERTS_SIZEOF_ETERM 4 -# else -# error "HALFWORD_HEAP_EMULATOR only allowed on 64-bit architecture" -# endif -# else -# define ERTS_SIZEOF_ETERM SIZEOF_VOID_P -# endif +#define ERTS_SIZEOF_ETERM SIZEOF_VOID_P #endif #if defined(__GNUC__) @@ -821,7 +813,7 @@ int erts_printf_format(fmtfn_t fn, void* arg, char* fmt, va_list ap) } break; case FMTC_T: /* Eterm */ - case FMTC_R: { /* Eterm, Eterm* base (base ignored if !HALFWORD_HEAP) */ + case FMTC_R: { /* Eterm, Eterm* base */ long prec; ErlPfEterm eterm; ErlPfEterm* eterm_base; |