Update to latest bit_field version

This commit is contained in:
Philipp Oppermann
2017-01-25 13:45:57 +01:00
parent fce85e68ee
commit 46100ba24b
3 changed files with 9 additions and 9 deletions

View File

@@ -4,7 +4,7 @@ name = "blog_os"
version = "0.1.0"
[dependencies]
bit_field = "0.5.0"
bit_field = "0.7.0"
bitflags = "0.7.0"
multiboot2 = "0.1.0"
once = "0.3.2"

View File

@@ -71,15 +71,15 @@ impl Descriptor {
let mut low = PRESENT.bits();
// base
low.set_range(16..40, ptr.get_range(0..24));
low.set_range(56..64, ptr.get_range(24..32));
low.set_bits(16..40, ptr.get_bits(0..24));
low.set_bits(56..64, ptr.get_bits(24..32));
// limit (the `-1` in needed since the bound is inclusive)
low.set_range(0..16, (size_of::<TaskStateSegment>() - 1) as u64);
low.set_bits(0..16, (size_of::<TaskStateSegment>() - 1) as u64);
// type (0b1001 = available 64-bit tss)
low.set_range(40..44, 0b1001);
low.set_bits(40..44, 0b1001);
let mut high = 0;
high.set_range(0..32, ptr.get_range(32..64));
high.set_bits(0..32, ptr.get_bits(32..64));
Descriptor::SystemSegment(low, high)
}

View File

@@ -81,7 +81,7 @@ pub struct EntryOptions(u16);
impl EntryOptions {
fn minimal() -> Self {
let mut options = 0;
options.set_range(9..12, 0b111); // 'must-be-one' bits
options.set_bits(9..12, 0b111); // 'must-be-one' bits
EntryOptions(options)
}
@@ -103,14 +103,14 @@ impl EntryOptions {
#[allow(dead_code)]
pub fn set_privilege_level(&mut self, dpl: u16) -> &mut Self {
self.0.set_range(13..15, dpl);
self.0.set_bits(13..15, dpl);
self
}
pub fn set_stack_index(&mut self, index: u16) -> &mut Self {
// The hardware IST index starts at 1, but our software IST index
// starts at 0. Therefore we need to add 1 here.
self.0.set_range(0..3, index + 1);
self.0.set_bits(0..3, index + 1);
self
}
}