readPhysical => read_physical
This commit is contained in:
parent
36f0e13135
commit
9a10510c30
5 changed files with 6 additions and 6 deletions
|
@ -25,7 +25,7 @@ std::optional<std::string> breakpoint_memory::is_triggered() const
|
|||
if (is_virtual)
|
||||
v = b->read(addr, word_mode, rm_cur, true, i_space);
|
||||
else
|
||||
v = b->readPhysical(addr);
|
||||
v = b->read_physical(addr);
|
||||
|
||||
auto it = values.find(v);
|
||||
if (it == values.end())
|
||||
|
|
2
bus.cpp
2
bus.cpp
|
@ -841,7 +841,7 @@ void bus::write_physical(const uint32_t a, const uint16_t value)
|
|||
}
|
||||
}
|
||||
|
||||
uint16_t bus::readPhysical(const uint32_t a)
|
||||
uint16_t bus::read_physical(const uint32_t a)
|
||||
{
|
||||
if (a >= m->get_memory_size()) {
|
||||
TRACE("physicalREAD from %o: trap 004", a);
|
||||
|
|
2
bus.h
2
bus.h
|
@ -128,7 +128,7 @@ public:
|
|||
uint16_t read_word(const uint16_t a) override { return read_word(a, i_space); }
|
||||
uint16_t peek_word(const uint16_t a);
|
||||
uint8_t readUnibusByte(const uint32_t a);
|
||||
uint16_t readPhysical(const uint32_t a);
|
||||
uint16_t read_physical(const uint32_t a);
|
||||
|
||||
write_rc_t 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 writeUnibusByte(const uint32_t a, const uint8_t value);
|
||||
|
|
|
@ -933,7 +933,7 @@ void debugger(console *const cnsl, bus *const b, std::atomic_uint32_t *const sto
|
|||
|
||||
for(int i=0; i<n; i++) {
|
||||
uint32_t cur_addr = addr + i * 2;
|
||||
int val = parts[2] == "v" ? b->read(cur_addr, wm_word, rm_cur, true) : b->readPhysical(cur_addr);
|
||||
int val = parts[2] == "v" ? b->read(cur_addr, wm_word, rm_cur, true) : b->read_physical(cur_addr);
|
||||
|
||||
if (val == -1) {
|
||||
cnsl->put_string_lf(format("Can't read from %06o\n", cur_addr));
|
||||
|
|
4
main.cpp
4
main.cpp
|
@ -144,7 +144,7 @@ int run_cpu_validation(const std::string & filename)
|
|||
json_t *value = nullptr;
|
||||
json_object_foreach(memory_after, key, value) {
|
||||
int key_v = atoi(key);
|
||||
uint16_t mem_contains = b->readPhysical(key_v);
|
||||
uint16_t mem_contains = b->read_physical(key_v);
|
||||
uint16_t should_be = json_integer_value(value);
|
||||
|
||||
if (mem_contains != should_be) {
|
||||
|
@ -193,7 +193,7 @@ int run_cpu_validation(const std::string & filename)
|
|||
json_t *temp = json_array_get(a_sp, i);
|
||||
uint16_t sp = c->lowlevel_register_sp_get(i);
|
||||
if (json_integer_value(temp) != sp) {
|
||||
DOLOG(warning, true, "SP[%d] register mismatch (is: %06o (%d), should be: %06o (%d)) for %06o", i, sp, sp, json_integer_value(temp), json_integer_value(temp), b->readPhysical(start_pc));
|
||||
DOLOG(warning, true, "SP[%d] register mismatch (is: %06o (%d), should be: %06o (%d)) for %06o", i, sp, sp, json_integer_value(temp), json_integer_value(temp), b->read_physical(start_pc));
|
||||
err = true;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue