diff mbox series

[v4,09/48] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu

Message ID 20211013024607.731881-10-richard.henderson@linaro.org
State Superseded
Headers show
Series [v4,01/48] hw/core: Add TCGCPUOps.record_sigbus | expand

Commit Message

Richard Henderson Oct. 13, 2021, 2:45 a.m. UTC 
This is not used by, nor required by, user-only.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/ppc/internal.h    | 8 +++-----
 target/ppc/excp_helper.c | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

-- 
2.25.1

Comments

Warner Losh Oct. 13, 2021, 2:54 a.m. UTC | #1 
On Tue, Oct 12, 2021 at 8:52 PM Richard Henderson <
richard.henderson@linaro.org> wrote:

> This is not used by, nor required by, user-only.

>

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  target/ppc/internal.h    | 8 +++-----

>  target/ppc/excp_helper.c | 8 +++-----

>  2 files changed, 6 insertions(+), 10 deletions(-)

>


Reviewed-by: Warner Losh <imp@bsdimp.com>



> diff --git a/target/ppc/internal.h b/target/ppc/internal.h

> index 339974b7d8..6aa9484f34 100644

> --- a/target/ppc/internal.h

> +++ b/target/ppc/internal.h

> @@ -211,11 +211,6 @@ void helper_compute_fprf_float16(CPUPPCState *env,

> float16 arg);

>  void helper_compute_fprf_float32(CPUPPCState *env, float32 arg);

>  void helper_compute_fprf_float128(CPUPPCState *env, float128 arg);

>

> -/* Raise a data fault alignment exception for the specified virtual

> address */

> -void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,

> -                                 MMUAccessType access_type, int mmu_idx,

> -                                 uintptr_t retaddr) QEMU_NORETURN;

> -

>  /* translate.c */

>

>  int ppc_fixup_cpu(PowerPCCPU *cpu);

> @@ -291,6 +286,9 @@ void ppc_cpu_record_sigsegv(CPUState *cs, vaddr addr,

>  bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,

>                        MMUAccessType access_type, int mmu_idx,

>                        bool probe, uintptr_t retaddr);

> +void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,

> +                                 MMUAccessType access_type, int mmu_idx,

> +                                 uintptr_t retaddr) QEMU_NORETURN;

>  #endif

>

>  #endif /* PPC_INTERNAL_H */

> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c

> index e568a54536..17607adbe4 100644

> --- a/target/ppc/excp_helper.c

> +++ b/target/ppc/excp_helper.c

> @@ -1454,11 +1454,8 @@ void helper_book3s_msgsndp(CPUPPCState *env,

> target_ulong rb)

>

>      book3s_msgsnd_common(pir, PPC_INTERRUPT_DOORBELL);

>  }

> -#endif

> -#endif /* CONFIG_TCG */

> -#endif

> +#endif /* TARGET_PPC64 */

>

> -#ifdef CONFIG_TCG

>  void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,

>                                   MMUAccessType access_type,

>                                   int mmu_idx, uintptr_t retaddr)

> @@ -1483,4 +1480,5 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr

> vaddr,

>      env->error_code = 0;

>      cpu_loop_exit_restore(cs, retaddr);

>  }

> -#endif

> +#endif /* CONFIG_TCG */

> +#endif /* !CONFIG_USER_ONLY */

> --

> 2.25.1

>

>

>
<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Oct 12, 2021 at 8:52 PM Richard Henderson &lt;<a href="mailto:richard.henderson@linaro.org">richard.henderson@linaro.org</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This is not used by, nor required by, user-only.<br>
<br>
Signed-off-by: Richard Henderson &lt;<a href="mailto:richard.henderson@linaro.org" target="_blank">richard.henderson@linaro.org</a>&gt;<br>

---<br>
 target/ppc/internal.h    | 8 +++-----<br>
 target/ppc/excp_helper.c | 8 +++-----<br>
 2 files changed, 6 insertions(+), 10 deletions(-)<br></blockquote><div><br></div><div>Reviewed-by: Warner Losh &lt;<a href="mailto:imp@bsdimp.com">imp@bsdimp.com</a>&gt;<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
