Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to llvm_asm to compile on latest nightly. #86

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch to llvm_asm to compile on latest nightly. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7aee9
Switch to llvm_asm to compile on latest nightly.
gz Jun 3, 2020
be55cc9
Add NetBSD
gz Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions benches/syscall.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern crate test;
#[bench]
fn syscall(b: &mut test::Bencher) {
b.iter(|| unsafe {
asm!("movq $$102, %rax\n\
llvm_asm!("movq $$102, %rax\n\
syscall"
:
:
Expand All @@ -25,7 +25,7 @@ fn syscall(b: &mut test::Bencher) {
#[bench]
fn syscall(b: &mut test::Bencher) {
b.iter(|| unsafe {
asm!("mov $$24, %eax\n\
llvm_asm!("mov $$24, %eax\n\
int $$0x80"
:
:
Expand Down
8 changes: 4 additions & 4 deletions src/arch/aarch64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(not(target_vendor = "apple"))]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# gdb has a hardcoded check that rejects backtraces where frame addresses
# do not monotonically decrease. It is turned off if the function is called
Expand Down Expand Up @@ -95,7 +95,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(target_vendor = "apple")]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# Identical to the above, except avoids .local/.size that aren't available on Mach-O.
__morestack:
Expand All @@ -110,7 +110,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -

#[naked]
unsafe extern "C" fn trampoline_2() {
asm!(
llvm_asm!(
r#"
# Set up the second part of our DWARF CFI.
# When unwinding the frame corresponding to this function, a DWARF unwinder
Expand Down Expand Up @@ -180,7 +180,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

let ret: usize;
let ret_sp: *mut usize;
asm!(
llvm_asm!(
r#"
# Set up the link register
adr lr, 0f
Expand Down
8 changes: 4 additions & 4 deletions src/arch/or1k.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub struct StackPointer(*mut usize);
pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -> !) -> StackPointer {
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# gdb has a hardcoded check that rejects backtraces where frame addresses
# do not monotonically decrease. It is turned off if the function is called
Expand Down Expand Up @@ -88,7 +88,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -

#[naked]
unsafe extern "C" fn trampoline_2() {
asm!(
llvm_asm!(
r#"
# Set up the second part of our DWARF CFI.
# When unwinding the frame corresponding to this function, a DWARF unwinder
Expand Down Expand Up @@ -160,7 +160,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

#[naked]
unsafe extern "C" fn trampoline() {
asm!(
llvm_asm!(
r#"
# Save the frame pointer and link register; the unwinder uses them to find
# the CFA of the caller, and so they have to have the correct value immediately
Expand Down Expand Up @@ -194,7 +194,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

let ret: usize;
let ret_sp: *mut usize;
asm!(
llvm_asm!(
r#"
# Call the trampoline to switch to the new context.
l.jal ${2}
Expand Down
10 changes: 5 additions & 5 deletions src/arch/x86.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(not(target_vendor = "apple"))]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# gdb has a hardcoded check that rejects backtraces where frame addresses
# do not monotonically decrease. It is turned off if the function is called
Expand Down Expand Up @@ -94,7 +94,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(target_vendor = "apple")]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# Identical to the above, except avoids .local/.size that aren't available on Mach-O.
__morestack:
Expand All @@ -109,7 +109,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -

#[naked]
unsafe extern "C" fn trampoline_2() {
asm!(
llvm_asm!(
r#"
# Set up the second part of our DWARF CFI.
# When unwinding the frame corresponding to this function, a DWARF unwinder
Expand Down Expand Up @@ -182,7 +182,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

#[naked]
unsafe extern "C" fn trampoline() {
asm!(
llvm_asm!(
r#"
# Save frame pointer explicitly; the unwinder uses it to find CFA of
# the caller, and so it has to have the correct value immediately after
Expand Down Expand Up @@ -217,7 +217,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

let ret: usize;
let ret_sp: *mut usize;
asm!(
llvm_asm!(
r#"
# Push instruction pointer of the old context and switch to
# the new context.
Expand Down
8 changes: 4 additions & 4 deletions src/arch/x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(not(target_vendor = "apple"))]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# gdb has a hardcoded check that rejects backtraces where frame addresses
# do not monotonically decrease. It is turned off if the function is called
Expand Down Expand Up @@ -99,7 +99,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -
#[cfg(target_vendor = "apple")]
#[naked]
unsafe extern "C" fn trampoline_1() {
asm!(
llvm_asm!(
r#"
# Identical to the above, except avoids .local/.size that aren't available on Mach-O.
__morestack:
Expand All @@ -114,7 +114,7 @@ pub unsafe fn init(stack: &Stack, f: unsafe extern "C" fn(usize, StackPointer) -

#[naked]
unsafe extern "C" fn trampoline_2() {
asm!(
llvm_asm!(
r#"
# Set up the second part of our DWARF CFI.
# When unwinding the frame corresponding to this function, a DWARF unwinder
Expand Down Expand Up @@ -182,7 +182,7 @@ pub unsafe fn swap(arg: usize, new_sp: StackPointer,

let ret: usize;
let ret_sp: *mut usize;
asm!(
llvm_asm!(
r#"
# Push the return address
leaq 0f(%rip), %rax
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
// http://opensource.org/licenses/MIT>, at your option. This file may not be
// copied, modified, or distributed except according to those terms.
#![feature(asm, naked_functions, untagged_unions)]
#![feature(llvm_asm, naked_functions, untagged_unions)]
#![cfg_attr(feature = "alloc", feature(alloc, allocator_api))]
#![cfg_attr(test, feature(test))]
#![no_std]
Expand Down
4 changes: 2 additions & 2 deletions src/stack/os/sys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ use self::libc::MAP_FAILED;
const GUARD_PROT: c_int = libc::PROT_NONE;
const STACK_PROT: c_int = libc::PROT_READ
| libc::PROT_WRITE;
#[cfg(not(any(target_os = "freebsd", target_os = "dragonfly", target_vendor = "apple")))]
#[cfg(not(any(target_os = "freebsd", target_os = "netbsd", target_os = "dragonfly", target_vendor = "apple")))]
const STACK_FLAGS: c_int = libc::MAP_STACK
| libc::MAP_PRIVATE
| libc::MAP_ANON;
// workaround for http://lists.freebsd.org/pipermail/freebsd-bugs/2011-July/044840.html
// according to libgreen, DragonFlyBSD suffers from this too
#[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_vendor = "apple"))]
#[cfg(any(target_os = "freebsd", target_os = "netbsd", target_os = "dragonfly", target_vendor = "apple"))]
const STACK_FLAGS: c_int = libc::MAP_PRIVATE
| libc::MAP_ANON;

Expand Down