aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2019-04-29 18:02:50 +0200
committerMike Pall <mike>2019-04-29 18:02:50 +0200
commit9bd5a722bee2ee2c5b159a89937778b81be49915 (patch)
tree2f7a7ae003e38c10a85aee0fc9664ffdc4ba084f /src
parent5802ab56b6435e8ea39616d04751b32b9996bfb7 (diff)
downloadluajit-9bd5a722bee2ee2c5b159a89937778b81be49915.tar.gz
luajit-9bd5a722bee2ee2c5b159a89937778b81be49915.tar.bz2
luajit-9bd5a722bee2ee2c5b159a89937778b81be49915.zip
ARM: Fix GCC 7 -Wimplicit-fallthrough warnings.
Diffstat (limited to 'src')
-rw-r--r--src/lj_asm.c2
-rw-r--r--src/lj_asm_arm.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c
index dd7186f6..8ce7bbd6 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -1719,8 +1719,8 @@ static void asm_setup_regsp(ASMState *as)
1719#if LJ_SOFTFP 1719#if LJ_SOFTFP
1720 case IR_MIN: case IR_MAX: 1720 case IR_MIN: case IR_MAX:
1721 if ((ir+1)->o != IR_HIOP) break; 1721 if ((ir+1)->o != IR_HIOP) break;
1722 /* fallthrough */
1723#endif 1722#endif
1723 /* fallthrough */
1724 /* C calls evict all scratch regs and return results in RID_RET. */ 1724 /* C calls evict all scratch regs and return results in RID_RET. */
1725 case IR_SNEW: case IR_XSNEW: case IR_NEWREF: 1725 case IR_SNEW: case IR_XSNEW: case IR_NEWREF:
1726 if (REGARG_NUMGPR < 3 && as->evenspill < 3) 1726 if (REGARG_NUMGPR < 3 && as->evenspill < 3)
diff --git a/src/lj_asm_arm.h b/src/lj_asm_arm.h
index 8e0ebd7a..ccd20545 100644
--- a/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@ -1046,7 +1046,7 @@ static ARMIns asm_fxloadins(IRIns *ir)
1046 case IRT_I16: return ARMI_LDRSH; 1046 case IRT_I16: return ARMI_LDRSH;
1047 case IRT_U16: return ARMI_LDRH; 1047 case IRT_U16: return ARMI_LDRH;
1048 case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VLDR_D; 1048 case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VLDR_D;
1049 case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VLDR_S; 1049 case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VLDR_S; /* fallthrough */
1050 default: return ARMI_LDR; 1050 default: return ARMI_LDR;
1051 } 1051 }
1052} 1052}
@@ -1057,7 +1057,7 @@ static ARMIns asm_fxstoreins(IRIns *ir)
1057 case IRT_I8: case IRT_U8: return ARMI_STRB; 1057 case IRT_I8: case IRT_U8: return ARMI_STRB;
1058 case IRT_I16: case IRT_U16: return ARMI_STRH; 1058 case IRT_I16: case IRT_U16: return ARMI_STRH;
1059 case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VSTR_D; 1059 case IRT_NUM: lua_assert(!LJ_SOFTFP); return ARMI_VSTR_D;
1060 case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VSTR_S; 1060 case IRT_FLOAT: if (!LJ_SOFTFP) return ARMI_VSTR_S; /* fallthrough */
1061 default: return ARMI_STR; 1061 default: return ARMI_STR;
1062 } 1062 }
1063} 1063}