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 all app common files under apps/common

Browse source
This commit is contained in:
Toby Jaffey 2025-12-12 15:45:17 +00:00
parent 60f362b819
commit 5bd6a32013
31 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

0
apps/crt0.S → apps/common/crt0.S
View file

0
apps/linker.ld → apps/common/linker.ld
View file

2
apps/makefile.common → apps/common/makefile.common
View file

@ -4,7 +4,7 @@ CFLAGS+=-I${TOPDIR}/common
CFLAGS+=${OPT} -fno-stack-protector -fno-builtin-memcpy -fno-builtin CFLAGS+=${OPT} -fno-stack-protector -fno-builtin-memcpy -fno-builtin
CFLAGS+=-static-libgcc -fdata-sections -ffunction-sections CFLAGS+=-static-libgcc -fdata-sections -ffunction-sections
CFLAGS+=-g -march=rv32im -mabi=ilp32 -static CFLAGS+=-g -march=rv32im -mabi=ilp32 -static
LDFLAGS:= -T ${TOPDIR}/apps/linker.ld -nostdlib -Wl,--gc-sections LDFLAGS:= -T ${TOPDIR}/apps/common/linker.ld -nostdlib -Wl,--gc-sections
LIBS:= -lgcc # needed for softfp LIBS:= -lgcc # needed for softfp
# check if the compiler is installed # check if the compiler is installed

4
apps/conio/Makefile
View file

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/fib/Makefile
View file

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/gfx/Makefile
View file

@ -2,7 +2,7 @@ TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
OPT=-Os OPT=-Os
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
HEAP_SIZE=$(shell echo "320 * 200 * 4" | bc) HEAP_SIZE=$(shell echo "320 * 200 * 4" | bc)
HOST_EXTRA=-e ${HEAP_SIZE} -i 9999999 HOST_EXTRA=-e ${HEAP_SIZE} -i 9999999
@ -12,4 +12,4 @@ test: all
${TOPDIR}/hosts/host-sdl/host-sdl ${HOST_EXTRA} ${PWD}/${PROJECT}.bin ${TOPDIR}/hosts/host-sdl/host-sdl ${HOST_EXTRA} ${PWD}/${PROJECT}.bin
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/heap/Makefile
View file

@ -4,9 +4,9 @@ PROJECT:=$(shell basename ${PWD})
HEAP_SIZE=$(shell echo "1024 * 512" | bc) HEAP_SIZE=$(shell echo "1024 * 512" | bc)
OPT=-Os OPT=-Os
CFLAGS=-DHEAP_SIZE=${HEAP_SIZE} CFLAGS=-DHEAP_SIZE=${HEAP_SIZE}
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S malloc_freelist.c SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S malloc_freelist.c
HOST_EXTRA=-e ${HEAP_SIZE} -i 100000 HOST_EXTRA=-e ${HEAP_SIZE} -i 100000
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

2
apps/hello-asm/Makefile
View file

@ -4,4 +4,4 @@ SRCS=${PROJECT}.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/helloworld/Makefile
View file

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/lissajous/Makefile
View file

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/maze/Makefile
View file

@ -1,9 +1,9 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
OPT=-O2 OPT=-O2
CFLAGS+=-fpeel-loops CFLAGS+=-fpeel-loops
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/memtest/Makefile
View file

@ -4,10 +4,10 @@ PROJECT:=$(shell basename ${PWD})
HEAP_SIZE=$(shell echo "1024 * 1024 * 32" | bc) HEAP_SIZE=$(shell echo "1024 * 1024 * 32" | bc)
OPT=-Os OPT=-Os
CFLAGS=-DHEAP_SIZE=${HEAP_SIZE} CFLAGS=-DHEAP_SIZE=${HEAP_SIZE}
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S barr_memtest.c SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S barr_memtest.c
HOST_EXTRA=-e ${HEAP_SIZE} -i 4294967295 HOST_EXTRA=-e ${HEAP_SIZE} -i 4294967295
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

2
apps/rust-hello/Makefile
View file

