aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lj_asm_arm.h2
-rw-r--r--src/vm_arm.dasc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h
index de435057..24deaeae 100644
--- a/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@ -1927,7 +1927,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
1927 } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) { 1927 } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) {
1928 as->curins--; /* Always skip the loword min/max. */ 1928 as->curins--; /* Always skip the loword min/max. */
1929 if (uselo || usehi) 1929 if (uselo || usehi)
1930 asm_sfpmin_max(as, ir-1, (ir-1)->o == IR_MIN ? CC_PL : CC_LE); 1930 asm_sfpmin_max(as, ir-1, (ir-1)->o == IR_MIN ? CC_HS : CC_LS);
1931 return; 1931 return;
1932#elif LJ_HASFFI 1932#elif LJ_HASFFI
1933 } else if ((ir-1)->o == IR_CONV) { 1933 } else if ((ir-1)->o == IR_CONV) {
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc
index ca08fc11..86bef0cf 100644
--- a/src/vm_arm.dasc
+++ b/src/vm_arm.dasc
@@ -1717,8 +1717,8 @@ static void build_subroutines(BuildCtx *ctx)
1717 |.endif 1717 |.endif
1718 |.endmacro 1718 |.endmacro
1719 | 1719 |
1720 | math_minmax math_min, gt, pl 1720 | math_minmax math_min, gt, hs
1721 | math_minmax math_max, lt, le 1721 | math_minmax math_max, lt, ls
1722 | 1722 |
1723 |//-- String library ----------------------------------------------------- 1723 |//-- String library -----------------------------------------------------
1724 | 1724 |