diff --git a/target/ppc/internal.h b/target/ppc/internal.h<br>
index 339974b7d8..6aa9484f34 100644<br>
--- a/target/ppc/internal.h<br>
+++ b/target/ppc/internal.h<br>
@@ -211,11 +211,6 @@ void helper_compute_fprf_float16(CPUPPCState *env, float16 arg);<br>
 void helper_compute_fprf_float32(CPUPPCState *env, float32 arg);<br>
 void helper_compute_fprf_float128(CPUPPCState *env, float128 arg);<br>
<br>
-/* Raise a data fault alignment exception for the specified virtual address */<br>
-void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,<br>
-                                 MMUAccessType access_type, int mmu_idx,<br>
-                                 uintptr_t retaddr) QEMU_NORETURN;<br>
-<br>
 /* translate.c */<br>
<br>
 int ppc_fixup_cpu(PowerPCCPU *cpu);<br>
@@ -291,6 +286,9 @@ void ppc_cpu_record_sigsegv(CPUState *cs, vaddr addr,<br>
 bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,<br>
                       MMUAccessType access_type, int mmu_idx,<br>
                       bool probe, uintptr_t retaddr);<br>
+void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,<br>
+                                 MMUAccessType access_type, int mmu_idx,<br>
+                                 uintptr_t retaddr) QEMU_NORETURN;<br>
 #endif<br>
<br>
 #endif /* PPC_INTERNAL_H */<br>
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c<br>
index e568a54536..17607adbe4 100644<br>
--- a/target/ppc/excp_helper.c<br>
+++ b/target/ppc/excp_helper.c<br>
@@ -1454,11 +1454,8 @@ void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb)<br>
<br>
     book3s_msgsnd_common(pir, PPC_INTERRUPT_DOORBELL);<br>
 }<br>
-#endif<br>
-#endif /* CONFIG_TCG */<br>
-#endif<br>
+#endif /* TARGET_PPC64 */<br>
<br>
-#ifdef CONFIG_TCG<br>
 void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,<br>
                                  MMUAccessType access_type,<br>
                                  int mmu_idx, uintptr_t retaddr)<br>
@@ -1483,4 +1480,5 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,<br>
     env-&gt;error_code = 0;<br>
     cpu_loop_exit_restore(cs, retaddr);<br>
 }<br>
-#endif<br>
+#endif /* CONFIG_TCG */<br>
+#endif /* !CONFIG_USER_ONLY */<br>
-- <br>
2.25.1<br>
<br>
<br>
</blockquote></div></div>
diff mbox series

Patch

diff --git a/target/ppc/internal.h b/target/ppc/internal.h
index 339974b7d8..6aa9484f34 100644
--- a/target/ppc/internal.h
+++ b/target/ppc/internal.h
@@ -211,11 +211,6 @@  void helper_compute_fprf_float16(CPUPPCState *env, float16 arg);
 void helper_compute_fprf_float32(CPUPPCState *env, float32 arg);
 void helper_compute_fprf_float128(CPUPPCState *env, float128 arg);
 
-/* Raise a data fault alignment exception for the specified virtual address */
-void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
-                                 MMUAccessType access_type, int mmu_idx,
-                                 uintptr_t retaddr) QEMU_NORETURN;
-
 /* translate.c */
 
 int ppc_fixup_cpu(PowerPCCPU *cpu);
@@ -291,6 +286,9 @@  void ppc_cpu_record_sigsegv(CPUState *cs, vaddr addr,
 bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
                       MMUAccessType access_type, int mmu_idx,
                       bool probe, uintptr_t retaddr);
+void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
+                                 MMUAccessType access_type, int mmu_idx,
+                                 uintptr_t retaddr) QEMU_NORETURN;
 #endif
 
 #endif /* PPC_INTERNAL_H */
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index e568a54536..17607adbe4 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -1454,11 +1454,8 @@  void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb)
 
     book3s_msgsnd_common(pir, PPC_INTERRUPT_DOORBELL);
 }
-#endif
-#endif /* CONFIG_TCG */
-#endif
+#endif /* TARGET_PPC64 */
 
-#ifdef CONFIG_TCG
 void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
                                  MMUAccessType access_type,
                                  int mmu_idx, uintptr_t retaddr)
@@ -1483,4 +1480,5 @@  void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
     env->error_code = 0;
     cpu_loop_exit_restore(cs, retaddr);
 }
-#endif
+#endif /* CONFIG_TCG */
+#endif /* !CONFIG_USER_ONLY */