From patchwork Fri Aug 28 14:18:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248539 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp1134322ilg; Fri, 28 Aug 2020 07:33:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE6x8QjZjg2WQinSFZCoCLlMpikQX3I5xJISR2YK7Tzh3VXZNG+Dc120gpCQV6+bd2jFtq X-Received: by 2002:a25:6c86:: with SMTP id h128mr2655268ybc.115.1598625234633; Fri, 28 Aug 2020 07:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598625234; cv=none; d=google.com; s=arc-20160816; b=JVD8XPp+WWwURGcl8YpCsrYUBENdvFmKA1BtiIvDWXNQJxlbBpvQ6yzfPQAP/2PlPX NUCcgEGFZGKEdhErFLIbvQhKXBr70eoMoUM5ddom2pik5c8m03zLBE38WmH+DmjeETcU OHguKHZ7Jwxz1SVYhR+QS7eIDGepKW70UMnJr58/sNcHKFquTmMwdNqwtUqx+WCD4QEp 9sf0f5kupWcf7Vk/0FphnE7NrgsdpV8EJMg5Ox/D7SUEyaxkGMkv0TlSlmcEta26OnEM 6iNKmp90diiIUShOoX7VaETjTwyynNZwqfsgxgLvvSR+GytL0ga7zjoDxBbXe2RVudas nw6A== 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=lL2TV9fvxAuHwerQiahLV44CD3Djc67HSq2e2+fPjhU=; b=ZUPmmCN38YuEHsh6t1ZeTfhZii/UiaDWKZQBoTmVM0dGWpZL75DU5h2reZzEAJ1d6R 66gP9EY/C+q+wxUIuV6Z/1D7LdGXTYPJh0YSr4wvsUDsNqlUTdoCOH6Z8EMrxuHStZ35 jug0o03CrubjQaGfAe6nuTZWm9crpqOc40ZR0aoUynh5ICyZ9vAdLBOq/d822yNgHGTo JfJsa/WqqD5jriCq9ye2SbqNe+w4JfG7Mgck3+NcLVyU30ir5VnDDQpG6y8KwfMBirDt 6SaIbcPLFeqOGZx8BY7dl7FhNhKOsj9PnC982+RPYoNgn0j/ERdhUniAlsiHRao6WCcE QCdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h2uppks3; 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 x5si1079199ybl.171.2020.08.28.07.33.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Aug 2020 07:33:54 -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=h2uppks3; 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]:57926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBfRy-0001gA-2J for patch@linaro.org; Fri, 28 Aug 2020 10:33:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBfEa-0000Sf-Nb for qemu-devel@nongnu.org; Fri, 28 Aug 2020 10:20:04 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:40437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBfEY-00056q-Fn for qemu-devel@nongnu.org; Fri, 28 Aug 2020 10:20:04 -0400 Received: by mail-pf1-x443.google.com with SMTP id c142so665850pfb.7 for ; Fri, 28 Aug 2020 07:20:01 -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=lL2TV9fvxAuHwerQiahLV44CD3Djc67HSq2e2+fPjhU=; b=h2uppks3xwpxy0Qhl+Zy4+9XnKx24TIktbuQqHcf6HqhMTz/3UKyZSw5JE/AgmRAtJ gIE67Kdgf9GNjlpuT/lp4RKDjVJAQYnUjAWjo5ebClujJiifUMAfAmlT5+L4jvGFr7Ns wlzONaiDg0n/UXDVsgdlF1qHcaj7cO0Wo83jxwWb3OAp5Y3r9+rR4WIU09pQsDQfOePx Q6KUXZw2LQKY2J4kHACfH32SAJccXpjPdQ1m6BqFHltXy8rBgMWr6HSePGS7ddRYMxBC L4/Bc8Gg5aLXWU5rEvZFaoIwjE1Fq+HwIgfs5Nv44LvxuPKa4VLKNe+mjrRMEDcxgM9R qwKw== 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=lL2TV9fvxAuHwerQiahLV44CD3Djc67HSq2e2+fPjhU=; b=njCYbhvnn9jw1m7+PZuzawpkpkIRJE8PcA1WO27rZCmxiShEKmt5/cjPW3aUPn6Xli FuXG/JfOl4MwiO0/mnOBG+h2DS/EjtEw+DqCRIhfRWGfe9AhXnTF1uGssdBJY+YTNrVd 6KeERiO80w+WzYyL0vrYfY2Ns1cLd1Zp7X2zAl9Q1MhSuuINpOFsPD2s2XLU1/VUXKCO DP5mfioL+d9QfyUXQfk2KpyvczRn6HbRs/hBk9KPrbNHUX8R3H3CKeR8j6/fl1jTM7/Z oSg5ZqPWBbBMBDF80X/JiR3Cdm9+PtVpKhL+fxSaQKiJhKzTZSXw8NkQyFhVbBTFKaSf M09g== X-Gm-Message-State: AOAM530iPzeHwd2J4Rzx1Uuxx4mUZMZP66qxPFyj9IuZOnXJNNgI6UlS QcS48xOm4e+h/9aVAuW4ciIcvr0aJJeVEA== X-Received: by 2002:a63:50c:: with SMTP id 12mr1426504pgf.173.1598624400550; Fri, 28 Aug 2020 07:20:00 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id j3sm1403080pjw.23.2020.08.28.07.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 07:19:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 22/76] target/microblaze: Remove helper_debug and env->debug Date: Fri, 28 Aug 2020 07:18:35 -0700 Message-Id: <20200828141929.77854-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200828141929.77854-1-richard.henderson@linaro.org> References: <20200828141929.77854-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x443.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@xilinx.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is not used, and seems redundant with -d cpu. Signed-off-by: Richard Henderson --- target/microblaze/cpu.h | 1 - target/microblaze/helper.h | 1 - target/microblaze/op_helper.c | 23 ----------------------- target/microblaze/translate.c | 16 ++-------------- 4 files changed, 2 insertions(+), 39 deletions(-) -- 2.25.1 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index b88acba12b..7708c9a3d3 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -229,7 +229,6 @@ typedef struct CPUMBState CPUMBState; #define STREAM_NONBLOCK (1 << 4) struct CPUMBState { - uint32_t debug; uint32_t btaken; uint32_t btarget; uint32_t bimm; diff --git a/target/microblaze/helper.h b/target/microblaze/helper.h index 820711366d..9309142f8d 100644 --- a/target/microblaze/helper.h +++ b/target/microblaze/helper.h @@ -1,5 +1,4 @@ DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) -DEF_HELPER_1(debug, void, env) DEF_HELPER_FLAGS_3(carry, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) DEF_HELPER_2(cmp, i32, i32, i32) DEF_HELPER_2(cmpu, i32, i32, i32) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index dc2bec0c99..d79202c3f8 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -71,29 +71,6 @@ void helper_raise_exception(CPUMBState *env, uint32_t index) cpu_loop_exit(cs); } -void helper_debug(CPUMBState *env) -{ - int i; - - qemu_log("PC=%08x\n", env->pc); - qemu_log("rmsr=%x resr=%x rear=%" PRIx64 " " - "debug[%x] imm=%x iflags=%x\n", - env->msr, env->esr, env->ear, - env->debug, env->imm, env->iflags); - qemu_log("btaken=%d btarget=%x mode=%s(saved=%s) eip=%d ie=%d\n", - env->btaken, env->btarget, - (env->msr & MSR_UM) ? "user" : "kernel", - (env->msr & MSR_UMS) ? "user" : "kernel", - (bool)(env->msr & MSR_EIP), - (bool)(env->msr & MSR_IE)); - for (i = 0; i < 32; i++) { - qemu_log("r%2.2d=%8.8x ", i, env->regs[i]); - if ((i + 1) % 4 == 0) - qemu_log("\n"); - } - qemu_log("\n\n"); -} - static inline uint32_t compute_carry(uint32_t a, uint32_t b, uint32_t cin) { uint32_t cout = 0; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 9a00a78b8a..ecfa6b86a4 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -53,7 +53,6 @@ #define DISAS_UPDATE DISAS_TARGET_1 /* cpu state was modified dynamically */ #define DISAS_TB_JUMP DISAS_TARGET_2 /* only pc was modified statically */ -static TCGv_i32 env_debug; static TCGv_i32 cpu_R[32]; static TCGv_i32 cpu_pc; static TCGv_i32 cpu_msr; @@ -1675,13 +1674,6 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) tcg_gen_insn_start(dc->pc); num_insns++; -#if SIM_COMPAT - if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)) { - tcg_gen_movi_i32(cpu_pc, dc->pc); - gen_helper_debug(); - } -#endif - if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { gen_raise_exception_sync(dc, EXCP_DEBUG); /* The address covered by the breakpoint must be included in @@ -1824,10 +1816,9 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, int flags) qemu_fprintf(f, "IN: PC=%x %s\n", env->pc, lookup_symbol(env->pc)); qemu_fprintf(f, "rmsr=%x resr=%x rear=%" PRIx64 " " - "debug=%x imm=%x iflags=%x fsr=%x rbtr=%x\n", + "imm=%x iflags=%x fsr=%x rbtr=%x\n", env->msr, env->esr, env->ear, - env->debug, env->imm, env->iflags, env->fsr, - env->btr); + env->imm, env->iflags, env->fsr, env->btr); qemu_fprintf(f, "btaken=%d btarget=%x mode=%s(saved=%s) eip=%d ie=%d\n", env->btaken, env->btarget, (env->msr & MSR_UM) ? "user" : "kernel", @@ -1857,9 +1848,6 @@ void mb_tcg_init(void) { int i; - env_debug = tcg_global_mem_new_i32(cpu_env, - offsetof(CPUMBState, debug), - "debug0"); env_iflags = tcg_global_mem_new_i32(cpu_env, offsetof(CPUMBState, iflags), "iflags");