Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

Use naked fn and define all interrupts in Rust #49

Merged
merged 10 commits into from
Jun 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
210 changes: 210 additions & 0 deletions src/interrupts/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading