From patchwork Thu Dec 12 04:00:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 181444 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp401356ile; Wed, 11 Dec 2019 20:21:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzu0dL9jZs0k6thvPX97GAaabBQHLLUOtO0ADvNbKarBQpWhMzlzSnoSGCFWPPA3OUuQLAT X-Received: by 2002:a9d:eea:: with SMTP id 97mr5501548otj.177.1576124478892; Wed, 11 Dec 2019 20:21:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576124478; cv=none; d=google.com; s=arc-20160816; b=z0b1DNoRmC+W2hI4qqPWQZNhhv6+9JGOQ5Xkkr73EAHjAlNGMGn5Nj/MdTNuWQ0xU6 EH/qnCgqydorfdbGjFSFsTC3FZ2/Z00VpMeKYu/LMMaru0kWqmFJoConRdXnZZSxj+GM E1DpvS80RSReKzl5MfdUJNSoFF/YIbKYIl6b8GL/iJhJ6ZTUJ0NotpDCvNRV5oUcUZuo MaQwi41BZvg/s6BYlX7FDy7Bz7yC60TmxL2mVF0IeOqTsgr+hNuNI1b6ILFRP+/4mC+b fL8FR4O4tj28RR75QNiqs6JUg/lw0sgnp/T5rHmoryXVzjYkkJBfaeTbs8lgHqnTSEPD D6Sw== 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=LUeojZYde3/VPw2CxoZItM1wJDRbu9EUvabmt44460c=; b=UYkoO5s+bq5NtlYaSY3Xt7Wfo23pYGsEFgMZZEtV+epdQ1XJa5w9IHi2nRnbOVBApw dxyMhMwCjzb1lTbA3y+HnkNcgueCm+GgCUPRbzUVVXyz+CRhil+sEEw9DHyI+PY3WQ4Y LyQO+V+4O2/F+ZRuW4VuIvzjOVjYly6Tlit/CoHi8S5h9/N7sJl5OpRlegkqWjNB2iSP x/wUbZlXYWxornLbLwcHdrR6SfPXEuVqDMUMvWNZicXGr9NVHQfBKbc0vEmAtU2cTRuv ttfTTxH/EarV0B6KcXbTHiGu9H8HaTEqy94jwK574tIwiYpPIBN/wKdTio7lIXwmZ5nF ErvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eiblINp2; 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 v145si2380633oia.68.2019.12.11.20.21.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Dec 2019 20:21:18 -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=pass header.i=@linaro.org header.s=google header.b=eiblINp2; 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]:54248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifFyY-00019E-98 for patch@linaro.org; Wed, 11 Dec 2019 23:21:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifFf9-00015B-SX for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifFf8-0004UN-IN for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:15 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:34018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifFf8-0004SH-BV for qemu-devel@nongnu.org; Wed, 11 Dec 2019 23:01:14 -0500 Received: by mail-pl1-x641.google.com with SMTP id x17so11569pln.1 for ; Wed, 11 Dec 2019 20:01:14 -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=LUeojZYde3/VPw2CxoZItM1wJDRbu9EUvabmt44460c=; b=eiblINp2VMI3MQxaYSnI2FBOhKZFOnvn+VkzoxYpz/Nl4SlibWU3HBih2G6tNva4Vf wRC2BkJXqBCPOKMRgWC1AU+MevuT9+cgTDHdzYHR5bM4YhwUnwlCxLeLD+JH4Rvj6BSd cCJV2NbVOBkdpCFQt+TvPNdTb02JmP2d4XhToaBfjsJeiaBiMChwFQ18dx/etimCPs1B dwnDuGrnthmSAn61PpUuV9xb4rqUOn0BG/MqXezipE1GkBic7+7gzVcWX/LI+1cf2/9I qykamI4WQmVbMdMMRXsGjOPdX0gYyfpkurhtelbL0x3I5Gna23Peusrur1+6xG3i4DXY pZ5w== 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=LUeojZYde3/VPw2CxoZItM1wJDRbu9EUvabmt44460c=; b=CUWXKQXV75DBpg0eTSgBddlZ4adagNfuIUtftoPcwu44RuBcWMiFtHl8fHwX/kUh4J STafwuJQ8praJWJ9XkEW4B7ZOe7gTFhzKCOj5ygp1LdcNfQAnAZd4m0FdsX4t9x1ak58 uhPvt1G5EOZedc7bGPQmUiurgLIAac3JvQZ3s5e+KgPTqU8oCRsQlfHJgUUAeCme/cWq 8OWjpPPGO6JP6rmyoay0dj2RRNMkjWvTac0lu/ELklSklvsZcrbGvBQHyMMbb85AHney AKZ5pQwn54JnPbjH8O4HWz+TwRxu1AtUtyaMVEJBa4ULQnDAdE+anqsbc12w4HfweDwV +yFg== X-Gm-Message-State: APjAAAUHizsT2TzPITBx8UdsIEiGU185/mAQzW+YfFJ7PedMyUuHMflT k0zKRKS2gvvL82ckR7HF/BfZVG0kayg= X-Received: by 2002:a17:902:8608:: with SMTP id f8mr7383736plo.106.1576123273028; Wed, 11 Dec 2019 20:01:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 20:01:12 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 25/28] target/s390x: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Date: Wed, 11 Dec 2019 20:00:36 -0800 Message-Id: <20191212040039.26546-26-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::641 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: David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The generated functions aside from *_real are unused. The *_real functions have a couple of users in mem_helper.c; use *_mmuidx_ra instead, with MMU_REAL_IDX. Cc: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/cpu.h | 5 ----- target/s390x/mem_helper.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 17460ed7b3..2670728e8a 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -36,11 +36,6 @@ #define TARGET_INSN_START_EXTRA_WORDS 2 -#define MMU_MODE0_SUFFIX _primary -#define MMU_MODE1_SUFFIX _secondary -#define MMU_MODE2_SUFFIX _home -#define MMU_MODE3_SUFFIX _real - #define MMU_USER_IDX 0 #define S390_MAX_CPUS 248 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 57ce17c252..d379be8418 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -43,6 +43,11 @@ #define HELPER_LOG(x...) #endif +#define cpu_ldl_real_ra(e, p, r) cpu_ldl_mmuidx_ra(e, p, MMU_REAL_IDX, r) +#define cpu_ldq_real_ra(e, p, r) cpu_ldq_mmuidx_ra(e, p, MMU_REAL_IDX, r) +#define cpu_stl_real_ra(e, p, v, r) cpu_stl_mmuidx_ra(e, p, v, MMU_REAL_IDX, r) +#define cpu_stq_real_ra(e, p, v, r) cpu_stq_mmuidx_ra(e, p, v, MMU_REAL_IDX, r) + static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key) { uint16_t pkm = env->cregs[3] >> 16;