aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Cunningham <cc@localhost>2021-12-03 10:03:29 -0700
committerChristian Cunningham <cc@localhost>2021-12-03 10:03:29 -0700
commit2affe4c1e52775be8ad5eb0b026987ab712efcee (patch)
tree26640ab7782cba5bc1a2d19f19e1937f27ee7355
parent18b60c587559903f210596f1272052262af5eb9a (diff)
Fixed volatile ASM
-rw-r--r--Unix.mk4
-rw-r--r--Win.mk4
-rw-r--r--src/lib.c2
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");
}