From cf2d28f5ce8f4de0a52b6d4c4d245f8970898b01 Mon Sep 17 00:00:00 2001
From: josh <josh@5b3e749e-e535-0410-8002-a9bb6afbdfca>
Date: Tue, 14 Jul 2009 03:34:16 +0000
Subject: [PATCH] added k_main.cc, need to set up a stack before calling
 k_main()

git-svn-id: svn://anubis/hos/trunk@51 5b3e749e-e535-0410-8002-a9bb6afbdfca
---
 kernel/boot/boot.asm  | 5 ++++-
 kernel/boot/k_main.cc | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 kernel/boot/k_main.cc

diff --git a/kernel/boot/boot.asm b/kernel/boot/boot.asm
index ae3d6fe..625ea65 100644
--- a/kernel/boot/boot.asm
+++ b/kernel/boot/boot.asm
@@ -16,7 +16,7 @@
 extern _end, _bss
 
 ; Symbols from C
-extern k_bootstrap, bootstrap_stack, mm_gdtr
+extern k_bootstrap, bootstrap_stack, mm_gdtr, k_main
 
 ;-------------------------------------------------------
 [section .text]
@@ -107,6 +107,9 @@ segmentation_disabled:
     mov     cx, 0x0700 + 'f'
     mov     [CONSOLE_MEMORY+160*8+5*2], cx
 
+    ; TODO: set up a stack!
+;    call    k_main
+
 idle_loop:
     hlt
     jmp     idle_loop
diff --git a/kernel/boot/k_main.cc b/kernel/boot/k_main.cc
new file mode 100644
index 0000000..3aacb2a
--- /dev/null
+++ b/kernel/boot/k_main.cc
@@ -0,0 +1,4 @@
+
+void k_main()
+{
+}