diff options
| author |  Philipp Oppermann <dev@phil-opp.com>
| 2017-01-17 12:38:36 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-01-17 12:38:36 +0100 |
| commit | 4ea243fcde12460d5e0dd8d1407d2ea2671aca7a (patch) | |
| tree | ecf278fd8110e95c2851ff6b5d8765c705b89372 /src/shared/segmentation.rs | |
| parent | 5fe8d4213a70415b97c6d7bb71a52171cd55db3e (diff) | |
| parent | ea25a5a4680b92c3e9e21a2ef8be3ef4b0212486 (diff) | |
| download | rust-x86-4ea243fcde12460d5e0dd8d1407d2ea2671aca7a.tar.gz rust-x86-4ea243fcde12460d5e0dd8d1407d2ea2671aca7a.tar.zst rust-x86-4ea243fcde12460d5e0dd8d1407d2ea2671aca7a.zip | |
Merge pull request #27 from phil-opp/ice-fix
Structures are not considered immediates anymore
Diffstat (limited to 'src/shared/segmentation.rs')
| -rw-r--r-- | src/shared/segmentation.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/segmentation.rs b/src/shared/segmentation.rs index 2fcfa87..e836d42 100644 --- a/src/shared/segmentation.rs +++ b/src/shared/segmentation.rs @@ -107,27 +107,27 @@ impl fmt::Display for SegmentSelector { /// 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"); } /// Returns the current value of the code segment register. |