Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relibc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Peter Limkilde Svendsen
relibc
Commits
5b8d53dd
Verified
Commit
5b8d53dd
authored
8 months ago
by
Jacob Lorentzon
Browse files
Options
Downloads
Patches
Plain Diff
Fix x86_64 trampoline.
parent
cda5f189
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
redox-rt/src/arch/x86_64.rs
+11
-1
11 additions, 1 deletion
redox-rt/src/arch/x86_64.rs
with
11 additions
and
1 deletion
redox-rt/src/arch/x86_64.rs
+
11
−
1
View file @
5b8d53dd
...
...
@@ -231,6 +231,7 @@ asmfunction!(__relibc_internal_sigentry: ["
push r13
push r14
push r15
sub rsp, 16
push rax // selected signal
...
...
@@ -258,7 +259,7 @@ asmfunction!(__relibc_internal_sigentry: ["
xrstor [rsp]
5:
add rsp, 4096 + 32
add rsp, 4096 + 32
+ 16
pop r15
pop r14
pop r13
...
...
@@ -277,8 +278,17 @@ asmfunction!(__relibc_internal_sigentry: ["
popfq
pop qword ptr fs:[{tcb_sa_off} + {sa_tmp_rip}]
// x86 lacks atomic instructions for setting both the stack and instruction pointer
// simultaneously, except the slow microcoded IRETQ instruction. Thus, we let the arch_pre
// function emulate atomicity between the pop rsp and indirect jump.
.globl __relibc_internal_sigentry_crit_first
__relibc_internal_sigentry_crit_first:
pop rsp
.globl __relibc_internal_sigentry_crit_second
__relibc_internal_sigentry_crit_second:
jmp qword ptr fs:[{tcb_sa_off} + {sa_tmp_rip}]
6:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment