diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-27 19:30:32 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-27 19:31:24 +0100 |
| commit | bece9227ecffb5f164a383a826f63835bd32175a (patch) | |
| tree | 9dc5c751d0d69254aee69c58696c2c314c70069e /erts/emulator/beam/global.h | |
| parent | a6ffce4547a3a2c4cb1409a0a679a64b9afdfe9f (diff) | |
| parent | 29196a3528e034d3d46ec4589749074f8d766b97 (diff) | |
| download | otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.gz otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.bz2 otp-bece9227ecffb5f164a383a826f63835bd32175a.zip | |
Merge branch 'sverk/misc-bug-fixes'
OTP-11618
* sverk/misc-bug-fixes:
erts: Fix faulty assert in match spec engine.
erts: Fix crash when comparing very large floats with integers
erts: Refactor big-float compare on HALFWORD to use C-stack
erts: Fix halfword compile errors in ESTACK
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index c183c519ff..83a8911a36 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -371,9 +371,9 @@ extern int stackdump_on_exit; */ typedef struct { - UWord* start; - UWord* sp; - UWord* end; + Eterm* start; + Eterm* sp; + Eterm* end; ErtsAlcType_t alloc_type; }ErtsEStack; @@ -384,7 +384,7 @@ void erl_grow_estack(ErtsEStack*, Eterm* def_stack); #define ESTK_DEF_STACK(s) ESTK_CONCAT(s,_default_estack) #define DECLARE_ESTACK(s) \ - UWord ESTK_DEF_STACK(s)[DEF_ESTACK_SIZE]; \ + Eterm ESTK_DEF_STACK(s)[DEF_ESTACK_SIZE]; \ ErtsEStack s = { \ ESTK_DEF_STACK(s), /* start */ \ ESTK_DEF_STACK(s), /* sp */ \ @@ -418,8 +418,8 @@ do {\ if (s.start == ESTK_DEF_STACK(s)) {\ UWord _wsz = ESTACK_COUNT(s);\ (dst)->start = erts_alloc(s.alloc_type,\ - DEF_ESTACK_SIZE * sizeof(UWord));\ - memcpy((dst)->start, s.start,_wsz*sizeof(UWord));\ + DEF_ESTACK_SIZE * sizeof(Eterm));\ + memcpy((dst)->start, s.start,_wsz*sizeof(Eterm));\ (dst)->sp = (dst)->start + _wsz;\ (dst)->end = (dst)->start + DEF_ESTACK_SIZE;\ (dst)->alloc_type = s.alloc_type;\ @@ -495,7 +495,7 @@ typedef struct { #define DEF_WSTACK_SIZE (16) -void erl_grow_wstack(ErtsWStack*, Eterm* def_stack); +void erl_grow_wstack(ErtsWStack*, UWord* def_stack); #define WSTK_CONCAT(a,b) a##b #define WSTK_DEF_STACK(s) WSTK_CONCAT(s,_default_wstack) |