diff options
author | Mike Pall <mike> | 2013-04-22 22:27:23 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2013-04-22 22:27:23 +0200 |
commit | 611ec41bcaeaf6641cffe22d6c5c9ff8d12b7321 (patch) | |
tree | 14c219e97475f5cb613ca24d649fc838130619a3 | |
parent | b1327bcf89ab58fe2824eff73fdec28bc9acc305 (diff) | |
download | luajit-611ec41bcaeaf6641cffe22d6c5c9ff8d12b7321.tar.gz luajit-611ec41bcaeaf6641cffe22d6c5c9ff8d12b7321.tar.bz2 luajit-611ec41bcaeaf6641cffe22d6c5c9ff8d12b7321.zip |
Fix compiler warning.
-rw-r--r-- | src/lj_asm_arm.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h index 196f797e..7c5f7188 100644 --- a/src/lj_asm_arm.h +++ b/src/lj_asm_arm.h | |||
@@ -1817,6 +1817,7 @@ notst: | |||
1817 | as->flagmcp = as->mcp; /* Allow elimination of the compare. */ | 1817 | as->flagmcp = as->mcp; /* Allow elimination of the compare. */ |
1818 | } | 1818 | } |
1819 | 1819 | ||
1820 | #if LJ_HASFFI | ||
1820 | /* 64 bit integer comparisons. */ | 1821 | /* 64 bit integer comparisons. */ |
1821 | static void asm_int64comp(ASMState *as, IRIns *ir) | 1822 | static void asm_int64comp(ASMState *as, IRIns *ir) |
1822 | { | 1823 | { |
@@ -1852,6 +1853,7 @@ static void asm_int64comp(ASMState *as, IRIns *ir) | |||
1852 | } | 1853 | } |
1853 | emit_n(as, ARMI_CMP^mhi, lefthi); | 1854 | emit_n(as, ARMI_CMP^mhi, lefthi); |
1854 | } | 1855 | } |
1856 | #endif | ||
1855 | 1857 | ||
1856 | /* -- Support for 64 bit ops in 32 bit mode ------------------------------- */ | 1858 | /* -- Support for 64 bit ops in 32 bit mode ------------------------------- */ |
1857 | 1859 | ||
@@ -1865,11 +1867,14 @@ static void asm_hiop(ASMState *as, IRIns *ir) | |||
1865 | if ((ir-1)->o <= IR_NE) { /* 64 bit integer or FP comparisons. ORDER IR. */ | 1867 | if ((ir-1)->o <= IR_NE) { /* 64 bit integer or FP comparisons. ORDER IR. */ |
1866 | as->curins--; /* Always skip the loword comparison. */ | 1868 | as->curins--; /* Always skip the loword comparison. */ |
1867 | #if LJ_SOFTFP | 1869 | #if LJ_SOFTFP |
1868 | if (!irt_isint(ir->t)) | 1870 | if (!irt_isint(ir->t)) { |
1869 | asm_sfpcomp(as, ir-1); | 1871 | asm_sfpcomp(as, ir-1); |
1870 | else | 1872 | return; |
1873 | } | ||
1874 | #endif | ||
1875 | #if LJ_HASFFI | ||
1876 | asm_int64comp(as, ir-1); | ||
1871 | #endif | 1877 | #endif |
1872 | asm_int64comp(as, ir-1); | ||
1873 | return; | 1878 | return; |
1874 | #if LJ_SOFTFP | 1879 | #if LJ_SOFTFP |
1875 | } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) { | 1880 | } else if ((ir-1)->o == IR_MIN || (ir-1)->o == IR_MAX) { |