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

SP is not selectable via bit 11 of PSW

Browse source 
R0...R5 are not selectable via run-mode
This commit is contained in:
folkert van heusden 2023-03-24 19:59:52 +01:00
parent 9ed0c622d1
commit ba5916f750
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
3 changed files with 41 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus.cpp
View file

@ -121,12 +121,12 @@ uint16_t bus::read(const uint16_t a, const bool word_mode, const bool use_prev,
if (a >= 0160000) { if (a >= 0160000) {
//// REGISTERS //// //// REGISTERS ////
if (a >= ADDR_KERNEL_R && a <= ADDR_KERNEL_R + 5) { // kernel R0-R5 if (a >= ADDR_KERNEL_R && a <= ADDR_KERNEL_R + 5) { // kernel R0-R5
uint16_t temp = c->getRegister(a - ADDR_KERNEL_R, 0, false) & (word_mode ? 0xff : 0xffff); uint16_t temp = c->getRegister(a - ADDR_KERNEL_R) & (word_mode ? 0xff : 0xffff);
if (!peek_only) DOLOG(debug, false, "READ-I/O kernel R%d: %06o", a - ADDR_KERNEL_R, temp); if (!peek_only) DOLOG(debug, false, "READ-I/O kernel R%d: %06o", a - ADDR_KERNEL_R, temp);
return temp; return temp;
} }
if (a >= ADDR_USER_R && a <= ADDR_USER_R + 5) { // user R0-R5 if (a >= ADDR_USER_R && a <= ADDR_USER_R + 5) { // user R0-R5
uint16_t temp = c->getRegister(a - ADDR_USER_R, 3, false) & (word_mode ? 0xff : 0xffff); uint16_t temp = c->getRegister(a - ADDR_USER_R) & (word_mode ? 0xff : 0xffff);
if (!peek_only) DOLOG(debug, false, "READ-I/O user R%d: %06o", a - ADDR_USER_R, temp); if (!peek_only) DOLOG(debug, false, "READ-I/O user R%d: %06o", a - ADDR_USER_R, temp);
return temp; return temp;
} }
@ -768,13 +768,13 @@ void bus::write(const uint16_t a, const bool word_mode, uint16_t value, const bo
if (a >= ADDR_KERNEL_R && a <= ADDR_KERNEL_R + 5) { // kernel R0-R5 if (a >= ADDR_KERNEL_R && a <= ADDR_KERNEL_R + 5) { // kernel R0-R5
int reg = a - ADDR_KERNEL_R; int reg = a - ADDR_KERNEL_R;
DOLOG(debug, true, "WRITE-I/O kernel R%d: %06o", reg, value); DOLOG(debug, true, "WRITE-I/O kernel R%d: %06o", reg, value);
c->setRegister(reg, false, false, value); c->setRegister(reg, value);
return; return;
} }
if (a >= ADDR_USER_R && a <= ADDR_USER_R + 5) { // user R0-R5 if (a >= ADDR_USER_R && a <= ADDR_USER_R + 5) { // user R0-R5
int reg = a - ADDR_USER_R; int reg = a - ADDR_USER_R;
DOLOG(debug, true, "WRITE-I/O user R%d: %06o", reg, value); DOLOG(debug, true, "WRITE-I/O user R%d: %06o", reg, value);
c->setRegister(reg, true, false, value); c->setRegister(reg, value);
return; return;
} }
if (a == ADDR_KERNEL_SP) { // kernel SP if (a == ADDR_KERNEL_SP) { // kernel SP

78
cpu.cpp
View file

@ -93,10 +93,13 @@ void cpu::reset()
init_interrupt_queue(); init_interrupt_queue();
} }
uint16_t cpu::getRegister(const int nr, const int mode, const bool sp_prev_mode) const uint16_t cpu::getRegister(const int nr, const bool sp_prev_mode) const
{ {
if (nr < 6) if (nr < 6) {
return regs0_5[mode][nr]; int set = getBitPSW(11);
return regs0_5[set][nr];
}
if (nr == 6) { if (nr == 6) {
if (sp_prev_mode) if (sp_prev_mode)
@ -108,21 +111,13 @@ uint16_t cpu::getRegister(const int nr, const int mode, const bool sp_prev_mode)
return pc; return pc;
} }
uint16_t cpu::getRegister(const int nr) const void cpu::setRegister(const int nr, const uint16_t value, const bool prev_mode)
{ {
if (nr < 6) if (nr < 6) {
return regs0_5[getBitPSW(11)][nr]; int set = getBitPSW(11);
if (nr == 6)
return sp[getPSW() >> 14];
return pc;
}
void cpu::setRegister(const int nr, const bool set, const bool prev_mode, const uint16_t value)
{
if (nr < 6)
regs0_5[set][nr] = value; regs0_5[set][nr] = value;
}
else if (nr == 6) { else if (nr == 6) {
if (prev_mode) if (prev_mode)
sp[(getPSW() >> 12) & 3] = value; sp[(getPSW() >> 12) & 3] = value;
@ -318,10 +313,9 @@ void cpu::addToMMR1(const uint8_t mode, const uint8_t reg, const bool word_mode)
// GAM = general addressing modes // GAM = general addressing modes
gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode, const bool prev_mode, const bool read_value) gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode, const bool prev_mode, const bool read_value)
{ {
gam_rc_t g { false, false, false, i_space, { }, 0 }; gam_rc_t g { false, false, i_space, { }, 0 };
g.word_mode = word_mode; // word/byte g.word_mode = word_mode; // word/byte
g.prev_mode = prev_mode; // run mode g.prev_mode = prev_mode; // run mode
g.set = getBitPSW(11);
d_i_space_t isR7_space = reg == 7 ? i_space : (b->get_use_data_space(psw >> 14) ? d_space : i_space); d_i_space_t isR7_space = reg == 7 ? i_space : (b->get_use_data_space(psw >> 14) ? d_space : i_space);
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ always d_space here? TODO // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ always d_space here? TODO
@ -333,22 +327,22 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
switch(mode) { switch(mode) {
case 0: // Rn case 0: // Rn
g.reg = reg; g.reg = reg;
g.value = getRegister(reg, g.set, prev_mode) & (word_mode ? 0xff : 0xffff); g.value = getRegister(reg, prev_mode) & (word_mode ? 0xff : 0xffff);
break; break;
case 1: // (Rn) case 1: // (Rn)
g.addr = getRegister(reg, g.set, prev_mode); g.addr = getRegister(reg, prev_mode);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space); g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space);
break; break;
case 2: // (Rn)+ / #n case 2: // (Rn)+ / #n
g.addr = getRegister(reg, g.set, prev_mode); g.addr = getRegister(reg, prev_mode);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space); g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space);
addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? 2 : 1); addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? 2 : 1);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, word_mode);
break; break;
case 3: // @(Rn)+ / @#a case 3: // @(Rn)+ / @#a
g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, isR7_space); g.addr = b->read(getRegister(reg, prev_mode), false, prev_mode, isR7_space);
addRegister(reg, prev_mode, 2); addRegister(reg, prev_mode, 2);
if (read_value) { if (read_value) {
g.space = d_space; g.space = d_space;
@ -358,14 +352,14 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
break; break;
case 4: // -(Rn) case 4: // -(Rn)
addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? -2 : -1); addRegister(reg, prev_mode, !word_mode || reg == 7 || reg == 6 ? -2 : -1);
g.addr = getRegister(reg, g.set, prev_mode); g.addr = getRegister(reg, prev_mode);
if (read_value) if (read_value)
g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space); g.value = b->read(g.addr.value(), word_mode, prev_mode, false, isR7_space);
addToMMR1(mode, reg, word_mode); addToMMR1(mode, reg, word_mode);
break; break;
case 5: // @-(Rn) case 5: // @-(Rn)
addRegister(reg, prev_mode, -2); addRegister(reg, prev_mode, -2);
g.addr = b->read(getRegister(reg, g.set, prev_mode), false, prev_mode, isR7_space); g.addr = b->read(getRegister(reg, prev_mode), false, prev_mode, isR7_space);
if (read_value) { if (read_value) {
g.space = d_space; g.space = d_space;
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space);
@ -375,7 +369,7 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
case 6: // x(Rn) / a case 6: // x(Rn) / a
next_word = b->read(getPC(), false, prev_mode, i_space); next_word = b->read(getPC(), false, prev_mode, i_space);
addRegister(7, prev_mode, + 2); addRegister(7, prev_mode, + 2);
g.addr = getRegister(reg, g.set, prev_mode) + next_word; g.addr = getRegister(reg, prev_mode) + next_word;
if (read_value) { if (read_value) {
g.space = d_space; g.space = d_space;
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space);
@ -384,7 +378,7 @@ gam_rc_t cpu::getGAM(const uint8_t mode, const uint8_t reg, const bool word_mode
case 7: // @x(Rn) / @a case 7: // @x(Rn) / @a
next_word = b->read(getPC(), false, prev_mode, i_space); next_word = b->read(getPC(), false, prev_mode, i_space);
addRegister(7, prev_mode, + 2); addRegister(7, prev_mode, + 2);
g.addr = b->read(getRegister(reg, g.set, prev_mode) + next_word, false, prev_mode, d_space); g.addr = b->read(getRegister(reg, prev_mode) + next_word, false, prev_mode, d_space);
if (read_value) { if (read_value) {
g.space = d_space; g.space = d_space;
g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space); g.value = b->read(g.addr.value(), word_mode, prev_mode, g.space);
@ -403,7 +397,7 @@ bool cpu::putGAM(const gam_rc_t & g, const uint16_t value)
return g.addr.value() != ADDR_PSW; return g.addr.value() != ADDR_PSW;
} }
setRegister(g.reg, g.set, g.prev_mode, value); setRegister(g.reg, value, g.prev_mode);
return true; return true;
} }
@ -433,7 +427,7 @@ bool cpu::double_operand_instructions(const uint16_t instr)
const uint8_t src_mode = (src >> 3) & 7; const uint8_t src_mode = (src >> 3) & 7;
const uint8_t src_reg = src & 7; const uint8_t src_reg = src & 7;
gam_rc_t g_src { false, false, false, i_space, { }, 0 }; gam_rc_t g_src { false, false, i_space, { }, 0 };
if (operation != 0b110) if (operation != 0b110)
g_src = getGAM(src_mode, src_reg, word_mode, false); g_src = getGAM(src_mode, src_reg, word_mode, false);
@ -447,7 +441,7 @@ bool cpu::double_operand_instructions(const uint16_t instr)
switch(operation) { switch(operation) {
case 0b001: { // MOV/MOVB Move Word/Byte case 0b001: { // MOV/MOVB Move Word/Byte
if (word_mode && dst_mode == 0) if (word_mode && dst_mode == 0)
setRegister(dst_reg, false, int8_t(g_src.value.value())); // int8_t: sign extension setRegister(dst_reg, int8_t(g_src.value.value())); // int8_t: sign extension
else { else {
auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false, false); auto g_dst = getGAM(dst_mode, dst_reg, word_mode, false, false);
@ -844,7 +838,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setPSW_z(IS_0(v, word_mode)); setPSW_z(IS_0(v, word_mode));
setPSW_v(word_mode ? (v & 0xff) == 0x80 : v == 0x8000); setPSW_v(word_mode ? (v & 0xff) == 0x80 : v == 0x8000);
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
int32_t vl = (a.value.value() + 1) & (word_mode ? 0xff : 0xffff); int32_t vl = (a.value.value() + 1) & (word_mode ? 0xff : 0xffff);
@ -876,7 +870,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setPSW_z(IS_0(v, word_mode)); setPSW_z(IS_0(v, word_mode));
setPSW_v(word_mode ? (v & 0xff) == 0x7f : v == 0x7fff); setPSW_v(word_mode ? (v & 0xff) == 0x7f : v == 0x7fff);
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
auto a = getGAM(dst_mode, dst_reg, word_mode, false); auto a = getGAM(dst_mode, dst_reg, word_mode, false);
@ -910,7 +904,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setPSW_v(word_mode ? (v & 0xff) == 0x80 : v == 0x8000); setPSW_v(word_mode ? (v & 0xff) == 0x80 : v == 0x8000);
setPSW_c(v); setPSW_c(v);
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
auto a = getGAM(dst_mode, dst_reg, word_mode, false); auto a = getGAM(dst_mode, dst_reg, word_mode, false);
@ -946,7 +940,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setPSW_v((word_mode ? (vo & 0xff) == 0x7f : vo == 0x7fff) && org_c); setPSW_v((word_mode ? (vo & 0xff) == 0x7f : vo == 0x7fff) && org_c);
setPSW_c((word_mode ? (vo & 0xff) == 0xff : vo == 0xffff) && org_c); setPSW_c((word_mode ? (vo & 0xff) == 0xff : vo == 0xffff) && org_c);
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
auto a = getGAM(dst_mode, dst_reg, word_mode, false); auto a = getGAM(dst_mode, dst_reg, word_mode, false);
@ -988,7 +982,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
else else
setPSW_c(false); setPSW_c(false);
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
auto a = getGAM(dst_mode, dst_reg, word_mode, false); auto a = getGAM(dst_mode, dst_reg, word_mode, false);
@ -1038,7 +1032,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
temp = (v >> 1) | (getPSW_c() << 15); temp = (v >> 1) | (getPSW_c() << 15);
} }
setRegister(dst_reg, false, temp); setRegister(dst_reg, temp);
setPSW_c(new_carry); setPSW_c(new_carry);
setPSW_n(SIGN(temp, word_mode)); setPSW_n(SIGN(temp, word_mode));
@ -1085,7 +1079,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
temp = (v << 1) | getPSW_c(); temp = (v << 1) | getPSW_c();
} }
setRegister(dst_reg, false, temp); setRegister(dst_reg, temp);
setPSW_c(new_carry); setPSW_c(new_carry);
setPSW_n(SIGN(temp, word_mode)); setPSW_n(SIGN(temp, word_mode));
@ -1141,7 +1135,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
v |= hb << 15; v |= hb << 15;
} }
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
setPSW_n(SIGN(v, word_mode)); setPSW_n(SIGN(v, word_mode));
setPSW_z(IS_0(v, word_mode)); setPSW_z(IS_0(v, word_mode));
@ -1192,7 +1186,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setPSW_c(SIGN(vl, word_mode)); setPSW_c(SIGN(vl, word_mode));
setPSW_v(getPSW_n() ^ getPSW_c()); setPSW_v(getPSW_n() ^ getPSW_c());
setRegister(dst_reg, false, v); setRegister(dst_reg, v);
} }
else { else {
@ -1221,7 +1215,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
uint16_t v = 0xffff; uint16_t v = 0xffff;
if (dst_mode == 0) if (dst_mode == 0)
v = getRegister(dst_reg, getBitPSW(11), true); v = getRegister(dst_reg, true);
else { else {
// calculate address in current address space // calculate address in current address space
auto a = getGAMAddress(dst_mode, dst_reg, false); auto a = getGAMAddress(dst_mode, dst_reg, false);
@ -1264,7 +1258,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
bool set_flags = true; bool set_flags = true;
if (dst_mode == 0) if (dst_mode == 0)
setRegister(dst_reg, true, v); setRegister(dst_reg, v, true);
else { else {
auto a = getGAMAddress(dst_mode, dst_reg, false); auto a = getGAMAddress(dst_mode, dst_reg, false);
@ -1571,7 +1565,7 @@ bool cpu::misc_operations(const uint16_t instr)
pushStack(getRegister(link_reg)); pushStack(getRegister(link_reg));
// MOVE PC,link // MOVE PC,link
setRegister(link_reg, false, getPC()); setRegister(link_reg, getPC());
// JMP dst // JMP dst
setPC(dst_value); setPC(dst_value);
@ -1590,7 +1584,7 @@ bool cpu::misc_operations(const uint16_t instr)
setPC(getRegister(link_reg)); setPC(getRegister(link_reg));
// POP link // POP link
setRegister(link_reg, false, v); setRegister(link_reg, v);
return true; return true;
} }
@ -1647,8 +1641,6 @@ void cpu::trap(uint16_t vector, const int new_ipl, const bool is_interrupt)
new_psw |= (before_psw >> 2) & 030000; // apply new 'previous mode' new_psw |= (before_psw >> 2) & 030000; // apply new 'previous mode'
setPSW(new_psw, false); setPSW(new_psw, false);
// DOLOG(info, true, "R6: %06o, before PSW: %06o, new PSW: %06o", getRegister(6), before_psw, new_psw);
//
if (processing_trap_depth >= 2 && kernel_mode) if (processing_trap_depth >= 2 && kernel_mode)
setRegister(6, 04); setRegister(6, 04);

8
cpu.h
View file

@ -15,7 +15,6 @@
typedef struct { typedef struct {
bool word_mode; bool word_mode;
bool prev_mode; bool prev_mode;
bool set;
d_i_space_t space; d_i_space_t space;
union { union {
@ -132,17 +131,14 @@ public:
uint16_t getStackPointer(const int which) const { assert(which >= 0 && which < 4); return sp[which]; } uint16_t getStackPointer(const int which) const { assert(which >= 0 && which < 4); return sp[which]; }
uint16_t getPC() const { return pc; } uint16_t getPC() const { return pc; }
void setRegister(const int nr, const bool reg_set, const bool prev_mode, const uint16_t value); void setRegister(const int nr, const uint16_t value, const bool prev_mode = false);
void setRegister(const int nr, const bool prev_mode, const uint16_t v) { setRegister(nr, (getPSW() >> 11) & 1, prev_mode, v); }
void setRegister(const int nr, const uint16_t v) { setRegister(nr, (getPSW() >> 11) & 1, false, v); }
void setRegisterLowByte(const int nr, const bool prev_mode, const uint16_t value); void setRegisterLowByte(const int nr, const bool prev_mode, const uint16_t value);
void setStackPointer(const int which, const uint16_t value) { assert(which >= 0 && which < 4); sp[which] = value; } void setStackPointer(const int which, const uint16_t value) { assert(which >= 0 && which < 4); sp[which] = value; }
void setPC(const uint16_t value) { pc = value; } void setPC(const uint16_t value) { pc = value; }
uint16_t getRegister(const int nr, const int mode, const bool sp_prev_mode) const; uint16_t getRegister(const int nr, const bool sp_prev_mode = false) const;
uint16_t getRegister(const int nr) const;
bool put_result(const gam_rc_t & g, const uint16_t value); bool put_result(const gam_rc_t & g, const uint16_t value);
}; };