gwj / at91sam9263 · Commits

Commit 3d177870554de21dad2479da786f4f6d7e26d529

Authored by j_mayer
1 parent 863cf0b7

Fix host and target longs confusions (continued). 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3345 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 24 additions and 21 deletions
linux-user/main.c
  View file @3d17787
@@ -1958,14 +1958,17 @@ int main(int argc, char **argv) @@ -1958,14 +1958,17 @@ int main(int argc, char **argv)
1958 if (loglevel) { 1958 if (loglevel) {
1959 page_dump(logfile); 1959 page_dump(logfile);
1960 1960
1961 - fprintf(logfile, "start_brk 0x%08lx\n" , info->start_brk);  
1962 - fprintf(logfile, "end_code 0x%08lx\n" , info->end_code);  
1963 - fprintf(logfile, "start_code 0x%08lx\n" , info->start_code);  
1964 - fprintf(logfile, "start_data 0x%08lx\n" , info->start_data);  
1965 - fprintf(logfile, "end_data 0x%08lx\n" , info->end_data);  
1966 - fprintf(logfile, "start_stack 0x%08lx\n" , info->start_stack);  
1967 - fprintf(logfile, "brk 0x%08lx\n" , info->brk);  
1968 - fprintf(logfile, "entry 0x%08lx\n" , info->entry); 1961 + fprintf(logfile, "start_brk 0x" TARGET_FMT_lx "\n", info->start_brk);
  1962 + fprintf(logfile, "end_code 0x" TARGET_FMT_lx "\n", info->end_code);
  1963 + fprintf(logfile, "start_code 0x" TARGET_FMT_lx "\n",
  1964 + info->start_code);
  1965 + fprintf(logfile, "start_data 0x" TARGET_FMT_lx "\n",
  1966 + info->start_data);
  1967 + fprintf(logfile, "end_data 0x" TARGET_FMT_lx "\n", info->end_data);
  1968 + fprintf(logfile, "start_stack 0x" TARGET_FMT_lx "\n",
  1969 + info->start_stack);
  1970 + fprintf(logfile, "brk 0x" TARGET_FMT_lx "\n", info->brk);
  1971 + fprintf(logfile, "entry 0x" TARGET_FMT_lx "\n", info->entry);
1969 } 1972 }
1970 1973
1971 target_set_brk(info->brk); 1974 target_set_brk(info->brk);
linux-user/qemu.h
  View file @3d17787
@@ -17,18 +17,18 @@ @@ -17,18 +17,18 @@
17 * task_struct fields in the kernel 17 * task_struct fields in the kernel
18 */ 18 */
19 struct image_info { 19 struct image_info {
20 - target_ulong load_addr;  
21 - unsigned long start_code;  
22 - unsigned long end_code;  
23 - unsigned long start_data;  
24 - unsigned long end_data;  
25 - unsigned long start_brk;  
26 - unsigned long brk;  
27 - unsigned long start_mmap;  
28 - unsigned long mmap;  
29 - unsigned long rss;  
30 - unsigned long start_stack;  
31 - unsigned long entry; 20 + target_ulong load_addr;
  21 + target_ulong start_code;
  22 + target_ulong end_code;
  23 + target_ulong start_data;
  24 + target_ulong end_data;
  25 + target_ulong start_brk;
  26 + target_ulong brk;
  27 + target_ulong start_mmap;
  28 + target_ulong mmap;
  29 + target_ulong rss;
  30 + target_ulong start_stack;
  31 + target_ulong entry;
32 target_ulong code_offset; 32 target_ulong code_offset;
33 target_ulong data_offset; 33 target_ulong data_offset;
34 char **host_argv; 34 char **host_argv;
@@ -105,7 +105,7 @@ extern const char *qemu_uname_release; @@ -105,7 +105,7 @@ extern const char *qemu_uname_release;
105 struct linux_binprm { 105 struct linux_binprm {
106 char buf[128]; 106 char buf[128];
107 void *page[MAX_ARG_PAGES]; 107 void *page[MAX_ARG_PAGES];
108 - unsigned long p; 108 + target_ulong p;
109 int fd; 109 int fd;
110 int e_uid, e_gid; 110 int e_uid, e_gid;
111 int argc, envc; 111 int argc, envc;