justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Load ELF file by sections to get addresses right

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-06 22:03:44 -07:00
parent 97fb8ef653
commit cce892e92f
5 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/kernel/interrupt_isrs.inc
View File

@@ -100,6 +100,40 @@ IRQ (0x5d, 0x3d, irq3D)
IRQ (0x5e, 0x3e, irq3E)
IRQ (0x5f, 0x3f, irq3F)
IRQ (0x60, 0x40, irq40)
IRQ (0x61, 0x41, irq41)
IRQ (0x62, 0x42, irq42)
IRQ (0x63, 0x43, irq43)
IRQ (0x64, 0x44, irq44)
IRQ (0x65, 0x45, irq45)
IRQ (0x66, 0x46, irq46)
IRQ (0x67, 0x47, irq47)
IRQ (0x68, 0x48, irq48)
IRQ (0x69, 0x49, irq49)
IRQ (0x6a, 0x4a, irq4A)
IRQ (0x6b, 0x4b, irq4B)
IRQ (0x6c, 0x4c, irq4C)
IRQ (0x6d, 0x4d, irq4D)
IRQ (0x6e, 0x4e, irq4E)
IRQ (0x6f, 0x4f, irq4F)
IRQ (0x70, 0x50, irq50)
IRQ (0x71, 0x51, irq51)
IRQ (0x72, 0x52, irq52)
IRQ (0x73, 0x53, irq53)
IRQ (0x74, 0x54, irq54)
IRQ (0x75, 0x55, irq55)
IRQ (0x76, 0x56, irq56)
IRQ (0x77, 0x57, irq57)
IRQ (0x78, 0x58, irq58)
IRQ (0x79, 0x59, irq59)
IRQ (0x7a, 0x5a, irq5A)
IRQ (0x7b, 0x5b, irq5B)
IRQ (0x7c, 0x5c, irq5C)
IRQ (0x7d, 0x5d, irq5D)
IRQ (0x7e, 0x5e, irq5E)
IRQ (0x7f, 0x5f, irq5F)
ISR (0xec, isrTimer)
ISR (0xed, isrLINT0)
ISR (0xee, isrLINT1)

7
src/kernel/main.cpp
View File

@@ -46,7 +46,7 @@ init_console(const popcorn_data *header)
cons->puts(GIT_VERSION " booting...\n");
log::init(cons);
log::enable(logs::apic, log::level::info);
log::enable(logs::apic, log::level::debug);
log::enable(logs::devices, log::level::debug);
log::enable(logs::memory, log::level::info);
}
@@ -58,11 +58,6 @@ void do_error_1() { do_error_2(); }
void
kernel_main(popcorn_data *header)
{
// First clear BSS
kutil::memset(__bss_start, 0,
reinterpret_cast<uint64_t>(__bss_end) -
reinterpret_cast<uint64_t>(__bss_start));
page_manager *pager = new (&g_page_manager) page_manager;
memory_initialize_managers(