Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update linked_list_allocator dependency to v0.9.0 #989

Merged
merged 29 commits into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
167ef5b
Update x86_64 dependency to v0.14.2 to fix nightly breakage
phil-opp May 17, 2021
eb2f818
Merge branch 'post-04-update-x86_64' into post-04
phil-opp May 17, 2021
d3cb811
Merge branch 'post-04' into post-05
phil-opp May 17, 2021
91f7592
Merge branch 'post-05' into post-06
phil-opp May 17, 2021
62fe232
Merge branch 'post-06' into post-07
phil-opp May 17, 2021
d008e26
Merge branch 'post-07' into post-08
phil-opp May 17, 2021
3c2b79b
Merge branch 'post-08' into post-09
phil-opp May 17, 2021
20dce91
Merge branch 'post-09' into post-10
phil-opp May 17, 2021
4804317
Take `InterruptStackFrame` by value as required by x86_64 v0.14
phil-opp May 17, 2021
5ae0f13
Merge branch 'post-05' into post-06
phil-opp May 17, 2021
1e22d28
Merge branch 'post-06' into post-07
phil-opp May 17, 2021
d61e579
Merge branch 'post-07' into post-08
phil-opp May 17, 2021
b5d4b9b
Merge branch 'post-08' into post-09
phil-opp May 17, 2021
7653ffc
Merge branch 'post-09' into post-10
phil-opp May 17, 2021
d55fa1e
Adjust post-06 to take `InterruptStackFrame` by value
phil-opp May 17, 2021
ad4b2a2
Merge branch 'post-06' into post-07
phil-opp May 17, 2021
80e52e4
Merge branch 'post-07' into post-08
phil-opp May 17, 2021
66d0d5d
Merge branch 'post-08' into post-09
phil-opp May 17, 2021
51caf33
Merge branch 'post-09' into post-10
phil-opp May 17, 2021
3aa979e
Switch to forked `pic8259` crate to fix nightly build error
phil-opp May 17, 2021
75abc11
Adjust post-07 to take `InterruptStackFrame` by value
phil-opp May 17, 2021
26ee93c
Merge branch 'post-07-switch-pic-crate' into post-07
phil-opp May 17, 2021
c3d3b13
Merge branch 'post-07' into post-08
phil-opp May 17, 2021
6c161ff
Merge branch 'post-08' into post-09
phil-opp May 17, 2021
62378b2
Merge branch 'post-09' into post-10
phil-opp May 17, 2021
bf19ace
Adjust post-08 to take `InterruptStackFrame` by value
phil-opp May 17, 2021
0e1efb5
Merge branch 'post-08' into post-09
phil-opp May 17, 2021
31d907a
Merge branch 'post-09' into post-10
phil-opp May 17, 2021
f2d93a4
Update `linked_list_allocator` dependency to v0.9.0
phil-opp May 17, 2021
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
42 changes: 13 additions & 29 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ harness = false
bootloader = { version = "0.9.8", features = ["map_physical_memory"]}
volatile = "0.2.6"
spin = "0.5.2"
x86_64 = "0.13.2"
x86_64 = "0.14.2"
uart_16550 = "0.2.0"
pic8259_simple = "0.2.0"
pic8259 = "0.10.1"
pc-keyboard = "0.5.0"
linked_list_allocator = "0.8.0"
linked_list_allocator = "0.9.0"

[dependencies.lazy_static]
version = "1.0"
Expand Down
12 changes: 6 additions & 6 deletions src/interrupts.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{gdt, hlt_loop, print, println};
use lazy_static::lazy_static;
use pic8259_simple::ChainedPics;
use pic8259::ChainedPics;
use spin;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};

Expand Down Expand Up @@ -47,12 +47,12 @@ pub fn init_idt() {
IDT.load();
}

extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
}

extern "x86-interrupt" fn page_fault_handler(
stack_frame: &mut InterruptStackFrame,
stack_frame: InterruptStackFrame,
error_code: PageFaultErrorCode,
) {
use x86_64::registers::control::Cr2;
Expand All @@ -65,21 +65,21 @@ extern "x86-interrupt" fn page_fault_handler(
}

extern "x86-interrupt" fn double_fault_handler(
stack_frame: &mut InterruptStackFrame,
stack_frame: InterruptStackFrame,
_error_code: u64,
) -> ! {
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
}

extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
print!(".");
unsafe {
PICS.lock()
.notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
}
}

extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStackFrame) {
use pc_keyboard::{layouts, DecodedKey, HandleControl, Keyboard, ScancodeSet1};
use spin::Mutex;
use x86_64::instructions::port::Port;
Expand Down
2 changes: 1 addition & 1 deletion tests/stack_overflow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub fn init_test_idt() {
}

extern "x86-interrupt" fn test_double_fault_handler(
_stack_frame: &mut InterruptStackFrame,
_stack_frame: InterruptStackFrame,
_error_code: u64,
) -> ! {
serial_println!("[ok]");
Expand Down