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

ASH now bug-free?

Browse source
This commit is contained in:
folkert van heusden 2022-06-08 22:09:11 +02:00
parent 782095555d
commit 5770bdc263
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cpu.cpp
View file

@ -636,18 +636,26 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
case 2: { // ASH case 2: { // ASH
uint32_t R = getRegister(reg), oldR = R; uint32_t R = getRegister(reg), oldR = R;
uint16_t shift = getGAM(dst_mode, dst_reg, false, false); uint16_t shift = getGAM(dst_mode, dst_reg, false, false) & 077;
bool sign = SIGN(R, false);
// fprintf(stderr, "R: %06o, shift: %d, sign: %d, ", R, shift, sign);
// extend sign-bit // extend sign-bit
if (R & 0x8000) if (sign)
R |= 0xffff0000; R |= 0xffff0000;
if (shift == 0) if (shift == 0) {
setPSW_c(false); setPSW_c(false);
}
else if (shift < 32) { else if (shift < 32) {
R <<= shift - 1; R <<= shift;
setPSW_c(R & 0x8000); setPSW_c(R & 0x10000);
R <<= 1; }
else if (shift == 32) {
R = -sign;
setPSW_c(sign);
} }
else { else {
int shift_n = (64 - shift) - 1; int shift_n = (64 - shift) - 1;
@ -659,12 +667,20 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
R >>= 1; R >>= 1;
} }
setPSW_n(R < 0); R &= 0xffff;
setPSW_n(SIGN(R, false));
setPSW_z(R == 0); setPSW_z(R == 0);
setPSW_v(SIGN(R, false) != SIGN(oldR, false)); setPSW_v(SIGN(R, false) != SIGN(oldR, false));
setRegister(reg, R); setRegister(reg, R);
// uint16_t psw = getPSW();
// std::string psw_str = format("%d%d|%d|%d|%c%c%c%c%c", psw >> 14, (psw >> 12) & 3, (psw >> 11) & 1, (psw >> 5) & 7,
// psw & 16?'t':'-', psw & 8?'n':'-', psw & 4?'z':'-', psw & 2 ? 'v':'-', psw & 1 ? 'c':'-');
// // printf("flags: %06o\r\n", getPSW());
// fprintf(stderr, "%s > %06o, R OUT: %06o\r\n", psw_str.c_str(), psw, R);
return true; return true;
} }