glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

S390: stop using needlessly static long pc variable

Browse Source 
* syscall.c: Remove "static long pc" variable.
(get_scno): Use an automatic long variable instead of a static.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-02-08 15:50:05 +01:00
parent 751acb3d70
commit 7ba8e72bb5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
syscall.c
View File

@ -705,7 +705,6 @@ static long a3;
static long r2; static long r2;
#elif defined(S390) || defined(S390X) #elif defined(S390) || defined(S390X)
static long gpr2; static long gpr2;
static long pc;
static long syscall_mode; static long syscall_mode;
#elif defined(HPPA) #elif defined(HPPA)
static long hppa_r28; static long hppa_r28;
@ -921,6 +920,7 @@ get_scno(struct tcb *tcp)
/* /*
* Old style of "passing" the scno via the SVC instruction. * Old style of "passing" the scno via the SVC instruction.
*/ */
long psw;
long opcode, offset_reg, tmp; long opcode, offset_reg, tmp;
void *svc_addr; void *svc_addr;
static const int gpr_offset[16] = { static const int gpr_offset[16] = {
@ -930,12 +930,12 @@ get_scno(struct tcb *tcp)
PT_GPR12, PT_GPR13, PT_GPR14, PT_GPR15 PT_GPR12, PT_GPR13, PT_GPR14, PT_GPR15
}; };
if (upeek(tcp, PT_PSWADDR, &pc) < 0) if (upeek(tcp, PT_PSWADDR, &psw) < 0)
return -1; return -1;
errno = 0; errno = 0;
opcode = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)(pc-sizeof(long)), 0); opcode = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)(psw - sizeof(long)), 0);
if (errno) { if (errno) {
perror_msg("%s", "peektext(pc-oneword)"); perror_msg("%s", "peektext(psw-oneword)");
return -1; return -1;
} }