From patchwork Mon Aug 31 16:05:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248782 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp3451264ilg; Mon, 31 Aug 2020 09:20:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH8NCOoI/IA7by7tBY83/xnsD/vuTiuvjQgKmkss/cvBOgQYtg6Tu6gF4n5SzTHSzmk0ks X-Received: by 2002:a25:ae43:: with SMTP id g3mr3373472ybe.459.1598890807868; Mon, 31 Aug 2020 09:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598890807; cv=none; d=google.com; s=arc-20160816; b=UhCvasFAzCpM9ad1WE8A2Mx1+2bc7L7lHtCyC//2Xh5QT+w5DmvZoD+rtwIoq3sWAh p+/pKNB+eG7Ffv2c88mAtdtZyjq7nu9LboWAL+5zvYovLgyyd6v8RU8ICxhWrNMJrRDT bZPGJqhYSUeYtEA0lpsWJ4A8l7cs0bDO8OmozsOUr3QAZS3PIqaqFB4/j9o7FRQjoiaa bGWQ40QgMF2ijK4MmlmoYigBxj62XeteLvswzT96shHvA4dLkZsE20V5HrcyUdR1XwxY t8uqO0cpvhnpqA/jr305CP+eLYDH2gnUUEBSzMF9yooMbj1qgQ4wQsynDyMvgkHPu8l9 QKJw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eBuYjOca47LEZmSV1uuh9RJRYYiGMfYcTJpeBHPz1GU=; b=X23TFGBv0PdxX7xvlOOcBsGjxy2I3YXvvlTeVOGScWB3tCYPnF9I0e9AFmiU5aGP27 xDduYEvTFNCEIZgFHo2KFpausj5bTBg45Wgy+t6BHtp9sePREwm+qoUnA//xgNRpKQFL AAE0JuWofsGstPG1PNsH4XciQla1WOTidpuS2S4J/ZoGNe5CrxgbhQxN6nZdX5dwE+pb RCGTPheP/jGCYMmxH+MaaO2AYG30UKh4yVXhjCp0zpdDBzbUHz5SWhhdw5woSVBbdW05 CVo8RXQwqPgUxqQ7a8k+MI/kP9V5ylhdYaXRroD072wBEspzAcp1ga/sGvn7fgU1EzgB s0Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zkkg6TU0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u188si7843728ybb.378.2020.08.31.09.20.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Aug 2020 09:20:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=zkkg6TU0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCmXP-0005CH-74 for patch@linaro.org; Mon, 31 Aug 2020 12:20:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCmKV-0004bH-7A for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:06:47 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:37657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kCmKQ-00060S-Fs for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:06:46 -0400 Received: by mail-pg1-x52f.google.com with SMTP id 5so838634pgl.4 for ; Mon, 31 Aug 2020 09:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eBuYjOca47LEZmSV1uuh9RJRYYiGMfYcTJpeBHPz1GU=; b=zkkg6TU0P3yF09nRqOhGKhvfKddqJKa1Mq36VYO9CDKF159O66olqiy1+Chd1Y0vBY lF9wlTxknYTJK6xcgNOAB4e8LsZpLqsJXWq8F8rES90kNsKTfUsUncEt231kdwA86ckR 4GG4/e7F3U8PCIhEP9OJyg0TcIMV1cM70AgFs4vqAXcn33RpYFzV13WgNtWT0xbPgBb4 Uw2owhQ+waBVb7YobxDhjDYuwtVmGKH2Sm1VavhgJVdoLIpJj5O/2Fa0pqwVOotWd4oW QRu9id3N0jGYU5Ae8/VpAqdIEpbSx5GhB3QTb6uMKSo4M1OfT+S5fv7Rd/+YT3871igz VxIQ== 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:mime-version:content-transfer-encoding; bh=eBuYjOca47LEZmSV1uuh9RJRYYiGMfYcTJpeBHPz1GU=; b=ZNXb7MaGupsrVLmQMUi6cl+MfWxU/cMUwM6BJNPWex73TTsVSQDKLZzBykQKhiU+x3 rW3Qn6pttttWtoTAb4hgLEzS/1uCWk3X+vMjJpx7YKkbiCPxcPyAElt9y4EI8XGmWWXi BITxl114wvBEL/av00aJe/gvMmJbzmMSKf6KQDcEgxNt1PoKe04jDZisl+t3lQwV6EV9 /7pqdKGN2kgs9HGFqx82eadgsHq/KCbtJ5nxo9FrYY7+s/OmdS5RLE/Pa8NVmwkwj91B 0G4RvbSgyc3I0VYIihp4EWPpzrvf+y8JwN8Jq7UCR/XLuomgRKPO7aW1/2luX1fpboR+ 7KFA== X-Gm-Message-State: AOAM530+K7cBarUSdCUEabzKlAj2Uz4hQmE5LBMz4CL7kGQM8KNlXyxN 3PGEnbIwLwZb0jt6XUWLF6rYRAvBuL9WtQ== X-Received: by 2002:a65:4183:: with SMTP id a3mr1697519pgq.448.1598890000252; Mon, 31 Aug 2020 09:06:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id gt13sm17218pjb.43.2020.08.31.09.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 09:06:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 27/76] target/microblaze: Check singlestep_enabled in gen_goto_tb Date: Mon, 31 Aug 2020 09:05:12 -0700 Message-Id: <20200831160601.833692-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200831160601.833692-1-richard.henderson@linaro.org> References: <20200831160601.833692-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not use goto_tb if we're single-stepping. Tested-by: Edgar E. Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/translate.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 53ca0bfb38..2e753fa621 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -140,7 +140,12 @@ static inline bool use_goto_tb(DisasContext *dc, target_ulong dest) static void gen_goto_tb(DisasContext *dc, int n, target_ulong dest) { - if (use_goto_tb(dc, dest)) { + if (dc->singlestep_enabled) { + TCGv_i32 tmp = tcg_const_i32(EXCP_DEBUG); + tcg_gen_movi_i32(cpu_pc, dest); + gen_helper_raise_exception(cpu_env, tmp); + tcg_temp_free_i32(tmp); + } else if (use_goto_tb(dc, dest)) { tcg_gen_goto_tb(n); tcg_gen_movi_i32(cpu_pc, dest); tcg_gen_exit_tb(dc->tb, n);