Fix bug where Console::the() was initialized too late.

Yet another problem due to lack of BSS zeroing in the kernel loader...
This commit is contained in:
Andreas Kling 2018-10-30 23:01:48 +01:00
parent 00c21d1590
commit b833aa4162
Notes: sideshowbarker 2024-07-19 18:36:19 +09:00
3 changed files with 4 additions and 2 deletions

View File

@ -10,6 +10,7 @@ static Console* s_the;
Console& Console::the()
{
ASSERT(s_the);
return *s_the;
}

View File

@ -117,7 +117,7 @@ DWORD handle(DWORD function, DWORD arg1, DWORD arg2, DWORD arg3)
case Syscall::PosixTtynameR:
return current->sys$ttyname_r((int)arg1, (char*)arg2, (size_t)arg3);
default:
kprintf("int0x80: Unknown function %x requested {%x, %x, %x}\n", function, arg1, arg2, arg3);
kprintf("<%u> int0x80: Unknown function %x requested {%x, %x, %x}\n", current->pid(), function, arg1, arg2, arg3);
break;
}
return 0;

View File

@ -218,6 +218,8 @@ void init()
kmalloc_init();
vga_init();
auto console = make<Console>();
RTC::initialize();
PIC::initialize();
gdt_init();
@ -225,7 +227,6 @@ void init()
keyboard = new Keyboard;
auto console = make<Console>();
VirtualConsole::initialize();
tty0 = new VirtualConsole(0, VirtualConsole::AdoptCurrentVGABuffer);
tty1 = new VirtualConsole(1);