gwj / at91sam9263 · Commits

Commit 1e2bed4f7e08f2d1d3191cd03d66067e809659f7

Authored by bellard
1 parent 83195237

Darwin cleanup usage (Pierre d'Herbemont) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2387 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 8 deletions
darwin-user/main.c
  View file @1e2bed4
@@ -646,17 +646,18 @@ void usage(void) @@ -646,17 +646,18 @@ void usage(void)
646 "Darwin CPU emulator (compiled for %s emulation)\n" 646 "Darwin CPU emulator (compiled for %s emulation)\n"
647 "\n" 647 "\n"
648 "-h print this help\n" 648 "-h print this help\n"
649 - "-L path set the elf interpreter prefix (default=%s)\n" 649 + "-L path set the %s library path (default='%s')\n"
650 "-s size set the stack size in bytes (default=%ld)\n" 650 "-s size set the stack size in bytes (default=%ld)\n"
651 "\n" 651 "\n"
652 "debug options:\n" 652 "debug options:\n"
653 #ifdef USE_CODE_COPY 653 #ifdef USE_CODE_COPY
654 "-no-code-copy disable code copy acceleration\n" 654 "-no-code-copy disable code copy acceleration\n"
655 #endif 655 #endif
656 - "-d options activate log (logfile=%s)\n" 656 + "-d options activate log (logfile='%s')\n"
657 "-g wait for gdb on port 1234\n" 657 "-g wait for gdb on port 1234\n"
658 "-p pagesize set the host page size to 'pagesize'\n", 658 "-p pagesize set the host page size to 'pagesize'\n",
659 TARGET_ARCH, 659 TARGET_ARCH,
  660 + TARGET_ARCH,
660 interp_prefix, 661 interp_prefix,
661 stack_size, 662 stack_size,
662 DEBUG_LOGFILE); 663 DEBUG_LOGFILE);
@@ -753,11 +754,6 @@ int main(int argc, char **argv) @@ -753,11 +754,6 @@ int main(int argc, char **argv)
753 /* Zero out regs */ 754 /* Zero out regs */
754 memset(regs, 0, sizeof(struct target_pt_regs)); 755 memset(regs, 0, sizeof(struct target_pt_regs));
755 756
756 -#if 0  
757 - /* Scan interp_prefix dir for replacement files. */  
758 - init_paths(interp_prefix);  
759 -#endif  
760 -  
761 /* NOTE: we need to init the CPU at this stage to get 757 /* NOTE: we need to init the CPU at this stage to get
762 qemu_host_page_size */ 758 qemu_host_page_size */
763 env = cpu_init(); 759 env = cpu_init();
@@ -888,7 +884,7 @@ int main(int argc, char **argv) @@ -888,7 +884,7 @@ int main(int argc, char **argv)
888 set_idt(0x81, 3); /* Mach Syscalls */ 884 set_idt(0x81, 3); /* Mach Syscalls */
889 set_idt(0x82, 3); /* thread Syscalls */ 885 set_idt(0x82, 3); /* thread Syscalls */
890 886
891 - set_idt(0x90, 3); /* Unix Syscall backdoor */ 887 + set_idt(0x90, 3); /* qemu-darwin-user's Unix syscalls backdoor */
892 888
893 889
894 cpu_x86_load_seg(env, R_CS, __USER_CS); 890 cpu_x86_load_seg(env, R_CS, __USER_CS);