[v4] target/m68k: Conditional traps + trap cleanup

[PATCH v4 16/17] linux-user/strace: Adjust get_thread_area for m68k

Posted by Richard Henderson 3 years, 9 months ago

Unlike i386, m68k get_thread_area has no arguments.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/strace.list | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux-user/strace.list b/linux-user/strace.list
index 278596acd1..72e17b1acf 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -384,8 +384,13 @@
 { TARGET_NR_getsockopt, "getsockopt" , NULL, NULL, NULL },
 #endif
 #ifdef TARGET_NR_get_thread_area
+#if defined(TARGET_I386) && defined(TARGET_ABI32)
 { TARGET_NR_get_thread_area, "get_thread_area", "%s(0x"TARGET_ABI_FMT_lx")",
   NULL, NULL },
+#elif defined(TARGET_M68K)
+{ TARGET_NR_get_thread_area, "get_thread_area" , "%s()",
+  NULL, print_syscall_ret_addr },
+#endif
 #endif
 #ifdef TARGET_NR_gettid
 { TARGET_NR_gettid, "gettid" , "%s()", NULL, NULL },
-- 
2.34.1

Re: [PATCH v4 16/17] linux-user/strace: Adjust get_thread_area for m68k

Posted by Laurent Vivier 3 years, 8 months ago

Le 30/04/2022 à 19:53, Richard Henderson a écrit :
> Unlike i386, m68k get_thread_area has no arguments.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/strace.list | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/linux-user/strace.list b/linux-user/strace.list
> index 278596acd1..72e17b1acf 100644
> --- a/linux-user/strace.list
> +++ b/linux-user/strace.list
> @@ -384,8 +384,13 @@
>   { TARGET_NR_getsockopt, "getsockopt" , NULL, NULL, NULL },
>   #endif
>   #ifdef TARGET_NR_get_thread_area
> +#if defined(TARGET_I386) && defined(TARGET_ABI32)
>   { TARGET_NR_get_thread_area, "get_thread_area", "%s(0x"TARGET_ABI_FMT_lx")",
>     NULL, NULL },
> +#elif defined(TARGET_M68K)
> +{ TARGET_NR_get_thread_area, "get_thread_area" , "%s()",
> +  NULL, print_syscall_ret_addr },
> +#endif
>   #endif
>   #ifdef TARGET_NR_gettid
>   { TARGET_NR_gettid, "gettid" , "%s()", NULL, NULL },

Reviewed-by: Laurent Vivier <laurent@vivier.eu>