diff options
| author | Björn Gustavsson <[email protected]> | 2014-02-21 12:29:36 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-02-21 12:29:36 +0100 |
| commit | db911c1f15372d2dadf06e8502506b0936a4fbb3 (patch) | |
| tree | e98a9b0c35bb2bf158ebc4e2f2f0ceb8a88f57b1 /erts/emulator/beam/utils.c | |
| parent | 687d9c05f94e807537ee397157b68653d1ddf231 (diff) | |
| parent | 04f4d9656724f465352df9582773393a165c8803 (diff) | |
| download | otp-db911c1f15372d2dadf06e8502506b0936a4fbb3.tar.gz otp-db911c1f15372d2dadf06e8502506b0936a4fbb3.tar.bz2 otp-db911c1f15372d2dadf06e8502506b0936a4fbb3.zip | |
Merge branch 'bjorn/erts/restore-cmp-arguments'
* bjorn/erts/restore-cmp-arguments:
beam/utils.c: Change back cmp() to only take two arguments
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index bc4a05d385..7da555b18d 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -2425,14 +2425,24 @@ static int cmp_atoms(Eterm a, Eterm b) bb->name+3, bb->len-3); } -/* cmp(Eterm a, Eterm b, int exact) +#if !HALFWORD_HEAP +/* cmp(Eterm a, Eterm b) + * For compatibility with HiPE - arith-based compare. + */ +Sint cmp(Eterm a, Eterm b) +{ + return erts_cmp(a, b, 0); +} +#endif + +/* erts_cmp(Eterm a, Eterm b, int exact) * exact = 1 -> term-based compare * exact = 0 -> arith-based compare */ #if HALFWORD_HEAP -Sint cmp_rel_opt(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base, int exact) +Sint erts_cmp_rel_opt(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base, int exact) #else -Sint cmp(Eterm a, Eterm b, int exact) +Sint erts_cmp(Eterm a, Eterm b, int exact) #endif { DECLARE_WSTACK(stack); |