bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #85054 - jethrogb:jb/sgx-inline-asm, r=Amanieu

Browse source 
Revert SGX inline asm syntax

This was erroneously changed in #83387
This commit is contained in:
Yuki Okushi 2021-06-22 07:37:42 +09:00 • committed by GitHub
commit d6e344d45d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
library/std/src/os/fortanix_sgx/arch.rs
View file

@ -33,13 +33,13 @@ pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32>
asm!( asm!(
// rbx is reserved by LLVM // rbx is reserved by LLVM
"xchg {0}, rbx", "xchg %rbx, {0}",
"enclu", "enclu",
"mov rbx, {0}", "mov {0}, %rbx",
inout(reg) request => _, inout(reg) request => _,
inlateout("eax") ENCLU_EGETKEY => error, inlateout("eax") ENCLU_EGETKEY => error,
in("rcx") out.as_mut_ptr(), in("rcx") out.as_mut_ptr(),
options(nostack), options(att_syntax, nostack),
); );
match error { match error {
@ -64,14 +64,14 @@ pub fn ereport(
asm!( asm!(
// rbx is reserved by LLVM // rbx is reserved by LLVM
"xchg {0}, rbx", "xchg %rbx, {0}",
"enclu", "enclu",
"mov rbx, {0}", "mov {0}, %rbx",
inout(reg) targetinfo => _, inout(reg) targetinfo => _,
in("eax") ENCLU_EREPORT, in("eax") ENCLU_EREPORT,
in("rcx") reportdata, in("rcx") reportdata,
in("rdx") report.as_mut_ptr(), in("rdx") report.as_mut_ptr(),
options(preserves_flags, nostack), options(att_syntax, preserves_flags, nostack),
); );
report.assume_init() report.assume_init()

4
library/std/src/sys/sgx/abi/mem.rs
View file

@ -36,9 +36,9 @@ pub fn image_base() -> u64 {
let base: u64; let base: u64;
unsafe { unsafe {
asm!( asm!(
"lea {}, qword ptr [rip + IMAGE_BASE]", "lea IMAGE_BASE(%rip), {}",
lateout(reg) base, lateout(reg) base,
options(nostack, preserves_flags, nomem, pure), options(att_syntax, nostack, preserves_flags, nomem, pure),
) )
}; };
base base