mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

decoders: Cast to correctly-sized type before shifting

Browse source 
Fixes decoding for 64-bit instructions

Does not help/apply to any currently supported ARM versions (since
all are 32-bit length or below), it's for future-proofing should
such an arch be supported.
This commit is contained in:
VelocityRa 2018-09-22 21:00:50 +03:00 committed by MerryMage
parent 238f2f2cd0
commit c30b8dbe99
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/frontend/decoder/decoder_detail.h
View file

@ -36,16 +36,17 @@ private:
* A '1' in a bitstring indicates that a one must be present at that bit position. * A '1' in a bitstring indicates that a one must be present at that bit position.
*/ */
static auto GetMaskAndExpect(const char* const bitstring) { static auto GetMaskAndExpect(const char* const bitstring) {
const auto one = static_cast<opcode_type>(1);
opcode_type mask = 0, expect = 0; opcode_type mask = 0, expect = 0;
for (size_t i = 0; i < opcode_bitsize; i++) { for (size_t i = 0; i < opcode_bitsize; i++) {
const size_t bit_position = opcode_bitsize - i - 1; const size_t bit_position = opcode_bitsize - i - 1;
switch (bitstring[i]) { switch (bitstring[i]) {
case '0': case '0':
mask |= 1 << bit_position; mask |= one << bit_position;
break; break;
case '1': case '1':
expect |= 1 << bit_position; expect |= one << bit_position;
mask |= 1 << bit_position; mask |= one << bit_position;
break; break;
default: default:
// Ignore // Ignore
@ -62,6 +63,7 @@ private:
*/ */
template<size_t N> template<size_t N>
static auto GetArgInfo(const char* const bitstring) { static auto GetArgInfo(const char* const bitstring) {
const auto one = static_cast<opcode_type>(1);
std::array<opcode_type, N> masks = {}; std::array<opcode_type, N> masks = {};
std::array<size_t, N> shifts = {}; std::array<size_t, N> shifts = {};
size_t arg_index = 0; size_t arg_index = 0;
@ -84,7 +86,7 @@ private:
} }
ASSERT(arg_index < N); ASSERT(arg_index < N);
masks[arg_index] |= 1 << bit_position; masks[arg_index] |= one << bit_position;
shifts[arg_index] = bit_position; shifts[arg_index] = bit_position;
} }
} }