diff mbox series

target/ppc: mtmsrd is an illegal instruction on BookE

Message ID 20210706051321.609046-1-npiggin@gmail.com
State New
Headers show
Series target/ppc: mtmsrd is an illegal instruction on BookE | expand

Commit Message

Nicholas Piggin July 6, 2021, 5:13 a.m. UTC 
MSR is a 32-bit register in BookE and there is no mtmsrd instruction.

Cc: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 target/ppc/translate.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

David Gibson July 8, 2021, 2:44 a.m. UTC | #1 
On Tue, Jul 06, 2021 at 03:13:21PM +1000, Nicholas Piggin wrote:
> MSR is a 32-bit register in BookE and there is no mtmsrd instruction.
> 
> Cc: Christian Zigotzky <chzigotzky@xenosoft.de>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>

Applied to ppc-for-6.1, thanks.

> ---
>  target/ppc/translate.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index f65d1e81ea..d1f482b0f3 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -4940,6 +4940,11 @@ static void gen_mtcrf(DisasContext *ctx)
>  #if defined(TARGET_PPC64)
>  static void gen_mtmsrd(DisasContext *ctx)
>  {
> +    if (unlikely(!is_book3s_arch2x(ctx))) {
> +        gen_invalid(ctx);
> +        return;
> +    }
> +
>      CHK_SV;
>  
>  #if !defined(CONFIG_USER_ONLY)
diff mbox series

Patch

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index f65d1e81ea..d1f482b0f3 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -4940,6 +4940,11 @@  static void gen_mtcrf(DisasContext *ctx)
 #if defined(TARGET_PPC64)
 static void gen_mtmsrd(DisasContext *ctx)
 {
+    if (unlikely(!is_book3s_arch2x(ctx))) {
+        gen_invalid(ctx);
+        return;
+    }
+
     CHK_SV;
 
 #if !defined(CONFIG_USER_ONLY)