CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Sun Jun 9 22:35:37 UTC 2024 Modified Files: src/sys/arch/alpha/include: asm.h Log Message: alpha/asm.h: Respect _NETBSD_REVISIONID. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/alpha/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/asm.h diff -u src/sys/arch/alpha/include/asm.h:1.45 src/sys/arch/alpha/include/asm.h:1.46 --- src/sys/arch/alpha/include/asm.h:1.45 Thu Feb 23 14:55:10 2023 +++ src/sys/arch/alpha/include/asm.h Sun Jun 9 22:35:37 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.45 2023/02/23 14:55:10 riastradh Exp $ */ +/* $NetBSD: asm.h,v 1.46 2024/06/09 22:35:37 riastradh Exp $ */ /* * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University @@ -649,7 +649,14 @@ label: ASCIZ msg; \ #ifdef _KERNEL +#ifdef _NETBSD_REVISIONID +#define __KERNEL_RCSID(_n, _s) \ + __SECTIONSTRING(.ident, _s); \ + __SECTIONSTRING(.ident, \ + "$" "NetBSD: " __FILE__ " " _NETBSD_REVISIONID " $") +#else #define __KERNEL_RCSID(_n, _s) __SECTIONSTRING(.ident, _s) +#endif #define __KERNEL_COPYRIGHT(_n, _s) __SECTIONSTRING(.copyright, _s) #ifdef NO_KERNEL_RCSIDS @@ -706,7 +713,16 @@ IMPORT(cpu_info_primary, CPU_INFO_SIZEOF stq r, CPU_INFO_CURLWP(v0) #endif /* MULTIPROCESSOR */ + +#else /* !_KERNEL */ + +#ifdef _NETBSD_REVISIONID +#define RCSID(_s) \ + __SECTIONSTRING(.ident, _s); \ + __SECTIONSTRING(.ident, \ + "$" "NetBSD: " __FILE__ " " _NETBSD_REVISIONID " $") #else #define RCSID(_s) __SECTIONSTRING(.ident, _s) +#endif #endif /* _KERNEL */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Sun Jun 9 22:35:37 UTC 2024 Modified Files: src/sys/arch/alpha/include: asm.h Log Message: alpha/asm.h: Respect _NETBSD_REVISIONID. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/alpha/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: thorpej Date: Wed Nov 22 01:56:14 UTC 2023 Modified Files: src/sys/arch/alpha/include: cpu.h Log Message: If not _KERNEL, include to make sure we have offsetof(). To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/alpha/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: thorpej Date: Wed Nov 22 01:56:14 UTC 2023 Modified Files: src/sys/arch/alpha/include: cpu.h Log Message: If not _KERNEL, include to make sure we have offsetof(). To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/alpha/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/cpu.h diff -u src/sys/arch/alpha/include/cpu.h:1.104 src/sys/arch/alpha/include/cpu.h:1.105 --- src/sys/arch/alpha/include/cpu.h:1.104 Sat Aug 14 17:51:18 2021 +++ src/sys/arch/alpha/include/cpu.h Wed Nov 22 01:56:14 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.104 2021/08/14 17:51:18 ryo Exp $ */ +/* $NetBSD: cpu.h,v 1.105 2023/11/22 01:56:14 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -89,6 +89,10 @@ #include #include +#ifndef _KERNEL +#include +#endif /* ! _KERNEL */ + /* * Machine check information. */
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: thorpej
Date: Tue Nov 21 22:27:41 UTC 2023
Modified Files:
src/sys/arch/alpha/include: alpha_instruction.h
Log Message:
Expose alpha_print_instruction_context to not-_KERNEL.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/include/alpha_instruction.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/alpha_instruction.h
diff -u src/sys/arch/alpha/include/alpha_instruction.h:1.1 src/sys/arch/alpha/include/alpha_instruction.h:1.2
--- src/sys/arch/alpha/include/alpha_instruction.h:1.1 Tue Nov 21 22:19:12 2023
+++ src/sys/arch/alpha/include/alpha_instruction.h Tue Nov 21 22:27:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_instruction.h,v 1.1 2023/11/21 22:19:12 thorpej Exp $ */
+/* $NetBSD: alpha_instruction.h,v 1.2 2023/11/21 22:27:41 thorpej Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -746,7 +746,6 @@ typedef union {
#define op_cvtgd_su 0x5ad
#define op_cvtgqg_sv 0x5af
-#ifdef _KERNEL
struct alpha_print_instruction_context {
unsigned long pc; /* address of insn */
alpha_instruction insn; /* instruction bits */
@@ -755,6 +754,7 @@ struct alpha_print_instruction_context {
size_t cursor; /* current next output location */
};
+#ifdef _KERNEL
int alpha_print_instruction(struct alpha_print_instruction_context *);
#endif /* _KERNEL */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: thorpej Date: Tue Nov 21 22:27:41 UTC 2023 Modified Files: src/sys/arch/alpha/include: alpha_instruction.h Log Message: Expose alpha_print_instruction_context to not-_KERNEL. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/include/alpha_instruction.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Thu Feb 23 14:55:10 UTC 2023 Modified Files: src/sys/arch/alpha/include: asm.h Log Message: alpha: Add missing barriers in cpu_switchto. Details in comments. PR kern/57240 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/asm.h diff -u src/sys/arch/alpha/include/asm.h:1.44 src/sys/arch/alpha/include/asm.h:1.45 --- src/sys/arch/alpha/include/asm.h:1.44 Fri Sep 4 03:53:12 2020 +++ src/sys/arch/alpha/include/asm.h Thu Feb 23 14:55:10 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.44 2020/09/04 03:53:12 thorpej Exp $ */ +/* $NetBSD: asm.h,v 1.45 2023/02/23 14:55:10 riastradh Exp $ */ /* * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University @@ -669,10 +669,30 @@ label: ASCIZ msg; \ #define GET_CURLWP \ call_pal PAL_OSF1_rdval +/* + * Issue barriers to coordinate mutex_exit on this CPU with + * mutex_vector_enter on another CPU. + * + * 1. Any prior mutex_exit by oldlwp must be visible to other + *CPUs before we set ci_curlwp := newlwp on this one, + *requiring a store-before-store barrier. + * + * 2. ci_curlwp := newlwp must be visible on all other CPUs + *before any subsequent mutex_exit by newlwp can even test + *whether there might be waiters, requiring a + *store-before-load barrier. + * + * See kern_mutex.c for details -- this is necessary for + * adaptive mutexes to detect whether the lwp is on the CPU in + * order to safely block without requiring atomic r/m/w in + * mutex_exit. + */ #define SET_CURLWP(r) \ ldq v0, L_CPU(r) ; \ mov r, a0 ; \ + wmb /* store-before-store XXX patch out if !MP? */ ; \ stq r, CPU_INFO_CURLWP(v0); \ + mb /* store-before-load XXX patch out if !MP? */ ; \ call_pal PAL_OSF1_wrval #else /* if not MULTIPROCESSOR... */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Thu Feb 23 14:55:10 UTC 2023 Modified Files: src/sys/arch/alpha/include: asm.h Log Message: alpha: Add missing barriers in cpu_switchto. Details in comments. PR kern/57240 XXX pullup-8 XXX pullup-9 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/alpha/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: thorpej
Date: Wed Jul 20 15:52:47 UTC 2022
Modified Files:
src/sys/arch/alpha/include: alpha_cpu.h
Log Message:
Make alpha_wmb() actually a WMB rather than an MB (all uses of
alpha_wmb() have been audited and fixed-up as necessary).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/alpha/include/alpha_cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/alpha_cpu.h
diff -u src/sys/arch/alpha/include/alpha_cpu.h:1.55 src/sys/arch/alpha/include/alpha_cpu.h:1.56
--- src/sys/arch/alpha/include/alpha_cpu.h:1.55 Tue Nov 2 11:26:03 2021
+++ src/sys/arch/alpha/include/alpha_cpu.h Wed Jul 20 15:52:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_cpu.h,v 1.55 2021/11/02 11:26:03 ryo Exp $ */
+/* $NetBSD: alpha_cpu.h,v 1.56 2022/07/20 15:52:47 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -377,7 +377,7 @@ alpha_rpcc(void)
}
#define alpha_mb() __asm volatile("mb" : : : "memory")
-#define alpha_wmb() __asm volatile("mb" : : : "memory") /* XXX */
+#define alpha_wmb() __asm volatile("wmb" : : : "memory")
#if defined(_KERNEL) || defined(_STANDALONE)
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: thorpej Date: Wed Jul 20 15:52:47 UTC 2022 Modified Files: src/sys/arch/alpha/include: alpha_cpu.h Log Message: Make alpha_wmb() actually a WMB rather than an MB (all uses of alpha_wmb() have been audited and fixed-up as necessary). To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/alpha/include/alpha_cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Tue Jul 19 22:04:14 UTC 2022 Modified Files: src/sys/arch/alpha/include: pmap.h Log Message: alpha: Fix missing includes in pmap.h. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/alpha/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/pmap.h diff -u src/sys/arch/alpha/include/pmap.h:1.98 src/sys/arch/alpha/include/pmap.h:1.99 --- src/sys/arch/alpha/include/pmap.h:1.98 Mon May 31 17:22:44 2021 +++ src/sys/arch/alpha/include/pmap.h Tue Jul 19 22:04:14 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.98 2021/05/31 17:22:44 thorpej Exp $ */ +/* $NetBSD: pmap.h,v 1.99 2022/07/19 22:04:14 riastradh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -110,6 +110,9 @@ #include "opt_multiprocessor.h" #endif +#include +#include + #include #include
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Tue Jul 19 22:04:14 UTC 2022 Modified Files: src/sys/arch/alpha/include: pmap.h Log Message: alpha: Fix missing includes in pmap.h. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/alpha/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: andvar Date: Fri Jun 3 17:04:54 UTC 2022 Modified Files: src/sys/arch/alpha/include: cfbreg.h Log Message: remove reference to gatekeeper.dec.com ftp. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/cfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/cfbreg.h diff -u src/sys/arch/alpha/include/cfbreg.h:1.3 src/sys/arch/alpha/include/cfbreg.h:1.4 --- src/sys/arch/alpha/include/cfbreg.h:1.3 Thu Jun 22 16:46:52 2017 +++ src/sys/arch/alpha/include/cfbreg.h Fri Jun 3 17:04:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cfbreg.h,v 1.3 2017/06/22 16:46:52 flxd Exp $ */ +/* $NetBSD: cfbreg.h,v 1.4 2022/06/03 17:04:54 andvar Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -30,7 +30,7 @@ /* * Color Frame Buffer definitions, from: * ``PMAG-BA TURBOchannel Color Frame Buffer Functional Specification - * (Revision 1.2)'', availalable via anonymous FTP from gatekeeper.dec.com. + * (Revision 1.2)''. * * All definitions are in "dense" TURBOchannel space. */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: andvar Date: Fri Jun 3 17:04:54 UTC 2022 Modified Files: src/sys/arch/alpha/include: cfbreg.h Log Message: remove reference to gatekeeper.dec.com ftp. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/cfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Sun Feb 13 13:42:30 UTC 2022 Modified Files: src/sys/arch/alpha/include: lock.h Log Message: alpha: __cpu_simple_lock audit. Add missing "cc" and "memory" asm clobbers to the compiler can't reorder memory access around these. The necessary memory barrier instructions, mb, already appear in all the right places. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/include/lock.h diff -u src/sys/arch/alpha/include/lock.h:1.32 src/sys/arch/alpha/include/lock.h:1.33 --- src/sys/arch/alpha/include/lock.h:1.32 Sat Feb 12 17:17:53 2022 +++ src/sys/arch/alpha/include/lock.h Sun Feb 13 13:42:30 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.32 2022/02/12 17:17:53 riastradh Exp $ */ +/* $NetBSD: lock.h,v 1.33 2022/02/13 13:42:30 riastradh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ __cpu_simple_lock(__cpu_simple_lock_t *a " # END __cpu_simple_lock\n" : "=&r" (t0), "=m" (*alp) : "i" (__SIMPLELOCK_LOCKED), "m" (*alp) - : "memory"); + : "cc", "memory"); } static __inline int @@ -126,7 +126,7 @@ __cpu_simple_lock_try(__cpu_simple_lock_ " # END __cpu_simple_lock_try" : "=&r" (t0), "=r" (v0), "=m" (*alp) : "i" (__SIMPLELOCK_LOCKED), "m" (*alp) - : "memory"); + : "cc", "memory"); return (v0 != 0); } @@ -140,7 +140,9 @@ __cpu_simple_unlock(__cpu_simple_lock_t " mb \n" " stl $31, %0 \n" " # END __cpu_simple_unlock" - : "=m" (*alp)); + : "=m" (*alp) + : /* no inputs */ + : "memory"); } #if defined(MULTIPROCESSOR)
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Sun Feb 13 13:42:30 UTC 2022 Modified Files: src/sys/arch/alpha/include: lock.h Log Message: alpha: __cpu_simple_lock audit. Add missing "cc" and "memory" asm clobbers to the compiler can't reorder memory access around these. The necessary memory barrier instructions, mb, already appear in all the right places. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: thorpej
Date: Fri Oct 29 01:49:26 UTC 2021
Modified Files:
src/sys/arch/alpha/include: signal.h
Log Message:
Define __HAVE_STRUCT_SIGCONTEXT regardless of its current visibility.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/include/signal.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/signal.h
diff -u src/sys/arch/alpha/include/signal.h:1.18 src/sys/arch/alpha/include/signal.h:1.19
--- src/sys/arch/alpha/include/signal.h:1.18 Tue Oct 26 16:16:34 2021
+++ src/sys/arch/alpha/include/signal.h Fri Oct 29 01:49:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.18 2021/10/26 16:16:34 christos Exp $ */
+/* $NetBSD: signal.h,v 1.19 2021/10/29 01:49:26 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -32,6 +32,8 @@
#include
+#define __HAVE_STRUCT_SIGCONTEXT
+
typedef long sig_atomic_t;
#ifdef _KERNEL_OPT
@@ -66,7 +68,6 @@ struct sigcontext13 {
#endif /* _KERNEL && COMPAT_13 */
#if defined(_LIBC) || (defined(_KERNEL) && defined(COMPAT_16))
-#define __HAVE_STRUCT_SIGCONTEXT
struct sigcontext {
long sc_onstack; /* sigstack state to restore */
long __sc_mask13; /* signal mask to restore (old style) */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: thorpej Date: Fri Oct 29 01:49:26 UTC 2021 Modified Files: src/sys/arch/alpha/include: signal.h Log Message: Define __HAVE_STRUCT_SIGCONTEXT regardless of its current visibility. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/include/signal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/alpha/include
> On Sep 3, 2020, at 1:14 PM, matthew green wrote: > > "Jason R Thorpe" writes: >> Module Name: src >> Committed By:thorpej >> Date:Thu Sep 3 04:20:54 UTC 2020 >> >> Modified Files: >> src/sys/arch/alpha/include: cpu.h >> >> Log Message: >> Garabage-collect curpcb / cpu_info::ci_curpcb. > > does alpha have modules? this may be a ABI change needing > a kernel version bump... "Sort of." They don't work (not all of the required relocations are handled correctly), so I'm not that concerned. -- thorpej
re: CVS commit: src/sys/arch/alpha/include
"Jason R Thorpe" writes: > Module Name: src > Committed By: thorpej > Date: Thu Sep 3 04:20:54 UTC 2020 > > Modified Files: > src/sys/arch/alpha/include: cpu.h > > Log Message: > Garabage-collect curpcb / cpu_info::ci_curpcb. does alpha have modules? this may be a ABI change needing a kernel version bump... .mrg.
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: riastradh
Date: Fri Nov 29 20:05:08 UTC 2019
Modified Files:
src/sys/arch/alpha/include: lock.h mutex.h
Log Message:
Nix mb_* on alpha.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/include/lock.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/include/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/lock.h
diff -u src/sys/arch/alpha/include/lock.h:1.29 src/sys/arch/alpha/include/lock.h:1.30
--- src/sys/arch/alpha/include/lock.h:1.29 Sun Sep 17 00:01:07 2017
+++ src/sys/arch/alpha/include/lock.h Fri Nov 29 20:05:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.29 2017/09/17 00:01:07 christos Exp $ */
+/* $NetBSD: lock.h,v 1.30 2019/11/29 20:05:07 riastradh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -174,23 +174,4 @@ do { \
#define SPINLOCK_BACKOFF_HOOK (void)nullop((void *)0)
#endif /* MULTIPROCESSOR */
-static __inline void
-mb_read(void)
-{
- __asm __volatile("mb" : : : "memory");
-}
-
-static __inline void
-mb_write(void)
-{
- /* XXX wmb */
- __asm __volatile("mb" : : : "memory");
-}
-
-static __inline void
-mb_memory(void)
-{
- __asm __volatile("mb" : : : "memory");
-}
-
#endif /* _ALPHA_LOCK_H_ */
Index: src/sys/arch/alpha/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.4 src/sys/arch/alpha/include/mutex.h:1.5
--- src/sys/arch/alpha/include/mutex.h:1.4 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/mutex.h Fri Nov 29 20:05:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2019/11/29 20:05:07 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -60,8 +60,8 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#define MUTEX_RECEIVE(mtx) mb_read()
-#define MUTEX_GIVE(mtx) mb_memory()
+#define MUTEX_RECEIVE(mtx) __asm __volatile("mb" : : : "memory")
+#define MUTEX_GIVE(mtx) __asm __volatile("mb" : : : "memory")
#define MUTEX_CAS(p, o, n) _lock_cas((p), (o), (n))
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: riastradh Date: Fri Nov 29 20:05:08 UTC 2019 Modified Files: src/sys/arch/alpha/include: lock.h mutex.h Log Message: Nix mb_* on alpha. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/include/lock.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/include/mutex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: ad Date: Sun Nov 24 15:40:24 UTC 2019 Modified Files: src/sys/arch/alpha/include: cpu.h Log Message: Make ci_want_resched a u_int. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/arch/alpha/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: ad
Date: Sun Nov 24 15:40:24 UTC 2019
Modified Files:
src/sys/arch/alpha/include: cpu.h
Log Message:
Make ci_want_resched a u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/alpha/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/cpu.h
diff -u src/sys/arch/alpha/include/cpu.h:1.84 src/sys/arch/alpha/include/cpu.h:1.85
--- src/sys/arch/alpha/include/cpu.h:1.84 Wed Aug 22 01:05:21 2018
+++ src/sys/arch/alpha/include/cpu.h Sun Nov 24 15:40:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.84 2018/08/22 01:05:21 msaitoh Exp $ */
+/* $NetBSD: cpu.h,v 1.85 2019/11/24 15:40:24 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -121,7 +121,8 @@ struct cpu_info {
struct mchkinfo ci_mcinfo; /* machine check info */
cpuid_t ci_cpuid; /* our CPU ID */
struct cpu_softc *ci_softc; /* pointer to our device */
- u_long ci_want_resched; /* preempt current process */
+ u_int ci_want_resched; /* preempt current process */
+ u_int ci_unused; /* unused */
u_long ci_intrdepth; /* interrupt trap depth */
struct trapframe *ci_db_regs; /* registers for debuggers */
uint64_t ci_pcc_freq; /* cpu cycles/second */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: christos Date: Sun Oct 27 21:27:10 UTC 2019 Modified Files: src/sys/arch/alpha/include: fenv.h Log Message: elide gcc-8 shadow warnings. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/fenv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/include
Module Name:src
Committed By: christos
Date: Sun Oct 27 21:27:10 UTC 2019
Modified Files:
src/sys/arch/alpha/include: fenv.h
Log Message:
elide gcc-8 shadow warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/include/fenv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/fenv.h
diff -u src/sys/arch/alpha/include/fenv.h:1.2 src/sys/arch/alpha/include/fenv.h:1.3
--- src/sys/arch/alpha/include/fenv.h:1.2 Wed Aug 24 02:22:20 2016
+++ src/sys/arch/alpha/include/fenv.h Sun Oct 27 17:27:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.2 2016/08/24 06:22:20 christos Exp $ */
+/* $NetBSD: fenv.h,v 1.3 2019/10/27 21:27:10 christos Exp $ */
/*-
* Copyright (c) 2004-2005 David Schultz
@@ -72,6 +72,11 @@ __BEGIN_DECLS
extern const fenv_t __fe_dfl_env;
#define FE_DFL_ENV (&__fe_dfl_env)
+#if __GNUC_PREREQ__(8, 0)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
static __inline int
feclearexcept(int __excepts)
{
@@ -169,6 +174,10 @@ fesetround(int __round)
return 0;
}
+#if __GNUC_PREREQ__(8, 0)
+#pragma GCC diagnostic pop
+#endif
+
int fegetenv(fenv_t *);
int feholdexcept(fenv_t *);
int fesetenv(const fenv_t *);
Re: CVS commit: src/sys/arch/alpha/include
On Jan 15, 12:41pm, mar...@duskware.de (Martin Husemann) wrote: -- Subject: Re: CVS commit: src/sys/arch/alpha/include | On Sat, Jan 14, 2017 at 09:12:19PM +, Christos Zoulas wrote: | > No, this is the wrong fix! All asm.h files do that. Please back it out. | > I've fixed it differently (by not including asm.h in crtbegin.h). | | OK (but other asm.h seem to do it as well). I did not check all of them, but the ones I did (x86) did not. Nevertheless this header is only useful in .S files and including it in c compilation does not make sense. christos
Re: CVS commit: src/sys/arch/alpha/include
On Sat, Jan 14, 2017 at 09:12:19PM +, Christos Zoulas wrote: > No, this is the wrong fix! All asm.h files do that. Please back it out. > I've fixed it differently (by not including asm.h in crtbegin.h). OK (but other asm.h seem to do it as well). Martin
Re: CVS commit: src/sys/arch/alpha/include
In article <20170114161510.b8f2ff...@cvs.netbsd.org>, Martin Husemann wrote: >-=-=-=-=-=- > >Module Name: src >Committed By: martin >Date: Sat Jan 14 16:15:10 UTC 2017 > >Modified Files: > src/sys/arch/alpha/include: asm.h > >Log Message: >Avoid stupid gcc redefinition warnings by #undef before redefine. No, this is the wrong fix! All asm.h files do that. Please back it out. I've fixed it differently (by not including asm.h in crtbegin.h). christos
re: CVS commit: src/sys/arch/alpha/include
> On Mon, Jul 18, 2011 at 11:26:59AM +1000, matthew green wrote: > > making port-alpha build by simply removing what isn't building is the > > wrong answer, unless you're positive that is the right thing to do. > > This was rather poor phrasing, wasn't it? hope you understand this then: please revert your changes. .mrg.
Re: CVS commit: src/sys/arch/alpha/include
On Mon, Jul 18, 2011 at 11:26:59AM +1000, matthew green wrote: > making port-alpha build by simply removing what isn't building is the > wrong answer, unless you're positive that is the right thing to do. This was rather poor phrasing, wasn't it? Dave -- David Young OJC Technologies dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24
re: CVS commit: src/sys/arch/alpha/include
> On Sun, Jul 17, 2011 at 03:33:56PM +1000, matthew green wrote:
> >
> > > Module Name: src
> > > Committed By: dyoung
> > > Date: Sun Jul 17 01:08:12 UTC 2011
> > >
> > > Modified Files:
> > > src/sys/arch/alpha/include: sysarch.h
> > >
> > > Log Message:
> > > Don't #include from this header unless _KERNEL
> > > is #defined. While this header is installed in the alpha userland,
> > > however, is not.
> > >
> > > Don't declare any of the alpha_bus_ or alpha_pci_ symbols unless _KERNEL
> > > is #defined. I cannot find anything but libarch in the base system
> > > that uses the symbols. Anything using alpha_pci_ symbols ought to use
> > > pci(3), instead. Up next: don't use those symbols in libarch.
> >
> > what makes you think that libalpha isn't used? it sure does
> > sem to be to me:
> >
> > src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:106:DPADD+=
> > ${LIBALPHA}
> > src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:109:DPADD+=
> > ${LIBALPHA}
> > src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:75:DPADD+=
> > ${LIBALPHA}
> > src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile:30:DPADD+=
> > ${LIBALPHA}
> > src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile:28:DPADD+=
> > ${LIBALPHA}
> > src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile:31:DPADD+=
> > ${LIBALPHA}
>
> Hadn't searched the X11 sources. Can't libpci replace many of the
> libalpha uses?
i'm not sure, but please revert your change until we figure this out.
making port-alpha build by simply removing what isn't building is the
wrong answer, unless you're positive that is the right thing to do.
even if X11 didn't use libalpha, what about potential 3rd party code?
please contact port-alpha about this, or perhaps file a PR against
port-alpha if you do not have time to look at it properly. thanks.
.mrg.
ps: port-shark kernels don't build right now. can you please have a
look? thanks.
Re: CVS commit: src/sys/arch/alpha/include
On Sun, Jul 17, 2011 at 03:33:56PM +1000, matthew green wrote:
>
> > Module Name:src
> > Committed By: dyoung
> > Date: Sun Jul 17 01:08:12 UTC 2011
> >
> > Modified Files:
> > src/sys/arch/alpha/include: sysarch.h
> >
> > Log Message:
> > Don't #include from this header unless _KERNEL
> > is #defined. While this header is installed in the alpha userland,
> > however, is not.
> >
> > Don't declare any of the alpha_bus_ or alpha_pci_ symbols unless _KERNEL
> > is #defined. I cannot find anything but libarch in the base system
> > that uses the symbols. Anything using alpha_pci_ symbols ought to use
> > pci(3), instead. Up next: don't use those symbols in libarch.
>
> what makes you think that libalpha isn't used? it sure does
> sem to be to me:
>
> src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:106:DPADD+=
> ${LIBALPHA}
> src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:109:DPADD+=
> ${LIBALPHA}
> src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:75:DPADD+=
> ${LIBALPHA}
> src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile:30:DPADD+=
> ${LIBALPHA}
> src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile:28:DPADD+=
> ${LIBALPHA}
> src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile:31:DPADD+=
> ${LIBALPHA}
Hadn't searched the X11 sources. Can't libpci replace many of the
libalpha uses?
Dave
--
David Young OJC Technologies
dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24
re: CVS commit: src/sys/arch/alpha/include
> Module Name: src
> Committed By: dyoung
> Date: Sun Jul 17 01:08:12 UTC 2011
>
> Modified Files:
> src/sys/arch/alpha/include: sysarch.h
>
> Log Message:
> Don't #include from this header unless _KERNEL
> is #defined. While this header is installed in the alpha userland,
> however, is not.
>
> Don't declare any of the alpha_bus_ or alpha_pci_ symbols unless _KERNEL
> is #defined. I cannot find anything but libarch in the base system
> that uses the symbols. Anything using alpha_pci_ symbols ought to use
> pci(3), instead. Up next: don't use those symbols in libarch.
what makes you think that libalpha isn't used? it sure does
sem to be to me:
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:106:DPADD+=
${LIBALPHA}
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:109:DPADD+=
${LIBALPHA}
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:75:DPADD+=
${LIBALPHA}
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile:30:DPADD+=
${LIBALPHA}
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile:28:DPADD+=
${LIBALPHA}
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile:31:DPADD+=
${LIBALPHA}
.mrg.
