diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:26:28 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:26:28 +0100 |
| commit | 0eefc758e23ec46465179847c2a20dca531d7b37 (patch) | |
| tree | a140fd509852b3f163d4fb64bc0c9a69bccf3275 | |
| parent | a9cd11b212950a4c88a85c59e6485a5868a6bbdd (diff) | |
| parent | f0f54117c8f206e8045d301c2eb975b26e9f263d (diff) | |
| download | ffmpeg-0eefc758e23ec46465179847c2a20dca531d7b37.tar.gz | |
Merge commit 'f0f54117c8f206e8045d301c2eb975b26e9f263d'
* commit 'f0f54117c8f206e8045d301c2eb975b26e9f263d':
checkasm: x86: post commit review fixes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | tests/checkasm/x86/checkasm.asm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm index 41462f1887..e1dde6e60a 100644 --- a/tests/checkasm/x86/checkasm.asm +++ b/tests/checkasm/x86/checkasm.asm @@ -98,7 +98,7 @@ cglobal stack_clobber, 1,2 ; void checkasm_checked_call(void *func, ...) ;----------------------------------------------------------------------------- INIT_XMM -%macro check_call 0-1 +%macro CHECKED_CALL 0-1 cglobal checked_call%1, 2,15,16,max_args*8+8 mov t0, r0 @@ -171,9 +171,8 @@ cglobal checked_call%1, 2,15,16,max_args*8+8 .clobber_ok: %ifnid %1, _emms fstenv [rsp] - mov r9h, [rsp + 8] - add r9h, 1 - jz .emms_ok + cmp word [rsp + 8], 0xffff + je .emms_ok report_fail error_message_emms emms .emms_ok: @@ -201,7 +200,7 @@ cglobal checked_call%1, 2,15,16,max_args*8+8 mov eax, r3 %endmacro -%macro check_call 0-1 +%macro CHECKED_CALL 0-1 ;----------------------------------------------------------------------------- ; void checkasm_checked_call(void *func, ...) ;----------------------------------------------------------------------------- @@ -225,10 +224,9 @@ cglobal checked_call%1, 1,7 report_fail error_message .clobber_ok: %ifnid %1, _emms - fstenv [rsp] - mov r3h, [rsp + 8] - add r3h, 1 - jz .emms_ok + fstenv [esp] + cmp word [esp + 8], 0xffff + je .emms_ok report_fail error_message_emms emms .emms_ok: @@ -241,5 +239,5 @@ cglobal checked_call%1, 1,7 %endif ; ARCH_X86_64 -check_call -check_call _emms +CHECKED_CALL +CHECKED_CALL _emms |