Remove interrupt setup from asm bootloader, add io module, memcpy functions, and serial driver

This commit is contained in:
Jeremy Soller 2016-08-14 09:31:35 -06:00
commit 42c9ba12dc

View file

@ -7,10 +7,23 @@ pub static mut IDTR: IdtDescriptor = IdtDescriptor {
pub static mut IDT: [IdtEntry; 256] = [IdtEntry::new(); 256];
bitflags! {
pub flags IdtFlags: u8 {
const IDT_PRESENT = 1 << 7,
const IDT_RING_0 = 0 << 5,
const IDT_RING_1 = 1 << 5,
const IDT_RING_2 = 2 << 5,
const IDT_RING_3 = 3 << 5,
const IDT_SS = 1 << 4,
const IDT_INTERRUPT = 0xE,
const IDT_TRAP = 0xF,
}
}
#[repr(packed)]
pub struct IdtDescriptor {
pub size: u16,
pub offset: u64
size: u16,
offset: u64
}
impl IdtDescriptor {
@ -18,18 +31,22 @@ impl IdtDescriptor {
self.size = (slice.len() * mem::size_of::<IdtEntry>() - 1) as u16;
self.offset = slice.as_ptr() as u64;
}
pub unsafe fn load(&self) {
asm!("lidt [rax]" : : "{rax}"(self as *const _ as usize) : : "intel", "volatile");
}
}
#[derive(Copy, Clone, Debug)]
#[repr(packed)]
pub struct IdtEntry {
pub offsetl: u16,
pub selector: u16,
pub zero: u8,
pub attribute: u8,
pub offsetm: u16,
pub offseth: u32,
pub zero2: u32
offsetl: u16,
selector: u16,
zero: u8,
attribute: u8,
offsetm: u16,
offseth: u32,
zero2: u32
}
impl IdtEntry {
@ -45,7 +62,12 @@ impl IdtEntry {
}
}
pub fn set_offset(&mut self, base: usize) {
pub fn set_flags(&mut self, flags: IdtFlags) {
self.attribute = flags.bits;
}
pub fn set_offset(&mut self, selector: u16, base: usize) {
self.selector = selector;
self.offsetl = base as u16;
self.offsetm = (base >> 16) as u16;
self.offseth = (base >> 32) as u32;