diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-07 16:06:13 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-07 16:06:13 +0000 |
| commit | 3d177870554de21dad2479da786f4f6d7e26d529 (patch) | |
| tree | 8904dd61fc95d1b68f3aa92bf9c50bde363b75d2 | |
| parent | 863cf0b72cee98e42aa03403c38d5cac7fa535ca (diff) | |
| download | qemu-3d177870554de21dad2479da786f4f6d7e26d529.zip qemu-3d177870554de21dad2479da786f4f6d7e26d529.tar.gz qemu-3d177870554de21dad2479da786f4f6d7e26d529.tar.bz2 | |
Fix host and target longs confusions (continued).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3345 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | linux-user/main.c | 19 | ||||
| -rw-r--r-- | linux-user/qemu.h | 26 |
2 files changed, 24 insertions, 21 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 127ae10..fd130ef 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1958,14 +1958,17 @@ int main(int argc, char **argv) if (loglevel) { page_dump(logfile); - fprintf(logfile, "start_brk 0x%08lx\n" , info->start_brk); - fprintf(logfile, "end_code 0x%08lx\n" , info->end_code); - fprintf(logfile, "start_code 0x%08lx\n" , info->start_code); - fprintf(logfile, "start_data 0x%08lx\n" , info->start_data); - fprintf(logfile, "end_data 0x%08lx\n" , info->end_data); - fprintf(logfile, "start_stack 0x%08lx\n" , info->start_stack); - fprintf(logfile, "brk 0x%08lx\n" , info->brk); - fprintf(logfile, "entry 0x%08lx\n" , info->entry); + fprintf(logfile, "start_brk 0x" TARGET_FMT_lx "\n", info->start_brk); + fprintf(logfile, "end_code 0x" TARGET_FMT_lx "\n", info->end_code); + fprintf(logfile, "start_code 0x" TARGET_FMT_lx "\n", + info->start_code); + fprintf(logfile, "start_data 0x" TARGET_FMT_lx "\n", + info->start_data); + fprintf(logfile, "end_data 0x" TARGET_FMT_lx "\n", info->end_data); + fprintf(logfile, "start_stack 0x" TARGET_FMT_lx "\n", + info->start_stack); + fprintf(logfile, "brk 0x" TARGET_FMT_lx "\n", info->brk); + fprintf(logfile, "entry 0x" TARGET_FMT_lx "\n", info->entry); } target_set_brk(info->brk); diff --git a/linux-user/qemu.h b/linux-user/qemu.h index defa6b7..2c48e92 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -17,18 +17,18 @@ * task_struct fields in the kernel */ struct image_info { - target_ulong load_addr; - unsigned long start_code; - unsigned long end_code; - unsigned long start_data; - unsigned long end_data; - unsigned long start_brk; - unsigned long brk; - unsigned long start_mmap; - unsigned long mmap; - unsigned long rss; - unsigned long start_stack; - unsigned long entry; + target_ulong load_addr; + target_ulong start_code; + target_ulong end_code; + target_ulong start_data; + target_ulong end_data; + target_ulong start_brk; + target_ulong brk; + target_ulong start_mmap; + target_ulong mmap; + target_ulong rss; + target_ulong start_stack; + target_ulong entry; target_ulong code_offset; target_ulong data_offset; char **host_argv; @@ -105,7 +105,7 @@ extern const char *qemu_uname_release; struct linux_binprm { char buf[128]; void *page[MAX_ARG_PAGES]; - unsigned long p; + target_ulong p; int fd; int e_uid, e_gid; int argc, envc; |