diff options
| -rw-r--r-- | sys/arch/alpha/alpha/locore.s | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 4 | ||||
| -rw-r--r-- | sys/arch/arm/arm/locore.S | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/locore.s | 4 |
6 files changed, 19 insertions, 8 deletions
diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s index 32fc2269025..eb26251806e 100644 --- a/sys/arch/alpha/alpha/locore.s +++ b/sys/arch/alpha/alpha/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.47 2017/06/05 17:49:05 deraadt Exp $ */ +/* $OpenBSD: locore.s,v 1.48 2020/05/17 13:48:29 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.94 2001/04/26 03:10:44 ross Exp $ */ /*- @@ -1048,6 +1048,7 @@ LEAF(XentRestart, 1) /* XXX should be NESTED */ /**************************************************************************/ +#ifdef DDB /* * Kernel setjmp and longjmp. Rather minimalist. * @@ -1112,6 +1113,8 @@ longjmp_botchmsg: .text END(longjmp) +#endif /* DDB */ + /* * void sts(int rn, u_int32_t *rval); * void stt(int rn, u_int64_t *rval); diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index 5f30c9c48aa..daaf12ab9ac 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.119 2019/08/07 18:53:28 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.120 2020/05/17 13:48:30 deraadt Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -270,6 +270,7 @@ NENTRY(lgdt) RETGUARD_CHECK(lgdt, r11) lretq +#ifdef DDB ENTRY(setjmp) RETGUARD_SETUP(setjmp, r11) /* @@ -307,6 +308,7 @@ ENTRY(longjmp) incl %eax RETGUARD_CHECK(longjmp, r11) ret +#endif /* DDB */ /*****************************************************************************/ diff --git a/sys/arch/arm/arm/locore.S b/sys/arch/arm/arm/locore.S index 8ff3297b6ab..7055fafd225 100644 --- a/sys/arch/arm/arm/locore.S +++ b/sys/arch/arm/arm/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.20 2020/03/11 13:24:16 deraadt Exp $ */ +/* $OpenBSD: locore.S,v 1.21 2020/05/17 13:48:30 deraadt Exp $ */ /* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */ /* @@ -251,6 +251,7 @@ ENTRY_NP(cpu_reset) #endif /* OFW */ +#ifdef DDB /* * setjump + longjmp */ @@ -271,3 +272,4 @@ _C_LABEL(esym): .word _C_LABEL(end) ENTRY_NP(abort) b _C_LABEL(abort) +#endif /* DDB */ diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 02bba555305..8b73b8fdefb 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.199 2017/07/16 22:47:37 guenther Exp $ */ +/* $OpenBSD: locore.S,v 1.200 2020/05/17 13:48:31 deraadt Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -2427,7 +2427,7 @@ fic_short /* flush one line at a time */ nop EXIT(ficache) - +#ifdef DDB LEAF_ENTRY(setjmp) /* * Save the other general registers whose contents are expected to remain @@ -2486,7 +2486,7 @@ LEAF_ENTRY(longjmp) bv 0(rp) ldi 1, ret0 EXIT(longjmp) - +#endif /* DDB */ .align 32 diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index a29b01a2eda..0c5607fe38a 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.190 2018/07/09 19:20:29 guenther Exp $ */ +/* $OpenBSD: locore.s,v 1.191 2020/05/17 13:48:31 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -781,6 +781,7 @@ NENTRY(lgdt) pushl %eax lret +#ifdef DDB ENTRY(setjmp) movl 4(%esp),%eax movl %ebx,(%eax) # save ebx @@ -805,6 +806,7 @@ ENTRY(longjmp) xorl %eax,%eax # return (1); incl %eax ret +#endif /* DDB */ /*****************************************************************************/ diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index 19e049350f7..de59a9bb3c6 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.187 2019/11/05 08:17:21 mpi Exp $ */ +/* $OpenBSD: locore.s,v 1.188 2020/05/17 13:48:31 deraadt Exp $ */ /* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */ /* @@ -7676,6 +7676,7 @@ ENTRY(delay) ! %o0 = n nop END(delay) +#ifdef DDB ENTRY(setjmp) save %sp, -CC64FSZ, %sp ! Need a frame to return to. flushw @@ -7694,6 +7695,7 @@ ENTRY(longjmp) ret restore %i2, 0, %o0 END(longjmp) +#endif /* DDB */ #ifdef DDB /* |