mirror/uvm32
1
Fork 0
mirror of https://github.com/ringtailsoftware/uvm32.git synced 2026-06-06 06:53:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle 8, 16 and 32 bit accesses to extram.

Browse source
This commit is contained in:
Toby Jaffey 2025-12-11 10:33:45 +00:00
parent 63386f9a92
commit 7a1656ab10
5 changed files with 163 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
uvm32/uvm32.c
View file

@ -326,12 +326,34 @@ uvm32_evt_syscall_buf_t uvm32_getbuf_fixed(uvm32_state_t *vmst, uvm32_evt_t *evt
return scb;
}
uint32_t uvm32_extramLoad(void *userdata, uint32_t addr) {
uint32_t uvm32_extramLoad(void *userdata, uint32_t addr, uint32_t accessTyp) {
uvm32_state_t *vmst = (uvm32_state_t *)userdata;
addr -= UVM32_EXTRAM_BASE;
if (vmst->extram != UVM32_NULL) {
if (addr < vmst->extramLen) {
return ((uint32_t *)vmst->extram)[addr / 4];
switch(accessTyp) {
case 0:
return ((int8_t *)vmst->extram)[addr];
break;
case 1:
return ((int16_t *)vmst->extram)[addr/2];
break;
case 2:
return ((uint32_t *)vmst->extram)[addr / 4];
break;
case 4:
return ((uint8_t *)vmst->extram)[addr];
break;
case 5:
return ((uint16_t *)vmst->extram)[addr/2];
break;
default:
setStatusErr(vmst, UVM32_ERR_MEM_RD);
return 0;
break;
}
} else {
setStatusErr(vmst, UVM32_ERR_MEM_RD);
}
@ -339,12 +361,25 @@ uint32_t uvm32_extramLoad(void *userdata, uint32_t addr) {
return 0;
}
uint32_t uvm32_extramStore(void *userdata, uint32_t addr, uint32_t val ) {
uint32_t uvm32_extramStore(void *userdata, uint32_t addr, uint32_t val, uint32_t accessTyp) {
uvm32_state_t *vmst = (uvm32_state_t *)userdata;
addr -= UVM32_EXTRAM_BASE;
if (vmst->extram != UVM32_NULL) {
if (addr < vmst->extramLen) {
((uint32_t *)vmst->extram)[addr / 4] = val;
switch(accessTyp) {
case 0:
((uint8_t *)vmst->extram)[addr] = val;
break;
case 1:
((uint16_t *)vmst->extram)[addr/2] = val;
break;
case 2:
((uint32_t *)vmst->extram)[addr/4] = val;
break;
default:
setStatusErr(vmst, UVM32_ERR_MEM_WR);
break;
}
vmst->extramDirty = true;
} else {
setStatusErr(vmst, UVM32_ERR_MEM_WR);

8
uvm32/uvm32.h
View file

@ -55,10 +55,10 @@ typedef struct {
#define MINIRV32_DECORATE static
#define MINI_RV32_RAM_SIZE UVM32_MEMORY_SIZE
#define MINIRV32_POSTEXEC(pc, ir, retval) {if (retval > 0) return retval;}
uint32_t uvm32_extramLoad(void *userdata, uint32_t addr);
uint32_t uvm32_extramStore(void *userdata, uint32_t addr, uint32_t val);
#define MINIRV32_HANDLE_MEM_LOAD_CONTROL( addy, rval ) rval = uvm32_extramLoad(userdata, addy);
#define MINIRV32_HANDLE_MEM_STORE_CONTROL( addy, val ) if( uvm32_extramStore(userdata, addy, val) ) return val;
uint32_t uvm32_extramLoad(void *userdata, uint32_t addr, uint32_t accessTyp);
uint32_t uvm32_extramStore(void *userdata, uint32_t addr, uint32_t val, uint32_t accessTyp);
#define MINIRV32_HANDLE_MEM_LOAD_CONTROL( addy, rval ) rval = uvm32_extramLoad(userdata, addy, ( ir >> 12 ) & 0x7);
#define MINIRV32_HANDLE_MEM_STORE_CONTROL( addy, val ) if( uvm32_extramStore(userdata, addy, val, ( ir >> 12 ) & 0x7) ) return val;
#ifndef MINIRV32_IMPLEMENTATION
#define MINIRV32_STEPPROTO