From 711781d7a1714ea4eb0217eb1ba04811978c43d1 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 11 Dec 2015 14:06:38 +0100 Subject: x86: checkasm: check for or handle missing cleanup after MMX instructions Not every asm routine is expected clear the MMX state after returning. It is however a requisite for testing floating point code in checkasm. Annotate functions requiring cleanup with declare_func_emms() and issue emms after the call. The remaining functions are checked for having a cleared MMX state after return. --- tests/checkasm/x86/checkasm.asm | 78 ++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 20 deletions(-) (limited to 'tests/checkasm/x86') diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm index 94b19b66f2..147d7a7497 100644 --- a/tests/checkasm/x86/checkasm.asm +++ b/tests/checkasm/x86/checkasm.asm @@ -26,6 +26,7 @@ SECTION_RODATA error_message: db "failed to preserve register", 0 +error_message_emms: db "failed to issue emms", 0 %if ARCH_X86_64 ; just random numbers to reduce the chance of incidental match @@ -83,11 +84,22 @@ cglobal stack_clobber, 1,2 DECLARE_REG_TMP 7 %endif +%macro report_fail 1 + mov r9, rax + mov r10, rdx + lea r0, [%1] + xor eax, eax + call fail_func + mov rdx, r10 + mov rax, r9 +%endmacro + ;----------------------------------------------------------------------------- ; void checkasm_checked_call(void *func, ...) ;----------------------------------------------------------------------------- INIT_XMM -cglobal checked_call, 2,15,16,max_args*8+8 +%macro check_call 0-1 +cglobal checked_call%1, 2,15,16,max_args*8+8 mov t0, r0 ; All arguments have been pushed on the stack instead of registers in order to @@ -154,16 +166,22 @@ cglobal checked_call, 2,15,16,max_args*8+8 ; Call fail_func() with a descriptive message to mark it as a failure ; if the called function didn't preserve all callee-saved registers. ; Save the return value located in rdx:rax first to prevent clobbering. - jz .ok - mov r9, rax - mov r10, rdx - lea r0, [error_message] - xor eax, eax - call fail_func - mov rdx, r10 - mov rax, r9 -.ok: + jz .clobber_ok + report_fail error_message +.clobber_ok: +%ifnid %1, _emms + fstenv [rsp] + mov r9h, [rsp + 8] + add r9h, 1 + jz .emms_ok + report_fail error_message_emms + emms +.emms_ok: +%else + emms +%endif RET +%endmacro %else @@ -173,10 +191,21 @@ cglobal checked_call, 2,15,16,max_args*8+8 %define n5 dword 0xb78d0d1d %define n6 dword 0x33627ba7 +%macro report_fail 1 + mov r3, eax + mov r4, edx + lea r0, [%1] + mov [esp], r0 + call fail_func + mov edx, r4 + mov eax, r3 +%endmacro + +%macro check_call 0-1 ;----------------------------------------------------------------------------- ; void checkasm_checked_call(void *func, ...) ;----------------------------------------------------------------------------- -cglobal checked_call, 1,7 +cglobal checked_call%1, 1,7 mov r3, n3 mov r4, n4 mov r5, n5 @@ -192,16 +221,25 @@ cglobal checked_call, 1,7 or r3, r4 or r5, r6 or r3, r5 - jz .ok - mov r3, eax - mov r4, edx - lea r0, [error_message] - mov [esp], r0 - call fail_func - mov edx, r4 - mov eax, r3 -.ok: + jz .clobber_ok + report_fail error_message +.clobber_ok: +%ifnid %1, _emms + fstenv [rsp] + mov r3h, [rsp + 8] + add r3h, 1 + jz .emms_ok + report_fail error_message_emms + emms +.emms_ok: +%else + emms +%endif add esp, max_args*4 REP_RET +%endmacro %endif ; ARCH_X86_64 + +check_call +check_call _emms -- cgit v1.2.3