josh/hos
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

added k_main.cc, need to set up a stack before calling k_main()

Browse Source 
git-svn-id: svn://anubis/hos/trunk@51 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
josh 2009-07-14 03:34:16 +00:00
parent 594625b0fa
commit cf2d28f5ce
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/boot/boot.asm
View File

@ -16,7 +16,7 @@
extern _end, _bss extern _end, _bss
; Symbols from C ; Symbols from C
extern k_bootstrap, bootstrap_stack, mm_gdtr extern k_bootstrap, bootstrap_stack, mm_gdtr, k_main
;------------------------------------------------------- ;-------------------------------------------------------
[section .text] [section .text]
@ -107,6 +107,9 @@ segmentation_disabled:
mov cx, 0x0700 + 'f' mov cx, 0x0700 + 'f'
mov [CONSOLE_MEMORY+160*8+5*2], cx mov [CONSOLE_MEMORY+160*8+5*2], cx
; TODO: set up a stack!
; call k_main
idle_loop: idle_loop:
hlt hlt
jmp idle_loop jmp idle_loop

4
kernel/boot/k_main.cc Normal file
View File

@ -0,0 +1,4 @@
void k_main()
{
}