clean-up
This commit is contained in:
parent
a0647cc250
commit
7919937fd3
1 changed files with 3 additions and 7 deletions
10
cpu.cpp
10
cpu.cpp
|
@ -834,18 +834,15 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
|
||||||
else if (shift <= 15) {
|
else if (shift <= 15) {
|
||||||
R <<= shift;
|
R <<= shift;
|
||||||
setPSW_c(R & 0x10000);
|
setPSW_c(R & 0x10000);
|
||||||
setPSW_v(SIGN(oldR, wm_word) != SIGN(R, wm_word));
|
|
||||||
}
|
}
|
||||||
else if (shift < 32) {
|
else if (shift < 32) {
|
||||||
setPSW_c((R << (shift - 16)) & 1);
|
setPSW_c((R << (shift - 16)) & 1);
|
||||||
R = 0;
|
R = 0;
|
||||||
setPSW_v(SIGN(oldR, wm_word) != SIGN(R, wm_word));
|
|
||||||
}
|
}
|
||||||
else if (shift == 32) {
|
else if (shift == 32) {
|
||||||
R = -sign;
|
R = -sign;
|
||||||
|
|
||||||
setPSW_c(sign);
|
setPSW_c(sign);
|
||||||
setPSW_v(SIGN(R, wm_word) != SIGN(oldR, wm_word));
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int shift_n = 64 - shift;
|
int shift_n = 64 - shift;
|
||||||
|
@ -856,10 +853,10 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
|
||||||
R >>= 1;
|
R >>= 1;
|
||||||
R |= sign_extend;
|
R |= sign_extend;
|
||||||
}
|
}
|
||||||
|
|
||||||
setPSW_v(SIGN(R, wm_word) != SIGN(oldR, wm_word));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setPSW_v(SIGN(oldR, wm_word) != SIGN(R, wm_word));
|
||||||
|
|
||||||
R &= 0xffff;
|
R &= 0xffff;
|
||||||
|
|
||||||
setPSW_n(SIGN(R, wm_word));
|
setPSW_n(SIGN(R, wm_word));
|
||||||
|
@ -872,13 +869,12 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
|
||||||
|
|
||||||
case 3: { // ASHC
|
case 3: { // ASHC
|
||||||
uint32_t R0R1 = (uint32_t(get_register(reg)) << 16) | get_register(reg | 1);
|
uint32_t R0R1 = (uint32_t(get_register(reg)) << 16) | get_register(reg | 1);
|
||||||
|
bool sign = R0R1 & 0x80000000;
|
||||||
|
|
||||||
auto g_dst = getGAM(dst_mode, dst_reg, wm_word);
|
auto g_dst = getGAM(dst_mode, dst_reg, wm_word);
|
||||||
addToMMR1(g_dst);
|
addToMMR1(g_dst);
|
||||||
uint16_t shift = g_dst.value.value() & 077;
|
uint16_t shift = g_dst.value.value() & 077;
|
||||||
|
|
||||||
bool sign = R0R1 & 0x80000000;
|
|
||||||
|
|
||||||
setPSW_v(false);
|
setPSW_v(false);
|
||||||
|
|
||||||
if (shift == 0)
|
if (shift == 0)
|
||||||
|
|
Loading…
Add table
Reference in a new issue