M-Labs
/
compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #218 - Amanieu:blx_fix, r=alexcrichton 

Fix __kuser_cmpxchg inline asm

The wrong register was passed to BLX. However I just changed them to normal function calls to simplify things.
This commit is contained in:
bors 2017-12-20 06:04:26 +00:00
parent 0633d73c55 0fe7c79389
commit 000d06a57a
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/arm_linux.rs
View File

@ -4,23 +4,12 @@ use core::mem;
// Kernel-provided user-mode helper functions: // Kernel-provided user-mode helper functions:
// https://www.kernel.org/doc/Documentation/arm/kernel_user_helpers.txt // https://www.kernel.org/doc/Documentation/arm/kernel_user_helpers.txt
unsafe fn __kuser_cmpxchg(oldval: u32, newval: u32, ptr: *mut u32) -> bool { unsafe fn __kuser_cmpxchg(oldval: u32, newval: u32, ptr: *mut u32) -> bool {
let out: u32; let f: extern "C" fn (u32, u32, *mut u32) -> u32 = mem::transmute(0xffff0fc0u32);
// FIXME: we can't use BLX on ARMv4 f(oldval, newval, ptr) == 0
asm!("blx ${0}"
: "={r0}" (out)
: "r" (0xffff0fc0u32)
"{r0}" (oldval),
"{r1}" (newval),
"{r2}" (ptr)
: "r3", "r12", "lr", "cc", "memory");
out == 0
} }
unsafe fn __kuser_memory_barrier() { unsafe fn __kuser_memory_barrier() {
// FIXME: we can't use BLX on ARMv4 let f: extern "C" fn () = mem::transmute(0xffff0fa0u32);
asm!("blx ${0}" f();
:
: "r" (0xffff0fa0u32)
: "lr", "memory");
} }
// Word-align a pointer // Word-align a pointer