From eb7a6b0d265caf49fc6ec067ccdef16d86b13770 Mon Sep 17 00:00:00 2001 From: kobalicek Date: Wed, 6 Jan 2016 23:41:22 +0100 Subject: [PATCH] Fixed ASMJIT_FALL_THROUGH detection. Renamed ASMJIT_FALL_THROUGH to ASMJIT_FALLTHROUGH. --- src/asmjit/build.h | 12 +++---- src/asmjit/x86/x86assembler.cpp | 52 +++++++++++++-------------- src/asmjit/x86/x86compilercontext.cpp | 8 ++--- src/asmjit/x86/x86compilerfunc.cpp | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/asmjit/build.h b/src/asmjit/build.h index 2cac0ee..8a71fb6 100644 --- a/src/asmjit/build.h +++ b/src/asmjit/build.h @@ -716,15 +716,15 @@ #endif // [@CC_EXPECT}@] -// [@CC_FALL_THROUGH{@] -// \def ASMJIT_FALL_THROUGH +// [@CC_FALLTHROUGH{@] +// \def ASMJIT_FALLTHROUGH // The code falls through annotation (switch / case). -#if ASMJIT_CC_CLANG_GE(3, 3, 0) -# define ASMJIT_FALL_THROUGH [[clang::fallthrough]] +#if ASMJIT_CC_CLANG && __cplusplus >= 201103L +# define ASMJIT_FALLTHROUGH [[clang::fallthrough]] #else -# define ASMJIT_FALL_THROUGH (void)0 +# define ASMJIT_FALLTHROUGH (void)0 #endif -// [@CC_FALL_THROUGH}@] +// [@CC_FALLTHROUGH}@] // [@CC_UNUSED{@] // \def ASMJIT_UNUSED(x) diff --git a/src/asmjit/x86/x86assembler.cpp b/src/asmjit/x86/x86assembler.cpp index 59fd94f..a2eb021 100644 --- a/src/asmjit/x86/x86assembler.cpp +++ b/src/asmjit/x86/x86assembler.cpp @@ -660,7 +660,7 @@ static void X86Assembler_dumpRegister(StringBuilder& sb, uint32_t type, uint32_t goto _EmitNE; index -= 4; - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86RegTypeGpbHi: if (index >= 4) @@ -1060,14 +1060,14 @@ static ASMJIT_INLINE Error X86Assembler_emit(Assembler* self_, uint32_t code, co case kX86InstEncodingIdX86Op_66H: ADD_66H_P(true); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdX86Op: goto _EmitX86Op; case kX86InstEncodingIdX86Rm_B: opCode += o0->getSize() != 1; - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdX86Rm: ADD_66H_P_BY_SIZE(o0->getSize()); @@ -1857,7 +1857,7 @@ static ASMJIT_INLINE Error X86Assembler_emit(Assembler* self_, uint32_t code, co EMIT_BYTE(imLen == 1 ? 0x6A : 0x68); goto _EmitImm; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdX86Pop: if (encoded == ENC_OPS(Reg, None, None)) { @@ -2104,7 +2104,7 @@ _GroupPop_Gp: rmMem = x86OpMem(o1); goto _EmitX86M; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdX86Xadd: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -2257,7 +2257,7 @@ _EmitFpArith_Mem: opCode += 1; goto _EmitFpuOp; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdFpuR: if (encoded == ENC_OPS(Reg, None, None)) { @@ -2564,11 +2564,11 @@ _EmitMmMovD: case kX86InstEncodingIdExtRm_PQ: ADD_66H_P(o0->isRegType(kX86RegTypeXmm) || o1->isRegType(kX86RegTypeXmm)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdExtRm_Q: ADD_REX_W(o0->isRegType(kX86RegTypeGpq) || o1->isRegType(kX86RegTypeGpq) || (o1->isMem() && o1->getSize() == 8)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdExtRm: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -2780,7 +2780,7 @@ _EmitMmMovD: case kX86InstEncodingIdAvxMr_P: ADD_VEX_L(x86IsYmm(o0) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxMr: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -2798,7 +2798,7 @@ _EmitMmMovD: case kX86InstEncodingIdAvxMri_P: ADD_VEX_L(x86IsYmm(o0) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxMri: imVal = static_cast(o2)->getInt64(); @@ -2819,7 +2819,7 @@ _EmitMmMovD: case kX86InstEncodingIdAvxRm_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRm: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -2837,7 +2837,7 @@ _EmitMmMovD: case kX86InstEncodingIdAvxRmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRmi: imVal = static_cast(o2)->getInt64(); @@ -2858,7 +2858,7 @@ _EmitMmMovD: case kX86InstEncodingIdAvxRvm_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvm: if (encoded == ENC_OPS(Reg, Reg, Reg)) { @@ -2877,7 +2877,7 @@ _EmitAvxRvm: case kX86InstEncodingIdAvxRvmr_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvmr: if (!o3->isReg()) @@ -2901,7 +2901,7 @@ _EmitAvxRvm: case kX86InstEncodingIdAvxRvmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvmi: if (!o3->isImm()) @@ -2977,7 +2977,7 @@ _EmitAvxRvm: case kX86InstEncodingIdAvxRmMr_P: ADD_VEX_L(x86IsYmm(o0) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRmMr: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -3006,7 +3006,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdAvxRvmRmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvmRmi: if (encoded == ENC_OPS(Reg, Reg, Reg)) { @@ -3072,7 +3072,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdAvxRvmMvr_P: ADD_VEX_L(x86IsYmm(o0) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvmMvr: if (encoded == ENC_OPS(Reg, Reg, Reg)) { @@ -3100,7 +3100,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdAvxRvmVmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvmVmi: if (encoded == ENC_OPS(Reg, Reg, Reg)) { @@ -3152,7 +3152,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdAvxVmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxVmi: imVal = static_cast(o3)->getInt64(); @@ -3173,7 +3173,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdAvxRvrmRvmr_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdAvxRvrmRvmr: if (encoded == ENC_OPS(Reg, Reg, Reg) && o3->isReg()) { @@ -3262,7 +3262,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdFma4_P: // It's fine to just check the first operand, second is just for sanity. ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdFma4: if (encoded == ENC_OPS(Reg, Reg, Reg) && o3->isReg()) { @@ -3303,7 +3303,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdXopRm_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(o1)); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdXopRm: if (encoded == ENC_OPS(Reg, Reg, None)) { @@ -3387,7 +3387,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdXopRvmr_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdXopRvmr: if (!o3->isReg()) @@ -3411,7 +3411,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdXopRvmi_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdXopRvmi: if (!o3->isImm()) @@ -3435,7 +3435,7 @@ _AvxRmMr_AfterRegRegCheck: case kX86InstEncodingIdXopRvrmRvmr_P: ADD_VEX_L(x86IsYmm(static_cast(o0)) | x86IsYmm(static_cast(o1))); - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstEncodingIdXopRvrmRvmr: if (encoded == ENC_OPS(Reg, Reg, Reg) && o3->isReg()) { diff --git a/src/asmjit/x86/x86compilercontext.cpp b/src/asmjit/x86/x86compilercontext.cpp index c9a91a4..039429c 100644 --- a/src/asmjit/x86/x86compilercontext.cpp +++ b/src/asmjit/x86/x86compilercontext.cpp @@ -495,7 +495,7 @@ static ASMJIT_INLINE const X86SpecialInst* X86SpecialInst_get(uint32_t instId, c return NULL; if (opCount == 3 && !(opList[0].isVar() && opList[1].isVar() && opList[2].isVarOrMem())) return NULL; - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86InstIdMul: return x86SpecialInstMul; @@ -928,7 +928,7 @@ void X86Context::emitConvertVarToVar(uint32_t dstType, uint32_t dstIndex, uint32 compiler->emit(kX86InstIdCvtpd2ps, x86::xmm(dstIndex), x86::xmm(srcIndex)); return; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86VarTypeXmmSs: if (srcType == kX86VarTypeXmmSd || srcType == kX86VarTypeXmmPd || srcType == kX86VarTypeYmmPd) { @@ -947,7 +947,7 @@ void X86Context::emitConvertVarToVar(uint32_t dstType, uint32_t dstIndex, uint32 compiler->emit(kX86InstIdCvtps2pd, x86::xmm(dstIndex), x86::xmm(srcIndex)); return; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kX86VarTypeXmmSd: if (srcType == kX86VarTypeXmmSs || srcType == kX86VarTypeXmmPs || srcType == kX86VarTypeYmmPs) { @@ -5514,7 +5514,7 @@ _NextGroup: ASMJIT_PROPAGATE_ERROR(cAlloc.run(static_cast(node_))); break; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; case kHLNodeTypeHint: case kHLNodeTypeRet: { diff --git a/src/asmjit/x86/x86compilerfunc.cpp b/src/asmjit/x86/x86compilerfunc.cpp index c951976..39754b5 100644 --- a/src/asmjit/x86/x86compilerfunc.cpp +++ b/src/asmjit/x86/x86compilerfunc.cpp @@ -265,7 +265,7 @@ static Error X86FuncDecl_initFunc(X86FuncDecl* self, uint32_t arch, self->_rets[1]._varType = static_cast(ret - 2); self->_rets[1]._regIndex = kX86RegIndexDx; } - ASMJIT_FALL_THROUGH; + ASMJIT_FALLTHROUGH; #endif // ASMJIT_BUILD_X86 case kVarTypeInt8: