diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2015-03-25 15:22:49 +0100 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2015-03-25 15:22:49 +0100 |
| commit | b6ef71b6f487062689f320161ce7c1966dd2ac65 (patch) | |
| tree | 9211c2173bf86d47aae888e63ec62b778a963f77 | |
| parent | 588a90f0f015ab694106c7b44d70a721e040d977 (diff) | |
| download | android_external_strace-b6ef71b6f487062689f320161ce7c1966dd2ac65.tar.gz android_external_strace-b6ef71b6f487062689f320161ce7c1966dd2ac65.tar.bz2 android_external_strace-b6ef71b6f487062689f320161ce7c1966dd2ac65.zip | |
Move sparc64 get_scno() code where it belongs
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
| -rw-r--r-- | linux/sparc/get_scno.c | 20 | ||||
| -rw-r--r-- | linux/sparc64/get_scno.c | 20 |
2 files changed, 19 insertions, 21 deletions
diff --git a/linux/sparc/get_scno.c b/linux/sparc/get_scno.c index 0e59a280..b190b6c5 100644 --- a/linux/sparc/get_scno.c +++ b/linux/sparc/get_scno.c @@ -1,21 +1 @@ -#ifdef SPARC64 -/* Retrieve the syscall trap instruction. */ -unsigned long trap; -errno = 0; -trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.tpc, 0); -if (errno) - return -1; -trap >>= 32; -switch (trap) { -case 0x91d02010: - /* Linux/SPARC syscall trap. */ - update_personality(tcp, 0); - break; -case 0x91d0206d: - /* Linux/SPARC64 syscall trap. */ - update_personality(tcp, 1); - break; -} -#endif - scno = sparc_regs.u_regs[U_REG_G1]; diff --git a/linux/sparc64/get_scno.c b/linux/sparc64/get_scno.c index dbb0afa9..b92366e9 100644 --- a/linux/sparc64/get_scno.c +++ b/linux/sparc64/get_scno.c @@ -1 +1,19 @@ -#include "sparc/get_scno.c" +/* Retrieve the syscall trap instruction. */ +unsigned long trap; +errno = 0; +trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.tpc, 0); +if (errno) + return -1; +trap >>= 32; +switch (trap) { +case 0x91d02010: + /* Linux/SPARC syscall trap. */ + update_personality(tcp, 0); + break; +case 0x91d0206d: + /* Linux/SPARC64 syscall trap. */ + update_personality(tcp, 1); + break; +} + +scno = sparc_regs.u_regs[U_REG_G1]; |