From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH0iB-0006Jp-Q0 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:49:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH0i8-0006KF-Hz for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:49:31 -0500 Received: from mail-ob0-x234.google.com ([2607:f8b0:4003:c01::234]:42292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH0i8-0006Jp-AD for qemu-devel@nongnu.org; Thu, 29 Jan 2015 20:49:28 -0500 Received: by mail-ob0-f180.google.com with SMTP id vb8so3703119obc.11 for ; Thu, 29 Jan 2015 17:49:27 -0800 (PST) Date: Fri, 30 Jan 2015 11:45:26 +1000 From: "Edgar E. Iglesias" Message-ID: <20150130014526.GD8636@toto> References: <1422557717-19120-1-git-send-email-peter.maydell@linaro.org> <1422557717-19120-12-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1422557717-19120-12-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH v2 11/11] target-arm: Fix brace style in reindented code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Andrew Jones , Greg Bellows , Alex =?iso-8859-1?Q?Benn=E9e?= , qemu-devel@nongnu.org, patches@linaro.org On Thu, Jan 29, 2015 at 06:55:17PM +0000, Peter Maydell wrote: > This patch fixes the brace style in the code reindented in the > previous commit. > > Signed-off-by: Peter Maydell > Reviewed-by: Greg Bellows Reviewed-by: Edgar E. Iglesias > --- > target-arm/helper.c | 36 +++++++++++++++++++++++------------- > 1 file changed, 23 insertions(+), 13 deletions(-) > > diff --git a/target-arm/helper.c b/target-arm/helper.c > index c6f76b4..e09af89 100644 > --- a/target-arm/helper.c > +++ b/target-arm/helper.c > @@ -4646,18 +4646,20 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx, > return PAGE_READ | PAGE_WRITE; > } > > - if (access_type == 1) > + if (access_type == 1) { > prot_ro = 0; > - else > + } else { > prot_ro = PAGE_READ; > + } > > switch (ap) { > case 0: > if (arm_feature(env, ARM_FEATURE_V7)) { > return 0; > } > - if (access_type == 1) > + if (access_type == 1) { > return 0; > + } > switch (regime_sctlr(env, mmu_idx) & (SCTLR_S | SCTLR_R)) { > case SCTLR_S: > return is_user ? 0 : PAGE_READ; > @@ -4669,10 +4671,11 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx, > case 1: > return is_user ? 0 : PAGE_READ | PAGE_WRITE; > case 2: > - if (is_user) > + if (is_user) { > return prot_ro; > - else > + } else { > return PAGE_READ | PAGE_WRITE; > + } > case 3: > return PAGE_READ | PAGE_WRITE; > case 4: /* Reserved. */ > @@ -4682,8 +4685,9 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx, > case 6: > return prot_ro; > case 7: > - if (!arm_feature (env, ARM_FEATURE_V6K)) > + if (!arm_feature(env, ARM_FEATURE_V6K)) { > return 0; > + } > return prot_ro; > default: > abort(); > @@ -5194,17 +5198,20 @@ static int get_phys_addr_mpu(CPUARMState *env, uint32_t address, > *phys_ptr = address; > for (n = 7; n >= 0; n--) { > base = env->cp15.c6_region[n]; > - if ((base & 1) == 0) > + if ((base & 1) == 0) { > continue; > + } > mask = 1 << ((base >> 1) & 0x1f); > /* Keep this shift separate from the above to avoid an > (undefined) << 32. */ > mask = (mask << 1) - 1; > - if (((base ^ address) & ~mask) == 0) > + if (((base ^ address) & ~mask) == 0) { > break; > + } > } > - if (n < 0) > + if (n < 0) { > return 2; > + } > > if (access_type == 2) { > mask = env->cp15.pmsav5_insn_ap; > @@ -5216,21 +5223,24 @@ static int get_phys_addr_mpu(CPUARMState *env, uint32_t address, > case 0: > return 1; > case 1: > - if (is_user) > - return 1; > + if (is_user) { > + return 1; > + } > *prot = PAGE_READ | PAGE_WRITE; > break; > case 2: > *prot = PAGE_READ; > - if (!is_user) > + if (!is_user) { > *prot |= PAGE_WRITE; > + } > break; > case 3: > *prot = PAGE_READ | PAGE_WRITE; > break; > case 5: > - if (is_user) > + if (is_user) { > return 1; > + } > *prot = PAGE_READ; > break; > case 6: > -- > 1.9.1 >