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

Use internal memcpy/memset

Browse source
This commit is contained in:
Toby Jaffey 2025-12-08 23:48:50 +00:00
parent d7673eb0b9
commit 9be9e056cd
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
uvm32/uvm32.c
View file

@ -1,12 +1,33 @@
#define MINIRV32_IMPLEMENTATION #define MINIRV32_IMPLEMENTATION
#include "uvm32.h" #include "uvm32.h"
#include <stdio.h>
#include <string.h>
#ifndef UVM32_MEMORY_SIZE #ifndef UVM32_MEMORY_SIZE
#error Define UVM32_MEMORY_SIZE #error Define UVM32_MEMORY_SIZE
#endif #endif
#define UVM32_NULL (void *)0
#ifndef UVM32_MEMCPY
#define UVM32_MEMCPY uvm32_memcpy
void uvm32_memcpy(void *dst, const void *src, int len) {
uint8_t *d = (uint8_t *)dst;
const uint8_t *s = (const uint8_t *)src;
while(len--) {
*(d++) = *(s++);
}
}
#endif
#ifndef UVM32_MEMSET
#define UVM32_MEMSET uvm32_memset
void uvm32_memset(void *buf, int c, int len) {
uint8_t *b = (uint8_t *)buf;
while(len--) {
*(b++) = c;
}
}
#endif
#include "mini-rv32ima.h" #include "mini-rv32ima.h"
#define X(name) #name, #define X(name) #name,
@ -38,7 +59,7 @@ static void setStatusErr(uvm32_state_t *vmst, uvm32_err_t err) {
void uvm32_init(uvm32_state_t *vmst, const uvm32_mapping_t *mappings, uint32_t numMappings) { void uvm32_init(uvm32_state_t *vmst, const uvm32_mapping_t *mappings, uint32_t numMappings) {
vmst->status = UVM32_STATUS_PAUSED; vmst->status = UVM32_STATUS_PAUSED;
memset(vmst->memory, 0x00, UVM32_MEMORY_SIZE); UVM32_MEMSET(vmst->memory, 0x00, UVM32_MEMORY_SIZE);
// The core lives at the end of RAM. // The core lives at the end of RAM.
vmst->core = (struct MiniRV32IMAState*)(vmst->memory + UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState)); vmst->core = (struct MiniRV32IMAState*)(vmst->memory + UVM32_MEMORY_SIZE - sizeof(struct MiniRV32IMAState));
vmst->core->pc = MINIRV32_RAM_IMAGE_OFFSET; vmst->core->pc = MINIRV32_RAM_IMAGE_OFFSET;
@ -62,7 +83,7 @@ bool uvm32_load(uvm32_state_t *vmst, uint8_t *rom, int len) {
return false; return false;
} }
memcpy(vmst->memory, rom, len); UVM32_MEMCPY(vmst->memory, rom, len);
return true; return true;
} }
@ -72,7 +93,7 @@ static void get_safeptr_terminated(uvm32_state_t *vmst, uint32_t addr, uint8_t t
uint32_t p = ptrstart; uint32_t p = ptrstart;
if (p >= UVM32_MEMORY_SIZE) { if (p >= UVM32_MEMORY_SIZE) {
setStatusErr(vmst, UVM32_ERR_MEM_RD); setStatusErr(vmst, UVM32_ERR_MEM_RD);
buf->ptr = NULL; buf->ptr = UVM32_NULL;
buf->len = 0; buf->len = 0;
return; return;
} }
@ -80,7 +101,7 @@ static void get_safeptr_terminated(uvm32_state_t *vmst, uint32_t addr, uint8_t t
p++; p++;
if (p >= UVM32_MEMORY_SIZE) { if (p >= UVM32_MEMORY_SIZE) {
setStatusErr(vmst, UVM32_ERR_MEM_RD); setStatusErr(vmst, UVM32_ERR_MEM_RD);
buf->ptr = NULL; buf->ptr = UVM32_NULL;
buf->len = 0; buf->len = 0;
return; return;
} }
@ -200,7 +221,7 @@ uint32_t uvm32_run(uvm32_state_t *vmst, uvm32_evt_t *evt, uint32_t instr_meter)
// an event is ready // an event is ready
if (vmst->status == UVM32_STATUS_PAUSED) { if (vmst->status == UVM32_STATUS_PAUSED) {
// send back the built up event // send back the built up event
memcpy(evt, &vmst->ioevt, sizeof(uvm32_evt_t)); UVM32_MEMCPY(evt, &vmst->ioevt, sizeof(uvm32_evt_t));
return num_instr; return num_instr;
} else { } else {
if (vmst->status == UVM32_STATUS_ERROR) { if (vmst->status == UVM32_STATUS_ERROR) {