From patchwork Fri Aug 14 10:41:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52420 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id E1FFE22B12 for ; Fri, 14 Aug 2015 10:41:24 +0000 (UTC) Received: by labia3 with SMTP id ia3sf26698051lab.1 for ; Fri, 14 Aug 2015 03:41:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=7wDc3ZzMyA2I4iNebA5oXmFZWjT+CAlIQeA+mdZCP+o=; b=QQ6PTIrjIzqyEgGlNIDFqkF2iC3CTrM/XwrIkss6aGFFTRhPxOUaFRfqNnjnX2eY3E /BsDqcLofgiVZKZ6PFxpwvMb/Ta21hl1nKhjXHURHB1YLXrgsRWbcrtpov3+e5f4yOln c/djz3ox6yf3OGWgt5RjVKxGXqo+Jxl2t5WcksgHGEmsGVBpeISa/CqScg1hg2Pdz0lZ w+25nx3JvU5GZSX7wfdOjTI6mm+XQldIJqrdQcpRactGS6hJFSDVQsca5lf79BuMxDO/ cgWHgZCo4CpCA26I4PtUFBVoQnDV745AMaqW9R/ehJlUrVFYZjH9s6C1wgqf6IEoarad geUg== X-Gm-Message-State: ALoCoQknSkX94wPynySUUD9bFUDGGTkBXoE12EkZILMnw3ifKjOAO8RRLfqVtS/XowPawPBL0WMs X-Received: by 10.180.205.198 with SMTP id li6mr772247wic.5.1439548883134; Fri, 14 Aug 2015 03:41:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.201 with SMTP id s9ls361093laj.40.gmail; Fri, 14 Aug 2015 03:41:22 -0700 (PDT) X-Received: by 10.112.13.9 with SMTP id d9mr5184283lbc.27.1439548882853; Fri, 14 Aug 2015 03:41:22 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id l7si5686288lbk.138.2015.08.14.03.41.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 03:41:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labd1 with SMTP id d1so41721586lab.1 for ; Fri, 14 Aug 2015 03:41:22 -0700 (PDT) X-Received: by 10.112.140.68 with SMTP id re4mr42751744lbb.72.1439548882714; Fri, 14 Aug 2015 03:41:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1518518lba; Fri, 14 Aug 2015 03:41:22 -0700 (PDT) X-Received: by 10.180.218.195 with SMTP id pi3mr5236709wic.71.1439548881991; Fri, 14 Aug 2015 03:41:21 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fp5si3014305wib.85.2015.08.14.03.41.21 (version=TLS1_2 cipher=AES128-SHA256 bits=128/128); Fri, 14 Aug 2015 03:41:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZQCQJ-0000WP-6t; Fri, 14 Aug 2015 11:41:19 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini Subject: [PATCH v2 2/6] target-arm: Move TLBI ALLE1/ALLE1IS definitions into numeric order Date: Fri, 14 Aug 2015 11:41:15 +0100 Message-Id: <1439548879-1972-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1439548879-1972-1-git-send-email-peter.maydell@linaro.org> References: <1439548879-1972-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move the two regdefs for TLBI ALLE1 and TLBI ALLE1IS down so that the whole set of AArch64 TLBI regdefs is arranged in numeric order. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias --- target-arm/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 1568aa6..2ca8839 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2672,14 +2672,6 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 14, .opc2 = 2, .access = PL1_W, .type = ARM_CP_NOP }, /* TLBI operations */ - { .name = "TLBI_ALLE1", .state = ARM_CP_STATE_AA64, - .opc0 = 1, .opc1 = 4, .crn = 8, .crm = 7, .opc2 = 4, - .access = PL2_W, .type = ARM_CP_NO_RAW, - .writefn = tlbiall_write }, - { .name = "TLBI_ALLE1IS", .state = ARM_CP_STATE_AA64, - .opc0 = 1, .opc1 = 4, .crn = 8, .crm = 3, .opc2 = 4, - .access = PL2_W, .type = ARM_CP_NO_RAW, - .writefn = tlbiall_is_write }, { .name = "TLBI_VMALLE1IS", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 3, .opc2 = 0, .access = PL1_W, .type = ARM_CP_NO_RAW, @@ -2728,6 +2720,14 @@ static const ARMCPRegInfo v8_cp_reginfo[] = { .opc0 = 1, .opc1 = 0, .crn = 8, .crm = 7, .opc2 = 7, .access = PL1_W, .type = ARM_CP_NO_RAW, .writefn = tlbi_aa64_vaa_write }, + { .name = "TLBI_ALLE1IS", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 4, .crn = 8, .crm = 3, .opc2 = 4, + .access = PL2_W, .type = ARM_CP_NO_RAW, + .writefn = tlbiall_is_write }, + { .name = "TLBI_ALLE1", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 4, .crn = 8, .crm = 7, .opc2 = 4, + .access = PL2_W, .type = ARM_CP_NO_RAW, + .writefn = tlbiall_write }, #ifndef CONFIG_USER_ONLY /* 64 bit address translation operations */ { .name = "AT_S1E1R", .state = ARM_CP_STATE_AA64,