aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2015-04-21 11:25:01 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-04-21 11:25:01 +0200
commit6ba93050fa369626b22cc608c7f874148bb0e5c1 (patch)
tree5cb8c64cb7a11b5e12663e0b4bd05308d8df849b
parent6c3f8818f802164869519d58a538e70b1b8cc76c (diff)
parentb3e121949ad524be44878d656e923dd187780eda (diff)
downloadotp-6ba93050fa369626b22cc608c7f874148bb0e5c1.tar.gz
otp-6ba93050fa369626b22cc608c7f874148bb0e5c1.tar.bz2
otp-6ba93050fa369626b22cc608c7f874148bb0e5c1.zip
Merge branch 'egil/fix-halfword-cmp'
* egil/fix-halfword-cmp: erts: Fix halfword compare
-rw-r--r--erts/emulator/beam/utils.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index ae62a7a708..edefc5170f 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -2920,16 +2920,16 @@ Sint cmp(Eterm a, Eterm b)
#if HALFWORD_HEAP
static Sint erts_cmp_compound_rel_opt(Eterm a, Eterm* a_base,
- Eterm b, Eterm* b_base,
- int exact, int eq_only);
+ Eterm b, Eterm* b_base,
+ int exact, int eq_only);
#else
static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only);
#endif
#if HALFWORD_HEAP
-Sint erts_cmp(Eterm a, Eterm* a_base,
- Eterm b, Eterm* b_base,
- int exact, int eq_only)
+Sint erts_cmp_rel_opt(Eterm a, Eterm* a_base,
+ Eterm b, Eterm* b_base,
+ int exact, int eq_only)
#else
Sint erts_cmp(Eterm a, Eterm b, int exact, int eq_only)
#endif
@@ -2940,7 +2940,7 @@ Sint erts_cmp(Eterm a, Eterm b, int exact, int eq_only)
return (signed_val(a) - signed_val(b));
}
#if HALFWORD_HEAP
- return erts_cmp_compound(a,a_base,b,b_base,exact,eq_only);
+ return erts_cmp_compound_rel_opt(a,a_base,b,b_base,exact,eq_only);
#else
return erts_cmp_compound(a,b,exact,eq_only);
#endif
@@ -2952,8 +2952,9 @@ Sint erts_cmp(Eterm a, Eterm b, int exact, int eq_only)
* exact = 0 -> arith-based compare
*/
#if HALFWORD_HEAP
-static Sint erts_cmp_compound_rel_opt(Eterm a, Eterm* a_base, Eterm b, Eterm* b_base,
- int exact, int eq_only)
+static Sint erts_cmp_compound_rel_opt(Eterm a, Eterm* a_base,
+ Eterm b, Eterm* b_base,
+ int exact, int eq_only)
#else
static Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
#endif