From: Mark Cave-Ayland Date: Wed, 2 Jan 2019 09:14:16 +0000 (+0000) Subject: target/ppc: switch EXTRACT_HELPER macros over to use sextract32/extract32 X-Git-Tag: v4.0.0-rc0~182^2~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c23c2a538fb8bd78111eb56eb61b001e3b1490f;p=thirdparty%2Fqemu.git target/ppc: switch EXTRACT_HELPER macros over to use sextract32/extract32 These ensure that we consistently handle signed and unsigned extensions correctly when decoding immediates from instruction opcodes. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson Signed-off-by: David Gibson --- diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 8b358635492..5d460247e2a 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -52,20 +52,20 @@ FUNC_MASK(mask_u64, uint64_t, 64, UINT64_MAX); #define EXTRACT_HELPER(name, shift, nb) \ static inline uint32_t name(uint32_t opcode) \ { \ - return (opcode >> (shift)) & ((1 << (nb)) - 1); \ + return extract32(opcode, shift, nb); \ } #define EXTRACT_SHELPER(name, shift, nb) \ static inline int32_t name(uint32_t opcode) \ { \ - return (int16_t)((opcode >> (shift)) & ((1 << (nb)) - 1)); \ + return sextract32(opcode, shift, nb); \ } #define EXTRACT_HELPER_SPLIT(name, shift1, nb1, shift2, nb2) \ static inline uint32_t name(uint32_t opcode) \ { \ - return (((opcode >> (shift1)) & ((1 << (nb1)) - 1)) << nb2) | \ - ((opcode >> (shift2)) & ((1 << (nb2)) - 1)); \ + return extract32(opcode, shift1, nb1) << nb2 | \ + extract32(opcode, shift2, nb2); \ } #define EXTRACT_HELPER_SPLIT_3(name, \