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

Merge pull request #244 from qnighy/dynamic-stack-probing 

Fix segfault on probestack with dynamic alloca.
This commit is contained in:
Alex Crichton 2018-05-28 11:54:19 -05:00 committed by GitHub
parent 28daccd915 1d15be6a86
commit 6eb8f8d710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/probestack.rs
View File

@ -64,6 +64,13 @@ pub unsafe extern fn __rust_probestack() {
// bytes pushed on the stack orginally with our return address. Using // bytes pushed on the stack orginally with our return address. Using
// `8(%rsp)` simulates us testing the stack pointer in the caller's // `8(%rsp)` simulates us testing the stack pointer in the caller's
// context. // context.
// It's usually called when %rax >= 0x1000, but that's not always true.
// Dynamic stack allocation, which is needed to implement unsized
// rvalues, triggers stackprobe even if %rax < 0x1000.
// Thus we have to check %r11 first to avoid segfault.
cmp $$0x1000,%r11
jna 3f
2: 2:
sub $$0x1000,%rsp sub $$0x1000,%rsp
test %rsp,8(%rsp) test %rsp,8(%rsp)
@ -71,6 +78,7 @@ pub unsafe extern fn __rust_probestack() {
cmp $$0x1000,%r11 cmp $$0x1000,%r11
ja 2b ja 2b
3:
// Finish up the last remaining stack space requested, getting the last // Finish up the last remaining stack space requested, getting the last
// bits out of r11 // bits out of r11
sub %r11,%rsp sub %r11,%rsp
@ -98,6 +106,9 @@ pub unsafe extern fn __rust_probestack() {
asm!(" asm!("
push %ecx push %ecx
mov %eax,%ecx mov %eax,%ecx
cmp $$0x1000,%ecx
jna 3f
2: 2:
sub $$0x1000,%esp sub $$0x1000,%esp
test %esp,8(%esp) test %esp,8(%esp)
@ -105,6 +116,7 @@ pub unsafe extern fn __rust_probestack() {
cmp $$0x1000,%ecx cmp $$0x1000,%ecx
ja 2b ja 2b
3:
sub %ecx,%esp sub %ecx,%esp
test %esp,8(%esp) test %esp,8(%esp)