| Message ID | 20210203190010.759771-4-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target-arm: Implement ARMv8.5-MemTag, user mode | expand |
On 2/3/21 7:59 PM, Richard Henderson wrote: > This is more descriptive than 'unsigned long'. > No functional change, since these match on all linux+bsd hosts. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/cpu-all.h | 2 +- > bsd-user/main.c | 4 ++-- > linux-user/elfload.c | 4 ++-- > linux-user/main.c | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h > index c23c77589b..c52180e8e6 100644 > --- a/include/exec/cpu-all.h > +++ b/include/exec/cpu-all.h > @@ -158,7 +158,7 @@ static inline void tswap64s(uint64_t *s) > /* On some host systems the guest address space is reserved on the host. > * This allows the guest address space to be offset to a convenient location. > */ > -extern unsigned long guest_base; > +extern uintptr_t guest_base; > extern bool have_guest_base; > extern unsigned long reserved_va; > > diff --git a/bsd-user/main.c b/bsd-user/main.c > index 65163e1396..c09d74d788 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -41,7 +41,7 @@ > > int singlestep; > unsigned long mmap_min_addr; > -unsigned long guest_base; > +uintptr_t guest_base; > bool have_guest_base; > unsigned long reserved_va; > > @@ -965,7 +965,7 @@ int main(int argc, char **argv) > g_free(target_environ); > > if (qemu_loglevel_mask(CPU_LOG_PAGE)) { > - qemu_log("guest_base 0x%lx\n", guest_base); > + qemu_log("guest_base %p\n", (void *)guest_base); Why not use PRIxPTR? Otherwise: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 2/3/21 9:08 AM, Philippe Mathieu-Daudé wrote: > On 2/3/21 7:59 PM, Richard Henderson wrote: >> This is more descriptive than 'unsigned long'. >> No functional change, since these match on all linux+bsd hosts. >> >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> include/exec/cpu-all.h | 2 +- >> bsd-user/main.c | 4 ++-- >> linux-user/elfload.c | 4 ++-- >> linux-user/main.c | 4 ++-- >> 4 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h >> index c23c77589b..c52180e8e6 100644 >> --- a/include/exec/cpu-all.h >> +++ b/include/exec/cpu-all.h >> @@ -158,7 +158,7 @@ static inline void tswap64s(uint64_t *s) >> /* On some host systems the guest address space is reserved on the host. >> * This allows the guest address space to be offset to a convenient location. >> */ >> -extern unsigned long guest_base; >> +extern uintptr_t guest_base; >> extern bool have_guest_base; >> extern unsigned long reserved_va; >> >> diff --git a/bsd-user/main.c b/bsd-user/main.c >> index 65163e1396..c09d74d788 100644 >> --- a/bsd-user/main.c >> +++ b/bsd-user/main.c >> @@ -41,7 +41,7 @@ >> >> int singlestep; >> unsigned long mmap_min_addr; >> -unsigned long guest_base; >> +uintptr_t guest_base; >> bool have_guest_base; >> unsigned long reserved_va; >> >> @@ -965,7 +965,7 @@ int main(int argc, char **argv) >> g_free(target_environ); >> >> if (qemu_loglevel_mask(CPU_LOG_PAGE)) { >> - qemu_log("guest_base 0x%lx\n", guest_base); >> + qemu_log("guest_base %p\n", (void *)guest_base); > > Why not use PRIxPTR? Didn't think of it. Worth a respin? > > Otherwise: > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >
On Wed, Feb 3, 2021 at 8:10 PM Richard Henderson <richard.henderson@linaro.org> wrote: > On 2/3/21 9:08 AM, Philippe Mathieu-Daudé wrote: > > On 2/3/21 7:59 PM, Richard Henderson wrote: > >> This is more descriptive than 'unsigned long'. > >> No functional change, since these match on all linux+bsd hosts. > >> > >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > >> --- > >> include/exec/cpu-all.h | 2 +- > >> bsd-user/main.c | 4 ++-- > >> linux-user/elfload.c | 4 ++-- > >> linux-user/main.c | 4 ++-- > >> 4 files changed, 7 insertions(+), 7 deletions(-) > >> > >> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h > >> index c23c77589b..c52180e8e6 100644 > >> --- a/include/exec/cpu-all.h > >> +++ b/include/exec/cpu-all.h > >> @@ -158,7 +158,7 @@ static inline void tswap64s(uint64_t *s) > >> /* On some host systems the guest address space is reserved on the host. > >> * This allows the guest address space to be offset to a convenient location. > >> */ > >> -extern unsigned long guest_base; > >> +extern uintptr_t guest_base; > >> extern bool have_guest_base; > >> extern unsigned long reserved_va; > >> > >> diff --git a/bsd-user/main.c b/bsd-user/main.c > >> index 65163e1396..c09d74d788 100644 > >> --- a/bsd-user/main.c > >> +++ b/bsd-user/main.c > >> @@ -41,7 +41,7 @@ > >> > >> int singlestep; > >> unsigned long mmap_min_addr; > >> -unsigned long guest_base; > >> +uintptr_t guest_base; > >> bool have_guest_base; > >> unsigned long reserved_va; > >> > >> @@ -965,7 +965,7 @@ int main(int argc, char **argv) > >> g_free(target_environ); > >> > >> if (qemu_loglevel_mask(CPU_LOG_PAGE)) { > >> - qemu_log("guest_base 0x%lx\n", guest_base); > >> + qemu_log("guest_base %p\n", (void *)guest_base); > > > > Why not use PRIxPTR? > > Didn't think of it. Worth a respin? No, I was simply curious if it weren't possible for some reason. > > > > Otherwise: > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > >
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index c23c77589b..c52180e8e6 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -158,7 +158,7 @@ static inline void tswap64s(uint64_t *s) /* On some host systems the guest address space is reserved on the host. * This allows the guest address space to be offset to a convenient location. */ -extern unsigned long guest_base; +extern uintptr_t guest_base; extern bool have_guest_base; extern unsigned long reserved_va; diff --git a/bsd-user/main.c b/bsd-user/main.c index 65163e1396..c09d74d788 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -41,7 +41,7 @@ int singlestep; unsigned long mmap_min_addr; -unsigned long guest_base; +uintptr_t guest_base; bool have_guest_base; unsigned long reserved_va; @@ -965,7 +965,7 @@ int main(int argc, char **argv) g_free(target_environ); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - qemu_log("guest_base 0x%lx\n", guest_base); + qemu_log("guest_base %p\n", (void *)guest_base); log_page_dump("binary load"); qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); diff --git a/linux-user/elfload.c b/linux-user/elfload.c index a64050713f..29f07bb234 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2135,9 +2135,9 @@ static void pgb_have_guest_base(const char *image_name, abi_ulong guest_loaddr, void *addr, *test; if (!QEMU_IS_ALIGNED(guest_base, align)) { - fprintf(stderr, "Requested guest base 0x%lx does not satisfy " + fprintf(stderr, "Requested guest base %p does not satisfy " "host minimum alignment (0x%lx)\n", - guest_base, align); + (void *)guest_base, align); exit(EXIT_FAILURE); } diff --git a/linux-user/main.c b/linux-user/main.c index bb4e55e8fc..55aac56d70 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -58,7 +58,7 @@ static const char *cpu_model; static const char *cpu_type; static const char *seed_optarg; unsigned long mmap_min_addr; -unsigned long guest_base; +uintptr_t guest_base; bool have_guest_base; /* @@ -819,7 +819,7 @@ int main(int argc, char **argv, char **envp) g_free(target_environ); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { - qemu_log("guest_base 0x%lx\n", guest_base); + qemu_log("guest_base %p\n", (void *)guest_base); log_page_dump("binary load"); qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk);