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

Move CPU core out of RAM. This limits possibilities for self-modifying code hacks, but is cleaner/safer.

Browse source
This commit is contained in:
Toby Jaffey 2025-12-09 10:46:29 +00:00
parent 941cd141f4
commit 8c11b45670
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
precompiled/self.bin
View file

Binary file not shown.

25
uvm32/uvm32.c
View file

@ -60,25 +60,22 @@ void uvm32_init(uvm32_state_t *vmst, const uvm32_mapping_t *mappings, uint32_t n
vmst->status = UVM32_STATUS_PAUSED; vmst->status = UVM32_STATUS_PAUSED;
UVM32_MEMSET(vmst->memory, 0x00, UVM32_MEMORY_SIZE); UVM32_MEMSET(vmst->memory, 0x00, UVM32_MEMORY_SIZE);
// The core lives at the end of RAM. vmst->core.pc = MINIRV32_RAM_IMAGE_OFFSET;
vmst->core = (struct MiniRV32IMAState*)(vmst->memory + UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState));
vmst->core->pc = MINIRV32_RAM_IMAGE_OFFSET;
// https://projectf.io/posts/riscv-cheat-sheet/ // https://projectf.io/posts/riscv-cheat-sheet/
// setup stack pointer // setup stack pointer
// la sp, _sstack // la sp, _sstack
// addi sp,sp,-16 // addi sp,sp,-16
vmst->core->regs[2] = (MINIRV32_RAM_IMAGE_OFFSET + UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState)) - 16; vmst->core.regs[2] = (MINIRV32_RAM_IMAGE_OFFSET + UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState)) - 16;
vmst->core->regs[10] = 0x00; //hart ID vmst->core.regs[10] = 0x00; //hart ID
vmst->core->regs[11] = 0; vmst->core.regs[11] = 0;
vmst->core->extraflags |= 3; // Machine-mode. vmst->core.extraflags |= 3; // Machine-mode.
vmst->mappings = mappings; vmst->mappings = mappings;
vmst->numMappings = numMappings; vmst->numMappings = numMappings;
} }
bool uvm32_load(uvm32_state_t *vmst, uint8_t *rom, int len) { bool uvm32_load(uvm32_state_t *vmst, uint8_t *rom, int len) {
// RAM needs at least image then MiniRV32IMAState (core) if (len > UVM32_MEMORY_SIZE) {
if (len > UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState)) {
// too big // too big
return false; return false;
} }
@ -143,14 +140,14 @@ uint32_t uvm32_run(uvm32_state_t *vmst, uvm32_evt_t *evt, uint32_t instr_meter)
while(vmst->status == UVM32_STATUS_RUNNING) { while(vmst->status == UVM32_STATUS_RUNNING) {
uint64_t elapsedUs = 1; uint64_t elapsedUs = 1;
uint32_t ret; uint32_t ret;
ret = MiniRV32IMAStep(vmst, vmst->core, vmst->memory, 0, elapsedUs, 1); ret = MiniRV32IMAStep(vmst, &vmst->core, vmst->memory, 0, elapsedUs, 1);
if (3 == ret) { if (3 == ret) {
const uint32_t syscall = vmst->core->regs[17]; // a7 const uint32_t syscall = vmst->core.regs[17]; // a7
uint32_t value = vmst->core->regs[10]; // a0 uint32_t value = vmst->core.regs[10]; // a0
bool syscall_valid = false; bool syscall_valid = false;
// on exception we should jump to mtvec, but we handle directly // on exception we should jump to mtvec, but we handle directly
// and skip over the ecall instruction // and skip over the ecall instruction
vmst->core->pc += 4; vmst->core.pc += 4;
switch(syscall) { switch(syscall) {
// inbuilt syscalls // inbuilt syscalls
case UVM32_SYSCALL_HALT: case UVM32_SYSCALL_HALT:
@ -180,7 +177,7 @@ uint32_t uvm32_run(uvm32_state_t *vmst, uvm32_evt_t *evt, uint32_t instr_meter)
break; break;
case UVM32_SYSCALL_TYP_U32_RD: case UVM32_SYSCALL_TYP_U32_RD:
// pass link to r1 for user function to update // pass link to r1 for user function to update
vmst->ioevt.data.syscall.val.u32p = &vmst->core->regs[11]; vmst->ioevt.data.syscall.val.u32p = &vmst->core.regs[11];
break; break;
} }
vmst->ioevt.typ = UVM32_EVT_SYSCALL; vmst->ioevt.typ = UVM32_EVT_SYSCALL;

2
uvm32/uvm32.h
View file

@ -90,7 +90,7 @@ typedef enum {
typedef struct { typedef struct {
uvm32_status_t status; uvm32_status_t status;
uvm32_err_t err; uvm32_err_t err;
struct MiniRV32IMAState* core; // points at end of memory struct MiniRV32IMAState core;
uint8_t memory[UVM32_MEMORY_SIZE]; uint8_t memory[UVM32_MEMORY_SIZE];
uvm32_evt_t ioevt; // for building up in callbacks uvm32_evt_t ioevt; // for building up in callbacks
const uvm32_mapping_t *mappings; const uvm32_mapping_t *mappings;