From patchwork Wed Jul 21 06:41:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 483258 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5913122jao; Tue, 20 Jul 2021 23:59:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZbcn/Dm0Q1SLD540wWT0Fno3FdK0Qf1DsphvRGZlTWdpW/pZBSRcHSFZjhZ51HtlYffeg X-Received: by 2002:a25:a489:: with SMTP id g9mr41938198ybi.266.1626850799325; Tue, 20 Jul 2021 23:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626850799; cv=none; d=google.com; s=arc-20160816; b=azSujRC9FLELsEZkQ4DmOAP/Js52JL7ioBn0PK+aQBOsew/kAdkS5HVzD+LKelqP+s 3ktBCeUGmlUYQ7jOTRgHwp2Ba3jldMNFxxurqC4czUSx4fPCWnK88ZLn+1ImQ7kyWGus E+GHB0pj4b8U31C7Yo1OLFgeNfeoTJ2DQngY9vIlG0Yb9h3pgCaOJQ1IMlNFvBuUUK54 CUy+AfMscqrwDVzMN4T2X7Ppv3x8GMvxaq78GEvLIGUT9PW+9I0K5g0dWfcexOzPsn9V RWX+7DdbqQgVDBjzFd2IianMc4NVY8Q1s87iJ5dDwhAIg0l1lzPuj2R1RxQm9tzF/fAI wbDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=CzixB+E3HvHFDcaZAYJPFRD8OKsUYwozrqwpEEKECyQ=; b=ugT7fKnVHsIc2HZgHC5e3Xqg9E++9QS2PRylFp26q4LORl7Nt9LQMiz1O8eHulDHIl t4uJB0nf7yFEgD+IfhcQPVjYtWJqstAgMoZlv1v7Pg2FZ5unKM61xph0R323BPwtOCjY Vr30jUqBYwYs9NzQCxfhpTXE6MTR+eKrT3Bqmzl7tcNiPwC4ZKWNiHQGupOVlGsqIwNm MJ/Sg0ydWRvct2hWkCo0s9XwXoQB9c+3J13Xud2dgWuwNQXbMm2jag5liv1t5H+yk/9x Xl+N15bQaN9qmCLZzOSaU1Vd5ohsIkVWlz6rPXlc9pxObvgX1iZZe2GP/4HpgZh/rjeh OIFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GmkqcrUt; 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 k4si14916710ybh.120.2021.07.20.23.59.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 23:59:59 -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=GmkqcrUt; 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]:35142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m66D0-0002ng-Pl for patch@linaro.org; Wed, 21 Jul 2021 02:59:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m65w0-0005EI-7k for qemu-devel@nongnu.org; Wed, 21 Jul 2021 02:42:25 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:43877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m65vy-0005jA-Mo for qemu-devel@nongnu.org; Wed, 21 Jul 2021 02:42:24 -0400 Received: by mail-pf1-x42d.google.com with SMTP id a127so1472128pfa.10 for ; Tue, 20 Jul 2021 23:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CzixB+E3HvHFDcaZAYJPFRD8OKsUYwozrqwpEEKECyQ=; b=GmkqcrUtU38YAtSNGA1iNcS1GCx4koVU3gUH9HgaJhH0A9xDfzoX6k8sKXLaNSE0X1 nsirOcb5sW8Vnua3AVMAkR4viPEayvQqJAS6weRHUL5nW1dtMO7e49gtcN5eAzhtNvAk 5Ki/LSpSlmjGvy2kJweAA2DHhEB0BQrvcDSDnET7cmHz0nAOwwBSE26SHJqLKZkhbPb/ ttUs29upGQDszpnBZLOS9tUSZOW/YgCAFP+If5J3SYXk+PUhysBl/ORXoYPM1aAuPuoF fYZ5viehPVDRhYIryf6pSM//lioT/Ev2+Y6BADdWDyJxwvMtm502OSafMqz4Zt5Mq0W2 1TSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CzixB+E3HvHFDcaZAYJPFRD8OKsUYwozrqwpEEKECyQ=; b=QH7YjIM/PLT46Arzepl/RoVB6wUoqWxvv1L3bPW0MvzJvzy6XihxX5/EnEOGXJjo+o 3FHLG2cTnqrwYq5k36b3pwye6CMgdME4NjTF09qXWAeIRRkkxoQ3qZFw/XyAdcGfxr91 aJ3Nniu8ExjtRQdyLQbAO16Pypj+E5nqW1yIK46Jj/yXktqhIp4M2wqOy0JG+QaCXRPq W5DWj+aX8NL+9h+DrNP+hDsfQwYB23bDMBjtl2mKg4swtHk1W9nBWGOP9daN46Ev+3lO cjqntgjYcPsgmKKUVF2Jy0FaZ2VZkNOQG/7oZuciqnBocWw+g6LqsWLD44WB8Q39ZnzY NUrw== X-Gm-Message-State: AOAM532gAdfn9uOZXIAQ9gVoFfIwK9+RR8WJiWgzE0pDPDj91zxvRqqA 96u6cQ6FUrKhVcIE1yd5jpVxKJMPE3c33A== X-Received: by 2002:a65:610c:: with SMTP id z12mr35074816pgu.453.1626849741319; Tue, 20 Jul 2021 23:42:21 -0700 (PDT) Received: from localhost.localdomain (204-210-126-223.res.spectrum.com. [204.210.126.223]) by smtp.gmail.com with ESMTPSA id q17sm21146132pjd.42.2021.07.20.23.42.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 23:42:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-6.2 23/23] target/xtensa: Drop check for singlestep_enabled Date: Tue, 20 Jul 2021 20:41:55 -1000 Message-Id: <20210721064155.645508-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210721064155.645508-1-richard.henderson@linaro.org> References: <20210721064155.645508-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" GDB single-stepping is now handled generically. Signed-off-by: Richard Henderson --- target/xtensa/translate.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) -- 2.25.1 diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 20399d6a04..3fbf76f4dd 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -382,18 +382,14 @@ static void gen_jump_slot(DisasContext *dc, TCGv dest, int slot) if (dc->icount) { tcg_gen_mov_i32(cpu_SR[ICOUNT], dc->next_icount); } - if (dc->base.singlestep_enabled) { - gen_exception(dc, EXCP_DEBUG); + if (dc->op_flags & XTENSA_OP_POSTPROCESS) { + slot = gen_postprocess(dc, slot); + } + if (slot >= 0) { + tcg_gen_goto_tb(slot); + tcg_gen_exit_tb(dc->base.tb, slot); } else { - if (dc->op_flags & XTENSA_OP_POSTPROCESS) { - slot = gen_postprocess(dc, slot); - } - if (slot >= 0) { - tcg_gen_goto_tb(slot); - tcg_gen_exit_tb(dc->base.tb, slot); - } else { - tcg_gen_exit_tb(NULL, 0); - } + tcg_gen_exit_tb(NULL, 0); } dc->base.is_jmp = DISAS_NORETURN; } @@ -1292,12 +1288,7 @@ static void xtensa_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) case DISAS_NORETURN: break; case DISAS_TOO_MANY: - if (dc->base.singlestep_enabled) { - tcg_gen_movi_i32(cpu_pc, dc->pc); - gen_exception(dc, EXCP_DEBUG); - } else { - gen_jumpi(dc, dc->pc, 0); - } + gen_jumpi(dc, dc->pc, 0); break; default: g_assert_not_reached();