diff options
| author | Alex Auvolat <alex.auvolat@ens.fr> | 2014-11-30 22:23:06 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ens.fr> | 2014-11-30 22:23:06 +0100 |
| commit | 6f11c9e5c15cc8ef936741e5ee7575b731a47e0f (patch) | |
| tree | ec9ac1e9822c3e1ffe895479670c3729fbd20954 | |
| parent | 9caa9c3a5200e622022f70f24a2d004bf6e25c25 (diff) | |
| download | macroscope-6f11c9e5c15cc8ef936741e5ee7575b731a47e0f.tar.gz macroscope-6f11c9e5c15cc8ef936741e5ee7575b731a47e0f.zip | |
No, this time really add it.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | kernel/include/sys.h | 4 | ||||
| -rwxr-xr-x | kernel/launch-qemu.sh | 3 |
3 files changed, 6 insertions, 2 deletions
@@ -5,6 +5,7 @@ *.bin # codelite files +.codelite */.codelite *.project *.workspace 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 |