diff --git a/README.md b/README.md index a5fa6ea..c888ad1 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Although based on a fully fledged CPU emulator, uvm32 is intended for executing * [apps/lissajous](apps/lissajous) C console lissajous curve (showing softfp, floating point) * [apps/hello-asm](apps/hello-asm) Minimal hello world assembly * [apps/fib](apps/fib) C fibonacci series program (iterative and recursive) + * [apps/self](apps/self) host-mini with embedded mandelbrot generation program, compiled as an app (inception!) * [apps/sketch](apps/sketch) C Arduino/Wiring/Processing type program in `setup()` and `loop()` style * [apps/rust-hello](apps/rust-hello) Rust hello world program (note, the version of rust installed by brew on mac has issues, use the official rust installer from https://rust-lang.org/learn/get-started/) * [apps/zig-mandel](apps/zig-mandel) Zig ASCII mandelbrot generator program diff --git a/apps/Makefile b/apps/Makefile index abe6621..69c99b7 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -6,6 +6,7 @@ all: (cd helloworld && make) (cd lissajous && make) (cd conio && make) + (cd self && make) (cd zig-mandel && make) (cd zigtris && make) (cd rust-hello && make) @@ -16,6 +17,7 @@ clean: (cd helloworld && make clean) (cd lissajous && make clean) (cd conio && make clean) + (cd self && make clean) (cd zig-mandel && make clean) (cd zigtris && make clean) (cd rust-hello && make clean) diff --git a/apps/self/Makefile b/apps/self/Makefile new file mode 100644 index 0000000..1494480 --- /dev/null +++ b/apps/self/Makefile @@ -0,0 +1,27 @@ +PROJECT:=self + +DOCKER_IMAGE=riscv-dev +DOCKER_CMD:=docker run --rm -v ${PWD}../../../:/data -w /data/apps/${PROJECT} ${DOCKER_IMAGE} +PREFIX:=${DOCKER_CMD} riscv64-unknown-elf- +CFLAGS+=-I../../common -I../../uvm32 -DUVM32_MEMORY_SIZE=8192 +CFLAGS+=-fno-stack-protector +CFLAGS+=-static-libgcc -fdata-sections -ffunction-sections +CFLAGS+=-g -Os -march=rv32ima_zicsr -mabi=ilp32 -static +LDFLAGS:= -T ../linker.ld -nostdlib -Wl,--gc-sections +LIBS:= #-lgcc # needed for softfp + +SRCS=${PROJECT}.c ../../uvm32/uvm32.c ../crt0.S + +all: + ${PREFIX}gcc -o ${PROJECT}.elf ${CFLAGS} ${LDFLAGS} ${SRCS} ${LIBS} + $(PREFIX)objcopy ${PROJECT}.elf -O binary ${PROJECT}.bin + +disasm: all + $(PREFIX)objdump -S -d -f ${PROJECT}.elf + +test: all + ../../host/host ${PWD}/${PROJECT}.bin + +clean: + rm -f ${PROJECT}.o ${PROJECT}.elf ${PROJECT}.bin + diff --git a/apps/self/self.c b/apps/self/self.c new file mode 100644 index 0000000..72b36fa --- /dev/null +++ b/apps/self/self.c @@ -0,0 +1,80 @@ +#define USE_MAIN +#include "uvm32_target.h" + +#include "uvm32.h" +#include "../common/uvm32_common_custom.h" + +// Precompiled binary program to print integers +// This code expects to print via syscall 0x13C (UVM32_SYSCALL_PRINTD in common/uvm32_common_custom.h) +uint8_t rom[] = { + 0x23, 0x26, 0x11, 0x00, 0xef, 0x00, 0xc0, 0x00, 0xb7, 0x08, 0x00, 0x01, + 0x73, 0x00, 0x00, 0x00, 0x37, 0xf5, 0xff, 0xff, 0xb7, 0x15, 0x00, 0x00, + 0x37, 0xe6, 0xff, 0xff, 0x13, 0x07, 0xf0, 0x01, 0xb7, 0x47, 0x00, 0x00, + 0xb7, 0x06, 0x00, 0x01, 0x13, 0x08, 0xd5, 0xcc, 0x93, 0x82, 0x35, 0x33, + 0x13, 0x03, 0x76, 0xe6, 0x93, 0x83, 0x35, 0xb3, 0x13, 0x86, 0x16, 0x00, + 0x63, 0xc8, 0x02, 0x09, 0x13, 0x0e, 0x03, 0x00, 0x63, 0xca, 0x63, 0x06, + 0x93, 0x0e, 0x00, 0x00, 0x93, 0x05, 0x00, 0x00, 0x13, 0x0f, 0x00, 0x00, + 0x93, 0x0f, 0x00, 0x00, 0x93, 0x06, 0x00, 0x02, 0x13, 0x85, 0x06, 0xfe, + 0x63, 0x62, 0xa7, 0x04, 0x33, 0x85, 0xd5, 0x01, 0x63, 0xee, 0xa7, 0x02, + 0x13, 0x05, 0x00, 0x00, 0x93, 0x08, 0x06, 0x00, 0x33, 0x8f, 0xef, 0x03, + 0xb3, 0x8f, 0xd5, 0x41, 0x73, 0x00, 0x00, 0x00, 0x13, 0x5f, 0xbf, 0x40, + 0xb3, 0x8f, 0xcf, 0x01, 0x33, 0x0f, 0x0f, 0x01, 0xb3, 0x85, 0xff, 0x03, + 0x93, 0xd5, 0xc5, 0x00, 0x33, 0x05, 0xef, 0x03, 0x93, 0x5e, 0xc5, 0x00, + 0x93, 0x86, 0x16, 0x00, 0x6f, 0xf0, 0xdf, 0xfb, 0x13, 0x85, 0x06, 0x00, + 0x93, 0x08, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x13, 0x0e, 0x1e, 0x09, + 0xe3, 0xda, 0xc3, 0xf9, 0x13, 0x05, 0xa0, 0x00, 0x93, 0x08, 0x00, 0x00, + 0x73, 0x00, 0x00, 0x00, 0x13, 0x08, 0x98, 0x19, 0xe3, 0xdc, 0x02, 0xf7, + 0x37, 0x05, 0x00, 0x80, 0x13, 0x05, 0x05, 0x0e, 0x93, 0x08, 0x30, 0x00, + 0x73, 0x00, 0x00, 0x00, 0x67, 0x80, 0x00, 0x00, 0x48, 0x65, 0x6c, 0x6c, + 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x00 +}; + +// Create an identifier for our host handler +// syscalls exposed to vm environement +typedef enum { + F_PUTC, + F_PRINTLN, +} f_code_t; + +// Map exposed syscalls to syscalls +const uvm32_mapping_t env[] = { + { .syscall = UVM32_SYSCALL_PRINTLN, .typ = UVM32_SYSCALL_TYP_BUF_TERMINATED_WR, .code = F_PRINTLN }, + { .syscall = UVM32_SYSCALL_PUTC, .typ = UVM32_SYSCALL_TYP_U32_WR, .code = F_PUTC }, +}; + +void main(void) { + uvm32_state_t vmst; + uvm32_evt_t evt; + bool isrunning = true; + + uvm32_init(&vmst, env, sizeof(env) / sizeof(env[0])); + uvm32_load(&vmst, rom, sizeof(rom)); + + while(isrunning) { + uvm32_run(&vmst, &evt, 100); // num instructions before vm considered hung + + switch(evt.typ) { + case UVM32_EVT_END: + isrunning = false; + break; + case UVM32_EVT_SYSCALL: // vm has paused to handle UVM32_SYSCALL + switch((f_code_t)evt.data.syscall.code) { + case F_PUTC: + putc(evt.data.syscall.val.u32); + break; + case F_PRINTLN: + for (int i=0;i