From patchwork Tue Dec 3 02:29:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 180672 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp945229ile; Mon, 2 Dec 2019 18:43:34 -0800 (PST) X-Google-Smtp-Source: APXvYqxdOBCPV2fRpKaXZz6H+y2era/SsrHgYbT5lDIiJgBPqx8jhTHj5IHD5brsUxPsf2cr3YEP X-Received: by 2002:ac8:259c:: with SMTP id e28mr3080007qte.323.1575341014315; Mon, 02 Dec 2019 18:43:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575341014; cv=none; d=google.com; s=arc-20160816; b=C0SxwetfAAAS73WBz6yYCJyLjy78zPJCGrYyVxc4X60KeWn+hAaJT3yyRRYwzTu7Se s8/2AYIwYMq+76/J3CfjyOSGiplnWjA0oivvyFw4kc8Cy/cubj/B7+GCnjrMs9gLXE2R tYHCrGjTzCSmxJmzz17zKwdlKFwhh1oUd/vgQn0zhCHmJwS72jwGCZhcABBnBfkzyT8U Ew/IFVic26ExmY9VA+JFnjf0EXI8xKQhbjCUjX43TnbIxGdk4xZ5XypSAgT1Li8hmXP4 YyDhqv+mIMwNgBvPVa8kFtr3T2MYQwcAfyWv0MCpUwI4Lb7+eXu9d+qYwGFS5HIT8OU7 2Z1g== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=C5bF3i8DWT2f5RYnZflxU7iVnJmRJeE7IGuazbjeOWk=; b=BEPtg1qpKOx1wWEk+WtnzQb+qjewgpflv7LdVs1MfvlHN6NQBNwA+6eTHeLIfmiGqi r0aQsn80aeV6BjEtT2wKAvrT07fdoh0zNo4LSr235a4B3eG/YskdsNpnjHSHAOuchvs1 xLJL0cnVZwFMci6SZ5lyLQ+cs80eaGyeK/czZtzj3Efxfb2mJbBpDONWHavw/9DJLtTu VtJ4e4t0t+2X1QJjD7KF5m/pkOG6L1rKg5j3/3vNrn5FUMRApJpy8+mdtsGtu4usfGZm br07/zvap9p8ELVnbV13qPb6yLu2rkWY+CGA4mWFF+KDChV3VPXzxgIT4tUJO+GdM50i da+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fEud/aFL"; 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 7si1235405qkc.60.2019.12.02.18.43.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2019 18:43:34 -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="fEud/aFL"; 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]:47336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibyA1-0001r5-8R for patch@linaro.org; Mon, 02 Dec 2019 21:43:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60455) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibxxB-0003HH-3W for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibxwz-0008HR-QO for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:08 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:33294) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibxwu-0008Cs-ME for qemu-devel@nongnu.org; Mon, 02 Dec 2019 21:30:01 -0500 Received: by mail-pj1-x1044.google.com with SMTP id r67so833027pjb.0 for ; Mon, 02 Dec 2019 18:30:00 -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; bh=C5bF3i8DWT2f5RYnZflxU7iVnJmRJeE7IGuazbjeOWk=; b=fEud/aFLjXvpezvj1+nNR1bPr50j9b2EZrSJQOBkBtuRrWn0jVEYGKgqhJDck2dryb fQZuG4bbOX/Bx5Y6sYnCVK5Imb+pc4SaeS+S3Jy8hqhG9ihXaep5BUHYpFCJu8C0CBXF y/hss2b6tlpbQSvRjcCL28cf1pIBuBcsDcyYeRY6xg1Xy8YvY6bGvnkMReKglt8eUxKE 6ENkxnGk8ruknFYWqsNO6GFmu2tt155HLJ9sOQ9e1maByI639APyAEo25SqGalHYZt/U h9cQU6bZeTdTyGjj4wwcjpmh/VYuRpLZRD4hdN3Wp5JxIiRGO810ceKsSu7Q0ch0s9Vz SwnQ== 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; bh=C5bF3i8DWT2f5RYnZflxU7iVnJmRJeE7IGuazbjeOWk=; b=amm0c2t3ZbJVLt7o4t5ZH7TvZbh0kWFSKAjhrVq2COigs6t7K0SDna3tHzxkSjuKrQ tsUUQm95DhBgmdkoXcNxSnKY58+He0TzlH/xSBeK/tYO2tb1fulrcJ4u4ayTWZzZCOcs uo2HeKVYKCYO0PwUn7R6PJIdtiO+dJyA3hZjlD2IEDa/FYfsH1yvRuaE/N/4sMDp+x7G KIvijbSdLTaD3SlY2tQ72A4A+PtZnRFklYh+u+YCK9gVFNua+fXBq2JBW5EqqPycExco J3RRZ2FaW84/ts3w8jfViHXgU282rIcjZYChzA/CwFhCWCUcVNm3roxykJ/0jqc2G4dL m1Lg== X-Gm-Message-State: APjAAAVWPJ+NoRt1+sPuUec3YsvQP+uLN1N68SO+h/17OfqRtp++gATP AiVTvw2su9D0qb9wpxPpJ5/7PXIiofY= X-Received: by 2002:a17:902:b68c:: with SMTP id c12mr2652690pls.126.1575340198790; Mon, 02 Dec 2019 18:29:58 -0800 (PST) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id q22sm873695pfg.170.2019.12.02.18.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2019 18:29:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 15/40] target/arm: Expand TBFLAG_ANY.MMUIDX to 4 bits Date: Mon, 2 Dec 2019 18:29:12 -0800 Message-Id: <20191203022937.1474-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203022937.1474-1-richard.henderson@linaro.org> References: <20191203022937.1474-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 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: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We are about to expand the number of mmuidx to 10, and so need 4 bits. For the benefit of reading the number out of -d exec, align it to the penultimate nibble. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ae9fc1ded3..5f295c7e60 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3176,17 +3176,17 @@ typedef ARMCPU ArchCPU; * Unless otherwise noted, these bits are cached in env->hflags. */ FIELD(TBFLAG_ANY, AARCH64_STATE, 31, 1) -FIELD(TBFLAG_ANY, MMUIDX, 28, 3) -FIELD(TBFLAG_ANY, SS_ACTIVE, 27, 1) -FIELD(TBFLAG_ANY, PSTATE_SS, 26, 1) /* Not cached. */ +FIELD(TBFLAG_ANY, SS_ACTIVE, 30, 1) +FIELD(TBFLAG_ANY, PSTATE_SS, 29, 1) /* Not cached. */ +FIELD(TBFLAG_ANY, BE_DATA, 28, 1) +FIELD(TBFLAG_ANY, MMUIDX, 24, 4) /* Target EL if we take a floating-point-disabled exception */ -FIELD(TBFLAG_ANY, FPEXC_EL, 24, 2) -FIELD(TBFLAG_ANY, BE_DATA, 23, 1) +FIELD(TBFLAG_ANY, FPEXC_EL, 22, 2) /* * For A-profile only, target EL for debug exceptions. * Note that this overlaps with the M-profile-only HANDLER and STACKCHECK bits. */ -FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 21, 2) +FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 20, 2) /* * Bit usage when in AArch32 state, both A- and M-profile.