[affinityos commit] r8 - in trunk: kernel lib/libc

[codesite...@google.com]

Author: ownthebox.net
Date: Wed Aug 2 07:33:54 2006
New Revision: 8

Modified:
trunk/kernel/Makefile
trunk/kernel/idt.c
trunk/lib/libc/Makefile

Log:
Fixed the Makefile in the kernel directory.

Modified: trunk/kernel/Makefile
==============================================================================
--- trunk/kernel/Makefile (original)
+++ trunk/kernel/Makefile Wed Aug 2 07:33:54 2006
@@ -1,13 +1,13 @@
C_CODE = main.c x86.c text_mode.c gdt.c idt.c timer.c keyboard.c
ASM_CODE = start.asm

-all: kernel.bin
+all: kernel.sys

include ../Makefile.common

-kernel.bin: $(OBJECTS)
- @echo " [$(LD)] Linking kernel with $(OBJECTS)"
- @$(LD) -T ../link.ld $(OBJECTS) $(DOTS)lib/libc.a
+kernel.sys: $(OBJECTS)
+ @echo " [$(LD)] Linking kernel with $(OBJECTS)."
+ @$(LD) -T ../link.ld -o ../kernel.sys $(OBJECTS) $(DOTS)lib/libc.a

clean:
rm -fr *.o

Modified: trunk/kernel/idt.c
==============================================================================
--- trunk/kernel/idt.c (original)
+++ trunk/kernel/idt.c Wed Aug 2 07:33:54 2006
@@ -166,7 +166,8 @@
/*
Display the exception that occurred. Then halt using an infinite loop.
*/
- printfc(LIGHT_RED, BLACK, "Exception occurred: %s\n", pszException_Messages[r->int_no]);
+ printfc(LIGHT_RED, BLACK, "Unhandled kernel fault has occured\n");
+ printfc(LIGHT_RED, BLACK, "The interrupt (%s) occured at EIP: %s\n", pszException_Messages[r->int_no], r->eip);
for (;;);
}
}

Modified: trunk/lib/libc/Makefile
==============================================================================
--- trunk/lib/libc/Makefile (original)
+++ trunk/lib/libc/Makefile Wed Aug 2 07:33:54 2006
@@ -6,6 +6,7 @@
include ../../Makefile.common

libc.a: $(ALL_OBJS)
- $(AR) rcs ../libc.a $(OBJECTS)
+ @echo "Converting libc objects into a library: $(OBJECTS)."
+ @$(AR) rcs ../libc.a $(OBJECTS)

clean: @rm -f *.o