Updating for rust 0.9.

.gitignore

@@ -2,3 +2,4 @@
 build
 img
 boot.iso
+*.o

Makefile

@@ -1,11 +1,16 @@
-.phony: all submodules
+.phony: all submodules image rust-core
 
-all: submodules
+all: submodules image
+
+image: rust-core
 	mkdir -p build
-	rustc -O -c --lib src/boot.rs -o build/boot.o
+	rustc -O -c --lib src/boot.rs -L external/rust-core/core
 	mkdir -p img/efi/boot
-	x86_64-efi-pe-ld --oformat pei-x86-64 --subsystem 10 -pie -e efi_start build/boot.o -o img/efi/boot/bootx64.efi
+	x86_64-efi-pe-ld --oformat pei-x86-64 --subsystem 10 -pie -e efi_start src/boot.o  external/rust-core/core/core.o -o img/efi/boot/bootx64.efi
 	mkisofs -o boot.iso img
 
 submodules:
 	git submodule update --init --recursive
+
+rust-core:
+	rustc -c --lib external/rust-core/core/lib.rs

src/boot.rs

@@ -1,10 +1,12 @@
 #[no_std];
 
 #[feature(asm)];
+#[feature(macro_rules)];
+
+extern mod core;
 
 use uefi::SimpleTextOutput;
 
-pub mod core;
 pub mod uefi;
 
 #[no_split_stack]

src/uefi/mod.rs

@@ -56,11 +56,12 @@ pub struct SystemTable(*EFI_SYSTEM_TABLE);
 
 impl SystemTable {
     #[no_split_stack]
-    fn console(&self) -> Console {
+    pub fn console(&self) -> Console {
         unsafe {
+            let &SystemTable(tbl) = self;
             Console {
-                input: (***self).ConIn,
-                output: (***self).ConOut,
+                input:  (*tbl).ConIn,
+                output: (*tbl).ConOut,
             }
         }
     }