diff options
| -rw-r--r-- | asm/multiboot.h | 16 | ||||
| -rw-r--r-- | asm/start.h | 21 | ||||
| -rw-r--r-- | asm/start.s (renamed from asm/multiboot.s) | 0 | ||||
| -rw-r--r-- | kernel/interrupts.c | 3 |
4 files changed, 22 insertions, 18 deletions
diff --git a/asm/multiboot.h b/asm/multiboot.h deleted file mode 100644 index f2acaf1..0000000 --- a/asm/multiboot.h +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file - * _multiboot.s_ defines the following sections/functions, some are linked at - * specific addresses in the final ELF kernel binary. - * This is specified in the _linker.ld_ file. - * - * * 0x07000 .smp - entry point for application processors (16bit code) - * * 0x10000 .multiboot - the multiboot header - * * .text - * * .bootstrap_stack - * * _start() - main entry point for booting cpu, calls kernel_main(). - */ - -/** This will be called by a multiboot compilant boot-loader (i.e. grub2) */ -void _start(); - diff --git a/asm/start.h b/asm/start.h new file mode 100644 index 0000000..ff30326 --- /dev/null +++ b/asm/start.h @@ -0,0 +1,21 @@ +/** + * @file + * Defines the following sections/functions, some are linked at + * specific addresses in the final ELF kernel binary. + * This is specified in the _linker.ld_ file. + * + * * 0x007000 .smp - entry point for application processors (16bit code) + * * 0x100000 .multiboot - the multiboot header + * + * * .text + * * .bootstrap_stack + * * _start() - main entry point for booting cpu, calls kernel_main(). + * + * The addresses for .smp and .multiboot are based on the assumption: + * * 0x00000500 - 0x00007BFF : guaranteed free to use + * * 0x00100000 - 0x00EFFFFF : free for use (if it exists) + */ + +/** This will be called by a multiboot compilant boot-loader (i.e. grub2) */ +void _start(); + diff --git a/asm/multiboot.s b/asm/start.s index bb12a7c..bb12a7c 100644 --- a/asm/multiboot.s +++ b/asm/start.s diff --git a/kernel/interrupts.c b/kernel/interrupts.c index 0343ad3..04bac9f 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -16,7 +16,6 @@ static struct int_desc uint8_t zeros; uint8_t flags; uint16_t addrHi; - } idt[INT_MAX]; // interrupt descriptor table descriptor @@ -29,7 +28,7 @@ static struct idt_desc uint32_t interrupt_handler(uint32_t esp, uint32_t num) { - if(num!=0)klog("int: %d %d",num,esp); +// if(num!=0)klog("int: %d %d",num,esp); if(num==0) { |