From patchwork Fri Aug 7 12:33:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52039 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 91D4122EAD for ; Fri, 7 Aug 2015 12:33:35 +0000 (UTC) Received: by wibdx1 with SMTP id dx1sf17383633wib.2 for ; Fri, 07 Aug 2015 05:33:34 -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=0MuFnw9ALbej82VnlCSSPiPJ3jvu+Y/rACap1UcGDWU=; b=aT67hg2U1M8VBwx7/brNgbKm55yDSignJH4ljPkExbEd11w3E8D7GOQCT1w6p1ygu0 VIJc4IW0AfmDsxaVSgdLC++phjIu4Cc5poiKilWF06Sc3LmCG/dC4k40C6LJlozZGEE5 1o0kwXosVzoscZ39hQ9b7BV5LtJE2S+Q6rYuxlDsSGzcN0sxt+HfQzWe1CNdCi/3rKkV iK5xnKhQgXRvaxeq/K65bnRlIDRs9I7U//W283ym/vx+ZZRC4wK4n1P3MuJZ/zF6DkQ8 bGVmVUM/B5Vwn2qWCCLijWVq2XJHVLoDc5Rl1GbOOraoSrMFU1trT0a4QQLbOkhx13/P sEVg== X-Gm-Message-State: ALoCoQm81grJdX9PzwBelbsjtG7DObSX4MPLWTx2/EOs75FC3hNsqXKmKf/zKH//b7kJz0DUX/4O X-Received: by 10.112.99.37 with SMTP id en5mr2110251lbb.7.1438950814872; Fri, 07 Aug 2015 05:33:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.246.36 with SMTP id xt4ls380361lac.1.gmail; Fri, 07 Aug 2015 05:33:34 -0700 (PDT) X-Received: by 10.112.170.103 with SMTP id al7mr7361333lbc.66.1438950814594; Fri, 07 Aug 2015 05:33:34 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id rl9si7368176lac.65.2015.08.07.05.33.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 05:33:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labkb6 with SMTP id kb6so45020000lab.2 for ; Fri, 07 Aug 2015 05:33:34 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr7329268lbb.35.1438950814337; Fri, 07 Aug 2015 05:33:34 -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 l6csp347839lba; Fri, 7 Aug 2015 05:33:33 -0700 (PDT) X-Received: by 10.194.21.70 with SMTP id t6mr16012279wje.74.1438950813485; Fri, 07 Aug 2015 05:33:33 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ev2si10734678wib.69.2015.08.07.05.33.32 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 07 Aug 2015 05:33:33 -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 1ZNgq3-0007SB-1L; Fri, 07 Aug 2015 13:33:31 +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 2/6] target-arm: Move TLBI ALLE1/ALLE1IS definitions into numeric order Date: Fri, 7 Aug 2015 13:33:26 +0100 Message-Id: <1438950810-28618-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1438950810-28618-1-git-send-email-peter.maydell@linaro.org> References: <1438950810-28618-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.43 as permitted sender) smtp.mail=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 --- 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 01f0d0d..d5052c2 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2434,14 +2434,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, @@ -2490,6 +2482,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,