6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 23:32:28 +00:00
Code Issues Projects Releases Wiki Activity

Move ownership of mask test.

Browse Source
This commit is contained in:
Thomas Harte 2023-10-13 15:34:06 -04:00
parent 1a0f848b21
commit 6ec291d96f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
InstructionSets/x86/Implementation/PerformImplementation.hpp
View File

@ -934,11 +934,6 @@ inline void rcl(IntT &destination, uint8_t count, Status &status) {
SIZE = 32: tempCOUNT ← COUNT AND 1FH; SIZE = 32: tempCOUNT ← COUNT AND 1FH;
ESAC; ESAC;
*/ */
if constexpr (model != Model::i8086) {
count &= 0x1f;
}
auto temp_count = count % (Numeric::bit_size<IntT>() + 1);
/* /*
(* RCL instruction operation *) (* RCL instruction operation *)
WHILE (tempCOUNT ≠ 0) WHILE (tempCOUNT ≠ 0)
@ -959,6 +954,7 @@ inline void rcl(IntT &destination, uint8_t count, Status &status) {
The OF flag is affected only for single- bit rotates (see “Description” above); The OF flag is affected only for single- bit rotates (see “Description” above);
it is undefined for multi-bit rotates. The SF, ZF, AF, and PF flags are not affected. it is undefined for multi-bit rotates. The SF, ZF, AF, and PF flags are not affected.
*/ */
auto temp_count = count % (Numeric::bit_size<IntT>() + 1);
auto carry = status.carry_bit<IntT>(); auto carry = status.carry_bit<IntT>();
while(temp_count--) { while(temp_count--) {
const IntT temp_carry = (destination >> (Numeric::bit_size<IntT>() - 1)) & 1; const IntT temp_carry = (destination >> (Numeric::bit_size<IntT>() - 1)) & 1;
@ -1025,10 +1021,11 @@ template <
}; };
const auto shift_count = [&]() -> uint8_t { const auto shift_count = [&]() -> uint8_t {
static constexpr uint8_t mask = (model != Model::i8086) ? 0x1f : 0xff;
switch(instruction.source().template source<false>()) { switch(instruction.source().template source<false>()) {
case Source::None: return 1; case Source::None: return 1;
case Source::Immediate: return uint8_t(instruction.operand()); case Source::Immediate: return uint8_t(instruction.operand()) & mask;
default: return registers.cl(); default: return registers.cl() & mask;
} }
}; };