From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emP0b-0006Hf-21 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:15:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emP0X-0001No-QP for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:15:52 -0500 Received: from p3plsmtpa11-03.prod.phx3.secureserver.net ([68.178.252.104]:35250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emP0X-0001NQ-Kg for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:15:49 -0500 From: Steven Seeger Reply-To: steven.seeger@flightsystems.net Date: Thu, 15 Feb 2018 14:15:43 -0500 Message-ID: <5193436.NpsRQSl3SI@wirbelwind> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Subject: [Qemu-devel] [PATCH 01/02] fix issue where a branch to pc+4 confuses GDB because pc and npc are set to the same value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org >>From ef3183a1648f45c705b55704de3755f84e9bcf80 Mon Sep 17 00:00:00 2001 From: Steven Seeger Date: Thu, 15 Feb 2018 13:20:04 -0500 Subject: [PATCH 1/2] fix issue where a branch to pc+4 confuses GDB because pc and npc are set to the same value Signed-off-by: Steven Seeger --- target/sparc/translate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 71e0853e43..4c2272003d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1464,6 +1464,9 @@ static void do_branch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) dc->npc = dc->pc + 4; } else { dc->pc = dc->npc; + if (target == dc->pc) { + target += 4; + } dc->npc = target; tcg_gen_mov_tl(cpu_pc, cpu_npc); } @@ -1504,6 +1507,9 @@ static void do_fbranch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) dc->npc = dc->pc + 4; } else { dc->pc = dc->npc; + if (target == dc->pc) { + target += 4; + } dc->npc = target; tcg_gen_mov_tl(cpu_pc, cpu_npc); } -- 2.13.6