From patchwork Mon Jul 2 15:10:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140802 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp75059ljj; Mon, 2 Jul 2018 08:18:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe79wE/SDA6ty2RUIYPbhxDI6zvGlgOkvW+aBPC9TbqbvYWAqY+JSCwWc7yykC5XHxjcXzZ X-Received: by 2002:ac8:701d:: with SMTP id x29-v6mr23538090qtm.98.1530544724325; Mon, 02 Jul 2018 08:18:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530544724; cv=none; d=google.com; s=arc-20160816; b=C1MA6a7aP9pOP94zv4MJSy8dl2mTd51WF3+U51x8jeH/StK1pGJ4GuagUkoXLNYOTq 4jM/cF71THaeNp3psMhYjNUO7o6uf1+yVKjgbgJSWxZJveJRB8YLeDCQsyYJOsjd8xUj l2GY/xUW/NvbS4nTMw0tKf7E9RblomtsYQRDgWcqZxUkIy/UzQ9VRGTkQsGK7smMMYtJ XyyXL3DwWKqH3o1e8LKyJpj1tU8EyTAfKJ+nMQdajIDykzjvPVFuF5FH35JuIeyJiBeL QwKmirZyJ1VRlp+DbuUxrGc2vR54Tbo+1+A3xg787dGmahuVCs0NcH6ex1VwIBzS4v6D MlnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=egPnLBVgtP7NhsuuXtIHrGJQwyDZe26xfhEhEduYjIY=; b=Ppv/xNK5fQy9V/Lqo36mmOWieWFJ0T013HHH3VdEgNYRGuIsb2c9B2o/DwqqXJJDlV ajOFWqOL+DH1aWIyqTJZNea48pIKyuZ3ahdHRuCqh/w2pTizLh99bK0+nr1buXiQfmuR RWsgxtsw6U0jZKSs6atg0VLrOAeBrOOek4B4osu0D3CHGOqLeM7NSYoEGxPIk//2rA/k V6eg7Qt9j45SNKotTHMu31vGnNDcfWEQOV46k5HxN/6lcfDtvj9m44rEkCC8TxB1bdZO ZM7hpLjeypzzey5i2McM5wxTfLo/9Zr7G84V1r+DLUv7HPlZzAqxcsg5SS4XhXO+QTIl 0tyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=e4pm6DSz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m82-v6si9459438qki.213.2018.07.02.08.18.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 08:18:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=e4pm6DSz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:33479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0bD-0001aU-Lk for patch@linaro.org; Mon, 02 Jul 2018 11:18:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0Tg-0003wJ-BI for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0Tf-0007pP-8S for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:10:56 -0400 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]:40443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0Tf-0007pF-2R for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:10:55 -0400 Received: by mail-pf0-x22c.google.com with SMTP id z24-v6so7656123pfe.7 for ; Mon, 02 Jul 2018 08:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=egPnLBVgtP7NhsuuXtIHrGJQwyDZe26xfhEhEduYjIY=; b=e4pm6DSzkfHdk/TR2CU8+/bP9WYycKetJu5llGfPfLcIAlS/gBUafIg5GLf/+AzTL0 IxrFC3BJ2tS+lr0KApvjJYOKdJNnyxPNW7ohE85OF196WbPv4Nns3uYOy/mqZ6eWKX7D DQGum9Pp6dP8L8vEM+dnslh2xeocudPL7aY8I7hqLu0cQveZah67Si49Mj87ZkvklMtx AE/UMiZKarX+9ERoeio+Ab68g7WqT8DtFJ2HNmZ6fTLMvhnKKmU1OjS4zKXlkHo+rfNe Kqak99ntHm6EfP3fHsHayx4gd6xg1fNmFHZ/lvPBYxuIuRmQ322uYQQlsXet++BvV6dg EicQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=egPnLBVgtP7NhsuuXtIHrGJQwyDZe26xfhEhEduYjIY=; b=gCP9jfWZkMIcsz6EGTwrvuUdn3g7lbZ12EAVqnBnf2OgTRRaQFmqkrqkvhPIupE5gW USgsnRvXG68Hl0RBHKMiQSZMxM7MHBTI/iItCH1k7a1NZM9o6q8v4QHVKboJYnDLvu/5 r5PGFKCHIVA4VjRJ6G3JZKolzlV/83FJSj1WyIeh3x+LoMg3hy9i5yB47WcZgyBLmH1/ C05OwQzxYPljmgDy+23ejd4uNaFa4BWGYaDAirFSgGuyv/RsYq4cVSfNN+h1U3Ynq8X3 HOQYC8XLEWVCgifCRV25d1WNBFc2W/SWfxxda8yALQJl1xOmXDHb4eUMYZ5rxDM3/9Nm 5Fow== X-Gm-Message-State: APt69E3BPjsYiIxebQITGqb8Oqo6U4mtGxq/QRYxm7I9pAAaJY98Vn/f eiPhDPRIYkVJN3ZsgxbdvoU7es0G X-Received: by 2002:a62:2ec1:: with SMTP id u184-v6mr25972153pfu.184.1530544254247; Mon, 02 Jul 2018 08:10:54 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id 15-v6sm28346424pfq.81.2018.07.02.08.10.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:10:53 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:04 +0900 Message-Id: <20180702151023.24532-7-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::22c Subject: [Qemu-devel] [PULL v2 06/25] target/openrisc: Fix singlestep_enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stafford Horne , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We failed to store to cpu_pc before raising the exception, which caused us to re-execute the same insn that we stepped. Reviewed-by: Stafford Horne Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/translate.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) -- 2.17.0 diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 43bdf378eb..22848b17ad 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1335,31 +1335,30 @@ static void openrisc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) { DisasContext *dc = container_of(dcbase, DisasContext, base); + /* If we have already exited the TB, nothing following has effect. */ + if (dc->base.is_jmp == DISAS_NORETURN) { + return; + } + if ((dc->tb_flags & TB_FLAGS_DFLAG ? 1 : 0) != (dc->delayed_branch != 0)) { tcg_gen_movi_i32(cpu_dflag, dc->delayed_branch != 0); } tcg_gen_movi_tl(cpu_ppc, dc->base.pc_next - 4); - if (dc->base.is_jmp == DISAS_NEXT) { - dc->base.is_jmp = DISAS_UPDATE; - tcg_gen_movi_tl(cpu_pc, dc->base.pc_next); - } - if (unlikely(dc->base.singlestep_enabled)) { - gen_exception(dc, EXCP_DEBUG); - } else { - switch (dc->base.is_jmp) { - case DISAS_TOO_MANY: - gen_goto_tb(dc, 0, dc->base.pc_next); - break; - case DISAS_NORETURN: - break; - case DISAS_UPDATE: - case DISAS_EXIT: + switch (dc->base.is_jmp) { + case DISAS_TOO_MANY: + gen_goto_tb(dc, 0, dc->base.pc_next); + break; + case DISAS_UPDATE: + case DISAS_EXIT: + if (unlikely(dc->base.singlestep_enabled)) { + gen_exception(dc, EXCP_DEBUG); + } else { tcg_gen_exit_tb(NULL, 0); - break; - default: - g_assert_not_reached(); } + break; + default: + g_assert_not_reached(); } }