Backport ICE fix for gz#27.Backport ICE fix for gz#27.

Signed-off-by: Gerd Zellweger <[email protected]>
RWTH-OS · Jan 17, 2017 · b6210c7 · b6210c7
1 parent 63f4154
commit b6210c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "x86"
-version = "0.7.1"
+version = "0.7.2"
 authors = [
   "Gerd Zellweger <[email protected]>",
   "Eric Kidd <[email protected]>",

diff --git a/src/segmentation.rs b/src/segmentation.rs
@@ -170,27 +170,27 @@ impl fmt::Debug for SegmentDescriptor {
 
 /// Reload stack segment register.
 pub unsafe fn load_ss(sel: SegmentSelector) {
-    asm!("movw $0, %ss " :: "r" (sel) : "memory");
+    asm!("movw $0, %ss " :: "r" (sel.bits()) : "memory");
 }
 
 /// Reload data segment register.
 pub unsafe fn load_ds(sel: SegmentSelector) {
-    asm!("movw $0, %ds " :: "r" (sel) : "memory");
+    asm!("movw $0, %ds " :: "r" (sel.bits()) : "memory");
 }
 
 /// Reload es segment register.
 pub unsafe fn load_es(sel: SegmentSelector) {
-    asm!("movw $0, %es " :: "r" (sel) : "memory");
+    asm!("movw $0, %es " :: "r" (sel.bits()) : "memory");
 }
 
 /// Reload fs segment register.
 pub unsafe fn load_fs(sel: SegmentSelector) {
-    asm!("movw $0, %fs " :: "r" (sel) : "memory");
+    asm!("movw $0, %fs " :: "r" (sel.bits()) : "memory");
 }
 
 /// Reload gs segment register.
 pub unsafe fn load_gs(sel: SegmentSelector) {
-    asm!("movw $0, %gs " :: "r" (sel) : "memory");
+    asm!("movw $0, %gs " :: "r" (sel.bits()) : "memory");
 }
 
 /// Reload code segment register.

diff --git a/src/task.rs b/src/task.rs
@@ -40,5 +40,5 @@ impl TaskStateSegment {
 
 /// Load the task state register.
 pub unsafe fn load_ltr(sel: segmentation::SegmentSelector) {
-    asm!("ltr $0" :: "r" (sel));
+    asm!("ltr $0" :: "r" (sel.bits()));
 }