aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/include/sys.h4
-rwxr-xr-xkernel/launch-qemu.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/include/sys.h b/kernel/include/sys.h
index b76ca26..85cbee6 100644
--- a/kernel/include/sys.h
+++ b/kernel/include/sys.h
@@ -8,7 +8,7 @@ uint8_t inb(uint16_t port);
uint16_t inw(uint16_t port);
-#define PANIC(s) panic(s, __FILE__, __LINE__);
-#define ASSERT(s) { if (!(s)) panic_assert(#s, __FILE__, __LINE__); }
void panic(const char* message, const char* file, int line);
void panic_assert(const char* assertion, const char* file, int line);
+#define PANIC(s) panic(s, __FILE__, __LINE__);
+#define ASSERT(s) { if (!(s)) panic_assert(#s, __FILE__, __LINE__); }
diff --git a/kernel/launch-qemu.sh b/kernel/launch-qemu.sh
new file mode 100755
index 0000000..bc77868
--- /dev/null
+++ b/kernel/launch-qemu.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qemu-system-i386 -kernel kernel.bin -serial stdio