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

clean-up & "instruction_aborted" flag for MTFPDI

Browse source
This commit is contained in:
folkert van heusden 2024-04-01 22:03:15 +02:00
parent 9df48e1be7
commit ecbe3f5f84
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1
4 changed files with 568 additions and 538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1071
bus.cpp
View file

File diff suppressed because it is too large Load diff

2
bus.h
View file

@ -149,12 +149,14 @@ public:
uint16_t readByte(const uint16_t a) { return read(a, wm_byte, rm_cur); }
uint16_t readWord(const uint16_t a, const d_i_space_t s = i_space);
uint16_t peekWord(const uint16_t a);
uint16_t read_io(const uint16_t addr_in, const word_mode_t word_mode, const bool peek_only);
uint16_t readUnibusByte(const uint16_t a);
void write(const uint16_t a, const word_mode_t word_mode, uint16_t value, const rm_selection_t mode_selection, const d_i_space_t s = i_space);
void writeByte(const uint16_t a, const uint8_t value) { return write(a, wm_byte, value, rm_cur); }
void writeWord(const uint16_t a, const uint16_t value, const d_i_space_t s = i_space);
void write_io(const uint16_t addr_in, const word_mode_t word_mode, const uint16_t value);
uint16_t readPhysical(const uint32_t a);
void writePhysical(const uint32_t a, const uint16_t value);

32
cpu.cpp
View file

@ -682,6 +682,8 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
bool sign = SIGN(R, wm_word);
DOLOG(debug, true, "ASH shift %d, value %08o", shift, oldR);
if (shift == 0) {
setPSW_c(false);
setPSW_v(false);
@ -733,6 +735,8 @@ bool cpu::additional_double_operand_instructions(const uint16_t instr)
bool sign = R0R1 & 0x80000000;
DOLOG(debug, true, "ASH shift %d, value %08o", shift, R0R1);
setPSW_v(false);
if (shift == 0)
@ -1290,13 +1294,15 @@ bool cpu::single_operand_instructions(const uint16_t instr)
}
}
if (set_flags)
setPSW_flags_nzv(v, wm_word);
if (!instruction_aborted) {
if (set_flags)
setPSW_flags_nzv(v, wm_word);
// put on current stack
pushStack(v);
// put on current stack
pushStack(v);
b->addToMMR1(-2, 6);
b->addToMMR1(-2, 6);
}
break;
}
@ -1319,23 +1325,27 @@ bool cpu::single_operand_instructions(const uint16_t instr)
uint32_t phys_a = word_mode == wm_byte ? phys.physical_data : phys.physical_instruction;
bool phys_psw = word_mode == wm_byte ? phys.physical_data_is_psw : phys.physical_instruction_is_psw;
mtpi_count++;
if (phys_a >= b->get_io_base()) {
b->write(a.addr.value(), wm_word, v, rm_prev); // put in '13/12' address space
set_flags = phys_psw;
}
else {
mtpi_count++;
DOLOG(debug, true, "%lu %06o MTP%c %06o: %06o (physical: %o)", mtpi_count, pc-2, word_mode == wm_byte ? 'D' : 'I', a.addr.value(), v, phys_a);
b->check_odd_addressing(phys_a, prev_run_mode, word_mode == wm_byte ? d_space : i_space, true); // TODO d/i space must depend on the check done in calculate_physical_address
b->writePhysical(phys_a, v);
}
DOLOG(debug, true, "%lu %06o MTP%c %06o: %06o (physical: %o)", mtpi_count, pc-2, word_mode == wm_byte ? 'D' : 'I', a.addr.value(), v, phys_a);
}
if (set_flags)
setPSW_flags_nzv(v, wm_word);
if (!instruction_aborted) {
if (set_flags)
setPSW_flags_nzv(v, wm_word);
b->addToMMR1(2, 6);
b->addToMMR1(2, 6);
}
break;
}
@ -1671,6 +1681,7 @@ void cpu::trap(uint16_t vector, const int new_ipl, const bool is_interrupt)
uint16_t before_pc = 0;
it_is_a_trap = true;
instruction_aborted = true;
do {
try {
@ -2230,6 +2241,7 @@ std::map<std::string, std::vector<std::string> > cpu::disassemble(const uint16_t
void cpu::step_a()
{
it_is_a_trap = false;
instruction_aborted = false;
if ((b->getMMR0() & 0160000) == 0)
b->clearMMR1();

1
cpu.h
View file

@ -41,6 +41,7 @@ private:
uint64_t wait_time { 0 };
bool it_is_a_trap { false };
uint64_t mtpi_count { 0 };
bool instruction_aborted{ false };
// level, vector
std::map<uint8_t, std::set<uint8_t> > queued_interrupts;