[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/18] accel/tcg: Un-inline log_pc()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 09/18] accel/tcg: Un-inline log_pc() |
Date: |
Thu, 12 Dec 2024 19:53:32 +0100 |
log_pc() is only used within cpu-exec.c, no need to
expose it via "internal-target.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
accel/tcg/internal-target.h | 10 ----------
accel/tcg/cpu-exec.c | 11 +++++++++++
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
index 6f4ec0bd424..0437d798295 100644
--- a/accel/tcg/internal-target.h
+++ b/accel/tcg/internal-target.h
@@ -72,16 +72,6 @@ G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t
retaddr);
bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc);
-/* Return the current PC from CPU, which may be cached in TB. */
-static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
-{
- if (tb_cflags(tb) & CF_PCREL) {
- return cpu->cc->get_pc(cpu);
- } else {
- return tb->pc;
- }
-}
-
/**
* tcg_req_mo:
* @type: TCGBar
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index f82870a1e2a..396fa6f4a6b 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -21,6 +21,7 @@
#include "qemu/qemu-print.h"
#include "qapi/error.h"
#include "qapi/type-helpers.h"
+#include "hw/core/cpu.h"
#include "hw/core/tcg-cpu-ops.h"
#include "trace.h"
#include "disas/disas.h"
@@ -434,6 +435,16 @@ const void *HELPER(lookup_tb_ptr)(CPUArchState *env)
return tb->tc.ptr;
}
+/* Return the current PC from CPU, which may be cached in TB. */
+static vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
+{
+ if (tb_cflags(tb) & CF_PCREL) {
+ return cpu->cc->get_pc(cpu);
+ } else {
+ return tb->pc;
+ }
+}
+
/* Execute a TB, and fix up the CPU state afterwards if necessary */
/*
* Disable CFI checks.
--
2.45.2
- [PATCH 05/18] accel/tcg: Use tb_page_addr_t type in page_unprotect(), (continued)
- [PATCH 05/18] accel/tcg: Use tb_page_addr_t type in page_unprotect(), Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 06/18] accel/tcg: Move page_[un]protect() to 'user/page-protection.h', Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 07/18] system: Remove unnecessary 'exec/translate-all.h' include, Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 08/18] accel/tcg: Move 'exec/translate-all.h' -> 'tb-internal.h', Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 09/18] accel/tcg: Un-inline log_pc(),
Philippe Mathieu-Daudé <=
- [PATCH 10/18] accel/tcg: Move TranslationBlock declarations to 'tb-internal.h', Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 11/18] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (1/4), Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 12/18] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (2/4), Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 13/18] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (3/4), Philippe Mathieu-Daudé, 2024/12/12
- [PATCH 14/18] accel/tcg: Move user-related declarations out of 'exec/cpu-all.h' (4/4), Philippe Mathieu-Daudé, 2024/12/12