CS Bug

katietheqt-old · katietheqt-old · commit 219ad216feab · 2020-08-08T10:15:48.000+01:00
diff --git a/src/instructions/segmentation.rs b/src/instructions/segmentation.rs
@@ -24,8 +24,8 @@ pub unsafe fn set_cs(sel: SegmentSelector) {
         }
 
         // Pushes the new CS and the address of the "ret" function
-        asm!("push {cs:x}; lea [{ret_sym}]; retf",
-            cs = in(reg) u64::from(sel.0), ret_sym = sym ret_sym);
+        asm!("push {cs}; lea {out_reg}, [{ret_sym}]; push {out_reg}, retf",
+            cs = in(reg) u64::from(sel.0), ret_sym = sym ret_sym, out_reg = out(reg) _);
     }
 
     #[cfg(not(feature = "inline_asm"))]

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ pub unsafe fn set_cs(sel: SegmentSelector) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// Pushes the new CS and the address of the "ret" function`
`27`		`- asm!("push {cs:x}; lea [{ret_sym}]; retf",`
`28`		`- cs = in(reg) u64::from(sel.0), ret_sym = sym ret_sym);`
	`27`	`+ asm!("push {cs}; lea {out_reg}, [{ret_sym}]; push {out_reg}, retf",`
	`28`	`+ cs = in(reg) u64::from(sel.0), ret_sym = sym ret_sym, out_reg = out(reg) _);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`#[cfg(not(feature = "inline_asm"))]`