split cpu loadstore calc out

[rv32.git] / cpu_loadstore_calc.py

diff --git a/cpu_loadstore_calc.py b/cpu_loadstore_calc.py
index 1781af055033500d89609113fbeedc22ac57b038..5a82a0d044a3e06570d5e77b7fd0bae03e83f3cd 100644 (file)
--- a/cpu_loadstore_calc.py
+++ b/cpu_loadstore_calc.py
@@ -56,7 +56,6 @@ class CPULoadStoreCalc(Module):
         self.dc_funct3 = Signal(3)
         self.rs1 = Signal(32)
         self.rs2 = Signal(32)
-        self.rw_address = Signal(32)
         self.rw_data_in = Signal(32)
         self.rw_data_out = Signal(32)
 
@@ -73,9 +72,6 @@ class CPULoadStoreCalc(Module):
                                      self.load_store_address_low_2)
         self.comb += lsa
 
-        # XXX rwaddr not 31:2 any more
-        self.comb += self.rw_address.eq(self.load_store_address[2:])
-
         # XXX not obvious
         b3 = Mux(self.load_store_address_low_2[1],
                  Mux(self.load_store_address_low_2[0], self.rs2[0:8],
@@ -128,7 +124,6 @@ if __name__ == "__main__":
             example.dc_funct3,
             example.rs1,
             example.rs2,
-            example.rw_address,
             example.rw_data_in,
             example.rw_data_out,
             example.load_store_address,