diff options
Diffstat (limited to 'src/bits32')
-rw-r--r-- | src/bits32/dtables.rs | 8 | ||||
-rw-r--r-- | src/bits32/segmentation.rs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/bits32/dtables.rs b/src/bits32/dtables.rs index 2be3be3..51596f8 100644 --- a/src/bits32/dtables.rs +++ b/src/bits32/dtables.rs @@ -1,19 +1,19 @@ //! Functions to load descriptor tables. use dtables::DescriptorTablePointer; -use bits32::segmentation::Descriptor32; +use bits32::segmentation::Descriptor; /// Load GDT table with 32bit descriptors -pub unsafe fn lgdt(gdt: &DescriptorTablePointer<Descriptor32>) { +pub unsafe fn lgdt(gdt: &DescriptorTablePointer<Descriptor>) { asm!("lgdt ($0)" :: "r" (gdt) : "memory"); } /// Load LDT table with 32bit descriptors. -pub unsafe fn lldt(ldt: &DescriptorTablePointer<Descriptor32>) { +pub unsafe fn lldt(ldt: &DescriptorTablePointer<Descriptor>) { asm!("lldt ($0)" :: "r" (ldt) : "memory"); } /// Load IDT table with 32bit descriptors. -pub unsafe fn lidt(idt: &DescriptorTablePointer<Descriptor32>) { +pub unsafe fn lidt(idt: &DescriptorTablePointer<Descriptor>) { asm!("lidt ($0)" :: "r" (idt) : "memory"); } diff --git a/src/bits32/segmentation.rs b/src/bits32/segmentation.rs index d75f4d8..dc6da52 100644 --- a/src/bits32/segmentation.rs +++ b/src/bits32/segmentation.rs @@ -8,12 +8,12 @@ use ::Ring; /// See Intel 3a, Section 3.4.5 "Segment Descriptors", and Section 3.5.2 #[derive(Copy, Clone, Debug, Default)] #[repr(C, packed)] -pub struct Descriptor32 { +pub struct Descriptor { pub lower: u32, pub upper: u32, } -impl Descriptor32 { +impl Descriptor { pub(crate) fn apply_builder_settings(&mut self, builder: &DescriptorBuilder) { builder.dpl.map(|ring| self.set_dpl(ring)); @@ -172,9 +172,9 @@ impl LdtDescriptorBuilder<u32> for DescriptorBuilder { } } -impl BuildDescriptor<Descriptor32> for DescriptorBuilder { - fn finish(&self) -> Descriptor32 { - let mut desc: Descriptor32 = Default::default(); +impl BuildDescriptor<Descriptor> for DescriptorBuilder { + fn finish(&self) -> Descriptor { + let mut desc: Descriptor = Default::default(); desc.apply_builder_settings(self); let typ = match self.typ { |