commit 14c521d45eb08b2a829b0fa90c682a7f0664ee85
author Edgar E. Iglesias <edgar.iglesias@xilinx.com> Tue May 27 17:09:54 2014 +0100
committer Peter Maydell <peter.maydell@linaro.org> Tue May 27 17:09:54 2014 +0100
tree f67657399dcae5842b8dcd40ea56005419c3bd6b
parent 7ab6c10d008c79d92b0b62e36fb0edc4066d37d6

target-arm: A64: Trap ERET from EL0 at translation time

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

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 @@
         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;