Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/alpha Do a minor cleanup of alpha (this will make a...



details:   https://anonhg.NetBSD.org/src/rev/ddd2cbad7cb7
branches:  trunk
changeset: 773559:ddd2cbad7cb7
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Feb 06 02:14:10 2012 +0000

description:
Do a minor cleanup of alpha (this will make applying pullups post branching
easier).
u_int{8,16,32,64}_t -> uint{*}_t
Change all old-style definitions to C89 prototypes.
Whitespace cleanup.
Constification in db_disasm.c

diffstat:

 sys/arch/alpha/alpha/api_up1000.c             |   16 +-
 sys/arch/alpha/alpha/autoconf.c               |    6 +-
 sys/arch/alpha/alpha/clock.c                  |   10 +-
 sys/arch/alpha/alpha/clockvar.h               |    4 +-
 sys/arch/alpha/alpha/compat_13_machdep.c      |   16 +-
 sys/arch/alpha/alpha/compat_16_machdep.c      |   18 +-
 sys/arch/alpha/alpha/core_machdep.c           |   14 +-
 sys/arch/alpha/alpha/cpu.c                    |   22 +-
 sys/arch/alpha/alpha/cpuconf.c                |    6 +-
 sys/arch/alpha/alpha/db_disasm.c              |   70 ++--
 sys/arch/alpha/alpha/db_instruction.h         |   14 +-
 sys/arch/alpha/alpha/db_interface.c           |   16 +-
 sys/arch/alpha/alpha/db_trace.c               |    8 +-
 sys/arch/alpha/alpha/dec_1000a.c              |   22 +-
 sys/arch/alpha/alpha/dec_2000_300.c           |   14 +-
 sys/arch/alpha/alpha/dec_2100_a50.c           |   34 +-
 sys/arch/alpha/alpha/dec_2100_a500.c          |   18 +-
 sys/arch/alpha/alpha/dec_3000_300.c           |   24 +-
 sys/arch/alpha/alpha/dec_3000_500.c           |   24 +-
 sys/arch/alpha/alpha/dec_550.c                |   22 +-
 sys/arch/alpha/alpha/dec_6600.c               |   26 +-
 sys/arch/alpha/alpha/dec_alphabook1.c         |   22 +-
 sys/arch/alpha/alpha/dec_axppci_33.c          |   22 +-
 sys/arch/alpha/alpha/dec_eb164.c              |   20 +-
 sys/arch/alpha/alpha/dec_eb64plus.c           |   22 +-
 sys/arch/alpha/alpha/dec_eb66.c               |   22 +-
 sys/arch/alpha/alpha/dec_kn20aa.c             |   22 +-
 sys/arch/alpha/alpha/dec_kn300.c              |   44 +-
 sys/arch/alpha/alpha/dec_kn8ae.c              |   30 +-
 sys/arch/alpha/alpha/disksubr.c               |   28 +-
 sys/arch/alpha/alpha/fp_complete.c            |   90 ++--
 sys/arch/alpha/alpha/interrupt.c              |   52 +-
 sys/arch/alpha/alpha/linux_syscall.c          |   34 +-
 sys/arch/alpha/alpha/machdep.c                |   59 +-
 sys/arch/alpha/alpha/mainbus.c                |   14 +-
 sys/arch/alpha/alpha/osf1_syscall.c           |   34 +-
 sys/arch/alpha/alpha/pmap.c                   |   20 +-
 sys/arch/alpha/alpha/process_machdep.c        |    6 +-
 sys/arch/alpha/alpha/prom.c                   |   50 +-
 sys/arch/alpha/alpha/promcons.c               |   28 +-
 sys/arch/alpha/alpha/sys_machdep.c            |   16 +-
 sys/arch/alpha/alpha/syscall.c                |   38 +-
 sys/arch/alpha/alpha/trap.c                   |   18 +-
 sys/arch/alpha/alpha/vm_machdep.c             |   16 +-
 sys/arch/alpha/common/shared_intr.c           |   14 +-
 sys/arch/alpha/eisa/eisa_machdep.c            |   66 ++--
 sys/arch/alpha/include/alpha.h                |   34 +-
 sys/arch/alpha/include/alpha_cpu.h            |    4 +-
 sys/arch/alpha/include/aout_machdep.h         |   12 +-
 sys/arch/alpha/include/asm.h                  |   14 +-
 sys/arch/alpha/include/autoconf.h             |   16 +-
 sys/arch/alpha/include/bus_defs.h             |   66 ++--
 sys/arch/alpha/include/bus_funcs.h            |   74 ++--
 sys/arch/alpha/include/bwx.h                  |   30 +-
 sys/arch/alpha/include/cpuconf.h              |    6 +-
 sys/arch/alpha/include/frame.h                |   12 +-
 sys/arch/alpha/include/ieeefp.h               |    4 +-
 sys/arch/alpha/include/int_limits.h           |    4 +-
 sys/arch/alpha/include/intr.h                 |    4 +-
 sys/arch/alpha/include/isa_machdep.h          |    4 +-
 sys/arch/alpha/include/kcore.h                |    8 +-
 sys/arch/alpha/include/logout.h               |  180 +++++-----
 sys/arch/alpha/include/pal.h                  |   14 +-
 sys/arch/alpha/include/pcb.h                  |   12 +-
 sys/arch/alpha/include/pci_machdep.h          |    4 +-
 sys/arch/alpha/include/pio.h                  |   14 +-
 sys/arch/alpha/include/pmap.h                 |    6 +-
 sys/arch/alpha/include/proc.h                 |   18 +-
 sys/arch/alpha/include/profile.h              |   12 +-
 sys/arch/alpha/include/prom.h                 |   30 +-
 sys/arch/alpha/include/pte.h                  |   12 +-
 sys/arch/alpha/include/reg.h                  |   18 +-
 sys/arch/alpha/include/rpb.h                  |  194 +++++-----
 sys/arch/alpha/include/setjmp.h               |   12 +-
 sys/arch/alpha/include/signal.h               |   12 +-
 sys/arch/alpha/include/sysarch.h              |    8 +-
 sys/arch/alpha/include/tc_machdep.h           |   10 +-
 sys/arch/alpha/include/userret.h              |   12 +-
 sys/arch/alpha/isa/isa_machdep.c              |   14 +-
 sys/arch/alpha/isa/isadma_bounce.c            |    6 +-
 sys/arch/alpha/jensenio/jensenio_bus_intio.c  |   32 +-
 sys/arch/alpha/jensenio/jensenio_dma.c        |    6 +-
 sys/arch/alpha/jensenio/jensenio_intr.c       |   12 +-
 sys/arch/alpha/jensenio/jensenioreg.h         |    4 +-
 sys/arch/alpha/jensenio/pckbc_jensenio.c      |    6 +-
 sys/arch/alpha/mcbus/mcbus.c                  |   12 +-
 sys/arch/alpha/mcbus/mcbusvar.h               |   16 +-
 sys/arch/alpha/pci/apecs.c                    |   14 +-
 sys/arch/alpha/pci/apecs_dma.c                |    6 +-
 sys/arch/alpha/pci/apecs_pci.c                |   14 +-
 sys/arch/alpha/pci/apecsreg.h                 |   14 +-
 sys/arch/alpha/pci/apecsvar.h                 |   14 +-
 sys/arch/alpha/pci/cia.c                      |   20 +-
 sys/arch/alpha/pci/cia_dma.c                  |   33 +-
 sys/arch/alpha/pci/cia_pci.c                  |   18 +-
 sys/arch/alpha/pci/ciareg.h                   |   22 +-
 sys/arch/alpha/pci/ciavar.h                   |   20 +-
 sys/arch/alpha/pci/dwlpx.c                    |   18 +-
 sys/arch/alpha/pci/dwlpx_dma.c                |   10 +-
 sys/arch/alpha/pci/dwlpx_pci.c                |    8 +-
 sys/arch/alpha/pci/dwlpxreg.h                 |    4 +-
 sys/arch/alpha/pci/dwlpxvar.h                 |   12 +-
 sys/arch/alpha/pci/irongate_bus_mem.c         |   10 +-
 sys/arch/alpha/pci/irongate_pci.c             |    6 +-
 sys/arch/alpha/pci/irongatevar.h              |    4 +-
 sys/arch/alpha/pci/lca.c                      |   14 +-
 sys/arch/alpha/pci/lca_dma.c                  |    6 +-
 sys/arch/alpha/pci/lca_pci.c                  |   14 +-
 sys/arch/alpha/pci/lcareg.h                   |   12 +-
 sys/arch/alpha/pci/lcavar.h                   |   12 +-
 sys/arch/alpha/pci/mcpcia.c                   |   14 +-
 sys/arch/alpha/pci/mcpcia_dma.c               |    8 +-
 sys/arch/alpha/pci/mcpcia_pci.c               |    8 +-
 sys/arch/alpha/pci/mcpciareg.h                |   74 ++--
 sys/arch/alpha/pci/pci_1000.c                 |   57 +-
 sys/arch/alpha/pci/pci_1000a.c                |   61 +-
 sys/arch/alpha/pci/pci_2100_a50.c             |   24 +-
 sys/arch/alpha/pci/pci_2100_a500.c            |   12 +-
 sys/arch/alpha/pci/pci_550.c                  |   32 +-
 sys/arch/alpha/pci/pci_6600.c                 |   22 +-
 sys/arch/alpha/pci/pci_alphabook1.c           |   20 +-
 sys/arch/alpha/pci/pci_axppci_33.c            |   22 +-
 sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c   |  421 +++++++++++++------------
 sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c  |  415 +++++++++++++------------
 sys/arch/alpha/pci/pci_eb164.c                |   52 +-
 sys/arch/alpha/pci/pci_eb64plus.c             |   44 +-
 sys/arch/alpha/pci/pci_eb66.c                 |   36 +-
 sys/arch/alpha/pci/pci_kn20aa.c               |   65 ++-
 sys/arch/alpha/pci/pci_kn300.c                |   22 +-
 sys/arch/alpha/pci/pci_kn8ae.c                |   38 +-
 sys/arch/alpha/pci/pci_machdep.c              |   14 +-
 sys/arch/alpha/pci/pci_sgmap_pte32.h          |    4 +-
 sys/arch/alpha/pci/pci_sgmap_pte64.h          |    6 +-
 sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c  |  198 ++++++------
 sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c |  200 ++++++------
 sys/arch/alpha/pci/sio.c                      |   14 +-
 sys/arch/alpha/pci/sio_pic.c                  |   46 +-
 sys/arch/alpha/pci/tsp_bus_mem.c              |   12 +-
 sys/arch/alpha/pci/tsp_dma.c                  |    8 +-
 sys/arch/alpha/pci/tsreg.h                    |    4 +-
 sys/arch/alpha/pci/tsvar.h                    |    8 +-
 sys/arch/alpha/pci/ttwoga.c                   |    8 +-
 sys/arch/alpha/pci/ttwoga_dma.c               |   12 +-
 sys/arch/alpha/pci/ttwoga_pci.c               |   12 +-
 sys/arch/alpha/pci/ttwogareg.h                |    4 +-
 sys/arch/alpha/pci/ttwogavar.h                |    4 +-
 sys/arch/alpha/sableio/pckbc_sableio.c        |    6 +-
 sys/arch/alpha/tc/ioasic.c                    |   22 +-
 sys/arch/alpha/tc/mcclock_ioasic.c            |    6 +-
 sys/arch/alpha/tc/tc_3000_300.c               |   46 +-
 sys/arch/alpha/tc/tc_3000_300.h               |   14 +-
 sys/arch/alpha/tc/tc_3000_500.c               |   52 +-
 sys/arch/alpha/tc/tc_3000_500.h               |   14 +-
 sys/arch/alpha/tc/tc_bus_mem.c                |  279 ++++++++--------
 sys/arch/alpha/tc/tc_conf.h                   |   12 +-
 sys/arch/alpha/tc/tc_dma_3000_500.c           |   21 +-
 sys/arch/alpha/tc/tc_sgmap.h                  |    4 +-
 sys/arch/alpha/tc/tcasic.c                    |   22 +-
 sys/arch/alpha/tlsb/kftxxvar.h                |    6 +-
 sys/arch/alpha/tlsb/tlsb.c                    |   14 +-
 sys/arch/alpha/tlsb/tlsbreg.h                 |   62 +-
 sys/arch/alpha/tlsb/tlsbvar.h                 |   10 +-
 162 files changed, 2547 insertions(+), 2508 deletions(-)

diffs (truncated from 12891 to 300 lines):

diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/api_up1000.c
--- a/sys/arch/alpha/alpha/api_up1000.c Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/api_up1000.c Mon Feb 06 02:14:10 2012 +0000
@@ -1,21 +1,21 @@
-/* $NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: api_up1000.c,v 1.29 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.28 2011/07/01 19:22:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.29 2012/02/06 02:14:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,7 +118,7 @@
        ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off);
 
        switch (ctb->ctb_term_type) {
-       case CTB_PRINTERPORT: 
+       case CTB_PRINTERPORT:
                /* serial console ... */
                /* XXX */
                {
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/autoconf.c
--- a/sys/arch/alpha/alpha/autoconf.c   Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/autoconf.c   Mon Feb 06 02:14:10 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.50 2011/07/27 15:08:42 njoly Exp $ */
+/* $NetBSD: autoconf.c,v 1.51 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.50 2011/07/27 15:08:42 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.51 2012/02/06 02:14:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -87,7 +87,7 @@
        (void)spl0();
 
        /*
-        * Note that bootstrapping is finished, and set the HWRPB up  
+        * Note that bootstrapping is finished, and set the HWRPB up
         * to do restarts.
         */
        hwrpb_restart_setup();
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/clock.c
--- a/sys/arch/alpha/alpha/clock.c      Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/clock.c      Mon Feb 06 02:14:10 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.41 2011/02/08 20:20:07 rmind Exp $ */
+/* $NetBSD: clock.c,v 1.42 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2011/02/08 20:20:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2012/02/06 02:14:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -77,7 +77,7 @@
 void
 cpu_initclocks(void)
 {
-        uint64_t pcc_freq;
+       uint64_t pcc_freq;
 
        if (clock_init == NULL)
                panic("cpu_initclocks: no clock attached");
@@ -100,8 +100,8 @@
        /*
         * Initialize PCC timecounter.
         */
-        pcc_freq = cpu_frequency(curcpu());
-        cc_init(NULL, pcc_freq, "PCC", PCC_QUAL);
+       pcc_freq = cpu_frequency(curcpu());
+       cc_init(NULL, pcc_freq, "PCC", PCC_QUAL);
 
        /*
         * Get the clock started.
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/clockvar.h
--- a/sys/arch/alpha/alpha/clockvar.h   Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/clockvar.h   Mon Feb 06 02:14:10 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.5 2007/07/21 11:59:56 tsutsui Exp $ */
+/* $NetBSD: clockvar.h,v 1.6 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 /*
- * Definitions for CPU-independent clock handling for the alpha 
+ * Definitions for CPU-independent clock handling for the alpha
  */
 
 void clockattach(void (*)(void *), void *);
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/compat_13_machdep.c
--- a/sys/arch/alpha/alpha/compat_13_machdep.c  Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/compat_13_machdep.c  Mon Feb 06 02:14:10 2012 +0000
@@ -1,21 +1,21 @@
-/* $NetBSD: compat_13_machdep.c,v 1.19 2011/06/07 00:48:29 matt Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.20 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.19 2011/06/07 00:48:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.20 2012/02/06 02:14:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,7 @@
         * program jumps out of a signal handler.
         */
        scp = SCARG(uap, sigcntxp);
-       if (ALIGN(scp) != (u_int64_t)scp)
+       if (ALIGN(scp) != (uint64_t)scp)
                return (EINVAL);
 
        if (copyin((void *)scp, &ksc, sizeof(ksc)) != 0)
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/compat_16_machdep.c
--- a/sys/arch/alpha/alpha/compat_16_machdep.c  Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/compat_16_machdep.c  Mon Feb 06 02:14:10 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.17 2011/06/07 00:48:29 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.18 2012/02/06 02:14:10 matt Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,17 +35,17 @@
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
@@ -86,7 +86,7 @@
 #include <machine/cpu.h>
 #include <machine/reg.h>
 
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.17 2011/06/07 00:48:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.18 2012/02/06 02:14:10 matt Exp $");
 
 
 #ifdef DEBUG
@@ -215,7 +215,7 @@
 
        /* tf->tf_regs[FRAME_A1] = ksi->ksi_code; */
        tf->tf_regs[FRAME_A1] = KSI_TRAPCODE(ksi);
-       tf->tf_regs[FRAME_A2] = (u_int64_t)&fp->sf_sc;
+       tf->tf_regs[FRAME_A2] = (uint64_t)&fp->sf_sc;
 
        /* Remember that we're now on the signal stack. */
        if (onstack)
@@ -263,7 +263,7 @@
        if (sigdebug & SDB_FOLLOW)
            printf("sigreturn: pid %d, scp %p\n", p->p_pid, scp);
 #endif
-       if (ALIGN(scp) != (u_int64_t)scp)
+       if (ALIGN(scp) != (uint64_t)scp)
                return (EINVAL);
 
        if (copyin((void *)scp, &ksc, sizeof(ksc)) != 0)
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/core_machdep.c
--- a/sys/arch/alpha/alpha/core_machdep.c       Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/core_machdep.c       Mon Feb 06 02:14:10 2012 +0000
@@ -1,21 +1,21 @@
-/* $NetBSD: core_machdep.c,v 1.6 2011/06/13 21:32:42 matt Exp $ */
+/* $NetBSD: core_machdep.c,v 1.7 2012/02/06 02:14:10 matt Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
  *
  *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.6 2011/06/13 21:32:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.7 2012/02/06 02:14:10 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 2524709f7c70 -r ddd2cbad7cb7 sys/arch/alpha/alpha/cpu.c
--- a/sys/arch/alpha/alpha/cpu.c        Mon Feb 06 02:03:32 2012 +0000
+++ b/sys/arch/alpha/alpha/cpu.c        Mon Feb 06 02:14:10 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.94 2011/07/28 03:21:14 uebayasi Exp $ */
+/* $NetBSD: cpu.c,v 1.95 2012/02/06 02:14:10 matt Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,17 +35,17 @@
  * All rights reserved.
  *
  * Author: Chris G. Demetriou
- * 
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.



Home | Main Index | Thread Index | Old Index