| From 16249b21456d681b5d98400287b8dbd926050c75 Mon Sep 17 00:00:00 2001 |
| From: Andreas Arnez <arnez@linux.ibm.com> |
| Date: Wed, 15 May 2024 14:32:42 +0200 |
| Subject: [PATCH] Avoid use of guest_IP_AT_SYSCALL in handle_extension() |
| |
| The guest state field guest_IP_AT_SYSCALL is referenced in |
| handle_extension(), even though it may not be defined by all |
| architectures. Avoid its use altogether. |
| |
| Signed-off-by: Andreas Arnez <arnez@linux.ibm.com> |
| Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> |
| Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=16249b21456d681b5d98400287b8dbd926050c75 |
| --- |
| coregrind/m_scheduler/scheduler.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c |
| index 29751bb28..cc8d070b7 100644 |
| --- a/coregrind/m_scheduler/scheduler.c |
| +++ b/coregrind/m_scheduler/scheduler.c |
| @@ -1237,8 +1237,7 @@ static void handle_extension(ThreadId tid) |
| block_signals(); |
| VG_(poll_signals)(tid); |
| } else if (err != ExtErr_OK) { |
| - ThreadState* tst = VG_(get_ThreadState)(tid); |
| - Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; |
| + Addr addr = VG_(get_IP)(tid); |
| switch (err) { |
| case ExtErr_Illop: |
| VG_(synth_sigill)(tid, addr); |
| -- |
| 2.39.2 |
| |
