Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vexriscv_debug: use csr read()/write() accessors 

CSR access widths can be different from register widths.  8-bit
registers are common.

The runtime-generated `read()` and `write()` functions handle this
mapping correctly.  When direct register accesses are handled, this
mapping is lost.

Use the accessor functions rather than directly accessing the memory
addresses, so that we work on platforms other than 32-bit-wide.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2018-07-17 18:03:58 +08:00
parent f9104b201a
commit 41a9e7d9ae
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/tools/vexriscv_debug.py
View File

@ -35,9 +35,9 @@ class VexRiscvDebugBridge():
if not hasattr(self, "rc"): if not hasattr(self, "rc"):
self.rc = RemoteClient(csr_csv=self.args.csr) self.rc = RemoteClient(csr_csv=self.args.csr)
self.rc.open() self.rc.open()
self.core_addr = self.rc.regs.cpu_or_bridge_debug_core.addr self.core_reg = self.rc.regs.cpu_or_bridge_debug_core
self.data_addr = self.rc.regs.cpu_or_bridge_debug_data.addr self.data_reg = self.rc.regs.cpu_or_bridge_debug_data
self.refresh_addr = self.rc.regs.cpu_or_bridge_debug_refresh.addr self.refresh_reg = self.rc.regs.cpu_or_bridge_debug_refresh
def _get_args(self): def _get_args(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -52,21 +52,21 @@ class VexRiscvDebugBridge():
print("Accepted debugger connection from {}".format(address[0])) print("Accepted debugger connection from {}".format(address[0]))
def _refresh_reg(self, reg): def _refresh_reg(self, reg):
self.rc.write(self.refresh_addr, reg) self.refresh_reg.write(reg)
def read_core(self): def read_core(self):
self._refresh_reg(0) self._refresh_reg(0)
self.write_to_debugger(self.rc.read(self.core_addr)) self.write_to_debugger(self.core_reg.read())
def read_data(self): def read_data(self):
self._refresh_reg(4) self._refresh_reg(4)
self.write_to_debugger(self.rc.read(self.data_addr)) self.write_to_debugger(self.data_reg.read())
def write_core(self, value): def write_core(self, value):
self.rc.write(self.core_addr, value) self.core_reg.write(value)
def write_data(self, value): def write_data(self, value):
self.rc.write(self.data_addr, value) self.data_reg.write(value)
def read_from_debugger(self): def read_from_debugger(self):
data = self.debugger.recv(10) data = self.debugger.recv(10)