Merge pull request #117 from riscv/multicore_debug

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

diff --git a/riscv/devices.cc b/riscv/devices.cc
index 25e39e0dc866326d31ae4a6329ea7e1207bd05be..15115c8a6ccd5ec13ece8c125c8625fad7cd55be 100644 (file)
--- a/riscv/devices.cc
+++ b/riscv/devices.cc
@@ -21,20 +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);
 }
 
-rom_device_t::rom_device_t(std::vector<char> data)
-  : data(data)
+std::pair<reg_t, abstract_device_t*> bus_t::find_device(reg_t addr)
 {
-}
-
-bool rom_device_t::load(reg_t addr, size_t len, uint8_t* bytes)
-{
-  if (addr + len > data.size())
-    return false;
-  memcpy(bytes, &data[addr], len);
-  return true;
-}
-
-bool rom_device_t::store(reg_t addr, size_t len, const uint8_t* bytes)
-{
-  return false;
+  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);
 }