Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with native emul: rename sc_tstate to sc_psr.

Browse Source
This commit is contained in:
kleink 2001-05-09 20:21:50 +00:00
parent f0d6ebbd33
commit e0b29e0491
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc64/include/netbsd32_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_machdep.h,v 1.5 1999/12/30 16:24:33 eeh Exp $ */
/* $NetBSD: netbsd32_machdep.h,v 1.6 2001/05/09 20:21:50 kleink Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@ -41,7 +41,7 @@ struct netbsd32_sigcontext {
int sc_sp; /* %sp to restore */
int sc_pc; /* pc to restore */
int sc_npc; /* npc to restore */
int sc_tstate; /* pstate to restore */
int sc_psr; /* pstate to restore */
int sc_g1; /* %g1 to restore */
int sc_o0; /* %o0 to restore */
sigset_t sc_mask; /* signal mask to restore (new style) */

6
sys/arch/sparc64/sparc64/netbsd32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_machdep.c,v 1.13 2001/05/09 20:13:38 kleink Exp $ */
/* $NetBSD: netbsd32_machdep.c,v 1.14 2001/05/09 20:21:51 kleink Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@ -182,7 +182,7 @@ netbsd32_sendsig(catcher, sig, mask, code)
sf.sf_sc.sc_sp = (u_long)oldsp;
sf.sf_sc.sc_pc = tf->tf_pc;
sf.sf_sc.sc_npc = tf->tf_npc;
sf.sf_sc.sc_tstate = TSTATECCR_TO_PSR(tf->tf_tstate); /* XXX */
sf.sf_sc.sc_psr = TSTATECCR_TO_PSR(tf->tf_tstate); /* XXX */
sf.sf_sc.sc_g1 = tf->tf_global[1];
sf.sf_sc.sc_o0 = tf->tf_out[0];
@ -405,7 +405,7 @@ netbsd32___sigreturn14(p, v, retval)
return (EINVAL);
#endif
/* take only psr ICC field */
tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(sc.sc_tstate);
tf->tf_tstate = (int64_t)(tf->tf_tstate & ~TSTATE_CCR) | PSRCC_TO_TSTATE(sc.sc_psr);
tf->tf_pc = (int64_t)scp->sc_pc;
tf->tf_npc = (int64_t)scp->sc_npc;
tf->tf_global[1] = (int64_t)scp->sc_g1;