anton/riscemu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-mode #1

Manually merged
anton merged 69 commits from kernel-mode into master 2021-11-16 08:02:40 +01:00
Conversation 0 Commits 69 Files Changed 32 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79369889f4 - Show all commits

16
riscemu/priv/CSR.py
View File

@ -79,7 +79,7 @@ class CSR:
#TODO: implement write masks (bitmasks which control writeable bits in registers #TODO: implement write masks (bitmasks which control writeable bits in registers
def set(self, addr: Union[str, int], val: int): def set(self, addr: Union[str, int], val: int):
addr = self._addr_to_name(addr) addr = self._name_to_addr(addr)
if addr is None: if addr is None:
return return
val = to_unsigned(val) val = to_unsigned(val)
@ -87,15 +87,15 @@ class CSR:
self.regs[addr] = val self.regs[addr] = val
def get(self, addr: Union[str, int]) -> int: def get(self, addr: Union[str, int]) -> int:
addr = self._addr_to_name(addr) addr = self._name_to_addr(addr)
if addr is None: if addr is None:
return raise RuntimeError(f"Invalid CSR name: {addr}!")
if addr in self.virtual_regs: if addr in self.virtual_regs:
return self.virtual_regs[addr]() return self.virtual_regs[addr]()
return self.regs[addr] return self.regs[addr]
def set_listener(self, addr: Union[str, int], listener: Callable[[int, int], None]): def set_listener(self, addr: Union[str, int], listener: Callable[[int, int], None]):
addr = self._addr_to_name(addr) addr = self._name_to_addr(addr)
if addr is None: if addr is None:
print("unknown csr address name: {}".format(addr)) print("unknown csr address name: {}".format(addr))
return return
@ -135,13 +135,13 @@ class CSR:
def assert_can_read(self, mode: PrivModes, addr: int): def assert_can_read(self, mode: PrivModes, addr: int):
if (addr >> 8) & 3 > mode.value(): if (addr >> 8) & 3 > mode.value():
raise IllegalInstructionTrap() raise InstructionAccessFault(addr)
def assert_can_write(self, mode: PrivModes, addr: int): def assert_can_write(self, mode: PrivModes, addr: int):
if (addr >> 8) & 3 > mode.value or addr >> 10 == 11: if (addr >> 8) & 3 > mode.value or addr >> 10 == 11:
raise IllegalInstructionTrap() raise InstructionAccessFault(addr)
def _addr_to_name(self, addr: Union[str, int]) -> Optional[int]: def _name_to_addr(self, addr: Union[str, int]) -> Optional[int]:
if isinstance(addr, str): if isinstance(addr, str):
if addr not in self.name_to_addr: if addr not in self.name_to_addr:
print("Unknown CSR register {}".format(addr)) print("Unknown CSR register {}".format(addr))
@ -150,7 +150,7 @@ class CSR:
return addr return addr
def virtual_register(self, addr: Union[str, int]): def virtual_register(self, addr: Union[str, int]):
addr = self._addr_to_name(addr) addr = self._name_to_addr(addr)
if addr is None: if addr is None:
print("unknown csr address name: {}".format(addr)) print("unknown csr address name: {}".format(addr))