Re: [PATCH 02/14] target/s390x: Move cpu_get_tb_cpu_state out of line

[Ilya Leoshkevich]

On Wed, 2024-05-01 at 22:44 -0700, Richard Henderson wrote:
> Signed-off-by: Richard Henderson 
> ---
>  target/s390x/cpu.h | 23 ++-
>  target/s390x/cpu.c | 22 ++
>  2 files changed, 24 insertions(+), 21 deletions(-)

Reviewed-by: Ilya Leoshkevich 

Re: [PATCH 02/14] target/s390x: Move cpu_get_tb_cpu_state out of line

[Thomas Huth]

On 02/05/2024 07.44, Richard Henderson wrote:

Signed-off-by: Richard Henderson 
---
  target/s390x/cpu.h | 23 ++-
  target/s390x/cpu.c | 22 ++
  2 files changed, 24 insertions(+), 21 deletions(-)


Reviewed-by: Thomas Huth 

[PATCH 02/14] target/s390x: Move cpu_get_tb_cpu_state out of line

[Richard Henderson]

Signed-off-by: Richard Henderson 
---
 target/s390x/cpu.h | 23 ++-
 target/s390x/cpu.c | 22 ++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 414680eed1..950f84f316 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -413,27 +413,8 @@ static inline int s390x_env_mmu_index(CPUS390XState *env, 
bool ifetch)
 
 #include "tcg/tcg_s390x.h"
 
-static inline void cpu_get_tb_cpu_state(CPUS390XState *env, vaddr *pc,
-uint64_t *cs_base, uint32_t *flags)
-{
-if (env->psw.addr & 1) {
-/*
- * Instructions must be at even addresses.
- * This needs to be checked before address translation.
- */
-env->int_pgm_ilen = 2; /* see s390_cpu_tlb_fill() */
-tcg_s390_program_interrupt(env, PGM_SPECIFICATION, 0);
-}
-*pc = env->psw.addr;
-*cs_base = env->ex_value;
-*flags = (env->psw.mask >> FLAG_MASK_PSW_SHIFT) & FLAG_MASK_PSW;
-if (env->cregs[0] & CR0_AFP) {
-*flags |= FLAG_MASK_AFP;
-}
-if (env->cregs[0] & CR0_VECTOR) {
-*flags |= FLAG_MASK_VECTOR;
-}
-}
+void cpu_get_tb_cpu_state(CPUS390XState *env, vaddr *pc,
+  uint64_t *cs_base, uint32_t *flags);
 
 #endif /* CONFIG_TCG */
 
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index f7194534ae..a8428b5a1e 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -324,6 +324,28 @@ static void s390_cpu_reset_full(DeviceState *dev)
 #ifdef CONFIG_TCG
 #include "hw/core/tcg-cpu-ops.h"
 
+void cpu_get_tb_cpu_state(CPUS390XState *env, vaddr *pc,
+  uint64_t *cs_base, uint32_t *flags)
+{
+if (env->psw.addr & 1) {
+/*
+ * Instructions must be at even addresses.
+ * This needs to be checked before address translation.
+ */
+env->int_pgm_ilen = 2; /* see s390_cpu_tlb_fill() */
+tcg_s390_program_interrupt(env, PGM_SPECIFICATION, 0);
+}
+*pc = env->psw.addr;
+*cs_base = env->ex_value;
+*flags = (env->psw.mask >> FLAG_MASK_PSW_SHIFT) & FLAG_MASK_PSW;
+if (env->cregs[0] & CR0_AFP) {
+*flags |= FLAG_MASK_AFP;
+}
+if (env->cregs[0] & CR0_VECTOR) {
+*flags |= FLAG_MASK_VECTOR;
+}
+}
+
 static const TCGCPUOps s390_tcg_ops = {
 .initialize = s390x_translate_init,
 .restore_state_to_opc = s390x_restore_state_to_opc,
-- 
2.34.1