projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -name option, by Anthony Liguori.
[qemu]
/
darwin-user
/
main.c
diff --git
a/darwin-user/main.c
b/darwin-user/main.c
index
259aab3
..
78cf864
100644
(file)
--- a/
darwin-user/main.c
+++ b/
darwin-user/main.c
@@
-478,7
+478,7
@@
static void set_idt(int n, unsigned int dpl)
}
/* ABI convention: after a syscall if there was an error the CF flag is set */
}
/* ABI convention: after a syscall if there was an error the CF flag is set */
-static inline set_error(CPUX86State *env, int ret)
+static inline void set_error(CPUX86State *env, int ret)
{
if(ret<0)
env->eflags = env->eflags | 0x1;
{
if(ret<0)
env->eflags = env->eflags | 0x1;
@@
-646,17
+646,18
@@
void usage(void)
"Darwin CPU emulator (compiled for %s emulation)\n"
"\n"
"-h print this help\n"
"Darwin CPU emulator (compiled for %s emulation)\n"
"\n"
"-h print this help\n"
- "-L path set the elf interpreter prefix (default=%s)\n"
+ "-L path set the %s library path (default='%s')\n"
"-s size set the stack size in bytes (default=%ld)\n"
"\n"
"debug options:\n"
#ifdef USE_CODE_COPY
"-no-code-copy disable code copy acceleration\n"
#endif
"-s size set the stack size in bytes (default=%ld)\n"
"\n"
"debug options:\n"
#ifdef USE_CODE_COPY
"-no-code-copy disable code copy acceleration\n"
#endif
- "-d options activate log (logfile=%s)\n"
+ "-d options activate log (logfile='%s')\n"
"-g wait for gdb on port 1234\n"
"-p pagesize set the host page size to 'pagesize'\n",
TARGET_ARCH,
"-g wait for gdb on port 1234\n"
"-p pagesize set the host page size to 'pagesize'\n",
TARGET_ARCH,
+ TARGET_ARCH,
interp_prefix,
stack_size,
DEBUG_LOGFILE);
interp_prefix,
stack_size,
DEBUG_LOGFILE);
@@
-753,11
+754,6
@@
int main(int argc, char **argv)
/* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs));
/* Zero out regs */
memset(regs, 0, sizeof(struct target_pt_regs));
-#if 0
- /* Scan interp_prefix dir for replacement files. */
- init_paths(interp_prefix);
-#endif
-
/* NOTE: we need to init the CPU at this stage to get
qemu_host_page_size */
env = cpu_init();
/* NOTE: we need to init the CPU at this stage to get
qemu_host_page_size */
env = cpu_init();
@@
-888,7
+884,7
@@
int main(int argc, char **argv)
set_idt(0x81, 3); /* Mach Syscalls */
set_idt(0x82, 3); /* thread Syscalls */
set_idt(0x81, 3); /* Mach Syscalls */
set_idt(0x82, 3); /* thread Syscalls */
- set_idt(0x90, 3); /* Unix Syscall backdoor */
+ set_idt(0x90, 3); /* qemu-darwin-user's Unix syscalls backdoor */
cpu_x86_load_seg(env, R_CS, __USER_CS);
cpu_x86_load_seg(env, R_CS, __USER_CS);