From patchwork Fri Aug 28 14:18:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248538 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp1133947ilg; Fri, 28 Aug 2020 07:33:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg0ttOTCrsIMuggb+QniCzUtliLETnH6ICXXl5LJaFH3r+rqujOhDxn0NbXfe17IXIN2it X-Received: by 2002:a25:a143:: with SMTP id z61mr2921398ybh.468.1598625209078; Fri, 28 Aug 2020 07:33:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598625209; cv=none; d=google.com; s=arc-20160816; b=JfRnD8o5E1zXR9deemdQD0Bd/02WWliSC8XZJXtQOe0BIOxQRAglSyN+bi1IVEMUmv 8nT4aMPmQBBdOIyVbWJVgJ9aZYFYQiWRNcj2KFfheOX9Dh7v9aehvQKOQag+M0eIjmpI YikXfLGdsUeP6WlasmQneY13oEwLM1A5HYF9oNVhBYXk8dCC+HJXqIAAAqM3m0I/OcuD A+v+J/bDSYlm7dKmnxEzlFE/P5rqOK8HHEqYEleB1vhsjRFoCtA9wa4LPTnYXMtx2sd2 XWQ9txLY1vT5LyA7lJipagSKiDD2ujIokqf2ZYVf40ZF7iIdO1vhtjntPpkkGtXssBP3 G3DQ== 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=b/4g1T+WE9RDnuv3IAKyPSAVgdbvulTxnio8bcXmxqI=; b=BTUnHs/wUxbZzGjaTGp0psn3oet/WGiV+gOtqbjR9FfV8Ob59Sef9ZQ+geZsD6mBDm GlejpCvcaoIQVuNTCVIYtxqtexm5q3PA+kQl7YXwcYJJoLGpHlZ5M2rJcjWBheClGz0v k2I6PcpMnXBM8DpLW6k4l5x36Umot8IJSl9yWHDhqARg6yWNAQkbodFQ1WzAR9tq0oas Qhupd6wF029NEiLSArTAJiO4mnvapOl79U/p0PYMXPaO/hBFqYE06Tv1+nRh9mWy9MPN 97yjxQiaeeRwIcyKQaQVbzdDmqnMx3LUfPnH1AuN9EqOM8wSxgnivT+PSBqFsJxmBuwE 5PAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hMyYKG6i; 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 s91si933998ybi.418.2020.08.28.07.33.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Aug 2020 07:33:29 -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=hMyYKG6i; 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]:53162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBfRY-00084R-CQ for patch@linaro.org; Fri, 28 Aug 2020 10:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBfEr-00011t-Mg for qemu-devel@nongnu.org; Fri, 28 Aug 2020 10:20:21 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:37203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBfEk-0005A7-Tf for qemu-devel@nongnu.org; Fri, 28 Aug 2020 10:20:21 -0400 Received: by mail-pl1-x644.google.com with SMTP id c15so532455plq.4 for ; Fri, 28 Aug 2020 07:20:14 -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=b/4g1T+WE9RDnuv3IAKyPSAVgdbvulTxnio8bcXmxqI=; b=hMyYKG6iT0h/SFFlVYPd9MK/4bGQ8pub5C8qdGVH5s5Mo3MwXa6BIfcS9qTpt0+rdM 3id2GW0GADLz0+KI26LMWUFraqWSeit4Mfg3qymldd2kUyRnNfHUrx52TcKgqMqN2XIB q6rLQlglQEU1XOWPB70N90+6CDTF+wFIfVdmpODFwrPe7WcfGALEACr2nniBUgBzXGrz oQ7Kn2W8GoDzoWmDn76vWGpZ4hb8Ijddw7iVBNZc4eWR0AvaNBhcL4j6oL9YYeBGIkTG TilM5EfjgRtFcUu6AQ8xB0ignvvnTaz6IpUqDFITVJhoneXrx5a4RR0RvX9hnz/SfnIS Iglw== 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=b/4g1T+WE9RDnuv3IAKyPSAVgdbvulTxnio8bcXmxqI=; b=lRAT3W5QwSdVtU8HMetuP2eIzuzF7Y+SUIRd5gPyebxkNEL+d9wipjFKuVRlsgbME6 UH/loZXgmcnjMR3h+07S9kpuPUiRPawhcYbUoiq4szzSURl43WGktDWUA7hGgos6HBDy xuF3EDaP7rToa4TtErj1EF6q3O+nojK2A7j377yI9BcSt85I3m4MYjuOMXwEw3xEtp2O zc71RoSjajv3MZpHDXW4KPutXV2L8csLF3BFmNBSgNytcSZpMXVyRkccQ/rbIQSVv/Ph a5be4tZNlwp1DfD2byKd+VOaCgx7pDXqLJNjT9jVeGeD99nYeRklvHdPJV739MP+6IjF wlNg== X-Gm-Message-State: AOAM530CbcOsSrQuYhoJl+iNaievwcuAzlQ5nsWwxkqfZMYpwDbP8gF8 tGMLuMVPNIG4Ff/Jp634MYmDbBrIPtvuMA== X-Received: by 2002:a17:902:76cb:: with SMTP id j11mr1477125plt.29.1598624413102; Fri, 28 Aug 2020 07:20:13 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id j3sm1403080pjw.23.2020.08.28.07.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 07:20:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 32/76] target/microblaze: Remove empty D macros Date: Fri, 28 Aug 2020 07:18:45 -0700 Message-Id: <20200828141929.77854-33-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::644; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x644.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 never used in op_helper.c and translate.c. There are two trivial uses in helper.c which can be improved by always logging MMU_EXCP to CPU_LOG_INT. Signed-off-by: Richard Henderson --- target/microblaze/helper.c | 11 ++++------- target/microblaze/op_helper.c | 2 -- target/microblaze/translate.c | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index 9a95456401..f8e2ca12a9 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -24,8 +24,6 @@ #include "qemu/host-utils.h" #include "exec/log.h" -#define D(x) - #if defined(CONFIG_USER_ONLY) void mb_cpu_do_interrupt(CPUState *cs) @@ -155,10 +153,13 @@ void mb_cpu_do_interrupt(CPUState *cs) case EXCP_MMU: env->regs[17] = env->pc; + qemu_log_mask(CPU_LOG_INT, + "MMU exception at pc=%x iflags=%x ear=%" PRIx64 "\n", + env->pc, env->iflags, env->ear); + env->esr &= ~(1 << 12); /* Exception breaks branch + dslot sequence? */ if (env->iflags & D_FLAG) { - D(qemu_log("D_FLAG set at exception bimm=%d\n", env->bimm)); env->esr |= 1 << 12 ; env->btr = env->btarget; @@ -166,14 +167,10 @@ void mb_cpu_do_interrupt(CPUState *cs) env->regs[17] -= 4; /* was the branch immprefixed?. */ if (env->bimm) { - qemu_log_mask(CPU_LOG_INT, - "bimm exception at pc=%x iflags=%x\n", - env->pc, env->iflags); env->regs[17] -= 4; log_cpu_state_mask(CPU_LOG_INT, cs, 0); } } else if (env->iflags & IMM_FLAG) { - D(qemu_log("IMM_FLAG set at exception\n")); env->regs[17] -= 4; } diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index d79202c3f8..decdca0fd8 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -26,8 +26,6 @@ #include "exec/cpu_ldst.h" #include "fpu/softfloat.h" -#define D(x) - void helper_put(uint32_t id, uint32_t ctrl, uint32_t data) { int test = ctrl & STREAM_TEST; diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 6757720776..860859324a 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -41,8 +41,6 @@ # define LOG_DIS(...) do { } while (0) #endif -#define D(x) - #define EXTRACT_FIELD(src, start, end) \ (((src) >> start) & ((1 << (end - start + 1)) - 1))