From patchwork Tue Dec 19 12:02:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 45240 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp7961406pzf; Tue, 19 Dec 2023 04:02:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IGX7bK6UxNlxld64igjbYjYhMCvor5icFo1sd760noF0n8YxqXBP8FJ+YZ/lOrmKk6AKVu5 X-Received: by 2002:a17:907:d384:b0:a1c:897e:fd9b with SMTP id vh4-20020a170907d38400b00a1c897efd9bmr21227966ejc.6.1702987337930; Tue, 19 Dec 2023 04:02:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702987337; cv=none; d=google.com; s=arc-20160816; b=cwQiBc9bC9NuYE+Evr0eAdvuDtcZ7/J5bIGHmyoErwEerP5sE6Tg0MHVIr1FqJ5Ppr huMGW2lwTlj2bSBpHMa1qjEOCf9EYDAL2V4boqp1b9HYV5lhMc1rQsCTOq5nhrSHScfd 0/1VwQcqQBJodgSQyGKqwovbw3X/l1gDDcpa0fndNtj/cS6Bmc8v/rMrDCvQ/Tjl47io LFA5fgjBU98HRxipkOVmZLEVueQ5zt2Pe/QZ4pOKtF2Ot2Zjc++Qmu6gpenXe4pC/ge1 QkOVTnEAb3yPDbjfoWzROZLwlO1cTHFCKVkmKjE1AZUBkDtU9UKhogq+x6zDuRt//Ccr AXpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=trFdKCiVifZISUrnIVcWGU7m/D3L6qL49NapdM+SMt0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=X2cvl5Ew7zSMdZIhb/+6INaV3RgYVzo7T0FEC3+QNiBW5dVEYuniiZu1GiC95VLvaP bqCMeugc1VuDqSmdTAygab0lhKaKO/o/4xBXqJmlqnKiVZM5mb4kHstUUlQLwNpOoAqf HjA20VAMShthxwVz329g7zUweC0Zx211BScBIIxK46892YwqGeTfD8PnJZmKA+WU0VQY cAWaH/rUwthmaooP14SW/JFj0Cmx7lYs2M639QszXwXxrjmocsxZj16sYsF2glob1/1t OnMgSIRUsoQYdMdgfs5uvbM/RuSbjWLWKQSO57NDdd/kwtWQAlltsqH+a9MuQV3Neheq FKtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=D8ObDhGd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s4-20020a1709066c8400b00a2359f7169esi1504336ejr.337.2023.12.19.04.02.12; Tue, 19 Dec 2023 04:02:17 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=D8ObDhGd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7898C68D0B0; Tue, 19 Dec 2023 14:02:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9269068CFB7 for ; Tue, 19 Dec 2023 14:02:02 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-50e39ac39bcso2837539e87.3 for ; Tue, 19 Dec 2023 04:02:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1702987322; x=1703592122; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=md6ZzX4PyBVFqdShLvPM2UViEouBz1uD2R6ehkD2g7w=; b=D8ObDhGd2PcQd9DnWlbqUTP2J0wzSAhjoBq/UF969+lcjienYSizWLtNJ06q3TVrX6 fzOhndSNoMHdRizJUhD2naGCvEglOmLCpROO7Yxx/6+ykyKi5S+nuFoc4sNjG0tcR4Tb kzyK5g5+jeM4hTbsLzj61GZiNm+5zHegiv3ArTPPC7/bemHTrLHObZ1Xj9l6BBvHYeHh o6y9uXOauvpz7yOT87DLY/F6bhUvh/0IJP4rreCTarVahlv02zYT08EQzMqTgfTUHKfv nXOF5gOmYL8vjowT4gIDCkNylIR6Hu0BjFIcsG2BhCcFobnQmK9NFlHBM5e3emNzqr1h 5Ekg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702987322; x=1703592122; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=md6ZzX4PyBVFqdShLvPM2UViEouBz1uD2R6ehkD2g7w=; b=KZIiuTF8ENdRtGt/UYGcHiDkYn1ieBgtjt0AftI27Pa1RDWFuxoi5Ey0cF82mspgj9 j4QlhWKubCNtt/kbRf113XWUphJ1j/GCWVRJgh5by+rnKeiMvb8smqAW8amvkDyDRNUj XaMK6Cwz7OWv9vSEw6RxFLUhZyBXj+vDxPFo0IyYybPYgBrJt3U5V22bpsPAV9v+S4H/ SCEAEJQo9Gnw/Kw/hfbFONO4GIq1POe7henE7Bmm7epSP4AebHBUDHV0K6tr6HWFE1uk /egFGPof8BcCKK2KfrLhx8HVNRH1tXKSr7UwARNPrMpS821+/Zfll11Qp16OicQy+TqJ j6fw== X-Gm-Message-State: AOJu0YzNu/Z5mbrBZOR1YY6cuGXl7KlCbWI3HVdksVmG0eZdJwfPXu9h P1dsaPlf0dJ/JYbkShLxFjNMq5PZCEAirGnbqg2mvA== X-Received: by 2002:a05:6512:128e:b0:50d:fb92:d3e0 with SMTP id u14-20020a056512128e00b0050dfb92d3e0mr4446822lfs.274.1702987321362; Tue, 19 Dec 2023 04:02:01 -0800 (PST) Received: from localhost (host-97-144.parnet.fi. [77.234.97.144]) by smtp.gmail.com with ESMTPSA id b14-20020a056512218e00b0050e38ade1afsm546779lft.200.2023.12.19.04.02.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Dec 2023 04:02:00 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Dec 2023 14:02:00 +0200 Message-Id: <20231219120200.24003-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] checkasm: Generalize crash handling X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8zUsxVNPSdKC This replaces the riscv specific handling from 7212466e735aa187d82f51dadbce957fe3da77f0 (which essentially is reverted, together with 286d6742218ba0235c32876b50bf593cb1986353) with a different implementation of the same (plus a bit more), based on the corresponding feature in dav1d's checkasm, supporting both Unix and Windows. See in particular dav1d commits 0b6ee30eab2400e4f85b735ad29a68a842c34e21 and 0421f787ea592fd2cc74c887f20b8dc31393788b, authored by Henrik Gramner. The overall approach is the same; set up a signal handler, store the state with setjmp/sigsetjmp, jump out of the crashing function with longjmp/siglongjmp. The main difference is in what happens when the signal handler is invoked. In the previous implementation, it would resume from right before calling the crashing function, and then skip that call based on the setjmp return value. In the imported implementation from dav1d, we return to right before the check_func() call, which will skip testing the current function (as the pointer is the same as it was before). Other differences are: - Support for other signal handling mechanisms (Windows AddVectoredExceptionHandler) - Using RtlCaptureContext/RtlRestoreContext instead of setjmp/longjmp on Windows with SEH (which adds the design limitation that it doesn't return a value like setjmp does) - Only catching signals once per function - if more than one signal is delivered before signal handling is reenabled, any signal is handled as it would without our handler - Not using an arch specific signal handler written in assembly --- tests/checkasm/checkasm.c | 100 ++++++++++++++++++++++++++------ tests/checkasm/checkasm.h | 79 ++++++++++++++++++------- tests/checkasm/riscv/checkasm.S | 12 ---- 3 files changed, 140 insertions(+), 51 deletions(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 6318d9296b..668034c67f 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -23,8 +23,10 @@ #include "config.h" #include "config_components.h" -#ifndef _GNU_SOURCE -# define _GNU_SOURCE // for syscall (performance monitoring API), strsignal() +#if CONFIG_LINUX_PERF +# ifndef _GNU_SOURCE +# define _GNU_SOURCE // for syscall (performance monitoring API) +# endif #endif #include @@ -326,6 +328,7 @@ static struct { const char *cpu_flag_name; const char *test_name; int verbose; + int catch_signals; } state; /* PRNG state */ @@ -627,6 +630,64 @@ static CheckasmFunc *get_func(CheckasmFunc **root, const char *name) return f; } +checkasm_context checkasm_context_buf; + +/* Crash handling: attempt to catch crashes and handle them + * gracefully instead of just aborting abruptly. */ +#ifdef _WIN32 +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +static LONG NTAPI signal_handler(EXCEPTION_POINTERS *const e) { + const char *err; + + if (!state.catch_signals) + return EXCEPTION_CONTINUE_SEARCH; + + switch (e->ExceptionRecord->ExceptionCode) { + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_INT_DIVIDE_BY_ZERO: + err = "fatal arithmetic error"; + break; + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: + err = "illegal instruction"; + break; + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_STACK_OVERFLOW: + err = "segmentation fault"; + break; + case EXCEPTION_IN_PAGE_ERROR: + err = "bus error"; + break; + default: + return EXCEPTION_CONTINUE_SEARCH; + } + state.catch_signals = 0; + checkasm_fail_func("%s", err); + checkasm_load_context(); + return EXCEPTION_CONTINUE_EXECUTION; /* never reached, but shuts up gcc */ +} +#endif +#else +static void signal_handler(const int s) { + if (state.catch_signals) { + state.catch_signals = 0; + checkasm_fail_func("%s", + s == SIGFPE ? "fatal arithmetic error" : + s == SIGILL ? "illegal instruction" : + s == SIGBUS ? "bus error" : + "segmentation fault"); + checkasm_load_context(); + } else { + /* fall back to the default signal handler */ + static const struct sigaction default_sa = { .sa_handler = SIG_DFL }; + sigaction(s, &default_sa, NULL); + raise(s); + } +} +#endif + /* Perform tests and benchmarks for the specified cpu flag if supported by the host */ static void check_cpu_flag(const char *name, int flag) { @@ -737,18 +798,24 @@ int main(int argc, char *argv[]) unsigned int seed = av_get_random_seed(); int i, ret = 0; +#ifdef _WIN32 +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + AddVectoredExceptionHandler(0, signal_handler); +#endif +#else + const struct sigaction sa = { + .sa_handler = signal_handler, + .sa_flags = SA_NODEFER, + }; + sigaction(SIGBUS, &sa, NULL); + sigaction(SIGFPE, &sa, NULL); + sigaction(SIGILL, &sa, NULL); + sigaction(SIGSEGV, &sa, NULL); +#endif #if ARCH_ARM && HAVE_ARMV5TE_EXTERNAL if (have_vfp(av_get_cpu_flags()) || have_neon(av_get_cpu_flags())) checkasm_checked_call = checkasm_checked_call_vfp; #endif -#if ARCH_RISCV && HAVE_RV - struct sigaction act = { - .sa_handler = checkasm_handle_signal, - .sa_flags = 0, - }; - - sigaction(SIGILL, &act, NULL); -#endif if (!tests[0].func || !cpus[0].flag) { fprintf(stderr, "checkasm: no tests to perform\n"); @@ -876,15 +943,6 @@ void checkasm_fail_func(const char *msg, ...) } } -void checkasm_fail_signal(int signum) -{ -#ifdef __GLIBC__ - checkasm_fail_func("fatal signal %d: %s", signum, strsignal(signum)); -#else - checkasm_fail_func("fatal signal %d", signum); -#endif -} - /* Get the benchmark context of the current function */ CheckasmPerf *checkasm_get_perf_context(void) { @@ -932,6 +990,10 @@ void checkasm_report(const char *name, ...) } } +void checkasm_set_signal_handler_state(const int enabled) { + state.catch_signals = enabled; +} + #define DEF_CHECKASM_CHECK_FUNC(type, fmt) \ int checkasm_check_##type(const char *const file, const int line, \ const type *buf1, ptrdiff_t stride1, \ diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index e3c19510fa..3d1d16d5bb 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -23,7 +23,6 @@ #ifndef TESTS_CHECKASM_CHECKASM_H #define TESTS_CHECKASM_CHECKASM_H -#include #include #include "config.h" @@ -43,6 +42,27 @@ #include "libavutil/lfg.h" #include "libavutil/timer.h" +#if !ARCH_X86_32 && defined(_WIN32) +/* setjmp/longjmp on Windows on architectures using SEH (all except x86_32) + * will try to use SEH to unwind the stack, which doesn't work for assembly + * functions without unwind information. */ +#include +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#define checkasm_context CONTEXT +#define checkasm_save_context() RtlCaptureContext(&checkasm_context_buf) +#define checkasm_load_context() RtlRestoreContext(&checkasm_context_buf, NULL) +#else +#define checkasm_context void* +#define checkasm_save_context() do {} while (0) +#define checkasm_load_context() do {} while (0) +#endif +#else +#include +#define checkasm_context jmp_buf +#define checkasm_save_context() setjmp(checkasm_context_buf) +#define checkasm_load_context() longjmp(checkasm_context_buf, 1) +#endif + void checkasm_check_aacencdsp(void); void checkasm_check_aacpsdsp(void); void checkasm_check_ac3dsp(void); @@ -105,9 +125,10 @@ struct CheckasmPerf; void *checkasm_check_func(void *func, const char *name, ...) av_printf_format(2, 3); int checkasm_bench_func(void); void checkasm_fail_func(const char *msg, ...) av_printf_format(1, 2); -void checkasm_fail_signal(int signum); struct CheckasmPerf *checkasm_get_perf_context(void); void checkasm_report(const char *name, ...) av_printf_format(1, 2); +void checkasm_set_signal_handler_state(int enabled); +extern checkasm_context checkasm_context_buf; /* float compare utilities */ int float_near_ulp(float a, float b, unsigned max_ulp); @@ -131,7 +152,7 @@ static av_unused void *func_ref, *func_new; #define BENCH_RUNS 1000 /* Trade-off between accuracy and speed */ /* Decide whether or not the specified function needs to be tested */ -#define check_func(func, ...) (func_ref = checkasm_check_func((func_new = func), __VA_ARGS__)) +#define check_func(func, ...) (checkasm_save_context(), func_ref = checkasm_check_func((func_new = func), __VA_ARGS__)) /* Declare the function prototype. The first argument is the return value, the remaining * arguments are the function parameters. Naming parameters is optional. */ @@ -146,7 +167,10 @@ static av_unused void *func_ref, *func_new; #define report checkasm_report /* Call the reference function */ -#define call_ref(...) ((func_type *)func_ref)(__VA_ARGS__) +#define call_ref(...)\ + (checkasm_set_signal_handler_state(1),\ + ((func_type *)func_ref)(__VA_ARGS__));\ + checkasm_set_signal_handler_state(0) #if ARCH_X86 && HAVE_X86ASM /* Verifies that clobbered callee-saved registers are properly saved and restored @@ -179,16 +203,22 @@ void checkasm_stack_clobber(uint64_t clobber, ...); ((cpu_flags) & av_get_cpu_flags()) ? (void *)checkasm_checked_call_emms : \ (void *)checkasm_checked_call; #define CLOB (UINT64_C(0xdeadbeefdeadbeef)) -#define call_new(...) (checkasm_stack_clobber(CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,\ +#define call_new(...) (checkasm_set_signal_handler_state(1),\ + checkasm_stack_clobber(CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,\ CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB),\ - checked_call(func_new, 0, 0, 0, 0, 0, __VA_ARGS__)) + checked_call(func_new, 0, 0, 0, 0, 0, __VA_ARGS__));\ + checkasm_set_signal_handler_state(0) #elif ARCH_X86_32 #define declare_new(ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = (void *)checkasm_checked_call; #define declare_new_float(ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = (void *)checkasm_checked_call_float; #define declare_new_emms(cpu_flags, ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = \ ((cpu_flags) & av_get_cpu_flags()) ? (void *)checkasm_checked_call_emms : \ (void *)checkasm_checked_call; -#define call_new(...) checked_call(func_new, __VA_ARGS__) +#define call_new(...)\ + (checkasm_set_signal_handler_state(1),\ + checked_call(func_new, __VA_ARGS__, 15, 14, 13, 12,\ + 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1));\ + checkasm_set_signal_handler_state(0) #endif #elif ARCH_ARM && HAVE_ARMV5TE_EXTERNAL /* Use a dummy argument, to offset the real parameters by 2, not only 1. @@ -200,7 +230,10 @@ extern void (*checkasm_checked_call)(void *func, int dummy, ...); #define declare_new(ret, ...) ret (*checked_call)(void *, int dummy, __VA_ARGS__, \ int, int, int, int, int, int, int, int, \ int, int, int, int, int, int, int) = (void *)checkasm_checked_call; -#define call_new(...) checked_call(func_new, 0, __VA_ARGS__, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0) +#define call_new(...) \ + (checkasm_set_signal_handler_state(1),\ + checked_call(func_new, 0, __VA_ARGS__, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0));\ + checkasm_set_signal_handler_state(0) #elif ARCH_AARCH64 && !defined(__APPLE__) void checkasm_stack_clobber(uint64_t clobber, ...); void checkasm_checked_call(void *func, ...); @@ -209,35 +242,39 @@ void checkasm_checked_call(void *func, ...); int, int, int, int, int, int, int)\ = (void *)checkasm_checked_call; #define CLOB (UINT64_C(0xdeadbeefdeadbeef)) -#define call_new(...) (checkasm_stack_clobber(CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,\ +#define call_new(...) (checkasm_set_signal_handler_state(1),\ + checkasm_stack_clobber(CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,\ CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB),\ checked_call(func_new, 0, 0, 0, 0, 0, 0, 0, __VA_ARGS__,\ - 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0)) + 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0));\ + checkasm_set_signal_handler_state(0) #elif ARCH_RISCV -void checkasm_set_function(void *, sigjmp_buf); +void checkasm_set_function(void *); void *checkasm_get_wrapper(void); -void checkasm_handle_signal(int signum); #if HAVE_RV && (__riscv_xlen == 64) && defined (__riscv_d) #define declare_new(ret, ...) \ - int checked_call_signum = 0; \ - sigjmp_buf checked_call_jb; \ ret (*checked_call)(__VA_ARGS__) = checkasm_get_wrapper(); #define call_new(...) \ - (checkasm_set_function(func_new, checked_call_jb), \ - (checked_call_signum = sigsetjmp(checked_call_jb, 1)) == 0 \ - ? checked_call(__VA_ARGS__) \ - : (checkasm_fail_signal(checked_call_signum), 0)) + (checkasm_set_signal_handler_state(1),\ + checkasm_set_function(func_new), checked_call(__VA_ARGS__));\ + checkasm_set_signal_handler_state(0) #else #define declare_new(ret, ...) -#define call_new(...) ((func_type *)func_new)(__VA_ARGS__) +#define call_new(...)\ + (checkasm_set_signal_handler_state(1),\ + ((func_type *)func_new)(__VA_ARGS__));\ + checkasm_set_signal_handler_state(0) #endif #else #define declare_new(ret, ...) #define declare_new_float(ret, ...) #define declare_new_emms(cpu_flags, ret, ...) /* Call the function */ -#define call_new(...) ((func_type *)func_new)(__VA_ARGS__) +#define call_new(...)\ + (checkasm_set_signal_handler_state(1),\ + ((func_type *)func_new)(__VA_ARGS__));\ + checkasm_set_signal_handler_state(0) #endif #ifndef declare_new_emms @@ -284,6 +321,7 @@ typedef struct CheckasmPerf { uint64_t tsum = 0;\ int ti, tcount = 0;\ uint64_t t = 0; \ + checkasm_set_signal_handler_state(1);\ for (ti = 0; ti < BENCH_RUNS; ti++) {\ PERF_START(t);\ tfunc(__VA_ARGS__);\ @@ -299,6 +337,7 @@ typedef struct CheckasmPerf { emms_c();\ perf->cycles += t;\ perf->iterations++;\ + checkasm_set_signal_handler_state(0);\ }\ } while (0) #else diff --git a/tests/checkasm/riscv/checkasm.S b/tests/checkasm/riscv/checkasm.S index 971d881157..73ca85f344 100644 --- a/tests/checkasm/riscv/checkasm.S +++ b/tests/checkasm/riscv/checkasm.S @@ -41,7 +41,6 @@ endconst checked_func: .quad 0 - .quad 0 saved_regs: /* Space to spill RA, SP, GP, TP, S0-S11 and FS0-FS11 */ @@ -53,7 +52,6 @@ func checkasm_set_function la.tls.ie t0, checked_func add t0, tp, t0 sd a0, (t0) - sd a1, 8(t0) ret endfunc @@ -177,14 +175,4 @@ func checkasm_get_wrapper, v call checkasm_fail_func j 4b endfunc - -func checkasm_handle_signal - mv a1, a0 - la.tls.ie a0, checked_func - add a0, tp, a0 - ld a0, 8(a0) - beqz a0, 8f - tail siglongjmp -8: tail abort /* No jump buffer to go to */ -endfunc #endif