aboutsummaryrefslogtreecommitdiff
path: root/src/lj_asm_arm.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lj_asm_arm.h')
-rw-r--r--src/lj_asm_arm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h
index 9d055c81..d2579349 100644
--- a/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@ -1659,8 +1659,8 @@ static void asm_min_max(ASMState *as, IRIns *ir, int cc, int fcc)
1659 asm_intmin_max(as, ir, cc); 1659 asm_intmin_max(as, ir, cc);
1660} 1660}
1661 1661
1662#define asm_min(as, ir) asm_min_max(as, ir, CC_GT, CC_HI) 1662#define asm_min(as, ir) asm_min_max(as, ir, CC_GT, CC_PL)
1663#define asm_max(as, ir) asm_min_max(as, ir, CC_LT, CC_LO) 1663#define asm_max(as, ir) asm_min_max(as, ir, CC_LT, CC_LE)
1664 1664
1665/* -- Comparisons --------------------------------------------------------- */ 1665/* -- Comparisons --------------------------------------------------------- */
1666 1666
@@ -1852,7 +1852,7 @@ static void asm_hiop(ASMState *as, IRIns *ir)
1852 } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) { 1852 } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) {
1853 as->curins--; /* Always skip the loword min/max. */ 1853 as->curins--; /* Always skip the loword min/max. */
1854 if (uselo || usehi) 1854 if (uselo || usehi)
1855 asm_sfpmin_max(as, ir-1, (ir-1)->o == IR_MIN ? CC_HI : CC_LO); 1855 asm_sfpmin_max(as, ir-1, (ir-1)->o == IR_MIN ? CC_PL : CC_LE);
1856 return; 1856 return;
1857#elif LJ_HASFFI 1857#elif LJ_HASFFI
1858 } else if ((ir-1)->o == IR_CONV) { 1858 } else if ((ir-1)->o == IR_CONV) {