From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpJa3-0002nR-Oz for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:37:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpJZx-0006r4-0y for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:37:19 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:41606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpJZw-0006no-QA for qemu-devel@nongnu.org; Thu, 12 Jul 2012 09:37:12 -0400 From: Peter Maydell Date: Thu, 12 Jul 2012 14:36:42 +0100 Message-Id: <1342100216-1832-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1342100216-1832-1-git-send-email-peter.maydell@linaro.org> References: <1342100216-1832-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 01/15] target-arm: Fix CP15 based WFI List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel@nongnu.org, Anthony Liguori , Paul Brook From: Paul Brook The coprocessor register rework broke cp15 based WFI instructions. We incorrectly fall through the normal register write case, which incorrectly adds a forced block termination. We've already done a special version of this (DISAS_WFI), so return immediately. Signed-off-by: Paul Brook Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target-arm/translate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index a2a0ecd..f39b9ca 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -6236,7 +6236,7 @@ static int disas_coproc_insn(CPUARMState * env, DisasContext *s, uint32_t insn) } gen_set_pc_im(s->pc); s->is_jmp = DISAS_WFI; - break; + return 0; default: break; } -- 1.7.1