From patchwork Thu Dec 12 04:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 181439 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp398042ile; Wed, 11 Dec 2019 20:17:00 -0800 (PST) X-Google-Smtp-Source: APXvYqxAvcfg0MuEJZaJLuUoiiqhSquQ1slv49fgJXP7eu2v3Jw80p/gV8NZHOV2fq1PHiesWJLg X-Received: by 2002:a9d:4c88:: with SMTP id m8mr5789997otf.12.1576124220558; Wed, 11 Dec 2019 20:17:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576124220; cv=none; d=google.com; s=arc-20160816; b=TeVJO3UxbZy+Sq/j5mIzoIQwHWsLxkxkfRZ/G0EOLnGNYUYSW9ghhR+DpcSHhztu+U ScYsAnsxt88VOlByoO/6m9q9BMnq1BYHYQH8/ZwfDkmuvCRhxKegoaRAmFBpU448FbYK weBuIBeoMH7GoV18O/1gjcYE3V9ovsDKcRnOompi8Ngk4udIKfa/6hhHZov5ZC7Ppdve clfWa+ylDcdkPlPwQZUtBGw7BY+Izk4OiJGUIivnWNHRRMsNr1Ky01nas8lL4Oc5hyem E+fjnQPvkbF0vSHs9Ql/e3bHzx5ITvnbYyto4tf9C6FxEi2ax8CNNTKW0os73GscwNWI 9WBA== 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=moeX6cR2plwHGjOubTw0OffPZ6hPUqHTM5k0VKv1gGw=; b=KmabGj2FebMpBoVXyYm2mS8quPmcG2b+Rr21jOTyOZcH3aSY3lCH/1SgNebfKIlD9i npxl4/DjY+KLE+0uEYkpclYPgXdo/NKugColZ6DOOiSBrzl9sTW8d//jNPi6fHdDF2nU Gh5lDKkerkHiDCsobMbJNS7wtImILMYEUiONr15OsrBS6OCIndnGWPd8cwXd95VwzT+G jzxr3Cj1QAS2QqcM3Rqtyu/z/r/CBdm//vDMwmE5BjaKfhCLbjNi0R0VB4cFr3U6ng8i y74b942JDf3O7HHP5v/EGXkz5VniHQaIVFzK2PQa8iasP0Wo+9jHW86588Us1mWYOcH3 Lejw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="TDGgw/3x"; 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 u12si2386991otq.51.2019.12.11.20.17.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Dec 2019 20:17:00 -0800 (PST) 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="TDGgw/3x"; 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]:54166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifFuN-00050s-D0 for patch@linaro.org; Wed, 11 Dec 2019 23:16:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifFf8-00012H-08 for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifFf6-0004PH-BY for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:13 -0500 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:40326) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifFf6-0004NY-3a for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:12 -0500 Received: by mail-pf1-x443.google.com with SMTP id q8so31380pfh.7 for ; Wed, 11 Dec 2019 20:01:11 -0800 (PST) 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=moeX6cR2plwHGjOubTw0OffPZ6hPUqHTM5k0VKv1gGw=; b=TDGgw/3xuGO9TphHh/QVr5iDK4w0h4KERlMCD4CERBr/dM7KmfBcRCG39x0TPXRR/K xzV0nsU0MuspCcQUEOq+Tu6JXLt7G8GXeS7T/QQ/bgVip74sRNxFNSZHB2yWAALzxuOS ui6vOzS33Ig9B+pJtp0G0TpI4YZgDuJustfPdg0Y+cnELkF5KxZCzcpP26LGDnlgZ0Wv 7gna/AQt9mbYaUQ6DTJjZD5yzzfgrbv+ch8RITVeyOlOlDA1E+mS43mQMnGgNalnkkmh JhJAvrQHjye8JD14ZvQI0aHVYR7ni2beffxDAMZOLSYh1SRb+1OLGL4xoARYN4kaMeRT H7mA== 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=moeX6cR2plwHGjOubTw0OffPZ6hPUqHTM5k0VKv1gGw=; b=gF7uSbSQk90FmnZ+KEL7fKSHURvQ/pYT27VOLjRqrbvRp1zGpcinFqdznTornQs0Ch J+c9fpGRmiIpWcVJTxYmxITdSzeYiQlA1wOudXbNMgbjIdqdM1U0rh/wqPoOPaT2I9im dGmPR/D1WLh/1JG+e4imZr6lnevAe24E9OBR2nbRGWDrGtl0blQv2ST069sTq3pt+b2t TU/aypxYc7bZMt8xu8awusnxFDgZ4MyiXcaoziLZx1W2bQ9cC1f11gy8Akq74pwEjaQg t8HGB8m3CGZDgdmdyCkvkxU+X0iFnTOL7ncADQrbBTgzSCNgeYXKTDV0IN5Nb89CR4IM vUHQ== X-Gm-Message-State: APjAAAWAOfn9pXT5v5JNhXJ1qbRGkol3uqLnqVFnCCEkOMPvvKfDy7Wd 231EXBHbE2OUzkbPxbflDTcbRf35ods= X-Received: by 2002:a63:d306:: with SMTP id b6mr7975228pgg.195.1576123270116; Wed, 11 Dec 2019 20:01:10 -0800 (PST) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id z130sm4666391pgz.6.2019.12.11.20.01.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 20:01:09 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Date: Wed, 11 Dec 2019 20:00:34 -0800 Message-Id: <20191212040039.26546-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191212040039.26546-1-richard.henderson@linaro.org> References: <20191212040039.26546-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::443 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: Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The generated *_user functions are unused. The *_kernel functions have a couple of users in op_helper.c; use *_mmuidx_ra instead, with MMU_KERNEL_IDX. Cc: Laurent Vivier Signed-off-by: Richard Henderson --- target/m68k/cpu.h | 2 -- target/m68k/op_helper.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Laurent Vivier diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 20de3c379a..89af14e899 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -516,8 +516,6 @@ enum { #define cpu_list m68k_cpu_list /* MMU modes definitions */ -#define MMU_MODE0_SUFFIX _kernel -#define MMU_MODE1_SUFFIX _user #define MMU_KERNEL_IDX 0 #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUM68KState *env, bool ifetch) diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index bc4f845e3f..96a4951c21 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -36,6 +36,11 @@ static inline void do_interrupt_m68k_hardirq(CPUM68KState *env) #else +#define cpu_lduw_kernel(e, p) cpu_lduw_mmuidx_ra(e, p, MMU_KERNEL_IDX, 0) +#define cpu_ldl_kernel(e, p) cpu_ldl_mmuidx_ra(e, p, MMU_KERNEL_IDX, 0) +#define cpu_stw_kernel(e, p, v) cpu_stw_mmuidx_ra(e, p, v, MMU_KERNEL_IDX, 0) +#define cpu_stl_kernel(e, p, v) cpu_stl_mmuidx_ra(e, p, v, MMU_KERNEL_IDX, 0) + static void cf_rte(CPUM68KState *env) { uint32_t sp;