Merge pull request #49 from intermezzOS/naked_fn

Use naked fn and define all interrupts in Rust
intermezzOS · Jun 13, 2016 · ed2a1e3 · ed2a1e3
2 parents 1838297 + 1f417f5
commit ed2a1e3
Show file tree

Hide file tree

Showing 4 changed files with 339 additions and 178 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -5,7 +5,7 @@ libcore_rlib_path = target/libcore/target/x86_64-unknown-intermezzos-gnu/release
 libcore_rlib = $(libcore_rlib_path)/libcore.rlib
 libcore_sha = 02e41cd5b925a1c878961042ecfb00470c68296b
 libintermezzos_a = target/x86_64-unknown-intermezzos-gnu/release/libintermezzos.a
-o_files = target/multiboot_header.o target/boot.o target/interrupt_handlers.o
+o_files = target/multiboot_header.o target/boot.o
 
 build: target/kernel.bin
 
@@ -22,10 +22,6 @@ $(libcore_rlib): target/libcore
 cargo: $(libcore_rlib)
 	RUSTFLAGS="-L $(libcore_rlib_path)" cargo build --release --target $(target).json
 
-target/interrupt_handlers.o: src/asm/interrupt_handlers.asm
-	mkdir -p target
-	nasm -f elf64 src/asm/interrupt_handlers.asm -o target/interrupt_handlers.o
-
 target/multiboot_header.o: src/asm/multiboot_header.asm
 	mkdir -p target
 	nasm -f elf64 src/asm/multiboot_header.asm -o target/multiboot_header.o

diff --git a/src/interrupts/Cargo.lock b/src/interrupts/Cargo.lock