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

Jump to bottom

Add partial aarch64 support to libuser #566

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

Add partial aarch64 support to libuser #566

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee7b8a7
Convert syscall() to macro
leo60228 Mar 20, 2020
6391063
#[cfg] x86-only code
leo60228 Mar 20, 2020
471dfce
Add aarch64 target JSON
leo60228 Mar 20, 2020
11698f9
Use x86 get_my_tls_region on x86_64 to fix docs
leo60228 Mar 20, 2020
253cacd
Use non-arch-specific register names
leo60228 Mar 20, 2020
3a4de25
Add aarch64 syscall stub
leo60228 Mar 20, 2020
f57980e
Handle shifted arguments on x86
leo60228 Mar 20, 2020
b97f8a9
Address review
leo60228 Mar 20, 2020
eb2d5c8
Add note about aarch64 threads
leo60228 Mar 20, 2020
708cb35
Revert "Use non-arch-specific register names"
leo60228 Mar 20, 2020
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
20 changes: 20 additions & 0 deletions libuser/src/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,28 @@ macro_rules! syscall {
arg6
};

#[cfg(not(target_arch = "aarch64"))]
syscall_inner(&mut registers);

#[cfg(target_arch = "aarch64")]
asm!(
roblabla marked this conversation as resolved.
Show resolved Hide resolved
"svc $7"
: "={x0}"(registers.nr),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wow, you did exactly what I was discussing in the previous comment 😅

For aarch64, I don't see the need for copying arguments to the Registers struct. Can't you just directly use nr ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought Registers was in the public API? If it isn't, that's unnecessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was, but I think that's a mistake, it should be defined only for i386

"={x1}"(registers.arg1),
"={x2}"(registers.arg2),
"={x3}"(registers.arg3),
"={x4}"(registers.arg4),
"={x5}"(registers.arg5),
"={x6}"(registers.arg6)
: "i"($nr),
"{x1}"(registers.arg1),
"{x2}"(registers.arg2),
"{x3}"(registers.arg3),
"{x4}"(registers.arg4),
"{x5}"(registers.arg5),
"{x6}"(registers.arg6)
);

if registers.nr == 0 {
Ok((registers.arg1, registers.arg2, registers.arg3, registers.arg4))
} else {
Expand Down