From 6f11c9e5c15cc8ef936741e5ee7575b731a47e0f Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 30 Nov 2014 22:23:06 +0100 Subject: No, this time really add it. --- .gitignore | 1 + kernel/include/sys.h | 4 ++-- kernel/launch-qemu.sh | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 kernel/launch-qemu.sh diff --git a/.gitignore b/.gitignore index fe99865..426ea32 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.3