diff options
| author | Mike Pall <mike> | 2025-04-10 22:45:38 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2025-04-10 22:45:38 +0200 |
| commit | 51d4c26ec7805d77bfc3470fdf99b73c4ef2faec (patch) | |
| tree | 9a746e729b55fcc212b76228c436cae57b025384 | |
| parent | c262976486e1e007b56380b6a36bfbea5f51d470 (diff) | |
| download | luajit-51d4c26ec7805d77bfc3470fdf99b73c4ef2faec.tar.gz luajit-51d4c26ec7805d77bfc3470fdf99b73c4ef2faec.tar.bz2 luajit-51d4c26ec7805d77bfc3470fdf99b73c4ef2faec.zip | |
ARM: Fix soft-float math.min()/math.max().
Reported by Dong Jianqiang. #1356
| -rw-r--r-- | src/lj_asm_arm.h | 2 | ||||
| -rw-r--r-- | src/vm_arm.dasc | 4 |
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 | | |
