From 2affe4c1e52775be8ad5eb0b026987ab712efcee Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Fri, 3 Dec 2021 10:03:29 -0700 Subject: Fixed volatile ASM --- Unix.mk | 4 ++-- Win.mk | 4 ++-- src/lib.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Unix.mk b/Unix.mk index 7a93f12..1cfaebe 100644 --- a/Unix.mk +++ b/Unix.mk @@ -56,10 +56,10 @@ obj/%.ao: src/%.S ${AS} ${AFLAGS} -c $< -o $@ run: build/kernel.elf - ${QEMU} -kernel $< ${QFLAGS} + @${QEMU} -kernel $< ${QFLAGS} run-debug: build/kernel-g.elf - ${QEMU} -kernel $< -s -S ${QFLAGS} + @${QEMU} -kernel $< -s -S ${QFLAGS} debug: build/kernel-g.elf build/kernel.list ${GDB} $< -command=gdbinit diff --git a/Win.mk b/Win.mk index 5986400..b992692 100644 --- a/Win.mk +++ b/Win.mk @@ -56,10 +56,10 @@ obj/%.ao: src/%.S ${AS} ${AFLAGS} -c $< -o $@ run: build/kernel.elf - ${QEMU} -kernel $< ${QFLAGS} + @${QEMU} -kernel $< ${QFLAGS} run-debug: build/kernel-g.elf - ${QEMU} -kernel $< -s -S ${QFLAGS} + @${QEMU} -kernel $< -s -S ${QFLAGS} debug: build/kernel-g.elf build/kernel.list ${GDB} $< -command=gdbinit diff --git a/src/lib.c b/src/lib.c index d6a5c9e..4493459 100644 --- a/src/lib.c +++ b/src/lib.c @@ -24,7 +24,7 @@ static inline void store32(unsigned long value, unsigned long addr) { } static inline void delay(unsigned long cycles) { - asm volatile("__delay_%=: subs%[cycles], %[cycles], #1;bne __delay_%=\n" + asm volatile("__delay_%=: subs %[cycles], %[cycles], #1;bne __delay_%=\n" : "=r"(cycles): [cycles]"0"(cycles) : "cc"); } -- cgit v1.2.1