From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Andrew Jones" <drjones@redhat.com>,
"Greg Bellows" <greg.bellows@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH v2 10/11] target-arm: Reindent ancient page-table-walk code
Date: Fri, 30 Jan 2015 11:39:34 +1000 [thread overview]
Message-ID: <20150130013934.GC8636@toto> (raw)
In-Reply-To: <1422557717-19120-11-git-send-email-peter.maydell@linaro.org>
On Thu, Jan 29, 2015 at 06:55:16PM +0000, Peter Maydell wrote:
> A few of the oldest parts of the page-table-walk code have broken indent
> (either hardcoded tabs or two-spaces). Reindent these sections.
>
> For ease of review, this patch does not touch the brace style and
> so is a whitespace-only change.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> Reviewed-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
> target-arm/helper.c | 192 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 96 insertions(+), 96 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 042ee7a..c6f76b4 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -4639,55 +4639,55 @@ static inline int check_ap(CPUARMState *env, ARMMMUIdx mmu_idx,
> int ap, int domain_prot,
> int access_type)
> {
> - int prot_ro;
> - bool is_user = regime_is_user(env, mmu_idx);
> -
> - if (domain_prot == 3) {
> - return PAGE_READ | PAGE_WRITE;
> - }
> -
> - if (access_type == 1)
> - prot_ro = 0;
> - else
> - prot_ro = PAGE_READ;
> -
> - switch (ap) {
> - case 0:
> - if (arm_feature(env, ARM_FEATURE_V7)) {
> - return 0;
> - }
> - 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;
> - case SCTLR_R:
> - return PAGE_READ;
> - default:
> - return 0;
> - }
> - case 1:
> - return is_user ? 0 : PAGE_READ | PAGE_WRITE;
> - case 2:
> - if (is_user)
> - return prot_ro;
> - else
> - return PAGE_READ | PAGE_WRITE;
> - case 3:
> - return PAGE_READ | PAGE_WRITE;
> - case 4: /* Reserved. */
> - return 0;
> - case 5:
> - return is_user ? 0 : prot_ro;
> - case 6:
> - return prot_ro;
> - case 7:
> - if (!arm_feature (env, ARM_FEATURE_V6K))
> - return 0;
> - return prot_ro;
> - default:
> - abort();
> - }
> + int prot_ro;
> + bool is_user = regime_is_user(env, mmu_idx);
> +
> + if (domain_prot == 3) {
> + return PAGE_READ | PAGE_WRITE;
> + }
> +
> + if (access_type == 1)
> + prot_ro = 0;
> + else
> + prot_ro = PAGE_READ;
> +
> + switch (ap) {
> + case 0:
> + if (arm_feature(env, ARM_FEATURE_V7)) {
> + return 0;
> + }
> + 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;
> + case SCTLR_R:
> + return PAGE_READ;
> + default:
> + return 0;
> + }
> + case 1:
> + return is_user ? 0 : PAGE_READ | PAGE_WRITE;
> + case 2:
> + if (is_user)
> + return prot_ro;
> + else
> + return PAGE_READ | PAGE_WRITE;
> + case 3:
> + return PAGE_READ | PAGE_WRITE;
> + case 4: /* Reserved. */
> + return 0;
> + case 5:
> + return is_user ? 0 : prot_ro;
> + case 6:
> + return prot_ro;
> + case 7:
> + if (!arm_feature (env, ARM_FEATURE_V6K))
> + return 0;
> + return prot_ro;
> + default:
> + abort();
> + }
> }
>
> static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,
> @@ -4765,13 +4765,13 @@ static int get_phys_addr_v5(CPUARMState *env, uint32_t address, int access_type,
> *page_size = 1024 * 1024;
> } else {
> /* Lookup l2 entry. */
> - if (type == 1) {
> - /* Coarse pagetable. */
> - table = (desc & 0xfffffc00) | ((address >> 10) & 0x3fc);
> - } else {
> - /* Fine pagetable. */
> - table = (desc & 0xfffff000) | ((address >> 8) & 0xffc);
> - }
> + if (type == 1) {
> + /* Coarse pagetable. */
> + table = (desc & 0xfffffc00) | ((address >> 10) & 0x3fc);
> + } else {
> + /* Fine pagetable. */
> + table = (desc & 0xfffff000) | ((address >> 8) & 0xffc);
> + }
> desc = ldl_phys(cs->as, table);
> switch (desc & 3) {
> case 0: /* Page translation fault. */
> @@ -4788,17 +4788,17 @@ static int get_phys_addr_v5(CPUARMState *env, uint32_t address, int access_type,
> *page_size = 0x1000;
> break;
> case 3: /* 1k page. */
> - if (type == 1) {
> - if (arm_feature(env, ARM_FEATURE_XSCALE)) {
> - phys_addr = (desc & 0xfffff000) | (address & 0xfff);
> - } else {
> - /* Page translation fault. */
> - code = 7;
> - goto do_fault;
> - }
> - } else {
> - phys_addr = (desc & 0xfffffc00) | (address & 0x3ff);
> - }
> + if (type == 1) {
> + if (arm_feature(env, ARM_FEATURE_XSCALE)) {
> + phys_addr = (desc & 0xfffff000) | (address & 0xfff);
> + } else {
> + /* Page translation fault. */
> + code = 7;
> + goto do_fault;
> + }
> + } else {
> + phys_addr = (desc & 0xfffffc00) | (address & 0x3ff);
> + }
> ap = (desc >> 4) & 3;
> *page_size = 0x400;
> break;
> @@ -5193,18 +5193,18 @@ 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)
> - 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)
> - break;
> + base = env->cp15.c6_region[n];
> + 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)
> + break;
> }
> if (n < 0)
> - return 2;
> + return 2;
>
> if (access_type == 2) {
> mask = env->cp15.pmsav5_insn_ap;
> @@ -5214,31 +5214,31 @@ static int get_phys_addr_mpu(CPUARMState *env, uint32_t address,
> mask = (mask >> (n * 4)) & 0xf;
> switch (mask) {
> case 0:
> - return 1;
> + return 1;
> case 1:
> - if (is_user)
> - return 1;
> - *prot = PAGE_READ | PAGE_WRITE;
> - break;
> + if (is_user)
> + return 1;
> + *prot = PAGE_READ | PAGE_WRITE;
> + break;
> case 2:
> - *prot = PAGE_READ;
> - if (!is_user)
> - *prot |= PAGE_WRITE;
> - break;
> + *prot = PAGE_READ;
> + if (!is_user)
> + *prot |= PAGE_WRITE;
> + break;
> case 3:
> - *prot = PAGE_READ | PAGE_WRITE;
> - break;
> + *prot = PAGE_READ | PAGE_WRITE;
> + break;
> case 5:
> - if (is_user)
> - return 1;
> - *prot = PAGE_READ;
> - break;
> + if (is_user)
> + return 1;
> + *prot = PAGE_READ;
> + break;
> case 6:
> - *prot = PAGE_READ;
> - break;
> + *prot = PAGE_READ;
> + break;
> default:
> - /* Bad permission. */
> - return 1;
> + /* Bad permission. */
> + return 1;
> }
> *prot |= PAGE_EXEC;
> return 0;
> --
> 1.9.1
>
next prev parent reply other threads:[~2015-01-30 1:43 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 18:55 [Qemu-devel] [PATCH v2 00/11] target-arm: handle mmu_idx/translation regimes properly Peter Maydell
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 01/11] cpu_ldst.h: Allow NB_MMU_MODES to be 7 Peter Maydell
2015-02-02 20:56 ` Richard Henderson
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 02/11] target-arm: Make arm_current_el() return sensible values for M profile Peter Maydell
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 03/11] target-arm/translate-a64: Fix wrong mmu_idx usage for LDT/STT Peter Maydell
2015-01-29 23:49 ` Edgar E. Iglesias
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 04/11] target-arm: Define correct mmu_idx values and pass them in TB flags Peter Maydell
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 05/11] target-arm: Use correct mmu_idx for unprivileged loads and stores Peter Maydell
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 06/11] target-arm: Don't define any MMU_MODE*_SUFFIXes Peter Maydell
2015-01-30 1:49 ` Edgar E. Iglesias
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 07/11] target-arm: Split AArch64 cases out of ats_write() Peter Maydell
2015-01-30 2:32 ` Edgar E. Iglesias
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 08/11] target-arm: Pass mmu_idx to get_phys_addr() Peter Maydell
2015-01-30 2:09 ` Edgar E. Iglesias
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 09/11] target-arm: Use mmu_idx in get_phys_addr() Peter Maydell
2015-01-30 2:03 ` Edgar E. Iglesias
2015-01-30 10:24 ` Peter Maydell
2015-01-30 15:06 ` Greg Bellows
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 10/11] target-arm: Reindent ancient page-table-walk code Peter Maydell
2015-01-30 1:39 ` Edgar E. Iglesias [this message]
2015-01-29 18:55 ` [Qemu-devel] [PATCH v2 11/11] target-arm: Fix brace style in reindented code Peter Maydell
2015-01-30 1:45 ` Edgar E. Iglesias
2015-01-30 1:36 ` [Qemu-devel] [PATCH v2 00/11] target-arm: handle mmu_idx/translation regimes properly Edgar E. Iglesias
2015-01-30 10:42 ` Peter Maydell
2015-02-03 11:31 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150130013934.GC8636@toto \
--to=edgar.iglesias@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=drjones@redhat.com \
--cc=greg.bellows@linaro.org \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.