folkert/KEK
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASH, MTPS and MFPS fixes

Browse source
This commit is contained in:
folkert van heusden 2022-03-20 17:50:58 +01:00
parent 6f7f65c915
commit 35a797e8dd
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cpu.cpp
View file

@ -481,10 +481,13 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
R <<= 1; R <<= 1;
} }
else if (shift < 0) { else if (shift < 0) {
R >>= -(shift - 1); R >>= -(shift + 1);
setPSW_c(R & 1); setPSW_c(R & 1);
R >>= 1; R >>= 1;
} }
else {
setPSW_c(false);
}
setPSW_n(R < 0); setPSW_n(R < 0);
setPSW_z(R == 0); setPSW_z(R == 0);
@ -839,16 +842,20 @@ bool cpu::single_operand_instructions(const uint16_t instr)
break; break;
case 0b000110100: // MTPS (put something in PSW) case 0b000110100: // MTPS (put something in PSW)
psw = getGAM(dst_mode, dst_reg, word_mode, false); psw &= 0xff00; // only alter lower 8 bits
psw |= getGAM(dst_mode, dst_reg, word_mode, false) & 0xef; // can't change bit 4
break; break;
case 0b000110111: // MFPS (get PSW to something) / SXT case 0b000110111: // MFPS (get PSW to something) / SXT
if (word_mode) { // MFPS if (word_mode) { // MFPS
putGAM(dst_mode, dst_reg, word_mode, psw, false); uint16_t temp = psw & 0xff;
if (dst_mode == 0 && sign(temp))
temp |= 0xff00;
putGAM(dst_mode, dst_reg, word_mode, temp, false);
} }
else { // SXT else { // SXT
a = getGAMAddress(dst_mode, dst_reg, word_mode, false); a = getGAMAddress(dst_mode, dst_reg, word_mode, false);
v = b -> read(a, word_mode);
vl = getPSW_n() ? -1 : 0; vl = getPSW_n() ? -1 : 0;