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

Merge the nathanw_sa branch.

This commit is contained in:
thorpej 2003-01-18 23:20:24 +00:00
parent c0b8b6d8c6
commit 470075179e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/hpcsh/hpcsh/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.38 2002/05/09 12:37:59 uch Exp $ */ /* $NetBSD: machdep.c,v 1.39 2003/01/18 23:20:24 thorpej Exp $ */
/*- /*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -281,7 +281,7 @@ machine_startup(int argc, char *argv[], struct bootinfo *bi)
__asm__ __volatile__( __asm__ __volatile__(
"jmp @%0;" "jmp @%0;"
"mov %1, sp" "mov %1, sp"
:: "r"(main),"r"(proc0.p_md.md_pcb->pcb_sf.sf_r7_bank)); :: "r"(main),"r"(lwp0.l_md.md_pcb->pcb_sf.sf_r7_bank));
/* NOTREACHED */ /* NOTREACHED */
while (1) while (1)
; ;
@ -330,7 +330,7 @@ cpu_reboot(int howto, char *bootstr)
{ {
/* take a snap shot before clobbering any registers */ /* take a snap shot before clobbering any registers */
if (curproc) if (curlwp)
savectx(curpcb); savectx(curpcb);
/* If system is cold, just halt. */ /* If system is cold, just halt. */

4
sys/arch/hpcsh/include/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2002/11/26 23:30:26 lukem Exp $ # $NetBSD: Makefile,v 1.12 2003/01/18 23:20:25 thorpej Exp $
INCSDIR= /usr/include/hpcsh INCSDIR= /usr/include/hpcsh
@ -12,7 +12,7 @@ INCS= ansi.h aout_machdep.h asm.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
intr.h \ intr.h \
limits.h lock.h \ limits.h lock.h \
math.h \ math.h mcontext.h \
param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \ param.h pcb.h pmap.h pmc.h proc.h profile.h psl.h pte.h ptrace.h \
reg.h \ reg.h \
setjmp.h signal.h stdarg.h \ setjmp.h signal.h stdarg.h \

3
sys/arch/hpcsh/include/mcontext.h Normal file
View File

@ -0,0 +1,3 @@
/* $NetBSD: mcontext.h,v 1.2 2003/01/18 23:20:25 thorpej Exp $ */
#include <sh3/mcontext.h>