diff options
| author | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-06 18:39:12 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ens.fr> | 2014-12-06 18:39:12 +0100 |
| commit | ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95 (patch) | |
| tree | e7945b5cae3925ae50082da7b80e9b3caf914fa4 /kernel/include | |
| parent | 274765f7daa3cc1094f9f26196fcf2b9a5289ee2 (diff) | |
| download | macroscope-ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95.tar.gz macroscope-ff27e3d5ca61fb6234b0876dc3368d0e5dfc5a95.zip | |
Trying to track an annoying bug.
Diffstat (limited to 'kernel/include')
| -rw-r--r-- | kernel/include/idt.h | 2 | ||||
| -rw-r--r-- | kernel/include/slab_alloc.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/kernel/include/idt.h b/kernel/include/idt.h index ba344c9..e054ed5 100644 --- a/kernel/include/idt.h +++ b/kernel/include/idt.h @@ -88,4 +88,6 @@ void idt_init(); void idt_set_ex_handler(int number, isr_handler_t func); //Set exception handler void idt_set_irq_handler(int number, isr_handler_t func); //Set IRQ handler +void dbg_dump_registers(registers_t*); + /* vim: set ts=4 sw=4 tw=0 noet :*/ diff --git a/kernel/include/slab_alloc.h b/kernel/include/slab_alloc.h index 5c575ba..5355a66 100644 --- a/kernel/include/slab_alloc.h +++ b/kernel/include/slab_alloc.h @@ -8,7 +8,14 @@ #include <stddef.h> #include <stdbool.h> -#include <sys.h> +#if defined(__linux__) +//redefine necessary stuff +#include <assert.h> +#define ASSERT assert +#define PAGE_SIZE 0x1000 +#else +#include <sys.h> // this is macroscope +#endif // expected format for the array of slab_type_t given to slab_create : // an array of slab_type descriptors, with last descriptor full of zeroes |