Re: [Qemu-devel] [PATCH 10/20] softmmu: Use uintptr_t for physaddr

[Blue Swirl]

On Sun, Apr 15, 2012 at 14:13, Stefan Weil <address@hidden> wrote:
> Variable physaddr is a host address which should be represented by
> data type 'uintptr_t'.

As you note, the name is wrong and should be fixed, for example
'hostaddr' or 'raw_ptr' would be better. If you need to revisit the
series, please consider changing the name too since it would not
change the patch much.

>
> This is needed for w64 and changes nothing for other hosts.
>
> Signed-off-by: Stefan Weil <address@hidden>
> ---
>  softmmu_header.h |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/softmmu_header.h b/softmmu_header.h
> index 6b72093..edc7826 100644
> --- a/softmmu_header.h
> +++ b/softmmu_header.h
> @@ -99,7 +99,6 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), 
> MEMSUFFIX)(ENV_PARAM
>     int page_index;
>     RES_TYPE res;
>     target_ulong addr;
> -    unsigned long physaddr;
>     int mmu_idx;
>
>     addr = ptr;
> @@ -111,7 +110,7 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), 
> MEMSUFFIX)(ENV_PARAM
>                                                                      addr,
>                                                                      mmu_idx);
>     } else {
> -        physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
> +        uintptr_t physaddr = addr + 
> env->tlb_table[mmu_idx][page_index].addend;
>         res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)physaddr);
>     }
>     return res;
> @@ -124,7 +123,6 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), 
> MEMSUFFIX)(ENV_PARAM
>  {
>     int res, page_index;
>     target_ulong addr;
> -    unsigned long physaddr;
>     int mmu_idx;
>
>     addr = ptr;
> @@ -135,7 +133,7 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), 
> MEMSUFFIX)(ENV_PARAM
>         res = (DATA_STYPE)glue(glue(glue(HELPER_PREFIX, ld), SUFFIX),
>                                MMUSUFFIX)(ENV_VAR addr, mmu_idx);
>     } else {
> -        physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
> +        uintptr_t physaddr = addr + 
> env->tlb_table[mmu_idx][page_index].addend;
>         res = glue(glue(lds, SUFFIX), _raw)((uint8_t *)physaddr);
>     }
>     return res;
> @@ -152,7 +150,6 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), 
> MEMSUFFIX)(ENV_PARAM target_ulong ptr,
>  {
>     int page_index;
>     target_ulong addr;
> -    unsigned long physaddr;
>     int mmu_idx;
>
>     addr = ptr;
> @@ -163,7 +160,7 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), 
> MEMSUFFIX)(ENV_PARAM target_ulong ptr,
>         glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_VAR addr, 
> v,
>                                                                mmu_idx);
>     } else {
> -        physaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
> +        uintptr_t physaddr = addr + 
> env->tlb_table[mmu_idx][page_index].addend;
>         glue(glue(st, SUFFIX), _raw)((uint8_t *)physaddr, v);
>     }
>  }
> --
> 1.7.0.4
>