From 4c782615c5d9f34be2a789dd6c970edfa76976eb Mon Sep 17 00:00:00 2001 From: RKennedy9064 Date: Mon, 24 May 2021 19:25:17 -0500 Subject: [PATCH 1/3] Update Cargo.toml --- testing/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 4a8c68c..0cd0816 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" bootloader = { version = "0.9.11", features = ["map_physical_memory"] } conquer-once = { version = "0.3.2", default-features = false } spinning_top = { version = "0.2.4", features = ["nightly"] } -pic8259_simple = "0.2.0" +pic8259 = "0.10.1" vga = { path = "../" } uart_16550 = "0.2.14" x86_64 = "0.14.2" From 1c0b29dba212d75eb75b3235cf616f5fa476252e Mon Sep 17 00:00:00 2001 From: RKennedy9064 Date: Mon, 24 May 2021 19:27:14 -0500 Subject: [PATCH 2/3] Update interrupts.rs --- testing/src/interrupts.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/src/interrupts.rs b/testing/src/interrupts.rs index 4a47680..7650e3e 100644 --- a/testing/src/interrupts.rs +++ b/testing/src/interrupts.rs @@ -2,7 +2,7 @@ use crate::gdt; use crate::{hlt_loop, serial_print, serial_println}; use conquer_once::spin::Lazy; use core::convert::Into; -use pic8259_simple::ChainedPics; +use pic8259::ChainedPics; use spinning_top::Spinlock; use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode}; From f88a4cfc0733d314da503ab62f48e3feda318374 Mon Sep 17 00:00:00 2001 From: Ryan Kennedy Date: Mon, 24 May 2021 20:22:55 -0500 Subject: [PATCH 3/3] Update testing --- testing/src/interrupts.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/src/interrupts.rs b/testing/src/interrupts.rs index 7650e3e..e6f1d02 100644 --- a/testing/src/interrupts.rs +++ b/testing/src/interrupts.rs @@ -49,14 +49,14 @@ pub fn init_idt() { } 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 page_fault_handler( - stack_frame: &mut InterruptStackFrame, + stack_frame: InterruptStackFrame, error_code: PageFaultErrorCode, ) { use x86_64::registers::control::Cr2; @@ -69,7 +69,7 @@ extern "x86-interrupt" fn page_fault_handler( } extern "x86-interrupt" fn segment_not_present( - _stack_frame: &mut InterruptStackFrame, + _stack_frame: InterruptStackFrame, _error_code: u64, ) { // For some reason this sometimes gets thrown when running tests in qemu,