From 6e9e6ffab7401b4bcc9d94cd72aa9f8853b8d115 Mon Sep 17 00:00:00 2001 From: Ruihan-Yin Date: Tue, 19 Nov 2024 16:08:06 -0800 Subject: [PATCH] resolve merge errors --- src/coreclr/jit/emitxarch.cpp | 10 +++++----- src/coreclr/jit/instr.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/coreclr/jit/emitxarch.cpp b/src/coreclr/jit/emitxarch.cpp index 9734339edd1e6c..718e6406d97568 100644 --- a/src/coreclr/jit/emitxarch.cpp +++ b/src/coreclr/jit/emitxarch.cpp @@ -2177,11 +2177,7 @@ emitter::code_t emitter::AddRexWPrefix(const instrDesc* id, code_t code) } } #ifdef TARGET_AMD64 - else if (hasRex2Prefix(code)) - { - return emitter::code_t(code | 0x000800000000ULL); - } - else if (TakesApxExtendedEvexPrefix(code)) + else if (TakesApxExtendedEvexPrefix(id)) { // If the instruction is not VEX/EVEX encodable, and has EVEX prefix, // then it is legacy promoted EVEX. @@ -2189,6 +2185,10 @@ emitter::code_t emitter::AddRexWPrefix(const instrDesc* id, code_t code) assert(IsApxExtendedEvexInstruction(ins)); return emitter::code_t(code | 0x0000800000000000ULL); } + else if (hasRex2Prefix(code)) + { + return emitter::code_t(code | 0x000800000000ULL); + } return emitter::code_t(code | 0x4800000000ULL); #else assert(!"UNREACHED"); diff --git a/src/coreclr/jit/instr.h b/src/coreclr/jit/instr.h index 7425bad3685f24..7855649fbf8b70 100644 --- a/src/coreclr/jit/instr.h +++ b/src/coreclr/jit/instr.h @@ -222,7 +222,7 @@ enum insFlags : uint64_t Encoding_REX2 = 1ULL << 44, // APX: NDD form: - INS_Flags_Has_NDD = 1ULL << 44, + INS_Flags_Has_NDD = 1ULL << 45, // TODO-Cleanup: Remove this flag and its usage from TARGET_XARCH INS_FLAGS_DONT_CARE = 0x00ULL,