From patchwork Tue Aug 25 20:59:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248294 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6447:0:0:0:0 with SMTP id l7csp6706ejn; Tue, 25 Aug 2020 14:18:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaK/SgjXLxHipbwd1yegqmDetn3LIKTRrFmJVU5gvWqLwJdvwv6OS+AMnZLD7hkj0Zzo7r X-Received: by 2002:a25:824a:: with SMTP id d10mr17538174ybn.260.1598390320130; Tue, 25 Aug 2020 14:18:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598390320; cv=none; d=google.com; s=arc-20160816; b=uDsoVWmsOuxzrAhehNpF0+WzJGVfSk2NzixESrtLyml3AuoIp6O3qvqt3o19MgKovd hC94kl6MN/HYvqPBb0q+ae6HywMVXo4hdVTkO+nwrUXl5Z4WVcEwq24lfKNy3vjx39lF cvnahe6k6cLB/YEfFx7qWQvj39sjev160/JRYwUc0GrG6o2N5XDzH+wYkPHwEKJMiOob pwJRRsifQVp/nwX8ZvWwb/w2Q+YzXLy8uB740RBf43MN6JMm3/4yOCOaewWlDCZ/7UEb RIhlYUO92VNVYJ64vDvo7BAFbT6rBpW1HEfk8gwslVVmsuQlcwgNy80HnGquYAZ5rt03 mtjQ== 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=vRHfeWYe4t2JOdjOnGDnZu1tFFPEQawCvJ5AdLU8/XA=; b=QJwGClmBoJiIskFcCV3oAsEyischpqDgfV6ZDXWGQmsEC6/yXUJFl8OytakrTisD8G v6/+zbkP3PXvMQHwc0a0FiEthvsDgeWUBuGU4mPhQOCSDdCIzNW9uFQnb3XtQVyRmI76 IWv98aN8+OOf1pGCwSdSRXmD0Lw32yoPJDz8UN7a+YfyxoOme/xMuKZAA2+s72t20bQX FGQlD5Sjv5r/H8Qsv2/eY7D/uOu+Uyk7podWNn/lcJL2Vr4bcgnsckb+EWN44uhxZ7su xAyLKp6oCXCbVw/SpaO1LgA5IRfFjz4vUUdjKL81+9apR7WefiB2lGeCVpBVMeIJeE8A 7ulw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B8Uu8iDo; 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=pass (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 c186si36455yba.330.2020.08.25.14.18.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Aug 2020 14:18:40 -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=pass header.i=@linaro.org header.s=google header.b=B8Uu8iDo; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAgL1-0002RZ-H9 for patch@linaro.org; Tue, 25 Aug 2020 17:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAg3X-0007kU-3v for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:36 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:42052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAg3Q-0001nR-Ks for qemu-devel@nongnu.org; Tue, 25 Aug 2020 17:00:33 -0400 Received: by mail-pg1-x541.google.com with SMTP id g1so3877987pgm.9 for ; Tue, 25 Aug 2020 14:00:28 -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=vRHfeWYe4t2JOdjOnGDnZu1tFFPEQawCvJ5AdLU8/XA=; b=B8Uu8iDoxOG0+lWySO7Vk2GvwdOBihkCDODrs9X9UigfE4Vv0JHSggtZGBbSCYZexa w5AqSeJSQWg1CcRuZRI5naiMxdfY9MrJOVLe+DX8/1JiLWkkTUp55Se7GFTlO+ROPXM3 UJvVvDF81tPiMVO1m7odPomrnssmnd9RJ9QlGHgtOYl3WW6of41q5ECbyz7pcmy1hPUL gEpZWK2upfkYY+R6mVNSqOEB2w3z7nUtZEEZPvkEqJ+LAK63pvh4BngYyBUq2J+4HdvZ kaapqEnoP3pIz96euGL1+bglT7bAQRWd0apfClM4MT1P1sf6SgqWnrztbJQKS/CNw12b EiQw== 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=vRHfeWYe4t2JOdjOnGDnZu1tFFPEQawCvJ5AdLU8/XA=; b=mqtLwGG9blg7fIFyxGJ/vXQK2oCX4bhlTWUyKaSXWsg+19B4bWipCiKxLZt9KJRD8W /i0JXW1xu5brCoWU5J/zw27zwKBcBd9i/V7Mi81UGAAsqljHsaFD3Mbm290PG6igamj/ WYHkQR81o/1X3rDOP+s91rhYosCeGnm84er/aj2c2ODh9xjXadKeEvivO7r31Tg8kZ5w LoDwP5oSC68I7/MuAjtGU64zFyIr92QJgjAzqsmcDV6w5OPFvG0jpmjYGw7y/AhmLRlz yC3SMf6nZaZHhATiS0ReyTha5kkfDK3Dp464XQlStnll5ZizufMQsjmQDaZeoAYFlTUf EwNA== X-Gm-Message-State: AOAM532sbC9e+NII1Q+CVEaqeKODnSixMoCr+jFxbGFLAyrsEmApk18B HTRS6dJth7LvYuDF8EmXaqeyd2dDWm315g== X-Received: by 2002:a63:4859:: with SMTP id x25mr8122986pgk.422.1598389226851; Tue, 25 Aug 2020 14:00:26 -0700 (PDT) Received: from localhost.localdomain (h216-228-167-147.bendor.dedicated.static.tds.net. [216.228.167.147]) by smtp.gmail.com with ESMTPSA id k4sm16074pgr.87.2020.08.25.14.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 14:00:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 27/77] target/microblaze: Check singlestep_enabled in gen_goto_tb Date: Tue, 25 Aug 2020 13:59:00 -0700 Message-Id: <20200825205950.730499-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825205950.730499-1-richard.henderson@linaro.org> References: <20200825205950.730499-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::541; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x541.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.iglesias@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not use goto_tb if we're single-stepping. 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..7d5b96c38b 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_i64(cpu_SR[SR_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);