diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2014-11-18 15:21:50 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2014-11-18 15:21:50 -0800 |
| commit | 3d0c7c45da5b72a88bfb03dc5ce3384b7f01cef6 (patch) | |
| tree | 1c9fd69700e1162c7ed78458160800b586600c9b /upb/pb/compile_decoder_x64.dasc | |
| parent | 648afe3da654b6e08fe6ea26ae520581eb892e23 (diff) | |
Sync to Google-internal development.
Diffstat (limited to 'upb/pb/compile_decoder_x64.dasc')
| -rw-r--r-- | upb/pb/compile_decoder_x64.dasc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/upb/pb/compile_decoder_x64.dasc b/upb/pb/compile_decoder_x64.dasc index 180017f..a87b376 100644 --- a/upb/pb/compile_decoder_x64.dasc +++ b/upb/pb/compile_decoder_x64.dasc @@ -61,17 +61,21 @@ | add DELIMEND, DECODER->buf |.endmacro | -| // OPT: use "call rel32" where possible. +| // Calls an external C function at address "addr". |.macro callp, addr -|| { -|| //int64_t ofs = (int64_t)addr - (int64_t)upb_status_init; -|| //if (ofs > (1 << 30) || ofs < -(1 << 30)) { | mov64 rax, (uintptr_t)addr +| +| // Stack must be 16-byte aligned (x86-64 ABI requires this). +| // +| // OPT: possibly remove this by statically ensuring correct alignment. +| // +| // OPT: use "call rel32" where possible. +| push r12 +| mov r12, rsp +| and rsp, 0xfffffffffffffff0UL // Align stack. | call rax -|| //} else { -| // call &addr -|| //} -|| } +| mov rsp, r12 +| pop r12 |.endmacro | |.macro ld64, val @@ -208,12 +212,6 @@ static void emit_static_asm(jitcompiler *jc) { | push r12 | push rbx | - | // Align stack. - | // Since the JIT can call other functions (the JIT'ted code is not a leaf - | // function) we must respect alignment rules. All x86-64 systems require - | // 16-byte stack alignment. - | sub rsp, 8 - | | mov rbx, ARG2_64 // Preserve JIT method. | | mov DECODER, rdi @@ -234,7 +232,6 @@ static void emit_static_asm(jitcompiler *jc) { | mov rax, DECODER->size_param | mov qword DECODER->call_len, 0 |1: - | add rsp, 8 // Counter previous alignment. | pop rbx | pop r12 | pop r13 @@ -270,7 +267,6 @@ static void emit_static_asm(jitcompiler *jc) { | // Must NOT do this before the memcpy(), otherwise memcpy() will | // clobber the stack we are trying to save! | mov rsp, DECODER->saved_rsp - | add rsp, 8 // Counter previous alignment. | pop rbx | pop r12 | pop r13 |