diff options
author | Mike Pall <mike> | 2024-08-20 19:01:38 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2024-08-20 19:01:38 +0200 |
commit | f4fa5646a8149ee0298e14d40cf078ec609a4354 (patch) | |
tree | 297354467fe4576ca10447db19c2aca0286f599a /src | |
parent | fb22d0f80f291827a4004e16bc589b54bcc4a3c7 (diff) | |
parent | 32a683d226a3b57adbfeabff17d1ae0f7676545d (diff) | |
download | luajit-f4fa5646a8149ee0298e14d40cf078ec609a4354.tar.gz luajit-f4fa5646a8149ee0298e14d40cf078ec609a4354.tar.bz2 luajit-f4fa5646a8149ee0298e14d40cf078ec609a4354.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
-rw-r--r-- | src/vm_arm.dasc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index fc08c658..4cad5d83 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc | |||
@@ -1823,9 +1823,19 @@ static void build_subroutines(BuildCtx *ctx) | |||
1823 | | | 1823 | | |
1824 | |//-- Bit library -------------------------------------------------------- | 1824 | |//-- Bit library -------------------------------------------------------- |
1825 | | | 1825 | | |
1826 | |// FP number to bit conversion for soft-float. Clobbers r0-r3. | ||
1827 | |->vm_tobit_fb: | 1826 | |->vm_tobit_fb: |
1828 | | bhi ->fff_fallback | 1827 | | bhi ->fff_fallback |
1828 | |.if FPU | ||
1829 | |// FP number to bit conversion for hard-float. Clobbers r0, d0-d1. | ||
1830 | | vldr d1, >9 | ||
1831 | | vmov d0, CARG1, CARG2 | ||
1832 | | vadd.f64 d0, d0, d1 | ||
1833 | | vmov CARG1, s0 | ||
1834 | | bx lr | ||
1835 | |9: | ||
1836 | | .long 0, 0x43380000 // (double)(2^52 + 2^51). | ||
1837 | |.else | ||
1838 | |// FP number to bit conversion for soft-float. Clobbers r0-r3. | ||
1829 | |->vm_tobit: | 1839 | |->vm_tobit: |
1830 | | lsl RB, CARG2, #1 | 1840 | | lsl RB, CARG2, #1 |
1831 | | adds RB, RB, #0x00200000 | 1841 | | adds RB, RB, #0x00200000 |
@@ -1850,6 +1860,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
1850 | | orr CARG1, CARG4, CARG1, lsl RB | 1860 | | orr CARG1, CARG4, CARG1, lsl RB |
1851 | | rsblt CARG1, CARG1, #0 | 1861 | | rsblt CARG1, CARG1, #0 |
1852 | | bx lr | 1862 | | bx lr |
1863 | |.endif | ||
1853 | | | 1864 | | |
1854 | |.macro .ffunc_bit, name | 1865 | |.macro .ffunc_bit, name |
1855 | | .ffunc_1 bit_..name | 1866 | | .ffunc_1 bit_..name |