CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: scole
Date: Mon Jun 29 17:09:33 UTC 2020
Modified Files:
src/sys/arch/ia64/include: mcontext.h
Log Message:
Fix for last checkin, don't try use non-existent register from a (currently)
dummy struct
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/include/mcontext.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/ia64/include/mcontext.h
diff -u src/sys/arch/ia64/include/mcontext.h:1.11 src/sys/arch/ia64/include/mcontext.h:1.12
--- src/sys/arch/ia64/include/mcontext.h:1.11 Mon Jun 29 01:37:27 2020
+++ src/sys/arch/ia64/include/mcontext.h Mon Jun 29 17:09:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.11 2020/06/29 01:37:27 scole Exp $ */
+/* $NetBSD: mcontext.h,v 1.12 2020/06/29 17:09:33 scole Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@ typedef struct __mcontext {
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.mc_special.sp) /* gregs[12] */
#define _UC_MACHINE_FP(uc) 0 /* Not supported in target */
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.mc_special.iip)
-#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[8])
+#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.mc_scratch.gr8) /* gregs[8] */
#define _UC_MACHINE_SET_PC(uc, pc) (uc)->uc_mcontext.mc_special.iip = (pc)
#if defined(_RTLD_SOURCE) || defined(_LIBC_SOURCE) || \
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Mon Jun 29 17:09:33 UTC 2020 Modified Files: src/sys/arch/ia64/include: mcontext.h Log Message: Fix for last checkin, don't try use non-existent register from a (currently) dummy struct To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/include/mcontext.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/ia64/include
Module Name:src Committed By: scole Date: Mon Jun 29 01:37:27 UTC 2020 Modified Files: src/sys/arch/ia64/include: mcontext.h setjmp.h Log Message: Allow kernel to compile by preventing "error: stack usage is ..." too-large errors. What was there previously was not correct and this will need to be revisited for debugger to ever become functional anyway. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/mcontext.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/setjmp.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/ia64/include/mcontext.h diff -u src/sys/arch/ia64/include/mcontext.h:1.10 src/sys/arch/ia64/include/mcontext.h:1.11 --- src/sys/arch/ia64/include/mcontext.h:1.10 Fri Dec 27 00:32:17 2019 +++ src/sys/arch/ia64/include/mcontext.h Mon Jun 29 01:37:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mcontext.h,v 1.10 2019/12/27 00:32:17 kamil Exp $ */ +/* $NetBSD: mcontext.h,v 1.11 2020/06/29 01:37:27 scole Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #include /* XXX fix this, just get to compile for now */ -#define _NGREG 128 +#define _NGREG 1 #ifndef __ASSEMBLER__ typedef unsigned long __greg_t; Index: src/sys/arch/ia64/include/setjmp.h diff -u src/sys/arch/ia64/include/setjmp.h:1.3 src/sys/arch/ia64/include/setjmp.h:1.4 --- src/sys/arch/ia64/include/setjmp.h:1.3 Thu May 2 16:55:51 2019 +++ src/sys/arch/ia64/include/setjmp.h Mon Jun 29 01:37:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.h,v 1.3 2019/05/02 16:55:51 scole Exp $ */ +/* $NetBSD: setjmp.h,v 1.4 2020/06/29 01:37:27 scole Exp $ */ /*- * Copyright (c) 2000 @@ -86,6 +86,7 @@ #define J_SIGMASK 0x1d8 #define J_SIGSET 0x1e0 -#define _JBLEN 0x200 /* Size in long XXX: Set to sizeof(mcontext_t)/sizeof(long) */ +/* XXX use FreeBSD value for now, set to sizeof(mcontext_t)/sizeof(long) ? */ +#define _JBLEN 0x20 /* Size in long doubles */ #endif /* !_MACHINE_SETJMP_H_ */
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Mon Jun 29 01:37:27 UTC 2020 Modified Files: src/sys/arch/ia64/include: mcontext.h setjmp.h Log Message: Allow kernel to compile by preventing "error: stack usage is ..." too-large errors. What was there previously was not correct and this will need to be revisited for debugger to ever become functional anyway. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/mcontext.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/setjmp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:57:58 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add troyounce To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.22 src/usr.bin/units/units.lib:1.23 --- src/usr.bin/units/units.lib:1.22 Wed Apr 22 16:35:47 2020 +++ src/usr.bin/units/units.lib Wed Apr 22 16:57:57 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.22 2020/04/22 16:35:47 scole Exp $ +/ $NetBSD: units.lib,v 1.23 2020/04/22 16:57:57 scole Exp $ / primitive units @@ -136,6 +136,7 @@ apdram 60 grain apounce 480 grain appound 5760 grain troypound appound +troyounce 1|12 troypound / Length
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:57:58 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add troyounce To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:35:47 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: On second thought, don't include more than one spelling for thai units To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:35:47 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: On second thought, don't include more than one spelling for thai units To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.21 src/usr.bin/units/units.lib:1.22 --- src/usr.bin/units/units.lib:1.21 Wed Apr 22 16:21:37 2020 +++ src/usr.bin/units/units.lib Wed Apr 22 16:35:47 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.21 2020/04/22 16:21:37 scole Exp $ +/ $NetBSD: units.lib,v 1.22 2020/04/22 16:35:47 scole Exp $ / primitive units @@ -658,15 +658,13 @@ krabiat 0.5208 cm nio 4 krabiat khuep 12 nio sok 2 khuep -wa 4 sok -wah wa -sen 20 wa +wah 4 sok +sen 20 wah yot 400 sen / Thai area tarangwah 4 m2 -talangwah tarangwah ngan 100 tarangwah rai 4 ngan @@ -674,7 +672,6 @@ rai 4 ngan salueng 3.75 gm baht 4 salueng -bat baht tamlueng 4 baht chang 20 tamlueng hap 50 chang
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:21:37 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add more Thai length, area and weight units To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: scole Date: Wed Apr 22 16:21:37 UTC 2020 Modified Files: src/usr.bin/units: units.lib Log Message: Add more Thai length, area and weight units To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.20 src/usr.bin/units/units.lib:1.21 --- src/usr.bin/units/units.lib:1.20 Tue Mar 21 01:21:59 2017 +++ src/usr.bin/units/units.lib Wed Apr 22 16:21:37 2020 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.20 2017/03/21 01:21:59 scole Exp $ +/ $NetBSD: units.lib,v 1.21 2020/04/22 16:21:37 scole Exp $ / primitive units @@ -652,9 +652,30 @@ worstedyarncount 1680 ft/pound metricyarncount meter/gram jewlerspoint 2 milligram -/ thai measurements +/ Thai length -wah 2 m -ngan 400 m2 -rai 1600 m2 +krabiat 0.5208 cm +nio 4 krabiat +khuep 12 nio +sok 2 khuep +wa 4 sok +wah wa +sen 20 wa +yot 400 sen + +/ Thai area + +tarangwah 4 m2 +talangwah tarangwah +ngan 100 tarangwah +rai 4 ngan + +/ Thai weight + +salueng 3.75 gm +baht 4 salueng +bat baht +tamlueng 4 baht +chang 20 tamlueng +hap 50 chang
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Mon Feb 3 02:56:25 UTC 2020 Modified Files: src/sys/arch/ia64: TODO Log Message: Update architectures ski is known to run on To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Mon Feb 3 02:56:25 UTC 2020 Modified Files: src/sys/arch/ia64: TODO Log Message: Update architectures ski is known to run on To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.9 src/sys/arch/ia64/TODO:1.10 --- src/sys/arch/ia64/TODO:1.9 Sun Nov 17 16:52:29 2019 +++ src/sys/arch/ia64/TODO Mon Feb 3 02:56:25 2020 @@ -1,9 +1,8 @@ -$ NetBSD: TODO,v 1.1 2018/04/14 12:06:03 scole Exp $ +$ NetBSD: TODO,v 1.10 2020/02/03 02:54:23 scole Exp $ What works: The ski simulator (pkgsrc/emulators/ski) is known to work on NetBSD - i386 and amd64, and probably will work on other archs as well. It - can run and step through in assembly. + i386, amd64 and macppc. It "should" work on other archs as well. Netbooting may work on some machines, basically you need to boot diskless with the loader.efi (from src/sys/arch/ia64/stand/ia64/)
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src
Committed By: scole
Date: Tue Jan 14 16:23:08 UTC 2020
Modified Files:
src/sys/arch/ia64/stand/ia64/ski: ssc.c
Log Message:
add noinline attribute
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/ssc.c
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/ia64/stand/ia64/ski/ssc.c
diff -u src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3 src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.4
--- src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3 Mon Jul 20 04:59:04 2009
+++ src/sys/arch/ia64/stand/ia64/ski/ssc.c Tue Jan 14 16:23:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ssc.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */
+/* $NetBSD: ssc.c,v 1.4 2020/01/14 16:23:07 scole Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -41,6 +41,8 @@
* PSR.dt across the SSC call. We do this by saving and restoring psr.l
* completely.
*/
+
+__attribute__((__noinline__))
u_int64_t
ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which)
{
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: scole Date: Tue Jan 14 16:23:08 UTC 2020 Modified Files: src/sys/arch/ia64/stand/ia64/ski: ssc.c Log Message: add noinline attribute To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/ssc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: scole Date: Wed Dec 11 21:05:17 UTC 2019 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Synchronize htdocs, manual, comments, and code so that enabling the platinumfb is done using "platinum" in openfirmware settings. Remove "screen" option which was somewhat disingenuous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.macppc
Module Name:src Committed By: scole Date: Wed Dec 11 21:05:17 UTC 2019 Modified Files: src/share/man/man4/man4.macppc: platinumfb.4 Log Message: Synchronize htdocs, manual, comments, and code so that enabling the platinumfb is done using "platinum" in openfirmware settings. Remove "screen" option which was somewhat disingenuous. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.macppc/platinumfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.macppc/platinumfb.4 diff -u src/share/man/man4/man4.macppc/platinumfb.4:1.4 src/share/man/man4/man4.macppc/platinumfb.4:1.5 --- src/share/man/man4/man4.macppc/platinumfb.4:1.4 Thu Sep 15 15:25:11 2016 +++ src/share/man/man4/man4.macppc/platinumfb.4 Wed Dec 11 21:05:17 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: platinumfb.4,v 1.4 2016/09/15 15:25:11 wiz Exp $ +.\" $NetBSD: platinumfb.4,v 1.5 2019/12/11 21:05:17 scole Exp $ .\" .\" Copyright (c) 2016 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 14, 2016 +.Dd December 11, 2019 .Dt PLATINUMFB 4 macppc .Os .Sh NAME @@ -41,7 +41,7 @@ couple early model PowerMacs such as the This driver should support console output (with rastor ops) and X (in unaccelerated modes). .Pp -It may be required to set the output-device to 'screen' in Open Firmware. +It may be required to set the output-device to 'platinum' in Open Firmware. .Sh SEE ALSO .Xr wsdisplay 4 , .Xr rasops 9
CVS commit: src/sys/arch/macppc
Module Name:src
Committed By: scole
Date: Wed Dec 11 21:04:47 UTC 2019
Modified Files:
src/sys/arch/macppc/conf: GENERIC_601 INSTALL_601
src/sys/arch/macppc/dev: platinumfb.c
Log Message:
Synchronize htdocs, manual, comments, and code so that enabling the platinumfb
is done using "platinum" in openfirmware settings. Remove "screen" option
which was somewhat disingenuous.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/INSTALL_601
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/platinumfb.c
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/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.24 src/sys/arch/macppc/conf/GENERIC_601:1.25
--- src/sys/arch/macppc/conf/GENERIC_601:1.24 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/macppc/conf/GENERIC_601 Wed Dec 11 21:04:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.24 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC_601,v 1.25 2019/12/11 21:04:47 scole Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.24 $"
+ident "GENERIC-$Revision: 1.25 $"
maxusers 32
@@ -217,8 +217,8 @@ ahc* at pci? dev ? function ? # Adaptec
# official Macintosh firmware from 3Dfx. The others should work but are
# untested with OF 1.0.5
-# this will take over the console if output-device is set to 'screen' or
-# 'platinum'. It will provide a NetBSD console, but still won't work with OF
+# this will take over the console if output-device is set to 'platinum'.
+# It will provide a NetBSD console, but still won't work with OF
platinumfb0 at mainbus?
#gffb* at pci? function ? # NVIDIA GeForce2 MX
Index: src/sys/arch/macppc/conf/INSTALL_601
diff -u src/sys/arch/macppc/conf/INSTALL_601:1.3 src/sys/arch/macppc/conf/INSTALL_601:1.4
--- src/sys/arch/macppc/conf/INSTALL_601:1.3 Sun Dec 8 21:30:00 2019
+++ src/sys/arch/macppc/conf/INSTALL_601 Wed Dec 11 21:04:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_601,v 1.3 2019/12/08 21:30:00 scole Exp $
+# $NetBSD: INSTALL_601,v 1.4 2019/12/11 21:04:47 scole Exp $
#
# config file for INSTALL
#
@@ -82,8 +82,8 @@ ahc* at pci? dev ? function ? # Adaptec
# The only cards known to work ( so far ) are PCI Voodoo3s flashed with the
# official Macintosh firmware from 3Dfx. The others should work but are
# untested with OF 1.0.5
-# this will take over the console if output-device is set to 'screen' or
-# 'platinum'. It will provide a NetBSD console, but still won't work with OF
+# this will take over the console if output-device is set to 'platinum'.
+# It will provide a NetBSD console, but still won't work with OF
platinumfb0 at mainbus?
#gffb* at pci? function ? # NVIDIA GeForce2 MX
Index: src/sys/arch/macppc/dev/platinumfb.c
diff -u src/sys/arch/macppc/dev/platinumfb.c:1.3 src/sys/arch/macppc/dev/platinumfb.c:1.4
--- src/sys/arch/macppc/dev/platinumfb.c:1.3 Fri Sep 16 17:32:36 2016
+++ src/sys/arch/macppc/dev/platinumfb.c Wed Dec 11 21:04:47 2019
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.3 2016/09/16 17:32:36 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.4 2019/12/11 21:04:47 scole Exp $");
#include
#include
@@ -569,8 +569,8 @@ platinumfb_init(device_t self)
int i;
/*
- * become console if OF variable "output-device" is "screen" or
- * contains "platinum", since normal OF video variables are unavailable
+ * become console if OF variable "output-device" contains "platinum",
+ * since normal OF video variables are unavailable
*/
int options;
char output_device[128];
@@ -582,8 +582,7 @@ platinumfb_init(device_t self)
aprint_error_dev(sc->sc_dev,
"could not get output-device prop, assuming not console\n");
} else {
- if (strstr(output_device,"platinum") ||
- strcmp(output_device,"screen") == 0 ) {
+ if (strstr(output_device,"platinum")) {
is_console = TRUE;
}
}
CVS commit: src/sys/arch/macppc
Module Name:src Committed By: scole Date: Wed Dec 11 21:04:47 UTC 2019 Modified Files: src/sys/arch/macppc/conf: GENERIC_601 INSTALL_601 src/sys/arch/macppc/dev: platinumfb.c Log Message: Synchronize htdocs, manual, comments, and code so that enabling the platinumfb is done using "platinum" in openfirmware settings. Remove "screen" option which was somewhat disingenuous. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/INSTALL_601 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/dev/platinumfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: scole Date: Sun Dec 8 21:30:00 UTC 2019 Modified Files: src/sys/arch/macppc/conf: INSTALL_601 Log Message: add platinumfb To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/conf/INSTALL_601 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/macppc/conf/INSTALL_601 diff -u src/sys/arch/macppc/conf/INSTALL_601:1.2 src/sys/arch/macppc/conf/INSTALL_601:1.3 --- src/sys/arch/macppc/conf/INSTALL_601:1.2 Mon Jan 7 01:44:59 2019 +++ src/sys/arch/macppc/conf/INSTALL_601 Sun Dec 8 21:30:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_601,v 1.2 2019/01/07 01:44:59 scole Exp $ +# $NetBSD: INSTALL_601,v 1.3 2019/12/08 21:30:00 scole Exp $ # # config file for INSTALL # @@ -84,7 +84,7 @@ ahc* at pci? dev ? function ? # Adaptec # untested with OF 1.0.5 # this will take over the console if output-device is set to 'screen' or # 'platinum'. It will provide a NetBSD console, but still won't work with OF -#platinumfb0 at mainbus? +platinumfb0 at mainbus? #gffb* at pci? function ? # NVIDIA GeForce2 MX #machfb* at pci? function ? # ATI Mach 64, Rage, Rage Pro
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: scole Date: Sun Dec 8 21:30:00 UTC 2019 Modified Files: src/sys/arch/macppc/conf: INSTALL_601 Log Message: add platinumfb To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/conf/INSTALL_601 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: scole Date: Thu Dec 5 16:51:06 UTC 2019 Modified Files: src/doc: CHANGES.prev Log Message: Fix date sorting order of previous checkin To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: scole Date: Thu Dec 5 16:51:06 UTC 2019 Modified Files: src/doc: CHANGES.prev Log Message: Fix date sorting order of previous checkin To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/doc/CHANGES.prev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.151 src/doc/CHANGES.prev:1.152 --- src/doc/CHANGES.prev:1.151 Thu Dec 5 09:36:01 2019 +++ src/doc/CHANGES.prev Thu Dec 5 16:51:06 2019 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.151 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.152 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -12517,11 +12517,11 @@ Changes from NetBSD 8.0 to NetBSD 9.0: [christos 20190103] evbarm: Add SMP support for Allwinner multi-cluster SoCs (A83T, A80). [jmcneill 20190103] - macppc: Update install media and documentation for powerpc 601 - machines. [scole 20190107] wpa: Import wpa_supplicant and hostapd 2.7. [christos 20190104] acpi(4): Updated ACPICA to 20181213. [christos 20190104] tmux(1): Imported 2.8. [christos 20190104] + macppc: Update install media and documentation for powerpc 601 + machines. [scole 20190107] TrouSerS: Import trousers-0.3.14. [christos 20190107] tpm-tools: Import tpm-tools-1.3.9.1. [christos 20190107] compiler-rt: Import compiler-rt r350590 LLVM sanitizers.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Sun Nov 17 16:52:29 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: Mention ski works on amd64 and probably other archs To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.8 src/sys/arch/ia64/TODO:1.9 --- src/sys/arch/ia64/TODO:1.8 Mon Nov 11 18:06:47 2019 +++ src/sys/arch/ia64/TODO Sun Nov 17 16:52:29 2019 @@ -1,8 +1,9 @@ $ NetBSD: TODO,v 1.1 2018/04/14 12:06:03 scole Exp $ What works: - The ski simulator (pkgsrc/emulators/ski) works on NetBSD/i386, can run - and step through in assembly. + The ski simulator (pkgsrc/emulators/ski) is known to work on NetBSD + i386 and amd64, and probably will work on other archs as well. It + can run and step through in assembly. Netbooting may work on some machines, basically you need to boot diskless with the loader.efi (from src/sys/arch/ia64/stand/ia64/)
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Sun Nov 17 16:52:29 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: Mention ski works on amd64 and probably other archs To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Mon Nov 11 18:06:47 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: ski should run on i386 and amd64 with patches from http://gnats.netbsd.org/54690 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.7 src/sys/arch/ia64/TODO:1.8 --- src/sys/arch/ia64/TODO:1.7 Wed May 22 15:34:26 2019 +++ src/sys/arch/ia64/TODO Mon Nov 11 18:06:47 2019 @@ -68,7 +68,6 @@ ski emulator tasks: source code lines respectively - create a ski network driver - create a ski disk driver -- fix ski to run on other archs beside i386, or at least amd64 Pie in the sky: - Xen and itanium!
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Mon Nov 11 18:06:47 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: ski should run on i386 and amd64 with patches from http://gnats.netbsd.org/54690 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed May 22 15:34:26 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: LOCKDEBUG kernels should work now. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed May 22 15:34:26 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: LOCKDEBUG kernels should work now. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.6 src/sys/arch/ia64/TODO:1.7 --- src/sys/arch/ia64/TODO:1.6 Sun May 5 16:45:34 2019 +++ src/sys/arch/ia64/TODO Wed May 22 15:34:26 2019 @@ -28,7 +28,6 @@ Tasks remaining: originally written by one of ia64 gurus but still looks maintained and portable 4) something else -- kernel with LOCKDEBUG option crashes in pmap startup somewhere - redo _regset.h in netbsd style with __greg_t __gregset_t - implement ld.elf_so, MK_DYNAMICROOT - fix memory detection, on real hardware doesn't find all memory
CVS commit: src/sys/kern
Module Name:src Committed By: scole Date: Wed May 22 15:32:14 UTC 2019 Modified Files: src/sys/kern: subr_lockdebug.c Log Message: Increase LD_BATCH_SHIFT for ia64 LOCKDEBUG kernels. Otherwise, ia64 pmap will run out of space with this kernel debug option enabled. Discussed with over email. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/kern/subr_lockdebug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_lockdebug.c diff -u src/sys/kern/subr_lockdebug.c:1.70 src/sys/kern/subr_lockdebug.c:1.71 --- src/sys/kern/subr_lockdebug.c:1.70 Thu May 9 05:00:31 2019 +++ src/sys/kern/subr_lockdebug.c Wed May 22 15:32:14 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_lockdebug.c,v 1.70 2019/05/09 05:00:31 ozaki-r Exp $ */ +/* $NetBSD: subr_lockdebug.c,v 1.71 2019/05/22 15:32:14 scole Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.70 2019/05/09 05:00:31 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.71 2019/05/22 15:32:14 scole Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -59,7 +59,11 @@ unsigned int ld_panic; #ifdef LOCKDEBUG +#ifdef __ia64__ +#define LD_BATCH_SHIFT 16 +#else #define LD_BATCH_SHIFT 9 +#endif #define LD_BATCH (1 << LD_BATCH_SHIFT) #define LD_BATCH_MASK (LD_BATCH - 1) #define LD_MAX_LOCKS 1048576
CVS commit: src/sys/kern
Module Name:src Committed By: scole Date: Wed May 22 15:32:14 UTC 2019 Modified Files: src/sys/kern: subr_lockdebug.c Log Message: Increase LD_BATCH_SHIFT for ia64 LOCKDEBUG kernels. Otherwise, ia64 pmap will run out of space with this kernel debug option enabled. Discussed with over email. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/kern/subr_lockdebug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src
Committed By: scole
Date: Thu May 9 15:48:55 UTC 2019
Modified Files:
src/sys/arch/ia64/conf: Makefile.ia64
src/sys/arch/ia64/ia64: pmap.c
Log Message:
Revert -O0 for pmap, avoid RAW dependency compilation warning
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/conf/Makefile.ia64
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/ia64/ia64/pmap.c
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/ia64/conf/Makefile.ia64
diff -u src/sys/arch/ia64/conf/Makefile.ia64:1.7 src/sys/arch/ia64/conf/Makefile.ia64:1.8
--- src/sys/arch/ia64/conf/Makefile.ia64:1.7 Sat May 4 02:06:59 2019
+++ src/sys/arch/ia64/conf/Makefile.ia64 Thu May 9 15:48:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ia64,v 1.7 2019/05/04 02:06:59 scole Exp $
+# $NetBSD: Makefile.ia64,v 1.8 2019/05/09 15:48:55 scole Exp $
# Makefile for NetBSD
#
@@ -34,11 +34,6 @@ GENASSYM_CONF= ${IA64}/ia64/genassym.cf
CPPFLAGS+= -mconstant-gp -Dia64
AFLAGS+= -x assembler-with-cpp -Wa,-x
-# XXX don't optimize pmap.c to get rid of assembler warnings like:
-# Warning: Use of 'st8' may violate RAW dependency 'RR#' (data)
-# Happening with gcc7 and iirc several years worth of prior gcc versions
-COPTS.pmap.c+= -O0
-
##
## (3) libkern and compat
##
Index: src/sys/arch/ia64/ia64/pmap.c
diff -u src/sys/arch/ia64/ia64/pmap.c:1.37 src/sys/arch/ia64/ia64/pmap.c:1.38
--- src/sys/arch/ia64/ia64/pmap.c:1.37 Fri May 25 06:34:02 2018
+++ src/sys/arch/ia64/ia64/pmap.c Thu May 9 15:48:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.37 2018/05/25 06:34:02 jdolecek Exp $ */
+/* $NetBSD: pmap.c,v 1.38 2019/05/09 15:48:55 scole Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.37 2018/05/25 06:34:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.38 2019/05/09 15:48:55 scole Exp $");
#include
#include
@@ -471,12 +471,13 @@ pmap_bootstrap(void)
if (base == 0)
panic("Unable to allocate VHPT");
- if (bootverbose)
- printf("VHPT: address=%#lx, size=%#lx\n", base, size);
-
pmap_vhpt_nbuckets = size / sizeof(struct ia64_lpte);
pmap_vhpt_bucket = (void *)uvm_pageboot_alloc(pmap_vhpt_nbuckets *
sizeof(struct ia64_bucket));
+ if (bootverbose)
+ printf("VHPT: address=%#lx, size=%#lx, buckets=%ld, address=%lx\n",
+ base, size, pmap_vhpt_nbuckets, (long unsigned int)_vhpt_bucket[0]);
+
for (i = 0; i < pmap_vhpt_nbuckets; i++) {
/* Stolen memory is zeroed. */
mutex_init(_vhpt_bucket[i].mutex, MUTEX_DEFAULT, IPL_VM);
@@ -2541,6 +2542,8 @@ pmap_switch(pmap_t pm)
}
}
+ /* XXX */
+ ia64_srlz_d();
curcpu()->ci_pmap = pm;
ia64_srlz_d();
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Thu May 9 15:48:55 UTC 2019 Modified Files: src/sys/arch/ia64/conf: Makefile.ia64 src/sys/arch/ia64/ia64: pmap.c Log Message: Revert -O0 for pmap, avoid RAW dependency compilation warning To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/conf/Makefile.ia64 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/ia64/ia64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/stand/efi/libefi
Module Name:src
Committed By: scole
Date: Tue May 7 02:05:17 UTC 2019
Modified Files:
src/sys/arch/ia64/stand/efi/libefi: exec.c
Log Message:
Avoid some RAW dependency compilation warnings
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/exec.c
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/ia64/stand/efi/libefi/exec.c
diff -u src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7 src/sys/arch/ia64/stand/efi/libefi/exec.c:1.8
--- src/sys/arch/ia64/stand/efi/libefi/exec.c:1.7 Thu Aug 4 18:07:43 2016
+++ src/sys/arch/ia64/stand/efi/libefi/exec.c Tue May 7 02:05:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.7 2016/08/04 18:07:43 scole Exp $ */
+/* $NetBSD: exec.c,v 1.8 2019/05/07 02:05:17 scole Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -192,13 +192,17 @@ elf64_exec(struct preloaded_file *fp)
__asm __volatile("mov cr.ifa=%0" :: "r"(IA64_RR_BASE(7)));
__asm __volatile("mov cr.itir=%0" :: "r"(28 << 2));
- __asm __volatile("ptr.i %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+ __asm __volatile("srlz.d;;");
+
__asm __volatile("ptr.d %0,%1" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
+ __asm __volatile("srlz.d;;");
+ __asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
+ __asm __volatile("srlz.d;;");
+
+ __asm __volatile("ptr.i %0,%1;;" :: "r"(IA64_RR_BASE(7)), "r"(28<<2));
__asm __volatile("srlz.i;;");
__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(0), "r"(pte));
__asm __volatile("srlz.i;;");
- __asm __volatile("itr.d dtr[%0]=%1;;" :: "r"(0), "r"(pte));
- __asm __volatile("srlz.i;;");
enter_kernel(fp->marks[MARK_ENTRY], bi);
CVS commit: src/sys/arch/ia64/stand/efi/libefi
Module Name:src Committed By: scole Date: Tue May 7 02:05:17 UTC 2019 Modified Files: src/sys/arch/ia64/stand/efi/libefi: exec.c Log Message: Avoid some RAW dependency compilation warnings To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/efi/libefi/exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Sun May 5 16:45:34 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: a little bit of clean up, sort ski items, and some notes about libunwind To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.5 src/sys/arch/ia64/TODO:1.6 --- src/sys/arch/ia64/TODO:1.5 Wed Apr 3 21:03:06 2019 +++ src/sys/arch/ia64/TODO Sun May 5 16:45:34 2019 @@ -1,7 +1,7 @@ $ NetBSD: TODO,v 1.1 2018/04/14 12:06:03 scole Exp $ What works: - The ski simulator (pkgsrc/emulators/ski) works on NetBSD, can run + The ski simulator (pkgsrc/emulators/ski) works on NetBSD/i386, can run and step through in assembly. Netbooting may work on some machines, basically you need to boot @@ -13,32 +13,29 @@ What works: Also, a successful report of booting off the CD is here http://mail-index.netbsd.org/port-ia64/2009/06/18/msg000102.html -Tasks remaining, first couple seem most important: - -- pmap.c is getting compilation warnings (for gcc6 & gcc7) like - /var/tmp//cckQKcKn.s:7614: Warning: Use of 'st8' may violate RAW dependency 'RR#' (data) - ... - how to change compile flags for specific kernel file like "CFLAGS.pmap.c+= -O0" ? +Tasks remaining: - context switching and forking appear unfinished, vm_machdep.c::cpu_lwp_fork() appears incomplete -- pmap module, imported from freebsd but still needs more work and - testing +- pmap module, imported from freebsd but still needs more work and testing - IA64 Stack unwind code: Support remaining unwind descriptor types. (See arch/ia64/unwind/TODO). ddb() traces need to print line - information also. Seems like a lot of this could be re-used - from freebsd + information also. Seems like there are a few options: + 1) fix and finish current unwind that is minimal, incomplete, and buggy + 2) import FreeBSD/ia64 implementation, may be derived from HP originally: + http://lists.llvm.org/pipermail/cfe-dev/2016-September/050649.html + 3) import this version + https://www.nongnu.org/libunwind/man/libunwind-ia64(3).html + originally written by one of ia64 gurus but still looks maintained + and portable + 4) something else +- kernel with LOCKDEBUG option crashes in pmap startup somewhere - redo _regset.h in netbsd style with __greg_t __gregset_t -- some commands in ski are not yet implemented, 2 important ones - are still missing, "cstack" and "pm", which view the stack and - source code lines respectively -- create a ski network driver -- create a ski disk driver - implement ld.elf_so, MK_DYNAMICROOT - fix memory detection, on real hardware doesn't find all memory -- implement interrupts (sacpi & pci), can be mostly from freebsd? +- implement interrupts (sacpi & pci) - MKGDB for ia64 - implement fp[gs]etsticky, [make|get|set|swap]context -- floating point, fenv functions were imported from freebsd, but haven't been tested +- floating point, fenv functions were imported from freebsd, but only compile tested - implement core_machdep.c - implement __cloneS ptrace.S sbrk.S shmat.S - implement kvm_ia64.c @@ -48,10 +45,9 @@ Tasks remaining, first couple seem most mutex_spin_enter()/mutex_spin_exit() __HAVE_SPIN_MUTEX_STUBS - rwlock.h rw_enter(),rw_exit(),rw_tryenter() __HAVE_RW_STUBS, implemented already? - add efipart_dev to read gpt/ffs disks for bootloader -- fix printf of lx in bootloader/libsa ? -- sort out bootloader/loader.efi stuff, is freebsd one good enough or - do we want commands more like netbsd i386 bootloader? e.g., add - command to boot nfs from loader.efi instead of hack now +- sort out bootloader/loader.efi stuff, make it more like netbsd and + less like freebsd, command to boot nfs from loader.efi instead of + hack that exists now - ia64 implement __HAVE_FAST_SOFTINTS? - want or need __HAVE_CPU_UAREA_ROUTINES, cpu_uarea_alloc, cpu_uarea_free - fix all "[Nn]ot yet" and "XXX" functions everywhere @@ -65,9 +61,16 @@ Tasks remaining, first couple seem most - write console and/or X framebuffer driver. freebsd has vgapci device that may be portable - add ia32 emulation, port from freebsd -- create install EFI/cdrom/netbsd +- installation media for EFI/cdrom/usb + +ski emulator tasks: +- some commands in ski are not yet implemented. 2 important ones + are still missing, "cstack" and "pm", which view the stack and + source code lines respectively +- create a ski network driver +- create a ski disk driver - fix ski to run on other archs beside i386, or at least amd64 -Pie in the sky +Pie in the sky: - Xen and itanium! - qemu and itanium
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Sun May 5 16:45:34 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: a little bit of clean up, sort ski items, and some notes about libunwind To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu/arch/ia64
Module Name:src Committed By: scole Date: Sat May 4 22:55:32 UTC 2019 Modified Files: src/lib/csu/arch/ia64: crt0.S Log Message: add stop (;;) to elimate WAW dependency compiler warning To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/ia64/crt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu/arch/ia64
Module Name:src
Committed By: scole
Date: Sat May 4 22:55:32 UTC 2019
Modified Files:
src/lib/csu/arch/ia64: crt0.S
Log Message:
add stop (;;) to elimate WAW dependency compiler warning
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/ia64/crt0.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/ia64/crt0.S
diff -u src/lib/csu/arch/ia64/crt0.S:1.2 src/lib/csu/arch/ia64/crt0.S:1.3
--- src/lib/csu/arch/ia64/crt0.S:1.2 Mon Nov 26 17:37:45 2018
+++ src/lib/csu/arch/ia64/crt0.S Sat May 4 22:55:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.2 2018/11/26 17:37:45 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.3 2019/05/04 22:55:32 scole Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
-RCSID("$NetBSD: crt0.S,v 1.2 2018/11/26 17:37:45 joerg Exp $")
+RCSID("$NetBSD: crt0.S,v 1.3 2019/05/04 22:55:32 scole Exp $")
STRONG_ALIAS(_start,__start)
@@ -53,5 +53,6 @@ __start:
mov sp = in3 /* Setup Memory Stack Pointer. */
mov in1 = in2 /* obj is no longer used. */
alloc r31 = ar.pfs, 3, 0, 0, 0 /* Adjust backingstore for ___start() */
+ ;;
br.call.sptk.many rp = ___start
CVS commit: src/sys/arch/ia64/conf
Module Name:src Committed By: scole Date: Sat May 4 02:06:59 UTC 2019 Modified Files: src/sys/arch/ia64/conf: Makefile.ia64 Log Message: Disable optimization for pmap.c to prevent RAW assembler dependency warnings. If port ever becomes more stable, should revert this and figure out exactly why only pmap seems to have this issue in the kernel. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/Makefile.ia64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/conf
Module Name:src
Committed By: scole
Date: Sat May 4 02:06:59 UTC 2019
Modified Files:
src/sys/arch/ia64/conf: Makefile.ia64
Log Message:
Disable optimization for pmap.c to prevent RAW assembler dependency
warnings.
If port ever becomes more stable, should revert this and figure out
exactly why only pmap seems to have this issue in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/Makefile.ia64
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/ia64/conf/Makefile.ia64
diff -u src/sys/arch/ia64/conf/Makefile.ia64:1.6 src/sys/arch/ia64/conf/Makefile.ia64:1.7
--- src/sys/arch/ia64/conf/Makefile.ia64:1.6 Sat Sep 22 12:24:02 2018
+++ src/sys/arch/ia64/conf/Makefile.ia64 Sat May 4 02:06:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ia64,v 1.6 2018/09/22 12:24:02 rin Exp $
+# $NetBSD: Makefile.ia64,v 1.7 2019/05/04 02:06:59 scole Exp $
# Makefile for NetBSD
#
@@ -34,6 +34,11 @@ GENASSYM_CONF= ${IA64}/ia64/genassym.cf
CPPFLAGS+= -mconstant-gp -Dia64
AFLAGS+= -x assembler-with-cpp -Wa,-x
+# XXX don't optimize pmap.c to get rid of assembler warnings like:
+# Warning: Use of 'st8' may violate RAW dependency 'RR#' (data)
+# Happening with gcc7 and iirc several years worth of prior gcc versions
+COPTS.pmap.c+= -O0
+
##
## (3) libkern and compat
##
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Thu May 2 17:34:01 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: syscall_stubs.S Log Message: Add more code from FreeBSD, still needs work To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/ia64/syscall_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: scole
Date: Thu May 2 17:34:01 UTC 2019
Modified Files:
src/sys/arch/ia64/ia64: syscall_stubs.S
Log Message:
Add more code from FreeBSD, still needs work
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/ia64/syscall_stubs.S
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/ia64/ia64/syscall_stubs.S
diff -u src/sys/arch/ia64/ia64/syscall_stubs.S:1.5 src/sys/arch/ia64/ia64/syscall_stubs.S:1.6
--- src/sys/arch/ia64/ia64/syscall_stubs.S:1.5 Wed Jan 9 18:03:34 2019
+++ src/sys/arch/ia64/ia64/syscall_stubs.S Thu May 2 17:34:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall_stubs.S,v 1.5 2019/01/09 18:03:34 scole Exp $ */
+/* $NetBSD: syscall_stubs.S,v 1.6 2019/05/02 17:34:01 scole Exp $ */
/*-
* Copyright (c) 2002, 2003 Marcel Moolenaar
@@ -74,9 +74,510 @@
* information they need and we have the freedom to move code around.
*/
+/* XXX fix */
+#define syscall 0
+#define SYS_sigreturn 0
+
.section .text.gateway, "ax"
.align PAGE_SIZE
.global ia64_gateway_page
ia64_gateway_page:
-#warning this is a stub!!!
+{ .mmb
+mov r14=ar.k7 // Memory stack
+mov r15=ar.k6 // Register stack
+epc
+;;
+}
+{ .mlx
+mov r11=psr
+movlr31=epc_syscall
+;;
+}
+{ .mib
+rum psr.be
+mov b7=r31
+br b7
+;;
+}
+gw_ret:
+{ .mmi
+mov ar.rnat=r22
+;;
+mov ar.rsc=r24
+mov ar.pfs=r20
+}
+{ .mib
+mov ar.fpsr=r25
+mov b0=r18
+br.sptk b6
+;;
+}
+gw_ret_ia32:
+{ .mmi
+flushrs
+nop 0
+nop 0
+;;
+}
+{ .mib
+nop 0
+nop 0
+br.ia.sptk b6
+;;
+}
+
+ENTRY_NOPROFILE(break_sigtramp, 0)
+{ .mib
+mov ar.rsc=0
+cmp.ne p15,p0=0,gp
+cover
+;;
+}
+{ .mmi
+flushrs
+(p15) invala
+add r16=16+UC_MCONTEXT+MC_SPECIAL,sp
+;;
+}
+{ .mmi
+mov r17=ar.bsp
+mov r18=ar.rnat
+add r14=40,r16
+;;
+}
+{ .mmi
+st8 [r14]=r17,64// bspstore
+(p15) mov ar.bspstore=gp
+add r15=48,r16
+;;
+}
+{ .mmi
+st8 [r15]=r18 // rnat
+st8 [r14]=r0// ndirty
+nop 0
+;;
+}
+{ .mmi
+alloc r14=ar.pfs, 0, 0, 3, 0
+mov ar.rsc=15
+mov out0=r8
+;;
+}
+{ .mmi
+ld8 r16=[r10],8 // function address
+;;
+ld8 gp=[r10]// function's gp value
+mov b7=r16
+;;
+}
+{ .mib
+mov out1=r9
+add out2=16,sp
+br.call.sptkrp=b7
+;;
+}
+{ .mmi
+mov r15=SYS_sigreturn
+add out0=16,sp
+break 0x10
+;;
+}
+{ .mmi
+mov r15=SYS_exit
+mov out0=ret0
+break 0x10
+;;
+}
+END(break_sigtramp)
+
+ENTRY_NOPROFILE(epc_sigtramp, 0)
+{ .mmi
+ld8 r16=[r10],8 // function address
+mov ar.rsc=0
+cmp.ne p15,p0=0,gp
+;;
+}
+{ .mmi
+(p15) invala
+(p15) mov ar.bspstore=gp
+mov b7=r16
+;;
+}
+{ .mmi
+alloc r14=ar.pfs, 0, 0, 3, 0
+mov ar.rsc=15
+nop 0
+;;
+}
+{ .mii
+ld8 gp=[r10]// function's gp value
+mov out0=r8
+mov out1=r9
+}
+{ .mib
+add out2=16,sp
+nop 0
+br.call.sptkrp=b7
+;;
+}
+add out0=16,sp
+/* XXX fix */
+#if 0
+CALLSYS_NOERROR(sigreturn)
+mov out0=ret0
+CALLSYS_NOERROR(exit)
+#endif
+END(epc_sigtramp)
+
+.align PAGE_SIZE
+
+.text
+
+ENTRY_NOPROFILE(epc_syscall, 8)
+.prologue
+.unwabi @svr4, 'E'
+.save rp, r0
+.body
+{ .mmi
+mov r16=ar.rsc
+mov ar.rsc=0
+nop 0
+;;
+}
+{ .mmi
+mov r18=ar.bspstore
+;;
+mov
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Thu May 2 17:31:56 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: genassym.cf Log Message: Restore UC_MCONTEXT, UC_MCONTEXT, and clean up some whitespace To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ia64/ia64/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Thu May 2 17:31:56 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: genassym.cf Log Message: Restore UC_MCONTEXT, UC_MCONTEXT, and clean up some whitespace To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ia64/ia64/genassym.cf 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/ia64/ia64/genassym.cf diff -u src/sys/arch/ia64/ia64/genassym.cf:1.15 src/sys/arch/ia64/ia64/genassym.cf:1.16 --- src/sys/arch/ia64/ia64/genassym.cf:1.15 Thu May 2 16:55:50 2019 +++ src/sys/arch/ia64/ia64/genassym.cf Thu May 2 17:31:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.15 2019/05/02 16:55:50 scole Exp $ +# $NetBSD: genassym.cf,v 1.16 2019/05/02 17:31:56 scole Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -85,8 +85,8 @@ define KSTACK_PAGES KSTACK_PAGES define IA64_VM_MINKERN_REGION IA64_VM_MINKERN_REGION define IA64_PBVM_RR IA64_PBVM_RR -define IA64_PBVM_PAGE_SHIFT IA64_PBVM_PAGE_SHIFT -define IA64_PSR_I IA64_PSR_I +define IA64_PBVM_PAGE_SHIFT IA64_PBVM_PAGE_SHIFT +define IA64_PSR_I IA64_PSR_I define IA64_PSR_DT IA64_PSR_DT define IA64_PSR_DFL IA64_PSR_DFL define IA64_PSR_DFH IA64_PSR_DFH @@ -95,7 +95,7 @@ define IA64_PSR_RT IA64_PSR_RT define IA64_PSR_BN IA64_PSR_BN define IA64_PBVM_BASE IA64_PBVM_BASE define IA64_PBVM_PGTBL IA64_PBVM_PGTBL -define IA64_DCR_DEFAULT IA64_DCR_DEFAULT +define IA64_DCR_DEFAULT IA64_DCR_DEFAULT define PTE_PRESENT PTE_PRESENT define PTE_ACCESSED PTE_ACCESSED @@ -112,17 +112,20 @@ define EFAULT EFAULT # Important offsets into the lwp and proc structs & associated constants define L_PCB offsetof(struct lwp, l_addr) -define SIZEOF_PCB sizeof(struct pcb) -define SIZEOF_TRAPFRAME sizeof(struct trapframe) +define SIZEOF_PCB sizeof(struct pcb) +define SIZEOF_TRAPFRAME sizeof(struct trapframe) define SIZEOF_SPECIAL sizeof(struct _special) +define MC_SPECIAL offsetof(struct __mcontext, mc_special) +define UC_MCONTEXT offsetof(struct __ucontext, uc_mcontext) + # general constants define VM_MAX_ADDRESS VM_MAX_ADDRESS # Important offsets into the user struct & associated constants define UPAGES UPAGES -define FRAME_SYSCALL FRAME_SYSCALL +define FRAME_SYSCALL FRAME_SYSCALL define PC_CURLWP offsetof(struct cpu_info, ci_curlwp) define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Thu May 2 16:55:51 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: genassym.cf support.S src/sys/arch/ia64/include: setjmp.h Log Message: Remove some unused assembly and other variables to reduce compile warnings To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/genassym.cf cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/support.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/setjmp.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/ia64/ia64/genassym.cf diff -u src/sys/arch/ia64/ia64/genassym.cf:1.14 src/sys/arch/ia64/ia64/genassym.cf:1.15 --- src/sys/arch/ia64/ia64/genassym.cf:1.14 Tue Nov 20 20:36:24 2018 +++ src/sys/arch/ia64/ia64/genassym.cf Thu May 2 16:55:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.14 2018/11/20 20:36:24 scole Exp $ +# $NetBSD: genassym.cf,v 1.15 2019/05/02 16:55:50 scole Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,48 +63,22 @@ # @(#)genassym.c 5.11 (Berkeley) 5/10/91 # -if defined(_KERNEL_OPT) -include "opt_compat_linux.h" -include "opt_multiprocessor.h" -endif - include include include include -include include include -include -include -include -include -include - include include include include -include include include include -ifdef COMPAT_LINUX -include -include -endif - -ifdef COMPAT_IA32 - -endif - -ifdef MULTIPROCESSOR -include -endif - define PAGE_SIZE PAGE_SIZE define PAGE_SHIFT PAGE_SHIFT define KSTACK_PAGES KSTACK_PAGES @@ -112,7 +86,13 @@ define KSTACK_PAGES KSTACK_PAGES define IA64_VM_MINKERN_REGION IA64_VM_MINKERN_REGION define IA64_PBVM_RR IA64_PBVM_RR define IA64_PBVM_PAGE_SHIFT IA64_PBVM_PAGE_SHIFT +define IA64_PSR_I IA64_PSR_I +define IA64_PSR_DT IA64_PSR_DT +define IA64_PSR_DFL IA64_PSR_DFL define IA64_PSR_DFH IA64_PSR_DFH +define IA64_PSR_IT IA64_PSR_IT +define IA64_PSR_RT IA64_PSR_RT +define IA64_PSR_BN IA64_PSR_BN define IA64_PBVM_BASE IA64_PBVM_BASE define IA64_PBVM_PGTBL IA64_PBVM_PGTBL define IA64_DCR_DEFAULT IA64_DCR_DEFAULT @@ -125,61 +105,23 @@ define PTE_AR_RWX PTE_AR_RWX define PTE_MA_WB PTE_MA_WB define PTE_MA_UC PTE_MA_UC -define DT_NULL DT_NULL -define DT_RELA DT_RELA -define DT_RELAENT DT_RELAENT -define DT_RELASZ DT_RELASZ -define DT_SYMTAB DT_SYMTAB -define DT_SYMENT DT_SYMENT - - -define LSRUN LSRUN -define LSONPROC LSONPROC - # errno values define ENAMETOOLONG ENAMETOOLONG define EFAULT EFAULT # Important offsets into the lwp and proc structs & associated constants define L_PCB offsetof(struct lwp, l_addr) -define L_PRIORITY offsetof(struct lwp, l_priority) -define L_STAT offsetof(struct lwp, l_stat) -define L_WCHAN offsetof(struct lwp, l_wchan) -define L_PROC offsetof(struct lwp, l_proc) -define L_CPU offsetof(struct lwp, l_cpu) -define P_FLAG offsetof(struct proc, p_flag) -define P_RASLIST offsetof(struct proc, p_raslist) - -define PK_SYSTEM PK_SYSTEM - -define M_DATA offsetof(struct mbuf, m_data) -define M_LEN offsetof(struct mbuf, m_len) -define M_NEXT offsetof(struct mbuf, m_next) - -define IP_SRC offsetof(struct ip, ip_src) -define IP_DST offsetof(struct ip, ip_dst) - -define IP6_SRC offsetof(struct ip6_hdr, ip6_src) -define IP6_DST offsetof(struct ip6_hdr, ip6_dst) - -define CI_NTRAP offsetof(struct cpu_info, ci_data.cpu_ntrap) -define CI_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr) define SIZEOF_PCB sizeof(struct pcb) define SIZEOF_TRAPFRAME sizeof(struct trapframe) define SIZEOF_SPECIAL sizeof(struct _special) -define MC_SPECIAL offsetof(struct __mcontext, mc_special) -define UC_MCONTEXT offsetof(struct __ucontext, uc_mcontext) - # general constants define VM_MAX_ADDRESS VM_MAX_ADDRESS # Important offsets into the user struct & associated constants define UPAGES UPAGES -#XXX: - define FRAME_SYSCALL FRAME_SYSCALL define PC_CURLWP offsetof(struct cpu_info, ci_curlwp) Index: src/sys/arch/ia64/ia64/support.S diff -u src/sys/arch/ia64/ia64/support.S:1.8 src/sys/arch/ia64/ia64/support.S:1.9 --- src/sys/arch/ia64/ia64/support.S:1.8 Sat Apr 6 03:06:25 2019 +++ src/sys/arch/ia64/ia64/support.S Thu May 2 16:55:50 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: support.S,v 1.8 2019/04/06 03:06:25 thorpej Exp $ */ +/* $NetBSD: support.S,v 1.9 2019/05/02 16:55:50 scole Exp $ */ /*- * Copyright (c) 1998 Doug Rabson @@ -56,7 +56,6 @@ */ #include -#include #include "assym.h" Index: src/sys/arch/ia64/include/setjmp.h diff -u src/sys/arch/ia64/include/setjmp.h:1.2 src/sys/arch/ia64/include/setjmp.h:1.3 --- src/sys/arch/ia64/include/setjmp.h:1.2 Sun Sep 10 21:16:56 2006 +++ src/sys/arch/ia64/include/setjmp.h Thu May 2 16:55:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: setjmp.h,v 1.2 2006/09/10 21:16:56 cherry Exp $ */ +/* $NetBSD:
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Thu May 2 16:55:51 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: genassym.cf support.S src/sys/arch/ia64/include: setjmp.h Log Message: Remove some unused assembly and other variables to reduce compile warnings To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/genassym.cf cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/support.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/setjmp.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/ia64
Module Name:src Committed By: scole Date: Mon Apr 29 16:39:58 UTC 2019 Modified Files: src/sys/arch/ia64/acpi: madt.c src/sys/arch/ia64/ia64: mainbus.c Log Message: Rename ACPI_NAME_SIZE -> ACPI_NAMESEG_SIZE with acpica update, see src/sys/external/bsd/acpica/dist/changes.txt To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/acpi/madt.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/ia64/mainbus.c 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/ia64/acpi/madt.c diff -u src/sys/arch/ia64/acpi/madt.c:1.3 src/sys/arch/ia64/acpi/madt.c:1.4 --- src/sys/arch/ia64/acpi/madt.c:1.3 Sun Apr 7 07:37:51 2013 +++ src/sys/arch/ia64/acpi/madt.c Mon Apr 29 16:39:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: madt.c,v 1.3 2013/04/07 07:37:51 kiyohara Exp $ */ +/* $NetBSD: madt.c,v 1.4 2019/04/29 16:39:58 scole Exp $ */ /*- * Copyright (c) 2001 Doug Rabson * All rights reserved. @@ -148,7 +148,7 @@ ia64_probe_sapics(void) table->Header.Signature[3], table); if (strncmp(table->Header.Signature, ACPI_SIG_MADT, - ACPI_NAME_SIZE) != 0 || + ACPI_NAMESEG_SIZE) != 0 || ACPI_FAILURE(AcpiTbChecksum((void *)table, table->Header.Length))) continue; @@ -242,7 +242,7 @@ ia64_count_cpus(void) IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[t]); if (strncmp(table->Header.Signature, ACPI_SIG_MADT, - ACPI_NAME_SIZE) != 0 || + ACPI_NAMESEG_SIZE) != 0 || ACPI_FAILURE(AcpiTbChecksum((void *)table, table->Header.Length))) continue; Index: src/sys/arch/ia64/ia64/mainbus.c diff -u src/sys/arch/ia64/ia64/mainbus.c:1.10 src/sys/arch/ia64/ia64/mainbus.c:1.11 --- src/sys/arch/ia64/ia64/mainbus.c:1.10 Tue Jun 21 11:33:33 2016 +++ src/sys/arch/ia64/ia64/mainbus.c Mon Apr 29 16:39:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $ */ +/* $NetBSD: mainbus.c,v 1.11 2019/04/29 16:39:58 scole Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2019/04/29 16:39:58 scole Exp $"); #include "acpica.h" @@ -95,7 +95,7 @@ mainbus_attach(device_t parent, device_t IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[i]); sig = table->Header.Signature; - if (strncmp(sig, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0) + if (strncmp(sig, ACPI_SIG_MADT, ACPI_NAMESEG_SIZE) != 0) continue; len = table->Header.Length; if (ACPI_FAILURE(AcpiTbChecksum((void *)table, len)))
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Mon Apr 29 16:39:58 UTC 2019 Modified Files: src/sys/arch/ia64/acpi: madt.c src/sys/arch/ia64/ia64: mainbus.c Log Message: Rename ACPI_NAME_SIZE -> ACPI_NAMESEG_SIZE with acpica update, see src/sys/external/bsd/acpica/dist/changes.txt To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/acpi/madt.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/ia64/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Fri Apr 19 16:28:32 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: machdep.c Log Message: In map_vhpt(), read pmap_vhpt_log2size before any memory translation instructions to avoid "Data Nested TLB faults" with GCC 7.4.0 To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ia64/ia64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: scole
Date: Fri Apr 19 16:28:32 UTC 2019
Modified Files:
src/sys/arch/ia64/ia64: machdep.c
Log Message:
In map_vhpt(), read pmap_vhpt_log2size before any memory translation
instructions to avoid "Data Nested TLB faults" with GCC 7.4.0
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/ia64/ia64/machdep.c
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/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.42 src/sys/arch/ia64/ia64/machdep.c:1.43
--- src/sys/arch/ia64/ia64/machdep.c:1.42 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/ia64/ia64/machdep.c Fri Apr 19 16:28:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.42 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.43 2019/04/19 16:28:32 scole Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -267,18 +267,24 @@ map_vhpt(uintptr_t vhpt)
pt_entry_t pte;
uint64_t psr;
+ /*
+ * XXX read pmap_vhpt_log2size before any memory translation
+ * instructions to avoid "Data Nested TLB faults". Not
+ * exactly sure why this is needed with GCC 7.4
+ */
+ register uint64_t log2size = pmap_vhpt_log2size << 2;
+
pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
PTE_PL_KERN | PTE_AR_RW;
pte |= vhpt & PTE_PPN_MASK;
-__asm __volatile("ptr.d %0,%1" :: "r"(vhpt),
- "r"(pmap_vhpt_log2size << 2));
+__asm __volatile("ptr.d %0,%1" :: "r"(vhpt), "r"(log2size));
__asm __volatile("mov %0=psr" : "=r"(psr));
__asm __volatile("rsm psr.ic|psr.i");
ia64_srlz_i();
ia64_set_ifa(vhpt);
-ia64_set_itir(pmap_vhpt_log2size << 2);
+ ia64_set_itir(log2size);
ia64_srlz_d();
__asm __volatile("itr.d dtr[%0]=%1" :: "r"(3), "r"(pte));
__asm __volatile("mov psr.l=%0" :: "r" (psr));
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Apr 3 21:03:06 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: add note about pmap.c compilation warnings To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.4 src/sys/arch/ia64/TODO:1.5 --- src/sys/arch/ia64/TODO:1.4 Wed Jan 30 22:53:22 2019 +++ src/sys/arch/ia64/TODO Wed Apr 3 21:03:06 2019 @@ -15,6 +15,10 @@ What works: Tasks remaining, first couple seem most important: +- pmap.c is getting compilation warnings (for gcc6 & gcc7) like + /var/tmp//cckQKcKn.s:7614: Warning: Use of 'st8' may violate RAW dependency 'RR#' (data) + ... + how to change compile flags for specific kernel file like "CFLAGS.pmap.c+= -O0" ? - context switching and forking appear unfinished, vm_machdep.c::cpu_lwp_fork() appears incomplete - pmap module, imported from freebsd but still needs more work and
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Apr 3 21:03:06 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: add note about pmap.c compilation warnings To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: scole Date: Wed Apr 3 20:34:18 UTC 2019 Modified Files: src/doc: HACKS Log Message: Remove obsoleted ia64 gcc 4.5.3 hacks To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src
Committed By: scole
Date: Wed Apr 3 20:34:18 UTC 2019
Modified Files:
src/doc: HACKS
Log Message:
Remove obsoleted ia64 gcc 4.5.3 hacks
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/doc/HACKS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.187 src/doc/HACKS:1.188
--- src/doc/HACKS:1.187 Sun Apr 9 19:02:23 2017
+++ src/doc/HACKS Wed Apr 3 20:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.187 2017/04/09 19:02:23 scole Exp $
+# $NetBSD: HACKS,v 1.188 2019/04/03 20:34:18 scole Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -811,42 +811,6 @@ port emips
port ia64
- hack libc hesiod.c file does not compile with -O2 (internal
- compiler error in gcc 4.5.3)
- cdate Thu Dec 27 08:05:43 CET 2012
- who martin
- file src/lib/libc/net/Makefile.inc: 1.82
- descr
- workaround for:
- {standard input}: Assembler messages:
- {standard input}:1507: Warning: Use of 'mov' may violate WAW dependency 'GR%, % in 1 - 127' (impliedf), specific resource number is 15
- {standard input}:1506: Warning: This is the location of the conflicting usage
- {standard input}: Error: 2 warnings, treating warnings as errors
- kcah
-
- hack libelf libelf_extended.c compiler error in gcc 4.5.3
- cdate Thu Dec 27 09:05:51 CET 2012
- who martin
- file src/external/bsd/libelf/lib/Makefile: 1.3
- descr
- workaround for:
- {standard input}: Assembler messages:
- {standard input}:87: Warning: Use of 'adds' may violate RAW dependency 'GR%, % in 1 - 127' (impliedf), specific resource number is 33
- {standard input}:87: Warning: Only the first path encountering the conflict is reported
- {standard input}:85: Warning: This is the location of the conflicting usage
- kcah
-
- hack compiler error with gcc 4.5.x
- cdate Thu Dec 27 15:15:25 CET 2012
- who martin
- file src/crypto/external/bsd/netpgp/lib/verify/Makefile: 1.5
- descr
- workaround for:
- {standard input}: Assembler messages:
- {standard input}:22979: Warning: Use of 'mov' may violate WAW dependency 'GR%, % in 1 - 127' (impliedf), specific resource number is 8
- {standard input}:22978: Warning: This is the location of the conflicting usage
- kcah
-
hack libgcc unwind dummy function
cdate Fri Apr 17 14:31:03 CEST 2015
who martin
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Fri Mar 29 16:04:54 UTC 2019 Modified Files: src/sys/arch/ia64/include: vmparam.h Log Message: Remove SGROWSIZ parameter which looks like it was imported from FreeBSD and not use with NetBSD To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/vmparam.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/ia64/include
Module Name:src Committed By: scole Date: Fri Mar 29 16:04:54 UTC 2019 Modified Files: src/sys/arch/ia64/include: vmparam.h Log Message: Remove SGROWSIZ parameter which looks like it was imported from FreeBSD and not use with NetBSD To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/vmparam.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/ia64/include/vmparam.h diff -u src/sys/arch/ia64/include/vmparam.h:1.10 src/sys/arch/ia64/include/vmparam.h:1.11 --- src/sys/arch/ia64/include/vmparam.h:1.10 Sat Apr 8 18:05:36 2017 +++ src/sys/arch/ia64/include/vmparam.h Fri Mar 29 16:04:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.10 2017/04/08 18:05:36 scole Exp $ */ +/* $NetBSD: vmparam.h,v 1.11 2019/03/29 16:04:54 scole Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -57,9 +57,6 @@ #ifndef MAXSSIZ #define MAXSSIZ (1<<28) /* max stack size (256M) */ #endif -#ifndef SGROWSIZ -#define SGROWSIZ (128UL*1024) /* amount to grow stack */ -#endif #define IA64_VM_MINKERN_REGION 4
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: scole
Date: Sat Feb 9 23:03:01 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
use HAVE_FPREGS not HAVE_FPGPREGS and move some register_t inside proper
#define. fixes ia64 build. ok
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.75 src/tests/lib/libc/sys/t_ptrace_wait.c:1.76
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.75 Fri Feb 8 03:08:00 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Sat Feb 9 23:03:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.75 2019/02/08 03:08:00 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.76 2019/02/09 23:03:01 scole Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.75 2019/02/08 03:08:00 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.76 2019/02/09 23:03:01 scole Exp $");
#include
#include
@@ -2613,7 +2613,7 @@ BYTES_TRANSFER(bytes_transfer_piod_read_
///
-#if defined(HAVE_GPREGS) || defined(HAVE_FPGPREGS)
+#if defined(HAVE_GPREGS) || defined(HAVE_FPREGS)
static void
access_regs(const char *regset, const char *aux)
{
@@ -2625,12 +2625,12 @@ access_regs(const char *regset, const ch
#endif
#if defined(HAVE_GPREGS)
struct reg gpr;
+ register_t rgstr;
#endif
#if defined(HAVE_FPREGS)
struct fpreg fpr;
#endif
- register_t rgstr;
-
+
#if !defined(HAVE_GPREGS)
if (strcmp(regset, "regs") == 0)
atf_tc_fail("Impossible test scenario!");
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: scole Date: Sat Feb 9 23:03:01 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: use HAVE_FPREGS not HAVE_FPGPREGS and move some register_t inside proper #define. fixes ia64 build. ok To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Jan 30 22:53:22 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: RUMP building on ia64 now To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Jan 30 22:53:22 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: RUMP building on ia64 now To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.3 src/sys/arch/ia64/TODO:1.4 --- src/sys/arch/ia64/TODO:1.3 Tue Jan 29 19:44:03 2019 +++ src/sys/arch/ia64/TODO Wed Jan 30 22:53:22 2019 @@ -61,7 +61,6 @@ Tasks remaining, first couple seem most - write console and/or X framebuffer driver. freebsd has vgapci device that may be portable - add ia32 emulation, port from freebsd -- add rump stuff/MKRUMP - create install EFI/cdrom/netbsd - fix ski to run on other archs beside i386, or at least amd64
CVS commit: src/share/mk
Module Name:src
Committed By: scole
Date: Wed Jan 30 22:51:33 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
don't disable MKRUMP by default for ia64 as it can at least build now
To generate a diff of this commit:
cvs rdiff -u -r1.1096 -r1.1097 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1096 src/share/mk/bsd.own.mk:1.1097
--- src/share/mk/bsd.own.mk:1.1096 Tue Jan 29 19:40:42 2019
+++ src/share/mk/bsd.own.mk Wed Jan 30 22:51:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1096 2019/01/29 19:40:42 scole Exp $
+# $NetBSD: bsd.own.mk,v 1.1097 2019/01/30 22:51:33 scole Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1105,11 +1105,6 @@ USE_LIBCSANITIZER?= undefined
# Exceptions to the above:
#
-# Rump doesn't work yet on ia64
-.if ${MACHINE} == "ia64"
-MKRUMP= no
-.endif
-
# RUMP uses -nostdinc which coverity does not like
# It also does not use many new files, so disable it
.if defined(COVERITY_TOP_CONFIG)
CVS commit: src/share/mk
Module Name:src Committed By: scole Date: Wed Jan 30 22:51:33 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: don't disable MKRUMP by default for ia64 as it can at least build now To generate a diff of this commit: cvs rdiff -u -r1.1096 -r1.1097 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Tue Jan 29 19:44:03 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: add more items To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.2 src/sys/arch/ia64/TODO:1.3 --- src/sys/arch/ia64/TODO:1.2 Wed Nov 14 20:13:14 2018 +++ src/sys/arch/ia64/TODO Tue Jan 29 19:44:03 2019 @@ -32,14 +32,14 @@ Tasks remaining, first couple seem most - implement ld.elf_so, MK_DYNAMICROOT - fix memory detection, on real hardware doesn't find all memory - implement interrupts (sacpi & pci), can be mostly from freebsd? -- MKLINT and MKGDB for ia64? +- MKGDB for ia64 - implement fp[gs]etsticky, [make|get|set|swap]context - floating point, fenv functions were imported from freebsd, but haven't been tested - implement core_machdep.c - implement __cloneS ptrace.S sbrk.S shmat.S - implement kvm_ia64.c - implement pmc (performance monitoring counters) for ia64 pmc registers -- cpuctl +- implement ia64 md code for cpuctl, intrctl as needed - optional(?) mutex.h/lock_stubs.S, mutex_enter()/mutex_exit() __HAVE_MUTEX_STUBS mutex_spin_enter()/mutex_spin_exit() __HAVE_SPIN_MUTEX_STUBS - rwlock.h rw_enter(),rw_exit(),rw_tryenter() __HAVE_RW_STUBS, implemented already? @@ -63,6 +63,7 @@ Tasks remaining, first couple seem most - add ia32 emulation, port from freebsd - add rump stuff/MKRUMP - create install EFI/cdrom/netbsd +- fix ski to run on other archs beside i386, or at least amd64 Pie in the sky - Xen and itanium!
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Tue Jan 29 19:44:03 UTC 2019 Modified Files: src/sys/arch/ia64: TODO Log Message: add more items To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: scole Date: Tue Jan 29 19:40:42 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: remove "MKLINT.ia64=no" as default is no anyway, and should compile on 64 bit host now To generate a diff of this commit: cvs rdiff -u -r1.1095 -r1.1096 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1095 src/share/mk/bsd.own.mk:1.1096 --- src/share/mk/bsd.own.mk:1.1095 Sat Jan 19 12:58:37 2019 +++ src/share/mk/bsd.own.mk Tue Jan 29 19:40:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1095 2019/01/19 12:58:37 mrg Exp $ +# $NetBSD: bsd.own.mk,v 1.1096 2019/01/29 19:40:42 scole Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -811,7 +811,6 @@ NOPROFILE= # defined # # The ia64 port is incomplete. # -MKLINT.ia64= no MKGDB.ia64= no #
CVS commit: src/share/mk
Module Name:src Committed By: scole Date: Tue Jan 29 19:40:42 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: remove "MKLINT.ia64=no" as default is no anyway, and should compile on 64 bit host now To generate a diff of this commit: cvs rdiff -u -r1.1095 -r1.1096 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: scole
Date: Fri Jan 18 18:47:16 UTC 2019
Modified Files:
src/sys/arch/ia64/ia64: machdep.c
Log Message:
Add DPRINTF function, use kstack variable for proc0 memory, reorder some
functions so ci initialized before use
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/ia64/ia64/machdep.c
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/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.40 src/sys/arch/ia64/ia64/machdep.c:1.41
--- src/sys/arch/ia64/ia64/machdep.c:1.40 Thu Nov 15 20:39:18 2018
+++ src/sys/arch/ia64/ia64/machdep.c Fri Jan 18 18:47:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.40 2018/11/15 20:39:18 scole Exp $ */
+/* $NetBSD: machdep.c,v 1.41 2019/01/18 18:47:16 scole Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -119,6 +119,12 @@
#include
#include
+#ifdef DEBUG
+#define DPRINTF(fmt, args...) printf("%s: " fmt, __func__, ##args)
+#else
+#define DPRINTF(fmt, args...) ((void)0)
+#endif
+
/* the following is used externally (sysctl_hw) */
char machine[] = MACHINE; /* from */
char machine_arch[] = MACHINE_ARCH; /* from */
@@ -387,12 +393,6 @@ ia64_init(void)
vaddr_t v;
/* NO OUTPUT ALLOWED UNTIL FURTHER NOTICE */
-
- /*
- * TODO: Disable interrupts, floating point etc.
- * Maybe flush cache and tlb
- */
-
ia64_set_fpsr(IA64_FPSR_DEFAULT);
/*
@@ -514,10 +514,8 @@ ia64_init(void)
for (md = efi_md_first(); md != NULL; md = efi_md_next(md)) {
-#ifdef DEBUG
- printf("MD %p: type %d pa 0x%lx cnt 0x%lx\n", md,
- md->md_type, md->md_phys, md->md_pages);
-#endif
+ DPRINTF("MD %p: type %d pa 0x%lx cnt 0x%lx\n", md,
+ md->md_type, md->md_phys, md->md_pages);
pfn0 = ia64_btop(round_page(md->md_phys));
pfn1 = ia64_btop(trunc_page(md->md_phys + md->md_pages * 4096));
@@ -553,17 +551,15 @@ ia64_init(void)
* Must compute the location of the kernel
* within the segment.
*/
-#ifdef DEBUG
- printf("Descriptor %p contains kernel\n", md);
-#endif
+ DPRINTF("Descriptor %p contains kernel\n", md);
+
if (pfn0 < kernstartpfn) {
/*
* There is a chunk before the kernel.
*/
-#ifdef DEBUG
-printf("Loading chunk before kernel: "
- "0x%lx / 0x%lx\n", pfn0, kernstartpfn);
-#endif
+DPRINTF("Loading chunk before kernel: "
+ "0x%lx / 0x%lx\n", pfn0, kernstartpfn);
+
uvm_page_physload(pfn0, kernstartpfn,
pfn0, kernstartpfn, VM_FREELIST_DEFAULT);
@@ -572,10 +568,8 @@ ia64_init(void)
/*
* There is a chunk after the kernel.
*/
-#ifdef DEBUG
-printf("Loading chunk after kernel: "
- "0x%lx / 0x%lx\n", kernendpfn, pfn1);
-#endif
+DPRINTF("Loading chunk after kernel: "
+ "0x%lx / 0x%lx\n", kernendpfn, pfn1);
uvm_page_physload(kernendpfn, pfn1,
kernendpfn, pfn1, VM_FREELIST_DEFAULT);
@@ -585,10 +579,8 @@ ia64_init(void)
/*
* Just load this cluster as one chunk.
*/
-#ifdef DEBUG
- printf("Loading descriptor %p: 0x%lx / 0x%lx\n",
- md, pfn0, pfn1);
-#endif
+ DPRINTF("Loading descriptor %p: 0x%lx / 0x%lx\n",
+md, pfn0, pfn1);
uvm_page_physload(pfn0, pfn1, pfn0, pfn1,
VM_FREELIST_DEFAULT);
@@ -600,21 +592,16 @@ ia64_init(void)
panic("can't happen: system seems to have no memory!");
/*
- * Initialize the virtual memory system.
- */
-
- pmap_bootstrap();
-
- /*
* Initialize error message buffer (at end of core).
*/
msgbufaddr = (void *) uvm_pageboot_alloc(MSGBUFSIZE);
initmsgbuf(msgbufaddr, MSGBUFSIZE);
/*
- * Init mapping for u page(s) for proc 0
+ * Init mapping for u page(s) for proc 0. use memory area
+ * already set up in locore.S
*/
- v = uvm_pageboot_alloc(UPAGES * PAGE_SIZE);
+ v = (vaddr_t)
uvm_lwp_setuarea(, v);
/*
@@ -622,6 +609,8 @@ ia64_init(void)
* and make lwp0's trapframe pointer point to it for sanity.
*/
lwp0.l_md.md_tf = (struct trapframe *)(v + UAREA_TF_OFFSET);
+ lwp0.l_md.md_tf->tf_length = sizeof(struct trapframe);
+ lwp0.l_md.md_tf->tf_flags = FRAME_SYSCALL;
lwp0.l_md.user_stack = NULL;
lwp0.l_md.user_stack_size = 0;
@@ -630,8 +619,6 @@ ia64_init(void)
pcb0->pcb_special.sp = v + UAREA_SP_OFFSET;
pcb0->pcb_special.bspstore = v + UAREA_BSPSTORE_OFFSET;
- mutex_init(>pcb_fpcpu_slock, MUTEX_DEFAULT, 0);
-
/*
* Setup global data for the bootstrap cpu.
*/
@@ -643,9 +630,8 @@ ia64_init(void)
ia64_set_k4((uint64_t) ci);
ci->ci_cpuid = cpu_number();
-
/*
- * Initialise process context. XXX: This should really be in cpu_switch
+ * Initialise process context. XXX: This should really be in cpu_switchto
*/
ci->ci_curlwp =
@@ -662,6 +648,8 @@ ia64_init(void)
ia64_set_tpr(0);
ia64_srlz_d();
+ mutex_init(>pcb_fpcpu_slock, MUTEX_DEFAULT, 0);
+
/*
* Save our current context so that we have a known (maybe
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Fri Jan 18 18:47:16 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: machdep.c Log Message: Add DPRINTF function, use kstack variable for proc0 memory, reorder some functions so ci initialized before use To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/ia64/ia64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Fri Jan 18 18:03:06 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: vm_machdep.c Log Message: hopefully fix deadlock issue in cpu_switchto. pointed out by (Thanks!) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ia64/ia64/vm_machdep.c 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/ia64/ia64/vm_machdep.c diff -u src/sys/arch/ia64/ia64/vm_machdep.c:1.15 src/sys/arch/ia64/ia64/vm_machdep.c:1.16 --- src/sys/arch/ia64/ia64/vm_machdep.c:1.15 Wed Nov 14 21:10:59 2018 +++ src/sys/arch/ia64/ia64/vm_machdep.c Fri Jan 18 18:03:06 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.15 2018/11/14 21:10:59 scole Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.16 2019/01/18 18:03:06 scole Exp $ */ /* * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -91,8 +91,9 @@ cpu_switchto(lwp_t *oldlwp, lwp_t *newlw KASSERT(oldlwp == l); swapctx(oldpcb, newpcb); } - - return (oldlwp); + + /* return oldlwp for the original thread that called cpu_switchto */ + return ((lwp_t *)reg9); } /* @@ -189,13 +190,12 @@ cpu_lwp_fork(struct lwp *l1, struct lwp tf->tf_scratch.gr10 = 0; } - tf->tf_scratch.gr2 = (unsigned long)FDESC_FUNC(func); - tf->tf_scratch.gr3 = (unsigned long)arg; - - pcb2->pcb_special.sp = ua2 + UAREA_SP_OFFSET; - pcb2->pcb_special.rp = (unsigned long)FDESC_FUNC(lwp_trampoline); pcb2->pcb_special.bspstore = ua2 + UAREA_BSPSTORE_OFFSET + ndirty; pcb2->pcb_special.pfs = 0; + pcb2->pcb_special.sp = ua2 + UAREA_SP_OFFSET; + pcb2->pcb_special.rp = (unsigned long)FDESC_FUNC(lwp_trampoline); + tf->tf_scratch.gr2 = (unsigned long)FDESC_FUNC(func); + tf->tf_scratch.gr3 = (unsigned long)arg; return; }
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Fri Jan 18 18:03:06 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: vm_machdep.c Log Message: hopefully fix deadlock issue in cpu_switchto. pointed out by (Thanks!) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ia64/ia64/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Thu Jan 10 17:05:56 UTC 2019 Modified Files: src/sys/arch/ia64/include: cpu.h lock.h Log Message: consolidate hint@pause in one place. remove mf.a from memory barriers To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ia64/include/cpu.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/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/ia64/include
Module Name:src
Committed By: scole
Date: Thu Jan 10 17:05:56 UTC 2019
Modified Files:
src/sys/arch/ia64/include: cpu.h lock.h
Log Message:
consolidate hint@pause in one place. remove mf.a from memory barriers
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ia64/include/cpu.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/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/ia64/include/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.16 src/sys/arch/ia64/include/cpu.h:1.17
--- src/sys/arch/ia64/include/cpu.h:1.16 Sat Apr 8 18:01:22 2017
+++ src/sys/arch/ia64/include/cpu.h Thu Jan 10 17:05:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.16 2017/04/08 18:01:22 scole Exp $ */
+/* $NetBSD: cpu.h,v 1.17 2019/01/10 17:05:56 scole Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -78,6 +78,7 @@
#include
#include
#include
+#include
#include
struct cpu_info {
@@ -178,12 +179,7 @@ int cpu_maxproc(void); /*XXX: Fill in ma
#define DELAY(x) __nothing /* XXX: FIXME */
-static inline void cpu_idle(void);
-static inline
-void cpu_idle(void)
-{
- asm ("hint @pause" ::: "memory");
-}
+#define cpu_idle() ia64_pause()
#endif /* _KERNEL_ */
#endif /* _IA64_CPU_H */
Index: src/sys/arch/ia64/include/lock.h
diff -u src/sys/arch/ia64/include/lock.h:1.6 src/sys/arch/ia64/include/lock.h:1.7
--- src/sys/arch/ia64/include/lock.h:1.6 Sun Sep 17 00:01:07 2017
+++ src/sys/arch/ia64/include/lock.h Thu Jan 10 17:05:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.6 2017/09/17 00:01:07 christos Exp $ */
+/* $NetBSD: lock.h,v 1.7 2019/01/10 17:05:56 scole Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@ __cpu_simple_lock_clear(__cpu_simple_loc
#ifdef _KERNEL
#define SPINLOCK_SPIN_HOOK /* nothing */
-#define SPINLOCK_BACKOFF_HOOK /* XXX(kochi): hint@pause */
+#define SPINLOCK_BACKOFF_HOOK /* XXX ia64_pause() */
#endif
@@ -116,26 +116,28 @@ __cpu_simple_unlock(__cpu_simple_lock_t
*lockp = __SIMPLELOCK_UNLOCKED;
}
-/* XXX mf.a overkill for these? */
static __inline void
mb_read(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
}
static __inline void
mb_write(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
}
static __inline void
mb_memory(void)
{
- __asm __volatile("mf.a \n"
- "mf \n" ::: "memory");
+ __asm __volatile("mf \n" ::: "memory");
+}
+
+static __inline void
+ia64_pause(void)
+{
+ __asm __volatile("hint @pause" ::: "memory");
}
#endif /* _IA64_LOCK_H_ */
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Wed Jan 9 18:03:34 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: syscall_stubs.S Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/ia64/syscall_stubs.S 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/ia64/ia64/syscall_stubs.S diff -u src/sys/arch/ia64/ia64/syscall_stubs.S:1.4 src/sys/arch/ia64/ia64/syscall_stubs.S:1.5 --- src/sys/arch/ia64/ia64/syscall_stubs.S:1.4 Sat Apr 8 17:46:30 2017 +++ src/sys/arch/ia64/ia64/syscall_stubs.S Wed Jan 9 18:03:34 2019 @@ -1,6 +1,6 @@ -/* $NetBSD: syscall_stubs.S,v 1.4 2017/04/08 17:46:30 scole Exp $ */ +/* $NetBSD: syscall_stubs.S,v 1.5 2019/01/09 18:03:34 scole Exp $ */ - /*- +/*- * Copyright (c) 2002, 2003 Marcel Moolenaar * All rights reserved. *
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Wed Jan 9 18:03:34 UTC 2019 Modified Files: src/sys/arch/ia64/ia64: syscall_stubs.S Log Message: whitespace cleanup To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/ia64/syscall_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/macppc
Module Name:src Committed By: scole Date: Mon Jan 7 18:08:28 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/macppc: md.h msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl Log Message: Add GENERIC.MP and GENERIC_601 kernels to sysinst menu To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/macppc/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/macppc/msg.md.de \ src/usr.sbin/sysinst/arch/macppc/msg.md.en \ src/usr.sbin/sysinst/arch/macppc/msg.md.es \ src/usr.sbin/sysinst/arch/macppc/msg.md.fr \ src/usr.sbin/sysinst/arch/macppc/msg.md.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/macppc
Module Name:src
Committed By: scole
Date: Mon Jan 7 18:08:28 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/macppc: md.h msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Add GENERIC.MP and GENERIC_601 kernels to sysinst menu
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/macppc/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/macppc/msg.md.de \
src/usr.sbin/sysinst/arch/macppc/msg.md.en \
src/usr.sbin/sysinst/arch/macppc/msg.md.es \
src/usr.sbin/sysinst/arch/macppc/msg.md.fr \
src/usr.sbin/sysinst/arch/macppc/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/macppc/md.h
diff -u src/usr.sbin/sysinst/arch/macppc/md.h:1.2 src/usr.sbin/sysinst/arch/macppc/md.h:1.3
--- src/usr.sbin/sysinst/arch/macppc/md.h:1.2 Sun Nov 18 10:34:46 2018
+++ src/usr.sbin/sysinst/arch/macppc/md.h Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.2 2018/11/18 10:34:46 martin Exp $ */
+/* $NetBSD: md.h,v 1.3 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -62,6 +62,8 @@
* or upgrade.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
+#define SET_KERNEL_2_NAME "kern-GENERIC.MP"
+#define SET_KERNEL_3_NAME "kern-GENERIC_601"
/*
* Machine-specific command to write a new label to a disk.
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.de
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.de:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.de Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.de,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -52,3 +52,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.en
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.en:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.en Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.en,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.es
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.es:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.es Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.es,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Núcleo (GENERIC)}
+message set_kernel_2
+{Núcleo (GENERIC.MP)}
+
+message set_kernel_3
+{Núcleo (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.fr:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.fr Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.fr,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,3 +51,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
Index: src/usr.sbin/sysinst/arch/macppc/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.2
--- src/usr.sbin/sysinst/arch/macppc/msg.md.pl:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/msg.md.pl Mon Jan 7 18:08:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:46 dholland Exp $ */
+/* $NetBSD: msg.md.pl,v 1.2 2019/01/07 18:08:28 scole Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.5 2000/12/03 01:54:48 minoura Exp */
@@ -53,3 +53,8 @@ message dobootblks
message set_kernel_1
{Kernel (GENERIC)}
+message set_kernel_2
+{Kernel (GENERIC.MP)}
+
+message set_kernel_3
+{Kernel (GENERIC_601)}
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: scole Date: Mon Jan 7 01:44:59 UTC 2019 Modified Files: src/sys/arch/macppc/conf: GENERIC_601 GENERIC_MD INSTALL INSTALL_601 Log Message: increase MEMORY_DISK_ROOT_SIZE slightly to avoid running out of space when doing some sysinst options. Add ahc and rtk options for my testing convenience. The 601 kernels are still small enough for netbooting. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/conf/GENERIC_MD cvs rdiff -u -r1.128 -r1.129 src/sys/arch/macppc/conf/INSTALL cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/conf/INSTALL_601 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: scole Date: Mon Jan 7 01:44:59 UTC 2019 Modified Files: src/sys/arch/macppc/conf: GENERIC_601 GENERIC_MD INSTALL INSTALL_601 Log Message: increase MEMORY_DISK_ROOT_SIZE slightly to avoid running out of space when doing some sysinst options. Add ahc and rtk options for my testing convenience. The 601 kernels are still small enough for netbooting. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/conf/GENERIC_MD cvs rdiff -u -r1.128 -r1.129 src/sys/arch/macppc/conf/INSTALL cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/conf/INSTALL_601 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/macppc/conf/GENERIC_601 diff -u src/sys/arch/macppc/conf/GENERIC_601:1.22 src/sys/arch/macppc/conf/GENERIC_601:1.23 --- src/sys/arch/macppc/conf/GENERIC_601:1.22 Mon Nov 12 20:03:42 2018 +++ src/sys/arch/macppc/conf/GENERIC_601 Mon Jan 7 01:44:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_601,v 1.22 2018/11/12 20:03:42 scole Exp $ +# $NetBSD: GENERIC_601,v 1.23 2019/01/07 01:44:59 scole Exp $ # # GENERIC machine description file # @@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.22 $" +ident "GENERIC-$Revision: 1.23 $" maxusers 32 @@ -207,7 +207,7 @@ pchb* at pci? dev ? function ? # PCI-Hos ppb* at pci? dev ? function ? # PCI-PCI bridges # PCI SCSI controllers -#ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI +ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI # Display devices # @@ -371,8 +371,8 @@ pseudo-device drvctl #options PAX_MPROTECT=0 # PaX mprotect(2) restrictions -#rlphy* at mii? phy ? # Realtek 8139/8201L PHYs -#rtk* at pci? dev ? function ? # Realtek 8129/8139 +rlphy* at mii? phy ? # Realtek 8139/8201L PHYs +rtk* at pci? dev ? function ? # Realtek 8129/8139 #rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs #ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g Index: src/sys/arch/macppc/conf/GENERIC_MD diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.16 src/sys/arch/macppc/conf/GENERIC_MD:1.17 --- src/sys/arch/macppc/conf/GENERIC_MD:1.16 Sun Aug 10 17:58:51 2014 +++ src/sys/arch/macppc/conf/GENERIC_MD Mon Jan 7 01:44:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_MD,v 1.16 2014/08/10 17:58:51 joerg Exp $ +# $NetBSD: GENERIC_MD,v 1.17 2019/01/07 01:44:59 scole Exp $ # # GENERIC_MD config file # @@ -8,5 +8,5 @@ include "arch/macppc/conf/GENERIC" # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB +options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode Index: src/sys/arch/macppc/conf/INSTALL diff -u src/sys/arch/macppc/conf/INSTALL:1.128 src/sys/arch/macppc/conf/INSTALL:1.129 --- src/sys/arch/macppc/conf/INSTALL:1.128 Fri Aug 31 18:11:20 2018 +++ src/sys/arch/macppc/conf/INSTALL Mon Jan 7 01:44:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.128 2018/08/31 18:11:20 sevan Exp $ +# $NetBSD: INSTALL,v 1.129 2019/01/07 01:44:59 scole Exp $ # # config file for INSTALL FLOPPY # @@ -17,7 +17,7 @@ options RTC_OFFSET=0 # hardware clock i options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB +options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options USERCONF # userconf(4) support Index: src/sys/arch/macppc/conf/INSTALL_601 diff -u src/sys/arch/macppc/conf/INSTALL_601:1.1 src/sys/arch/macppc/conf/INSTALL_601:1.2 --- src/sys/arch/macppc/conf/INSTALL_601:1.1 Mon Nov 12 20:07:47 2018 +++ src/sys/arch/macppc/conf/INSTALL_601 Mon Jan 7 01:44:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_601,v 1.1 2018/11/12 20:07:47 scole Exp $ +# $NetBSD: INSTALL_601,v 1.2 2019/01/07 01:44:59 scole Exp $ # # config file for INSTALL # @@ -19,7 +19,7 @@ options RTC_OFFSET=0 # hardware clock i options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=5120 # 2560 KiB +options MEMORY_DISK_ROOT_SIZE=5760 # 2880 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options USERCONF # userconf(4) support @@ -72,6 +72,9 @@ pci* at ppb? bus ? pchb* at pci? dev ? function ? # PCI-Host bridges ppb* at pci? dev ? function ? # PCI-PCI bridges +# PCI SCSI controllers +ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI + # Display devices # # The 7200's onboard
CVS commit: src/distrib/macppc/floppies/ramdisk
Module Name:src Committed By: scole Date: Mon Jan 7 01:39:26 UTC 2019 Modified Files: src/distrib/macppc/floppies/ramdisk: Makefile Log Message: increase IMAGESIZE slightly to avoid running out of space when doing some sysinst options To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/macppc/floppies/ramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/macppc/floppies/ramdisk
Module Name:src
Committed By: scole
Date: Mon Jan 7 01:39:26 UTC 2019
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
Log Message:
increase IMAGESIZE slightly to avoid running out of space when doing some
sysinst options
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/macppc/floppies/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.49 src/distrib/macppc/floppies/ramdisk/Makefile:1.50
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.49 Mon Nov 12 20:11:39 2018
+++ src/distrib/macppc/floppies/ramdisk/Makefile Mon Jan 7 01:39:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2018/11/12 20:11:39 scole Exp $
+# $NetBSD: Makefile,v 1.50 2019/01/07 01:39:26 scole Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,7 @@ IMAGE= ramdisk.fs
# src/sys/arch/macppc/conf/INSTALL
# src/sys/arch/macppc/conf/INSTALL_601
# src/sys/arch/macppc/conf/GENERIC_MD
-IMAGESIZE= 2560k
+IMAGESIZE= 2880k
MAKEFS_FLAGS+= -f 15
WARNS= 1
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: scole
Date: Sat Dec 29 20:06:49 UTC 2018
Modified Files:
src/sys/arch/ia64/include: proc.h
Log Message:
fix stack size calculation
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/proc.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/ia64/include/proc.h
diff -u src/sys/arch/ia64/include/proc.h:1.9 src/sys/arch/ia64/include/proc.h:1.10
--- src/sys/arch/ia64/include/proc.h:1.9 Sun Dec 2 16:49:24 2018
+++ src/sys/arch/ia64/include/proc.h Sat Dec 29 20:06:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.9 2018/12/02 16:49:24 scole Exp $ */
+/* $NetBSD: proc.h,v 1.10 2018/12/29 20:06:49 scole Exp $ */
#ifndef _IA64_PROC_H_
#define _IA64_PROC_H_
@@ -41,8 +41,8 @@ struct mdproc {
#define UAREA_PCB_OFFSET (USPACE - sizeof(struct pcb))
#define UAREA_TF_OFFSET (UAREA_PCB_OFFSET - sizeof(struct trapframe))
-#define UAREA_SP_OFFSET (UAREA_TF_OFFSET -16)
+#define UAREA_SP_OFFSET (UAREA_TF_OFFSET - 16)
#define UAREA_BSPSTORE_OFFSET (0)
-#define UAREA_STACK_SIZE (USPACE - UAREA_SP_OFFSET)
+#define UAREA_STACK_SIZE (USPACE - 16 - sizeof(struct trapframe) - sizeof(struct pcb))
#endif /* _IA64_PROC_H_ */
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Sat Dec 29 20:06:49 UTC 2018 Modified Files: src/sys/arch/ia64/include: proc.h Log Message: fix stack size calculation To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/proc.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/ia64/include
Module Name:src
Committed By: scole
Date: Sun Dec 2 16:49:24 UTC 2018
Modified Files:
src/sys/arch/ia64/include: proc.h
Log Message:
fix SP offset
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/proc.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/ia64/include/proc.h
diff -u src/sys/arch/ia64/include/proc.h:1.8 src/sys/arch/ia64/include/proc.h:1.9
--- src/sys/arch/ia64/include/proc.h:1.8 Thu Nov 15 20:06:23 2018
+++ src/sys/arch/ia64/include/proc.h Sun Dec 2 16:49:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.8 2018/11/15 20:06:23 scole Exp $ */
+/* $NetBSD: proc.h,v 1.9 2018/12/02 16:49:24 scole Exp $ */
#ifndef _IA64_PROC_H_
#define _IA64_PROC_H_
@@ -41,9 +41,8 @@ struct mdproc {
#define UAREA_PCB_OFFSET (USPACE - sizeof(struct pcb))
#define UAREA_TF_OFFSET (UAREA_PCB_OFFSET - sizeof(struct trapframe))
-#define UAREA_SP_OFFSET (UAREA_TF_OFFSET -16 -sizeof(uint64_t))
+#define UAREA_SP_OFFSET (UAREA_TF_OFFSET -16)
#define UAREA_BSPSTORE_OFFSET (0)
-#define UAREA_STACK_SIZE (USPACE - 16 - sizeof(struct trapframe) - \
- sizeof(struct pcb))
+#define UAREA_STACK_SIZE (USPACE - UAREA_SP_OFFSET)
#endif /* _IA64_PROC_H_ */
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Sun Dec 2 16:49:24 UTC 2018 Modified Files: src/sys/arch/ia64/include: proc.h Log Message: fix SP offset To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/proc.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/powerpc/oea
Module Name:src
Committed By: scole
Date: Wed Nov 21 17:54:43 UTC 2018
Modified Files:
src/sys/arch/powerpc/oea: ofw_autoconf.c
Log Message:
don't bother reading ofw properties for platinumfb
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_autoconf.c
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/powerpc/oea/ofw_autoconf.c
diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.22 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.23
--- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.22 Fri Aug 17 15:54:35 2018
+++ src/sys/arch/powerpc/oea/ofw_autoconf.c Wed Nov 21 17:54:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_autoconf.c,v 1.22 2018/08/17 15:54:35 macallan Exp $ */
+/* $NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
* Copyright (C) 1995, 1996 TooLs GmbH.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.22 2018/08/17 15:54:35 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.23 2018/11/21 17:54:42 scole Exp $");
#ifdef ofppc
#include "gtpci.h"
@@ -244,6 +244,11 @@ device_register(device_t dev, void *aux)
copy_disp_props(dev, ca->ca_node, dict);
}
+ /* cannot read useful display properties for platinum */
+ if (device_is_a(dev, "platinumfb")) {
+ return;
+ }
+
#if NGTPCI > 0
if (device_is_a(dev, "gtpci")) {
extern struct gtpci_prot gtpci0_prot, gtpci1_prot;
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: scole Date: Wed Nov 21 17:54:43 UTC 2018 Modified Files: src/sys/arch/powerpc/oea: ofw_autoconf.c Log Message: don't bother reading ofw properties for platinumfb To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/oea/ofw_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: scole
Date: Tue Nov 20 20:36:24 UTC 2018
Modified Files:
src/sys/arch/ia64/ia64: genassym.cf locore.S
Log Message:
add IA64_DCR_DEFAULT, more changes from FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/ia64/genassym.cf
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/locore.S
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/ia64/ia64/genassym.cf
diff -u src/sys/arch/ia64/ia64/genassym.cf:1.13 src/sys/arch/ia64/ia64/genassym.cf:1.14
--- src/sys/arch/ia64/ia64/genassym.cf:1.13 Thu Aug 10 12:51:22 2017
+++ src/sys/arch/ia64/ia64/genassym.cf Tue Nov 20 20:36:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.13 2017/08/10 12:51:22 maxv Exp $
+# $NetBSD: genassym.cf,v 1.14 2018/11/20 20:36:24 scole Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -115,6 +115,7 @@ define IA64_PBVM_PAGE_SHIFT IA64_PBVM_P
define IA64_PSR_DFH IA64_PSR_DFH
define IA64_PBVM_BASE IA64_PBVM_BASE
define IA64_PBVM_PGTBL IA64_PBVM_PGTBL
+define IA64_DCR_DEFAULT IA64_DCR_DEFAULT
define PTE_PRESENT PTE_PRESENT
define PTE_ACCESSED PTE_ACCESSED
Index: src/sys/arch/ia64/ia64/locore.S
diff -u src/sys/arch/ia64/ia64/locore.S:1.8 src/sys/arch/ia64/ia64/locore.S:1.9
--- src/sys/arch/ia64/ia64/locore.S:1.8 Wed Nov 14 21:10:59 2018
+++ src/sys/arch/ia64/ia64/locore.S Tue Nov 20 20:36:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.8 2018/11/14 21:10:59 scole Exp $ */
+/* $NetBSD: locore.S,v 1.9 2018/11/20 20:36:24 scole Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -81,19 +81,37 @@ ENTRY_NOPROFILE(start, 1)
movl r16=pa_bootinfo
;;
}
+{ .mmi
st8 [r16]=r8 // save the PA of the bootinfo block
loadrs// invalidate regs
+ mov r17=IA64_DCR_DEFAULT
;;
+}
+{ .mmi
+ mov cr.dcr=r17
mov ar.rsc=3 // turn rse back on
+ nop 0
;;
+}
+{ .mmi
+ srlz.d
alloc r16=ar.pfs,0,0,1,0
- ;;
- movl out0=0 // we are linked at the right address
+ mov out0=r0 // we are linked at the right address
;;// we just need to process fptrs
-// br.call.sptk.many rp=_reloc // XXX: Look into relocs
- ;;
+ }
+#if 0 /* XXX: Look into relocs */
+{ .mib
+ nop 0
+ nop 0
+ br.call.sptk.many rp=_reloc
+}
+#endif
+{ .mib
+ nop 0
+ nop 0
br.call.sptk.many rp=ia64_init
;;
+}
/* We have the new bspstore in r8 and the new sp in r9.
Switch onto the new stack and call mi_startup(). */
{ .mmi
@@ -109,9 +127,13 @@ ENTRY_NOPROFILE(start, 1)
mov ar.rsc = 3
nop 0
;;
-}
+}
+{ .mib
+ nop 0
+ nop 0
br.call.sptk.many rp=main
;;
+}
/* NOTREACHED */
1: br.cond.sptk.few 1b
END(start)
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Tue Nov 20 20:36:24 UTC 2018 Modified Files: src/sys/arch/ia64/ia64: genassym.cf locore.S Log Message: add IA64_DCR_DEFAULT, more changes from FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/ia64/genassym.cf cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/acpi
Module Name:src Committed By: scole Date: Sat Nov 17 20:53:35 UTC 2018 Modified Files: src/sys/arch/ia64/acpi: acpi_machdep.c Log Message: change "InterruptNumber" to "irq" to fix compilation To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/acpi/acpi_machdep.c 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/ia64/acpi/acpi_machdep.c diff -u src/sys/arch/ia64/acpi/acpi_machdep.c:1.8 src/sys/arch/ia64/acpi/acpi_machdep.c:1.9 --- src/sys/arch/ia64/acpi/acpi_machdep.c:1.8 Fri Nov 16 23:03:55 2018 +++ src/sys/arch/ia64/acpi/acpi_machdep.c Sat Nov 17 20:53:35 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_machdep.c,v 1.8 2018/11/16 23:03:55 jmcneill Exp $ */ +/* $NetBSD: acpi_machdep.c,v 1.9 2018/11/17 20:53:35 scole Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -28,7 +28,7 @@ * Machine-dependent routines for ACPICA. */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.8 2018/11/16 23:03:55 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.9 2018/11/17 20:53:35 scole Exp $"); #include @@ -84,13 +84,13 @@ acpi_isa_irq_to_vector(UINT32 irq) }; if (has_i8259 && irq < 16) - return isa_irq_to_vector_map[InterruptNumber]; + return isa_irq_to_vector_map[irq]; return irq; } ACPI_STATUS -acpi_md_OsInstallInterruptHandler(UINT32 InterruptNumber, +acpi_md_OsInstallInterruptHandler(UINT32 irq, ACPI_OSD_HANDLER ServiceRoutine, void *Context, void **cookiep, const char *xname)
CVS commit: src/sys/arch/ia64/acpi
Module Name:src Committed By: scole Date: Sat Nov 17 20:53:35 UTC 2018 Modified Files: src/sys/arch/ia64/acpi: acpi_machdep.c Log Message: change "InterruptNumber" to "irq" to fix compilation To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/acpi/acpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/common
Module Name:src Committed By: scole Date: Fri Nov 16 20:49:08 UTC 2018 Modified Files: src/usr.bin/xlint/common: lp64.h Log Message: PR toolchain/53710 allow 64bit target to compile on 32bit host Ok'ed by To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/common/lp64.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/common/lp64.h diff -u src/usr.bin/xlint/common/lp64.h:1.6 src/usr.bin/xlint/common/lp64.h:1.7 --- src/usr.bin/xlint/common/lp64.h:1.6 Sun Oct 7 14:20:01 2018 +++ src/usr.bin/xlint/common/lp64.h Fri Nov 16 20:49:08 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: lp64.h,v 1.6 2018/10/07 14:20:01 christos Exp $ */ +/* $NetBSD: lp64.h,v 1.7 2018/11/16 20:49:08 scole Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -45,7 +45,9 @@ #define LONG_SIZE (8 * CHAR_BIT) #define QUAD_SIZE (8 * CHAR_BIT) #define PTR_SIZE (8 * CHAR_BIT) +#ifdef _LP64 #define INT128_SIZE (16 * CHAR_BIT) +#endif #define TARG_SCHAR_MAX ((signed char) (((unsigned char) -1) >> 1)) #define TARG_SCHAR_MIN ((-TARG_CHAR_MAX) - 1) @@ -67,7 +69,7 @@ #define TARG_QUAD_MIN ((-TARG_QUAD_MAX) - 1) #define TARG_UQUAD_MAX ((uint64_t) -1) -#ifndef _LP64 +#ifdef _LP64 /* XXX on a 32 build for a 64 build host we skip these */ #define TARG_INT128_MAX ((__int128_t) (((__uint128_t) -1) >> 1)) #define TARG_INT128_MIN ((-TARG_INT128_MAX) - 1)
CVS commit: src/usr.bin/xlint/common
Module Name:src Committed By: scole Date: Fri Nov 16 20:49:08 UTC 2018 Modified Files: src/usr.bin/xlint/common: lp64.h Log Message: PR toolchain/53710 allow 64bit target to compile on 32bit host Ok'ed by To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/xlint/common/lp64.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/ia64/ia64
Module Name:src
Committed By: scole
Date: Thu Nov 15 20:39:19 UTC 2018
Modified Files:
src/sys/arch/ia64/ia64: machdep.c
Log Message:
enable some incorrectly commented-out code
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/ia64/ia64/machdep.c
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/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.39 src/sys/arch/ia64/ia64/machdep.c:1.40
--- src/sys/arch/ia64/ia64/machdep.c:1.39 Wed Nov 14 21:10:59 2018
+++ src/sys/arch/ia64/ia64/machdep.c Thu Nov 15 20:39:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.39 2018/11/14 21:10:59 scole Exp $ */
+/* $NetBSD: machdep.c,v 1.40 2018/11/15 20:39:18 scole Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -667,10 +667,8 @@ ia64_init(void)
* sane) context as the initial context for new threads that are
* forked from us.
*/
-#if 0 /* XXX */
if (savectx(pcb0))
panic("savectx failed");
-#endif
/*
* Initialize debuggers, and break into them if appropriate.
CVS commit: src/sys/arch/ia64/ia64
Module Name:src Committed By: scole Date: Thu Nov 15 20:39:19 UTC 2018 Modified Files: src/sys/arch/ia64/ia64: machdep.c Log Message: enable some incorrectly commented-out code To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/ia64/ia64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: scole Date: Thu Nov 15 20:06:23 UTC 2018 Modified Files: src/sys/arch/ia64/include: proc.h Log Message: change "PCB" to "pcb" To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/include/proc.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/ia64/include
Module Name:src
Committed By: scole
Date: Thu Nov 15 20:06:23 UTC 2018
Modified Files:
src/sys/arch/ia64/include: proc.h
Log Message:
change "PCB" to "pcb"
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/include/proc.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/ia64/include/proc.h
diff -u src/sys/arch/ia64/include/proc.h:1.7 src/sys/arch/ia64/include/proc.h:1.8
--- src/sys/arch/ia64/include/proc.h:1.7 Wed Nov 14 21:10:59 2018
+++ src/sys/arch/ia64/include/proc.h Thu Nov 15 20:06:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.7 2018/11/14 21:10:59 scole Exp $ */
+/* $NetBSD: proc.h,v 1.8 2018/11/15 20:06:23 scole Exp $ */
#ifndef _IA64_PROC_H_
#define _IA64_PROC_H_
@@ -44,6 +44,6 @@ struct mdproc {
#define UAREA_SP_OFFSET (UAREA_TF_OFFSET -16 -sizeof(uint64_t))
#define UAREA_BSPSTORE_OFFSET (0)
#define UAREA_STACK_SIZE (USPACE - 16 - sizeof(struct trapframe) - \
- sizeof(struct PCB))
+ sizeof(struct pcb))
#endif /* _IA64_PROC_H_ */
CVS commit: src/sys/arch/ia64
Module Name:src
Committed By: scole
Date: Wed Nov 14 21:10:59 UTC 2018
Modified Files:
src/sys/arch/ia64/ia64: locore.S machdep.c syscall.c vm_machdep.c
src/sys/arch/ia64/include: md_var.h proc.h
Log Message:
- When forking, use own register stack for each thread
- For UAREA, arrange layout same as FreeBSD for now to hopefully
ease porting woes. add some related macros
locore.S is incorrectly assuming same layout and seems painful
to change bspstore in startup
- use ia64_init_return same as FreeBSD
- change some "printf" to "panic" for incompleted items
context switching is still broken but maybe less so
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/ia64/locore.S
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/ia64/ia64/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/ia64/syscall.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/vm_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/md_var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/proc.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/ia64/ia64/locore.S
diff -u src/sys/arch/ia64/ia64/locore.S:1.7 src/sys/arch/ia64/ia64/locore.S:1.8
--- src/sys/arch/ia64/ia64/locore.S:1.7 Sat Apr 8 17:45:22 2017
+++ src/sys/arch/ia64/ia64/locore.S Wed Nov 14 21:10:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.7 2017/04/08 17:45:22 scole Exp $ */
+/* $NetBSD: locore.S,v 1.8 2018/11/14 21:10:59 scole Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -94,6 +94,22 @@ ENTRY_NOPROFILE(start, 1)
;;
br.call.sptk.many rp=ia64_init
;;
+/* We have the new bspstore in r8 and the new sp in r9.
+ Switch onto the new stack and call mi_startup(). */
+{ .mmi
+mov ar.rsc = 0
+;;
+mov ar.bspstore = r8
+mov sp = r9
+;;
+}
+{ .mmi
+loadrs
+;;
+mov ar.rsc = 3
+nop 0
+;;
+}
br.call.sptk.many rp=main
;;
/* NOTREACHED */
Index: src/sys/arch/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.38 src/sys/arch/ia64/ia64/machdep.c:1.39
--- src/sys/arch/ia64/ia64/machdep.c:1.38 Sat Apr 8 17:46:01 2017
+++ src/sys/arch/ia64/ia64/machdep.c Wed Nov 14 21:10:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38 2017/04/08 17:46:01 scole Exp $ */
+/* $NetBSD: machdep.c,v 1.39 2018/11/14 21:10:59 scole Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -152,7 +152,7 @@ extern uint64_t ia64_gateway_page[];
uint64_t pa_bootinfo;
struct bootinfo bootinfo;
-
+extern vaddr_t kstack, kstack_top;
extern vaddr_t kernel_text, end;
struct fpswa_iface *fpswa_iface;
@@ -377,9 +377,10 @@ calculate_frequencies(void)
/* : Don't allocate 'ci' on stack. */
register struct cpu_info *ci __asm__("r13");
-void
+struct ia64_init_return
ia64_init(void)
{
+ struct ia64_init_return ret;
paddr_t kernstartpfn, kernendpfn, pfn0, pfn1;
struct pcb *pcb0;
struct efi_md *md;
@@ -620,33 +621,15 @@ ia64_init(void)
* Set the kernel sp, reserving space for an (empty) trapframe,
* and make lwp0's trapframe pointer point to it for sanity.
*/
+ lwp0.l_md.md_tf = (struct trapframe *)(v + UAREA_TF_OFFSET);
- /*
- * Process u-area is organised as follows:
- *
- * ---
- * | P | || 16Bytes | T |
- * | C | Register Stack | Memory Stack | <-> | F |
- * | B | -> | <-- | | |
- * ---
- *^ ^
- *|___ bspstore |___ sp
- *
- * --->
- * Higher Addresses
- *
- * PCB: struct pcb;TF: struct trapframe;
- */
-
-
- lwp0.l_md.md_tf = (struct trapframe *)(v + USPACE) - 1;
-
+ lwp0.l_md.user_stack = NULL;
+ lwp0.l_md.user_stack_size = 0;
+
pcb0 = lwp_getpcb();
-
- /* 16 bytes is the scratch area defined by the ia64 ABI. */
- pcb0->pcb_special.sp = (vaddr_t)lwp0.l_md.md_tf - 16;
- pcb0->pcb_special.bspstore = v + 1;
-
+ pcb0->pcb_special.sp = v + UAREA_SP_OFFSET;
+ pcb0->pcb_special.bspstore = v + UAREA_BSPSTORE_OFFSET;
+
mutex_init(>pcb_fpcpu_slock, MUTEX_DEFAULT, 0);
/*
@@ -684,8 +667,10 @@ ia64_init(void)
* sane) context as the initial context for new threads that are
* forked from us.
*/
+#if 0 /* XXX */
if (savectx(pcb0))
panic("savectx failed");
+#endif
/*
* Initialize debuggers, and break into them if appropriate.
@@ -699,6 +684,11 @@ ia64_init(void)
if (boothowto & RB_KDB)
Debugger();
#endif
+
+ ret.bspstore = pcb0->pcb_special.bspstore;
+ ret.sp = pcb0->pcb_special.sp;
+
+ return (ret);
}
uint64_t
Index: src/sys/arch/ia64/ia64/syscall.c
diff -u
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Nov 14 21:10:59 UTC 2018 Modified Files: src/sys/arch/ia64/ia64: locore.S machdep.c syscall.c vm_machdep.c src/sys/arch/ia64/include: md_var.h proc.h Log Message: - When forking, use own register stack for each thread - For UAREA, arrange layout same as FreeBSD for now to hopefully ease porting woes. add some related macros locore.S is incorrectly assuming same layout and seems painful to change bspstore in startup - use ia64_init_return same as FreeBSD - change some "printf" to "panic" for incompleted items context switching is still broken but maybe less so To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/ia64/locore.S cvs rdiff -u -r1.38 -r1.39 src/sys/arch/ia64/ia64/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/ia64/syscall.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/vm_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/md_var.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/include/proc.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/ia64
Module Name:src Committed By: scole Date: Wed Nov 14 20:13:14 UTC 2018 Modified Files: src/sys/arch/ia64: TODO Log Message: add more items To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/TODO 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/ia64/TODO diff -u src/sys/arch/ia64/TODO:1.1 src/sys/arch/ia64/TODO:1.2 --- src/sys/arch/ia64/TODO:1.1 Sat Apr 14 20:21:09 2018 +++ src/sys/arch/ia64/TODO Wed Nov 14 20:13:14 2018 @@ -39,6 +39,7 @@ Tasks remaining, first couple seem most - implement __cloneS ptrace.S sbrk.S shmat.S - implement kvm_ia64.c - implement pmc (performance monitoring counters) for ia64 pmc registers +- cpuctl - optional(?) mutex.h/lock_stubs.S, mutex_enter()/mutex_exit() __HAVE_MUTEX_STUBS mutex_spin_enter()/mutex_spin_exit() __HAVE_SPIN_MUTEX_STUBS - rwlock.h rw_enter(),rw_exit(),rw_tryenter() __HAVE_RW_STUBS, implemented already? @@ -48,6 +49,7 @@ Tasks remaining, first couple seem most do we want commands more like netbsd i386 bootloader? e.g., add command to boot nfs from loader.efi instead of hack now - ia64 implement __HAVE_FAST_SOFTINTS? +- want or need __HAVE_CPU_UAREA_ROUTINES, cpu_uarea_alloc, cpu_uarea_free - fix all "[Nn]ot yet" and "XXX" functions everywhere - create/fix sys/arch/ia64/include/pci_machdep.h and implement actual functions, need to handle "multiple" pci busses like from http://www.openpa.net/systems/il/rp3400-bus.txt, @@ -61,3 +63,7 @@ Tasks remaining, first couple seem most - add ia32 emulation, port from freebsd - add rump stuff/MKRUMP - create install EFI/cdrom/netbsd + +Pie in the sky +- Xen and itanium! +- qemu and itanium
CVS commit: src/sys/arch/ia64
Module Name:src Committed By: scole Date: Wed Nov 14 20:13:14 UTC 2018 Modified Files: src/sys/arch/ia64: TODO Log Message: add more items To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
