From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 19 Oct 2018 12:19:58 +0000 (+0100)
Subject: remove more get_data calls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4cdff8537e2bc67558270a061942664043fe3d23;p=riscv-isa-sim.git

remove more get_data calls
---

diff --git a/riscv/interactive.cc b/riscv/interactive.cc
index 2840963..afe6d13 100644
--- a/riscv/interactive.cc
+++ b/riscv/interactive.cc
@@ -287,33 +287,17 @@ reg_t sim_t::get_mem(const std::vector<std::string>& args)
   switch(addr % 8)
   {
     case 0:
-      val = mmu->load_uint64(addr)
-#ifdef NOTYET_SPIKE_SIMPLEV
-            .get_data()
-#endif
-        ;
+      val = mmu->load_uint64(addr);
       break;
     case 4:
-      val = mmu->load_uint32(addr)
-#ifdef NOTYET_SPIKE_SIMPLEV
-            .get_data()
-#endif
-        ;
+      val = mmu->load_uint32(addr);
       break;
     case 2:
     case 6:
-      val = mmu->load_uint16(addr)
-#ifdef NOTYET_SPIKE_SIMPLEV
-            .get_data()
-#endif
-        ;
+      val = mmu->load_uint16(addr);
       break;
     default:
-      val = mmu->load_uint8(addr)
-#ifdef NOTYET_SPIKE_SIMPLEV
-            .get_data()
-#endif
-        ;
+      val = mmu->load_uint8(addr);
       break;
   }
   return val;
@@ -332,13 +316,8 @@ void sim_t::interactive_str(const std::string& cmd, const std::vector<std::strin
   reg_t addr = strtol(args[0].c_str(),NULL,16);
 
   char ch;
-#ifdef NOTYET_SPIKE_SIMPLEV
-  while((ch = debug_mmu->load_uint8(addr++).get_data()))
-    putchar(ch);
-#else
   while((ch = debug_mmu->load_uint8(addr++)))
     putchar(ch);
-#endif
 
   putchar('\n');
 }
diff --git a/riscv/sv_mmu.h b/riscv/sv_mmu.h
index 9ef5208..d42063c 100644
--- a/riscv/sv_mmu.h
+++ b/riscv/sv_mmu.h
@@ -38,9 +38,6 @@ public:
     void store_##type(sv_reg_t addr, type##_t val) { \
       mmu_t::store_##type(addr, val); \
     }
-    //void store_##type(sv_reg_t addr, sv_reg_t val) { 
-    //  mmu_t::store_##type(addr, val); 
-    //}
 
   // store value to memory at aligned address
   sv_store_func(uint8)
@@ -60,22 +57,22 @@ public:
 
   void store_float128(sv_reg_t addr, float128_t val)
   {
-      mmu_t::store_float128(addr /*.get_data()*/, val);
+      mmu_t::store_float128(addr, val);
   }
 
   float128_t load_float128(sv_reg_t addr)
   {
-    return mmu_t::load_float128(addr/*.get_data()*/);
+    return mmu_t::load_float128(addr);
   }
 
    void acquire_load_reservation(sv_reg_t vaddr)
    { 
-     mmu_t::acquire_load_reservation(vaddr/*.get_data()*/);
+     mmu_t::acquire_load_reservation(vaddr);
    }
 
    bool check_load_reservation(sv_reg_t vaddr)
    { 
-     return mmu_t::check_load_reservation(vaddr/*.get_data()*/);
+     return mmu_t::check_load_reservation(vaddr);
    }
 
 };