| Message ID | 20210601214649.785647-3-farosas@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: powerpc_excp improvements - part I | expand |
On Tue, Jun 01, 2021 at 06:46:46PM -0300, Fabiano Rosas wrote: > This function is identical to dump_syscall, so use the latter for > system call vectored as well. > > Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> Applied to ppc-for-6.1, thanks. > --- > target/ppc/excp_helper.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 5ea8503b46..9e3aae1c96 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -70,18 +70,6 @@ static inline void dump_syscall(CPUPPCState *env) > ppc_dump_gpr(env, 8), env->nip); > } > > -static inline void dump_syscall_vectored(CPUPPCState *env) > -{ > - qemu_log_mask(CPU_LOG_INT, "syscall r0=%016" PRIx64 > - " r3=%016" PRIx64 " r4=%016" PRIx64 " r5=%016" PRIx64 > - " r6=%016" PRIx64 " r7=%016" PRIx64 " r8=%016" PRIx64 > - " nip=" TARGET_FMT_lx "\n", > - ppc_dump_gpr(env, 0), ppc_dump_gpr(env, 3), > - ppc_dump_gpr(env, 4), ppc_dump_gpr(env, 5), > - ppc_dump_gpr(env, 6), ppc_dump_gpr(env, 7), > - ppc_dump_gpr(env, 8), env->nip); > -} > - > static inline void dump_hcall(CPUPPCState *env) > { > qemu_log_mask(CPU_LOG_INT, "hypercall r3=%016" PRIx64 > @@ -564,7 +552,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) > break; > case POWERPC_EXCP_SYSCALL_VECTORED: /* scv exception */ > lev = env->error_code; > - dump_syscall_vectored(env); > + dump_syscall(env); > env->nip += 4; > new_msr |= env->msr & ((target_ulong)1 << MSR_EE); > new_msr |= env->msr & ((target_ulong)1 << MSR_RI);
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 5ea8503b46..9e3aae1c96 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -70,18 +70,6 @@ static inline void dump_syscall(CPUPPCState *env) ppc_dump_gpr(env, 8), env->nip); } -static inline void dump_syscall_vectored(CPUPPCState *env) -{ - qemu_log_mask(CPU_LOG_INT, "syscall r0=%016" PRIx64 - " r3=%016" PRIx64 " r4=%016" PRIx64 " r5=%016" PRIx64 - " r6=%016" PRIx64 " r7=%016" PRIx64 " r8=%016" PRIx64 - " nip=" TARGET_FMT_lx "\n", - ppc_dump_gpr(env, 0), ppc_dump_gpr(env, 3), - ppc_dump_gpr(env, 4), ppc_dump_gpr(env, 5), - ppc_dump_gpr(env, 6), ppc_dump_gpr(env, 7), - ppc_dump_gpr(env, 8), env->nip); -} - static inline void dump_hcall(CPUPPCState *env) { qemu_log_mask(CPU_LOG_INT, "hypercall r3=%016" PRIx64 @@ -564,7 +552,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) break; case POWERPC_EXCP_SYSCALL_VECTORED: /* scv exception */ lev = env->error_code; - dump_syscall_vectored(env); + dump_syscall(env); env->nip += 4; new_msr |= env->msr & ((target_ulong)1 << MSR_EE); new_msr |= env->msr & ((target_ulong)1 << MSR_RI);
This function is identical to dump_syscall, so use the latter for system call vectored as well. Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com> --- target/ppc/excp_helper.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)