diff options
Diffstat (limited to 'riscv/sim.cc')
-rw-r--r-- | riscv/sim.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/riscv/sim.cc b/riscv/sim.cc index 361008b..84ff98c 100644 --- a/riscv/sim.cc +++ b/riscv/sim.cc @@ -309,18 +309,18 @@ static bool paddr_ok(reg_t addr) return (addr >> MAX_PADDR_BITS) == 0; } -bool sim_t::mmio_load(reg_t addr, size_t len, uint8_t* bytes) +bool sim_t::mmio_load(reg_t paddr, size_t len, uint8_t* bytes) { - if (addr + len < addr || !paddr_ok(addr + len - 1)) + if (paddr + len < paddr || !paddr_ok(paddr + len - 1)) return false; - return bus.load(addr, len, bytes); + return bus.load(paddr, len, bytes); } -bool sim_t::mmio_store(reg_t addr, size_t len, const uint8_t* bytes) +bool sim_t::mmio_store(reg_t paddr, size_t len, const uint8_t* bytes) { - if (addr + len < addr || !paddr_ok(addr + len - 1)) + if (paddr + len < paddr || !paddr_ok(paddr + len - 1)) return false; - return bus.store(addr, len, bytes); + return bus.store(paddr, len, bytes); } void sim_t::make_dtb() @@ -402,19 +402,19 @@ void sim_t::set_rom() bus.add_device(DEFAULT_RSTVEC, boot_rom.get()); } -char* sim_t::addr_to_mem(reg_t addr) { - if (!paddr_ok(addr)) +char* sim_t::addr_to_mem(reg_t paddr) { + if (!paddr_ok(paddr)) return NULL; - auto desc = bus.find_device(addr); + auto desc = bus.find_device(paddr); if (auto mem = dynamic_cast<mem_t*>(desc.second)) - if (addr - desc.first < mem->size()) - return mem->contents(addr - desc.first); + if (paddr - desc.first < mem->size()) + return mem->contents(paddr - desc.first); return NULL; } -const char* sim_t::get_symbol(uint64_t addr) +const char* sim_t::get_symbol(uint64_t paddr) { - return htif_t::get_symbol(addr); + return htif_t::get_symbol(paddr); } // htif |