diff mbox

[PULL,21/26] target-arm: A64: Trap ERET from EL0 at translation time

Message ID 1401208114-22404-22-git-send-email-peter.maydell@linaro.org
State Accepted
Commit 14c521d45eb08b2a829b0fa90c682a7f0664ee85
Headers show

Commit Message

Peter Maydell May 27, 2014, 4:28 p.m. UTC 
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1400980132-25949-19-git-send-email-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/translate-a64.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index bfd139a..ec6a39d 100644
--- a/target-arm/translate-a64.c
+++ b/target-arm/translate-a64.c
@@ -1507,6 +1507,10 @@  static void disas_uncond_b_reg(DisasContext *s, uint32_t insn)
         tcg_gen_movi_i64(cpu_reg(s, 30), s->pc);
         break;
     case 4: /* ERET */
+        if (s->current_pl == 0) {
+            unallocated_encoding(s);
+            return;
+        }
         gen_helper_exception_return(cpu_env);
         s->is_jmp = DISAS_JUMP;
         return;