diff options
author | bde <bde@FreeBSD.org> | 1998-12-16 16:28:58 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-12-16 16:28:58 +0000 |
commit | 7b9dc76b762c332efb38713c18c2d0a20a25d4d0 (patch) | |
tree | 03e1009a8b165fa0765493fb3ca3d0ecab2f762b /sys/alpha | |
parent | 6e5fef184259ee17f628443ebdbac4fc70755766 (diff) | |
download | FreeBSD-src-7b9dc76b762c332efb38713c18c2d0a20a25d4d0.zip FreeBSD-src-7b9dc76b762c332efb38713c18c2d0a20a25d4d0.tar.gz |
Removed the cast to a pointer in the definition of PS_STRINGS and
adjusted related casts to match (only in the kernel in this commit).
The pointer was only wanted in one place in kern_exec.c. Applications
should use the kern.ps_strings sysctl instead of PS_STRINGS, so they
shouldn't notice this change.
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/machdep.c | 7 | ||||
-rw-r--r-- | sys/alpha/linux/linux_sysvec.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 446ecec..e8240f1 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: machdep.c,v 1.25 1998/12/04 10:52:47 dfr Exp $ + * $Id: machdep.c,v 1.26 1998/12/04 22:54:42 archie Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1313,8 +1313,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code) /* * Set up the registers to return to sigcode. */ - frame->tf_regs[FRAME_PC] = - (u_int64_t)PS_STRINGS - (esigcode - sigcode); + frame->tf_regs[FRAME_PC] = PS_STRINGS - (esigcode - sigcode); frame->tf_regs[FRAME_A0] = sig; frame->tf_regs[FRAME_A1] = code; frame->tf_regs[FRAME_A2] = (u_int64_t)scp; @@ -1447,7 +1446,7 @@ setregs(struct proc *p, u_long entry, u_long stack) tfp->tf_regs[FRAME_A0] = stack; /* a0 = sp */ tfp->tf_regs[FRAME_A1] = 0; /* a1 = rtld cleanup */ tfp->tf_regs[FRAME_A2] = 0; /* a2 = rtld object */ - tfp->tf_regs[FRAME_A3] = (u_int64_t)PS_STRINGS; /* a3 = ps_strings */ + tfp->tf_regs[FRAME_A3] = PS_STRINGS; /* a3 = ps_strings */ tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC]; /* a.k.a. PV */ p->p_md.md_flags &= ~MDP_FPUSED; diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c index 01362d3..188e3d5 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_sysvec.c,v 1.38 1998/11/15 15:33:51 bde Exp $ + * $Id: linux_sysvec.c,v 1.39 1998/12/14 18:54:01 dt Exp $ */ /* XXX we use functions that might not exist. */ @@ -281,7 +281,7 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code) * Build context to run handler in. */ regs->tf_esp = (int)fp; - regs->tf_eip = (int)(((char *)PS_STRINGS) - *(p->p_sysent->sv_szsigcode)); + regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); regs->tf_eflags &= ~PSL_VM; regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; |