From patchwork Mon Jul 2 13:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140762 Delivered-To: patch@linaro.org Received: by 2002:a2e:5dc8:0:0:0:0:0 with SMTP id v69-v6csp4095743lje; Mon, 2 Jul 2018 07:09:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeISQvk966/C9LVclosXhim/iZueRQPvuwd4E71HUYgWCyOms/RhG/pDbEnhFxZxJRI3pVI X-Received: by 2002:ac8:2463:: with SMTP id d32-v6mr14199839qtd.41.1530540557333; Mon, 02 Jul 2018 07:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530540557; cv=none; d=google.com; s=arc-20160816; b=bVERp5X/0KqV5WOtCISe3obTvEUDQOQERyMSbDf7T0keRcrHaCcj4VstSlIChvMes+ EqHwwLbcieSrhqTOZvqIo2ngNMX0YjJ3mkOsbzniSLCpl9vezQhYF63JZk4e6B4D2fqb Qw5+OLLMhSf2qCt4sRXZIkaPAXkbKKHOiQWEpT+Pp+VkNzYSU2kQ2kFu7i12/IvXWyZj RqIC3dALWwTJWQv/22ilT1VoMBC7hMKfEtPSA82JQkkanY/Yn9+46ZFDVcZfifcuZ4SJ l/FB6FdJm4BpVWe8QOYtQm6rxWs2GWej2j5yrn/mbIaXFoeb2oAtwAC+bpnOeFliku0O enWA== 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=V5ycKpoJVG0dUH8TBB4UuXQxCwo88SDCsaVRp3NmgoA4XN2XQYYVIzXvYpYEL4HWIW a7KVZcb0QODP7OLX74Otv0dSv2HASmZIJSbKwhxxY1IgTQhCVUpFpGaGuIlBGEmFeLxC gmxx+SfvBufRo0nYo0BAhQ0kdf+fow10ontSpHgWTP9TbZnRK9D2xaWkEZFDRvSfAg6r aX8fRP2gBUDJ0tXi1+kTPopImWTUkAbpWWEWtiBz3jyd/qI1EYrom7s21ObBn0zVm3t3 AaKsZbHRtuR+00vh5r5NwHQFlvHHTEFM17adz3tu36ifNS7Nv9gL9TSs5k/UYo8v22bH da8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Oi6GlD41; 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 a23-v6si1945012qva.162.2018.07.02.07.09.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:09:17 -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=Oi6GlD41; 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]:32996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzW0-0001Pg-PV for patch@linaro.org; Mon, 02 Jul 2018 10:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzLZ-0002GU-Of for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzLY-00083U-SS for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:29 -0400 Received: from mail-pg0-x233.google.com ([2607:f8b0:400e:c05::233]:36648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzLY-00082D-Md for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:28 -0400 Received: by mail-pg0-x233.google.com with SMTP id m19-v6so3662330pgv.3 for ; Mon, 02 Jul 2018 06:58:28 -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=Oi6GlD41fuiKjm6nbzVVH8dXTQVtKhGIKUnXun9/me0JKAPABvKXbi2WRXPzt9QmVh 0lKpVlLpzX7T1/r9jiquXg6zje2/Q9dVYDuZulyFZljQiUPDOO9Qxfv+ULs2ATsLLpdN nQ7+bHe2k9f6BYsWdiivoEvMj24u7WZPNOl15frk55ku0S7haQaLxiINSL/rZ+0+sMHg ROpu0HeSCqCxh1oGRAahyhjHjw1cn74j5tGtkI/SE1V5RUBizZZhoukZhz6Su1kVAbNn TXEgbGjZj7Mu6pgrtwDR2GrJ0AAe9z7ufBow2alF4M2mA1o9iWkoDgYfOmeGYgXhZ0ER IwDQ== 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=fbokLjgi9J0hIV/Ej/gjycYq7+MJ11urWHW+JfoIfuyeUC4BhmVdEK5uVwcyNJvHMC j0ChhRtBqsJzsybLboEnYBQ1c33m9SQB5Bsh1hDgwiJmzoaroAKvYv6kjdnDW5p0cUdi KEsYuUCmteeqqUjNVQ6qKMIpNf6KWZc3C/npJFkSZkgKow4KjL7dANNp8UxiccNVB7MX 7Q6FUiANHtxjX4gWszhD/eIyovY5/ghtY1u02YwkVfV4QMlpahNYvL+tRn8LzefAyrnB gzPZ6aBcom5qI0LXC3YLFFaPFGT2lmXNbuwAexPhXE3zj8kXdEnTLdyIoJnrk8nses3p ZADg== X-Gm-Message-State: APt69E1i6QQxyM0Ua0feuvcvVIzHlOGRkYwKEcLDB0Jm/tQwvWEITH9Q C0gs91jXLZx9FfC3vDHb/CE= X-Received: by 2002:a63:5624:: with SMTP id k36-v6mr1546696pgb.146.1530539907768; Mon, 02 Jul 2018 06:58:27 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id t21-v6sm42331266pfi.22.2018.07.02.06.58.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 06:58:27 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Mon, 2 Jul 2018 22:57:47 +0900 Message-Id: <20180702135806.7087-7-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702135806.7087-1-shorne@gmail.com> References: <20180702135806.7087-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::233 Subject: [Qemu-devel] [PULL 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(); } }