@ -10,4 +10,4 @@ clean: clean_common
test: all test: all
${TOPDIR}/host/host ${PROJECT}.bin ${TOPDIR}/host/host ${PROJECT}.bin
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

2
apps/rust-hello/build.rs
View file

@ -3,7 +3,7 @@ use std::path::PathBuf;
fn main() { fn main() {
// linker // linker
println!("cargo:rustc-link-arg-bin=rust-hello=-T../linker.ld"); println!("cargo:rustc-link-arg-bin=rust-hello=-T../common/linker.ld");
let bindings = bindgen::Builder::default() let bindings = bindgen::Builder::default()
.header("../../common/uvm32_sys.h") .header("../../common/uvm32_sys.h")

2
apps/rust-hello/src/main.rs
View file

@ -9,7 +9,7 @@ use core::panic::PanicInfo;
include!(concat!(env!("OUT_DIR"), "/bindings.rs")); include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
// startup code // startup code
global_asm!(include_str!("../../crt0.S")); global_asm!(include_str!("../../common/crt0.S"));
fn syscall(id: u32, param1: u32, param2: u32) -> u32 { fn syscall(id: u32, param1: u32, param2: u32) -> u32 {
let mut value; let mut value;

4
apps/self/Makefile
View file

@ -1,10 +1,10 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S ${TOPDIR}/uvm32/uvm32.c SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S ${TOPDIR}/uvm32/uvm32.c
CFLAGS=-DUVM32_MEMORY_SIZE=8192 -DCUSTOM_STDLIB_H=\"uvm32_target.h\" -I../../uvm32 CFLAGS=-DUVM32_MEMORY_SIZE=8192 -DCUSTOM_STDLIB_H=\"uvm32_target.h\" -I../../uvm32
all: all:
xxd -n mandel -i ${TOPDIR}/precompiled/mandel.bin | sed -e "s/unsigned char/const unsigned char/" > mandel.h xxd -n mandel -i ${TOPDIR}/precompiled/mandel.bin | sed -e "s/unsigned char/const unsigned char/" > mandel.h
make all_common make all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/sketch/Makefile
View file

@ -1,7 +1,7 @@
TOPDIR=../.. TOPDIR=../..
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
test: test_common test: test_common
clean: clean_common clean: clean_common
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

2
apps/zig-mandel/Makefile
View file

@ -12,4 +12,4 @@ clean: clean_common
test: all test: all
${TOPDIR}/hosts/host/host ${PROJECT}.bin ${TOPDIR}/hosts/host/host ${PROJECT}.bin
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/zig-mandel/build.zig
View file

@ -37,8 +37,8 @@ pub fn build(b: *std.Build) void {
b.installArtifact(exe); b.installArtifact(exe);
exe.addAssemblyFile(b.path("../crt0.S")); exe.addAssemblyFile(b.path("../common/crt0.S"));
exe.setLinkerScript(b.path("../linker.ld")); exe.setLinkerScript(b.path("../common/linker.ld"));
exe.addIncludePath(b.path("../../common")); exe.addIncludePath(b.path("../../common"));
const bin = b.addObjCopy(exe.getEmittedBin(), .{ const bin = b.addObjCopy(exe.getEmittedBin(), .{

2
apps/zigalloc/Makefile
View file

@ -15,4 +15,4 @@ clean: clean_common
test: all test: all
${TOPDIR}/hosts/host/host ${HOST_EXTRA} ${PROJECT}.bin ${TOPDIR}/hosts/host/host ${HOST_EXTRA} ${PROJECT}.bin
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/zigalloc/build.zig
View file

@ -42,8 +42,8 @@ pub fn build(b: *std.Build) void {
b.installArtifact(exe); b.installArtifact(exe);
exe.addAssemblyFile(b.path("../crt0.S")); exe.addAssemblyFile(b.path("../common/crt0.S"));
exe.setLinkerScript(b.path("../linker.ld")); exe.setLinkerScript(b.path("../common/linker.ld"));
exe.addIncludePath(b.path("../../common")); exe.addIncludePath(b.path("../../common"));
const bin = b.addObjCopy(exe.getEmittedBin(), .{ const bin = b.addObjCopy(exe.getEmittedBin(), .{

2
apps/zigdoom/Makefile
View file

@ -15,4 +15,4 @@ clean: clean_common
test: all test: all
${TOPDIR}/hosts/host-sdl/host-sdl ${HOST_EXTRA} ${PROJECT}.bin ${TOPDIR}/hosts/host-sdl/host-sdl ${HOST_EXTRA} ${PROJECT}.bin
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/zigdoom/build.zig
View file

@ -79,8 +79,8 @@ pub fn build(b: *std.Build) void {
b.installArtifact(exe); b.installArtifact(exe);
exe.addAssemblyFile(b.path("../crt0.S")); exe.addAssemblyFile(b.path("../common/crt0.S"));
exe.setLinkerScript(b.path("../linker.ld")); exe.setLinkerScript(b.path("../common/linker.ld"));
exe.addIncludePath(b.path("../../common")); exe.addIncludePath(b.path("../../common"));
const bin = b.addObjCopy(exe.getEmittedBin(), .{ const bin = b.addObjCopy(exe.getEmittedBin(), .{

2
apps/zigtris/Makefile
View file

@ -12,4 +12,4 @@ clean: clean_common
test: all test: all
${TOPDIR}/hosts/host/host ${PROJECT}.bin ${TOPDIR}/hosts/host/host ${PROJECT}.bin
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
apps/zigtris/build.zig
View file

@ -52,8 +52,8 @@ pub fn build(b: *std.Build) void {
b.installArtifact(exe); b.installArtifact(exe);
exe.addAssemblyFile(b.path("../crt0.S")); exe.addAssemblyFile(b.path("../common/crt0.S"));
exe.setLinkerScript(b.path("../linker.ld")); exe.setLinkerScript(b.path("../common/linker.ld"));
exe.addIncludePath(b.path("../../common")); exe.addIncludePath(b.path("../../common"));
const bin = b.addObjCopy(exe.getEmittedBin(), .{ const bin = b.addObjCopy(exe.getEmittedBin(), .{

4
test/basic_syscalls/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@xxd -i ${PROJECT}.bin > ${PROJECT}-header.c @xxd -i ${PROJECT}.bin > ${PROJECT}-header.c
@ -10,4 +10,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
test/custom_syscall/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@xxd -i ${PROJECT}.bin > ${PROJECT}-header.c @xxd -i ${PROJECT}.bin > ${PROJECT}-header.c
@ -10,4 +10,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
test/extram/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@xxd -i ${PROJECT}.bin > ${PROJECT}-header.c @xxd -i ${PROJECT}.bin > ${PROJECT}-header.c
@ -10,4 +10,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
test/meter/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
OPT=-O0 # don't let optimiser remove stall loop OPT=-O0 # don't let optimiser remove stall loop
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@ -11,4 +11,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
test/stackoverflow/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
OPT=-O0 # don't optimise OPT=-O0 # don't optimise
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@ -11,4 +11,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common

4
test/syscall_args/rom/Makefile
View file

@ -1,6 +1,6 @@
TOPDIR=../../../ TOPDIR=../../../
PROJECT:=$(shell basename ${PWD}) PROJECT:=$(shell basename ${PWD})
SRCS=${PROJECT}.c ${TOPDIR}/apps/crt0.S SRCS=${PROJECT}.c ${TOPDIR}/apps/common/crt0.S
all: all_common all: all_common
@# Convert ROM to C file and header @# Convert ROM to C file and header
@xxd -i ${PROJECT}.bin > ${PROJECT}-header.c @xxd -i ${PROJECT}.bin > ${PROJECT}-header.c
@ -10,4 +10,4 @@ test: test_common
clean: clean_common clean: clean_common
rm -f ${PROJECT}-header.h ${PROJECT}-header.c rm -f ${PROJECT}-header.h ${PROJECT}-header.c
include ${TOPDIR}/apps/makefile.common include ${TOPDIR}/apps/common/makefile.common