Merge pull request #110 from riscv/debug_rom_build

[riscv-isa-sim.git] / riscv / devices.cc

diff --git a/riscv/devices.cc b/riscv/devices.cc
index e6f5d7d0912b1672d8fda9f9adfec8710a856105..15115c8a6ccd5ec13ece8c125c8625fad7cd55be 100644 (file)
--- a/riscv/devices.cc
+++ b/riscv/devices.cc
@@ -21,10 +21,10 @@ bool bus_t::store(reg_t addr, size_t len, const uint8_t* bytes)
   return it->second->store(addr - -it->first, len, bytes);
 }
 
-char* bus_t::page(reg_t paddr)
+std::pair<reg_t, abstract_device_t*> bus_t::find_device(reg_t addr)
 {
-  auto it = devices.lower_bound(-paddr);
-  if (it == devices.end())
-    return NULL;
-  return it->second->page(paddr);
+  auto it = devices.lower_bound(-addr);
+  if (it == devices.end() || addr < -it->first)
+    return std::make_pair((reg_t)0, (abstract_device_t*)NULL);
+  return std::make_pair(-it->first, it->second);
 }