Skip to content

Commit ec99242

Browse files
committed
clean up darwin-user files
1 parent de09b60 commit ec99242

File tree

6 files changed

+58
-755
lines changed

6 files changed

+58
-755
lines changed

README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,32 @@
11
This QEMU patch introduces irix/solaris userland emulation. It currently runs
2-
only under linux (though BSD support would probably be feasable).
2+
only under linux and macOS (though BSD support would probably be feasable).
33

44
### compiling
55

6-
Configure QEMU for irix/solaris userland emulation and compile (see the original
6+
Configure QEMU for irix/solaris userland emulation for linux and compile (see the original
77
QEMU README for further instructions):
88

99
```
1010
configure --target-list=irix-linux-user,irixn32-linux-user,irix64-linux-user,solaris-linux-user
1111
make && make install
1212
```
1313

14+
Or, configure QEMU for irix userland emulatin for macOS
15+
16+
```
17+
./configure --target-list=irix-darwin-user \
18+
--disable-vnc \
19+
--disable-sdl \
20+
--disable-gtk \
21+
--disable-cocoa \
22+
--disable-opengl \
23+
--disable-capstone \
24+
--disable-hax \
25+
--disable-hvf \
26+
--disable-tools
27+
make
28+
```
29+
1430
### using
1531

1632
I recommend using binfmt. I have prepared some scripts for this which you can

darwin-user/Makefile.objs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
obj-y = main.o syscall.o strace.o mmap.o signal.o \
22
elfload.o linuxload.o uaccess.o uname.o \
3-
safe-syscall.o \
43
shim_fallocate.o shim_gettid.o shim_timers.o
54

65
obj-$(TARGET_HAS_BFLT) += flatload.o

darwin-user/host/x86_64/hostdep.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,5 @@
1212
#ifndef X86_64_HOSTDEP_H
1313
#define X86_64_HOSTDEP_H
1414

15-
/* Turn off safe-syscall for now ... */
16-
17-
// /* We have a safe-syscall.inc.S */
18-
// #define HAVE_SAFE_SYSCALL
19-
//
20-
// #ifndef __ASSEMBLER__
21-
//
22-
// /* These are defined by the safe-syscall.inc.S file */
23-
// extern char safe_syscall_start[];
24-
// extern char safe_syscall_end[];
25-
//
26-
// /* Adjust the signal context to rewind out of safe-syscall if we're in it */
27-
// static inline void rewind_if_in_safe_syscall(void *puc)
28-
// {
29-
// ucontext_t *uc = puc;
30-
// greg_t *pcreg = &uc->uc_mcontext.gregs[REG_RIP];
31-
//
32-
// if (*pcreg > (uintptr_t)safe_syscall_start
33-
// && *pcreg < (uintptr_t)safe_syscall_end) {
34-
// *pcreg = (uintptr_t)safe_syscall_start;
35-
// }
36-
// }
37-
//
38-
// #endif /* __ASSEMBLER__ */
3915

4016
#endif

darwin-user/host/x86_64/safe-syscall.inc.S

Lines changed: 0 additions & 91 deletions
This file was deleted.

darwin-user/safe-syscall.S

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)