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

PSW accessing check

Browse source
This commit is contained in:
folkert van heusden 2024-04-08 15:01:30 +02:00
parent 4992b723e7
commit a80d3b711d
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bus.cpp
View file

@ -523,6 +523,19 @@ memory_addresses_t bus::calculate_physical_address(const int run_mode, const uin
return { a, apf, physical_instruction, physical_instruction_is_psw, physical_data, physical_data_is_psw };
}
bool bus::is_psw(const uint16_t addr, const int run_mode, const d_i_space_t space)
{
auto meta = calculate_physical_address(run_mode, addr);
if (space == d_space && meta.physical_data_is_psw)
return true;
if (space == i_space && meta.physical_instruction_is_psw)
return true;
return false;
}
void bus::mmudebug(const uint16_t a)
{
for(int rm=0; rm<4; rm++) {

1
bus.h
View file

@ -176,6 +176,7 @@ public:
void trap_odd(const uint16_t a);
uint32_t get_io_base() { return MMR0 & 1 ? (MMR3 & 16 ? 017760000 : 0760000) : 0160000; }
bool is_psw(const uint16_t addr, const int run_mode, const d_i_space_t space);
uint32_t calculate_physical_address(const int run_mode, const uint16_t a, const bool trap_on_failure, const bool is_write, const bool peek_only, const d_i_space_t space);

33
cpu.cpp
View file

@ -161,8 +161,8 @@ bool cpu::put_result(const gam_rc_t & g, const uint16_t value)
}
b->write(g.addr.value(), g.word_mode, value, g.mode_selection, g.space);
return g.addr.value() != ADDR_PSW;
return !b->is_psw(g.addr.value(), g.mode_selection, g.space);
}
uint16_t cpu::addRegister(const int nr, const rm_selection_t mode_selection, const uint16_t value)
@ -455,7 +455,7 @@ bool cpu::putGAM(const gam_rc_t & g, const uint16_t value)
if (g.addr.has_value()) {
b->write(g.addr.value(), g.word_mode, value, g.mode_selection, g.space);
return g.addr.value() != ADDR_PSW;
return !b->is_psw(g.addr.value(), g.mode_selection, g.space);
}
setRegister(g.reg.value(), value, g.mode_selection);
@ -576,7 +576,10 @@ bool cpu::double_operand_instructions(const uint16_t instr)
int16_t result = 0;
bool set_flags = g_dst.addr.has_value() ? g_dst.addr.value() != ADDR_PSW : true;
bool set_flags = true;
if (g_dst.addr.has_value())
set_flags = !b->is_psw(g_dst.addr.value(), g_dst.mode_selection, g_dst.space);
if (instr & 0x8000) { // SUB
result = (g_dst.value.value() - g_ssrc.value.value()) & 0xffff;
@ -923,7 +926,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
else {
auto a = getGAM(dst_mode, dst_reg, word_mode, rm_cur);
int32_t vl = (a.value.value() + 1) & (word_mode == wm_byte ? 0xff : 0xffff);
bool set_flags = a.addr.value() != ADDR_PSW; // FIXME
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(vl, word_mode));
@ -953,10 +956,10 @@ bool cpu::single_operand_instructions(const uint16_t instr)
setRegister(dst_reg, v);
}
else {
auto a = getGAM(dst_mode, dst_reg, word_mode, rm_cur);
int32_t vl = (a.value.value() - 1) & (word_mode == wm_byte ? 0xff : 0xffff);
auto a = getGAM(dst_mode, dst_reg, word_mode, rm_cur);
int32_t vl = (a.value.value() - 1) & (word_mode == wm_byte ? 0xff : 0xffff);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(vl, word_mode));
@ -991,7 +994,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, v, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(v, word_mode));
@ -1029,7 +1032,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, v, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(v, word_mode));
@ -1067,7 +1070,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, v, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(v, word_mode));
@ -1119,7 +1122,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, temp, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_c(new_carry);
@ -1170,7 +1173,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, temp, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_c(new_carry);
@ -1217,7 +1220,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
b->write(a.addr.value(), a.word_mode, v, a.mode_selection, a.space);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(v, word_mode));
@ -1248,7 +1251,7 @@ bool cpu::single_operand_instructions(const uint16_t instr)
uint16_t vl = a.value.value();
uint16_t v = (vl << 1) & (word_mode == wm_byte ? 0xff : 0xffff);
bool set_flags = a.addr.value() != ADDR_PSW;
bool set_flags = !b->is_psw(a.addr.value(), a.mode_selection, a.space);
if (set_flags) {
setPSW_n(SIGN(v, word_mode));