Module Name: src
Committed By: skrll
Date: Mon Apr 15 20:45:08 UTC 2019
Modified Files:
src/sys/arch/hppa/hppa: autoconf.c copy.S db_machdep.c fpemu.S fpu.c
hpt.h idle_machdep.c intr.c ipifuncs.c kgdb_hppa.c lock_stubs.S
locore.S machdep.h mainbus.c pim.h sig_machdep.c sigcode.S
support.S trap.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/hppa/autoconf.c \
src/sys/arch/hppa/hppa/idle_machdep.c src/sys/arch/hppa/hppa/mainbus.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hppa/hppa/copy.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/hppa/db_machdep.c \
src/sys/arch/hppa/hppa/sigcode.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/hppa/fpemu.S \
src/sys/arch/hppa/hppa/support.S
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hppa/hppa/fpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/hppa/hpt.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/hppa/intr.c \
src/sys/arch/hppa/hppa/locore.S src/sys/arch/hppa/hppa/pim.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/hppa/ipifuncs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/hppa/kgdb_hppa.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hppa/hppa/lock_stubs.S \
src/sys/arch/hppa/hppa/sig_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/hppa/machdep.h
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/autoconf.c
diff -u src/sys/arch/hppa/hppa/autoconf.c:1.2 src/sys/arch/hppa/hppa/autoconf.c:1.3
--- src/sys/arch/hppa/hppa/autoconf.c:1.2 Wed Mar 26 17:57:17 2014
+++ src/sys/arch/hppa/hppa/autoconf.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.2 2014/03/26 17:57:17 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.2 2014/03/26 17:57:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
#include "opt_kgdb.h"
#include "opt_useleds.h"
@@ -271,12 +271,12 @@ hppa_led_blinker(void *arg)
/* Set the LEDs. */
hppa_led_ctl(-1, leds, 0);
-
+
/* NB: this assumes _HPPA_LED_FREQ is a power of two. */
led_cycle = (led_cycle + 1) & (_HPPA_LED_FREQ - 1);
callout_reset(&hppa_led_callout, hz / _HPPA_LED_FREQ,
hppa_led_blinker, (void *) led_cycle);
-
+
}
#endif /* USELEDS */
@@ -405,7 +405,7 @@ device_register(device_t dev, void *aux)
* a ppb.
*/
struct pci_attach_args *paa = (struct pci_attach_args*)aux;
-
+
if (paa->pa_device == PAGE0->mem_boot.pz_dp.dp_bc[3] &&
paa->pa_function == PAGE0->mem_boot.pz_dp.dp_bc[4]) {
/*
@@ -436,7 +436,7 @@ device_register(device_t dev, void *aux)
boot_device == device_parent(pdev)) {
struct scsipibus_attach_args *saa = aux;
struct scsipi_periph *p = saa->sa_periph;
-
+
if (p->periph_target == PAGE0->mem_boot.pz_dp.dp_layers[0] &&
p->periph_lun == PAGE0->mem_boot.pz_dp.dp_layers[1]) {
/* This is the boot device. */
@@ -489,7 +489,7 @@ hppa_walkbus(struct confargs *ca)
if (ca->ca_hpabase == 0)
return;
-
+
aprint_debug(">> Walking bus at HPA 0x%lx\n", ca->ca_hpabase);
for (i = 0; i < ca->ca_nmodules; i++) {
@@ -631,7 +631,7 @@ pdc_scanbus(device_t self, struct confar
if (dev)
hm->hm_registered = true;
-
+
}
}
@@ -668,7 +668,7 @@ hppa_pdcmodule_create(struct hppa_pdcmod
{
struct hppa_pdcmodule *nhm, *ahm;
int i;
-
+
nhm = kmem_zalloc(sizeof(*nhm), KM_SLEEP);
nhm->hm_registered = false;
@@ -696,7 +696,7 @@ hppa_pdcmodule_create(struct hppa_pdcmod
hm_link) {
int check;
int j, k;
-
+
for (j = 0; j < 6; j++) {
if (ahm->hm_dp.dp_bc[j] != -1)
break;
@@ -749,7 +749,7 @@ hppa_memmap_query(struct device_path *de
int error;
error = pdcproc_memmap(&pdc_memmap, devp);
-
+
if (error < 0)
return NULL;
Index: src/sys/arch/hppa/hppa/idle_machdep.c
diff -u src/sys/arch/hppa/hppa/idle_machdep.c:1.2 src/sys/arch/hppa/hppa/idle_machdep.c:1.3
--- src/sys/arch/hppa/hppa/idle_machdep.c:1.2 Thu May 17 14:51:19 2007
+++ src/sys/arch/hppa/hppa/idle_machdep.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: idle_machdep.c,v 1.2 2007/05/17 14:51:19 yamt Exp $ */
+/* $NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
/*
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.2 2007/05/17 14:51:19 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -36,5 +36,5 @@ __KERNEL_RCSID(0, "$NetBSD: idle_machdep
void
cpu_idle(void)
{
- /* do nothing */
+ /* do nothing */
}
Index: src/sys/arch/hppa/hppa/mainbus.c
diff -u src/sys/arch/hppa/hppa/mainbus.c:1.2 src/sys/arch/hppa/hppa/mainbus.c:1.3
--- src/sys/arch/hppa/hppa/mainbus.c:1.2 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/hppa/hppa/mainbus.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.2 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: mainbus.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
#include "locators.h"
#include "power.h"
@@ -1000,7 +1000,7 @@ mbus_dmamap_sync(void *v, bus_dmamap_t m
if ((offset + len) > map->dm_mapsize)
panic("mbus_dmamap_sync: bad length");
#endif
-
+
/*
* For a virtually-indexed write-back cache, we need to do the
* following things:
@@ -1135,7 +1135,7 @@ mbus_dmamem_free(void *v, bus_dma_segmen
mlist = segs[0]._ds_mlist;
if (mlist == NULL)
return;
-
+
uvm_pglistfree(mlist);
free(mlist, M_DEVBUF);
}
@@ -1408,7 +1408,7 @@ mbattach(device_t parent, device_t self,
err = pdcproc_chassis_info(&pdc_chassis_info, &nca.ca_pcl);
if (!err && nca.ca_pcl.enabled) {
nca.ca_name = "lcd";
- nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] =
+ nca.ca_dp.dp_bc[0] = nca.ca_dp.dp_bc[1] = nca.ca_dp.dp_bc[2] =
nca.ca_dp.dp_bc[3] = nca.ca_dp.dp_bc[4] = nca.ca_dp.dp_bc[5] = -1;
nca.ca_dp.dp_mod = -1;
nca.ca_irq = HPPACF_IRQ_UNDEF;
@@ -1417,7 +1417,7 @@ mbattach(device_t parent, device_t self,
config_found(self, &nca, mbprint);
}
-#endif
+#endif
hppa_modules_scan();
Index: src/sys/arch/hppa/hppa/copy.S
diff -u src/sys/arch/hppa/hppa/copy.S:1.23 src/sys/arch/hppa/hppa/copy.S:1.24
--- src/sys/arch/hppa/hppa/copy.S:1.23 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/hppa/hppa/copy.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.23 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: copy.S,v 1.24 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -310,7 +310,7 @@ ENTRY(hppa_ktext_stw, HPPA_FRAME_SIZE)
nop
nop
nop
-
+
/* End stack calling convention. */
ldw HPPA_FRAME_CRP(%r3), %rp
ldo HPPA_FRAME_SIZE(%r3), %sp
Index: src/sys/arch/hppa/hppa/db_machdep.c
diff -u src/sys/arch/hppa/hppa/db_machdep.c:1.7 src/sys/arch/hppa/hppa/db_machdep.c:1.8
--- src/sys/arch/hppa/hppa/db_machdep.c:1.7 Mon Apr 2 13:18:04 2012
+++ src/sys/arch/hppa/hppa/db_machdep.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.7 2012/04/02 13:18:04 skrll Exp $ */
+ /* $NetBSD: db_machdep.c,v 1.8 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.7 2012/04/02 13:18:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.8 2019/04/15 20:45:08 skrll Exp $");
#include <sys/param.h>
#include <sys/lwp.h>
@@ -192,7 +192,7 @@ db_dump_trap(db_expr_t addr, bool have_a
db_printf("\n");
db_printf("Other state\n");
db_printf("eiem: %08x\n", tf->tf_eiem);
-
+
snprintb(buf, sizeof(buf), PSW_BITS, tf->tf_ipsw);
db_printf("ipsw: %s\n", buf);
db_printf("flags: %08x\n", tf->tf_flags);
Index: src/sys/arch/hppa/hppa/sigcode.S
diff -u src/sys/arch/hppa/hppa/sigcode.S:1.7 src/sys/arch/hppa/hppa/sigcode.S:1.8
--- src/sys/arch/hppa/hppa/sigcode.S:1.7 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/hppa/sigcode.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sigcode.S,v 1.7 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: sigcode.S,v 1.8 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.46 2001/09/20 18:33:03 mickey Exp $ */
@@ -71,7 +71,7 @@
ENTRY_NOPROFILE(sigcode,0)
.call
/*
- * Our sendsig() places the address of the signal handler
+ * Our sendsig() places the address of the signal handler
* in %arg3. It may actually be a PLABEL.
*/
bb,>=,n %arg3, 30, L$sigcode_bounce ; branch if not a PLABEL
@@ -83,7 +83,7 @@ L$sigcode_bounce:
* This blr puts the address of the following nop in rp.
* It also schedules the nop for execution, which is why
* that instruction has to be a nop, or, rather, not any
- * instruction only meant to execute once the signal handler
+ * instruction only meant to execute once the signal handler
* returns.
*/
blr %r0, %rp
@@ -97,7 +97,7 @@ L$sigcode_bounce:
/*
* The signal handler has returned. Since %r3 is on the list
* of callee-saved registers, it's whatever the sendsig
- * code wanted it set to. Since we copy it into arg0,
+ * code wanted it set to. Since we copy it into arg0,
* it looks like sendsig leaves %r3 holding the desired
* single argument to sys___sigreturn14, i.e., the
* struct sigcontext *.
Index: src/sys/arch/hppa/hppa/fpemu.S
diff -u src/sys/arch/hppa/hppa/fpemu.S:1.6 src/sys/arch/hppa/hppa/fpemu.S:1.7
--- src/sys/arch/hppa/hppa/fpemu.S:1.6 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/hppa/fpemu.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpemu.S,v 1.6 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: fpemu.S,v 1.7 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: fpemu.S,v 1.4 2001/03/29 02:18:45 mickey Exp $ */
@@ -88,7 +88,7 @@ LEAF_ENTRY_NOPROFILE(fpu_emulate)
comib,= 1, %arg3, L$fpu_cln1
nop
extru %arg0, 16, 2, %r31
-
+
L$fpu_cln1:
/*
* theoreticaly we would need to determine the fpu instruction
@@ -179,7 +179,7 @@ L$fpemu0c_0_3: /* fabs */
L$fpemu0c_0_4: /* fsqrt */
/* quad not implemented */
FP_TABLE2(fsqrt,sgl,dbl,invalid,invalid)
-
+
L$fpemu0c_0_5: /* frnd */
/* quad not implemented */
FP_TABLE2(frnd,sgl,dbl,invalid,quad)
Index: src/sys/arch/hppa/hppa/support.S
diff -u src/sys/arch/hppa/hppa/support.S:1.6 src/sys/arch/hppa/hppa/support.S:1.7
--- src/sys/arch/hppa/hppa/support.S:1.6 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/hppa/support.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: support.S,v 1.6 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: support.S,v 1.7 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.46 2001/09/20 18:33:03 mickey Exp $ */
@@ -58,10 +58,10 @@
* suitability of this software for any purpose.
*/
-/*
+/*
* NOTICE: This is not a standalone file. To use it, #include it in
* your port's locore.S, like so:
- *
+ *
* #include <hppa/hppa/support.S>
*/
Index: src/sys/arch/hppa/hppa/fpu.c
diff -u src/sys/arch/hppa/hppa/fpu.c:1.25 src/sys/arch/hppa/hppa/fpu.c:1.26
--- src/sys/arch/hppa/hppa/fpu.c:1.25 Wed Nov 14 10:58:04 2018
+++ src/sys/arch/hppa/hppa/fpu.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.25 2018/11/14 10:58:04 skrll Exp $ */
+/* $NetBSD: fpu.c,v 1.26 2019/04/15 20:45:08 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.25 2018/11/14 10:58:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.26 2019/04/15 20:45:08 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,13 +85,13 @@ void hppa_fpu_swap(struct fpreg *, struc
static int hppa_fpu_ls(struct trapframe *, struct lwp *);
/*
- * Given a trapframe and a general register number, the
+ * Given a trapframe and a general register number, the
* FRAME_REG macro returns a pointer to that general
- * register. The _frame_reg_positions array is a lookup
- * table, since the general registers aren't in order
+ * register. The _frame_reg_positions array is a lookup
+ * table, since the general registers aren't in order
* in a trapframe.
- *
- * NB: this more or less assumes that all members of
+ *
+ * NB: this more or less assumes that all members of
* struct trapframe are u_ints.
*/
#define FRAME_REG(f, reg, r0) \
@@ -161,9 +161,9 @@ hppa_fpu_bootstrap(u_int ccr_enable)
*/
/*
- * The PA-RISC 1.1 Architecture manual is
- * pretty clear that the copr,0,0 must be
- * wrapped in double word stores of fr0,
+ * The PA-RISC 1.1 Architecture manual is
+ * pretty clear that the copr,0,0 must be
+ * wrapped in double word stores of fr0,
* otherwise its operation is undefined.
*/
__asm volatile(
@@ -182,7 +182,7 @@ hppa_fpu_bootstrap(u_int ccr_enable)
*/
fpu_csw = 0;
curcpu()->ci_fpu_state = 0;
- mtctl(ccr_enable & (CCR_MASK ^ HPPA_FPUS), CR_CCR);
+ mtctl(ccr_enable & (CCR_MASK ^ HPPA_FPUS), CR_CCR);
fpu_version = vers[0];
}
@@ -203,7 +203,7 @@ hppa_fpu_flush(struct lwp *l)
/*
* If this process' state is currently in hardware, swap it out.
*/
-
+
if (ci->ci_fpu_state == 0 ||
ci->ci_fpu_state != tf->tf_cr30) {
return;
@@ -216,7 +216,7 @@ hppa_fpu_flush(struct lwp *l)
/*
* This emulates a coprocessor load/store instruction.
*/
-static int
+static int
hppa_fpu_ls(struct trapframe *frame, struct lwp *l)
{
struct pcb *pcb = lwp_getpcb(l);
@@ -231,9 +231,9 @@ hppa_fpu_ls(struct trapframe *frame, str
/*
* Get the instruction that we're emulating,
* and break it down. Using HP bit notation,
- * b is a five-bit field starting at bit 10,
+ * b is a five-bit field starting at bit 10,
* x is a five-bit field starting at bit 15,
- * s is a two-bit field starting at bit 17,
+ * s is a two-bit field starting at bit 17,
* and t is a five-bit field starting at bit 31.
*/
inst = frame->tf_iir;
@@ -260,13 +260,13 @@ hppa_fpu_ls(struct trapframe *frame, str
/* Get the base register. */
base = FRAME_REG(frame, inst_b, r0);
-
+
/* Dispatch on whether or not this is an indexed load/store. */
if (inst & OPCODE_INDEXED) {
-
+
/* Get the index register value. */
index = *FRAME_REG(frame, inst_x, r0);
-
+
/* Dispatch on the completer. */
switch (inst & OPCODE_CMPLT) {
case OPCODE_CMPLT_S:
@@ -323,7 +323,7 @@ hppa_fpu_ls(struct trapframe *frame, str
/*
* This is called to emulate an instruction.
*/
-void
+void
hppa_fpu_emulate(struct trapframe *frame, struct lwp *l, u_int inst)
{
struct pcb *pcb = lwp_getpcb(l);
@@ -333,7 +333,7 @@ hppa_fpu_emulate(struct trapframe *frame
ksiginfo_t ksi;
/*
- * If the process' state is in any hardware FPU,
+ * If the process' state is in any hardware FPU,
* flush it out - we need to operate on it.
*/
hppa_fpu_flush(l);
@@ -391,10 +391,10 @@ hppa_fpu_emulate(struct trapframe *frame
case 0x06:
exception = decode_06(inst, fpregs);
break;
- case 0x26:
+ case 0x26:
exception = decode_26(inst, fpregs);
break;
- default:
+ default:
exception = UNIMPLEMENTEDEXCEPTION;
break;
}
Index: src/sys/arch/hppa/hppa/hpt.h
diff -u src/sys/arch/hppa/hppa/hpt.h:1.5 src/sys/arch/hppa/hppa/hpt.h:1.6
--- src/sys/arch/hppa/hppa/hpt.h:1.5 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hppa/hppa/hpt.h Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hpt.h,v 1.5 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: hpt.h,v 1.6 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -57,26 +57,26 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
- * Copyright 1996 1995 by Open Software Foundation, Inc.
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation.
- *
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * Copyright 1996 1995 by Open Software Foundation, Inc.
+ * All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appears in all copies and
+ * that both the copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
+ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/*
+/*
* Copyright (c) 1990,1993,1994 The University of Utah and
* the Computer Systems Laboratory at the University of Utah (CSL).
* All rights reserved.
Index: src/sys/arch/hppa/hppa/intr.c
diff -u src/sys/arch/hppa/hppa/intr.c:1.1 src/sys/arch/hppa/hppa/intr.c:1.2
--- src/sys/arch/hppa/hppa/intr.c:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/hppa/intr.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: intr.c,v 1.2 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2014/02/24 07:23:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2019/04/15 20:45:08 skrll Exp $");
#define __MUTEX_PRIVATE
@@ -71,7 +71,7 @@ struct hppa_interrupt_register *hppa_int
* This establishes a new interrupt register.
*/
void
-hppa_interrupt_register_establish(struct cpu_info *ci,
+hppa_interrupt_register_establish(struct cpu_info *ci,
struct hppa_interrupt_register *ir)
{
int idx;
@@ -145,7 +145,7 @@ hppa_intr_establish(int ipl, int (*handl
if (IR_BIT_USED_P(ir->ir_bits_map[31 ^ bit_pos]))
panic("%s: interrupt already handled", __func__);
}
-
+
/*
* If this interrupt bit leads us to another interrupt register,
* simply note that in the mapping for the bit.
@@ -156,7 +156,7 @@ hppa_intr_establish(int ipl, int (*handl
break;
if (idx == HPPA_INTERRUPT_BITS)
panic("%s: unknown int reg", __func__);
-
+
ir->ir_bits_map[31 ^ bit_pos] = IR_BIT_REG(idx);
return NULL;
@@ -173,7 +173,7 @@ hppa_intr_establish(int ipl, int (*handl
ir->ir_bits_map[31 ^ bit_pos] = 1 << idx;
} else {
int j;
-
+
ir->ir_bits_map[31 ^ bit_pos] |= 1 << idx;
j = (ir - hppa_interrupt_registers[0]);
ci->ci_ishared |= (1 << j);
@@ -373,7 +373,7 @@ hppa_intr(struct trapframe *frame)
/* If we have interrupts to dispatch, do so. */
while (ci->ci_ipending & ~ci->ci_cpl) {
int shared;
-
+
hppa_intr_dispatch(ci->ci_cpl, frame->tf_eiem, frame);
shared = ci->ci_ishared;
@@ -435,7 +435,7 @@ hppa_intr_dispatch(int ncpl, int eiem, s
ib->ib_evcnt.ev_count++;
arg = ib->ib_arg;
if (arg == NULL) {
- clkframe.cf_flags = (ci->ci_intr_depth ?
+ clkframe.cf_flags = (ci->ci_intr_depth ?
TFF_INTR : 0);
clkframe.cf_spl = ncpl;
if (frame != NULL) {
@@ -471,7 +471,7 @@ hppa_intr_dispatch(int ncpl, int eiem, s
KERNEL_UNLOCK_ONE(NULL);
locked = false;
}
-
+
/* Disable interrupts and loop. */
mtctl(0, CR_EIEM);
}
@@ -502,7 +502,7 @@ hppa_intr_ipending(struct hppa_interrupt
}
}
-
+
return pending;
}
Index: src/sys/arch/hppa/hppa/locore.S
diff -u src/sys/arch/hppa/hppa/locore.S:1.1 src/sys/arch/hppa/hppa/locore.S:1.2
--- src/sys/arch/hppa/hppa/locore.S:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/hppa/locore.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.2 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $ */
/*
@@ -662,7 +662,7 @@ LEAF_ENTRY(splraise)
bv %r0(%rp)
stw %arg0, CI_CPL(%t1)
EXIT(splraise)
-
+
/*
* int spllower(int ncpl);
*/
@@ -688,7 +688,7 @@ ENTRY(spllower,HPPA_FRAME_SIZE)
ldw CI_IPENDING(%t1), %r1 ; load ipending
andcm,<> %r1, %arg0, %r1 ; and with complement of new cpl
b,n spllower_out ; branch if we got beaten
-
+
spllower_dispatch:
/* start stack calling convention */
stw %rp, HPPA_FRAME_CRP(%sp)
@@ -707,7 +707,7 @@ spllower_dispatch:
.call
bv %r0(%r1)
copy %r0, %arg2 ; call with a NULL frame
-
+
/* restore %eiem, we don't need ncpl */
ldw HPPA_FRAME_ARG(1)(%r3), %arg1
@@ -715,7 +715,7 @@ spllower_dispatch:
ldw HPPA_FRAME_CRP(%r3), %rp
ldo HPPA_FRAME_SIZE(%r3), %sp
ldw,mb -HPPA_FRAME_SIZE(%sp), %r3
-
+
spllower_out:
/*
* Now return, storing %eiem in the delay slot.
Index: src/sys/arch/hppa/hppa/pim.h
diff -u src/sys/arch/hppa/hppa/pim.h:1.1 src/sys/arch/hppa/hppa/pim.h:1.2
--- src/sys/arch/hppa/hppa/pim.h:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/hppa/pim.h Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pim.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: pim.h,v 1.2 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -394,7 +394,7 @@ struct hppa_pim64_regs {
};
struct hppa_pim64_checks {
- /* The Check Type. */
+ /* The Check Type. */
uint32_t pim_check_type;
/*
Index: src/sys/arch/hppa/hppa/ipifuncs.c
diff -u src/sys/arch/hppa/hppa/ipifuncs.c:1.4 src/sys/arch/hppa/hppa/ipifuncs.c:1.5
--- src/sys/arch/hppa/hppa/ipifuncs.c:1.4 Fri May 23 08:17:08 2014
+++ src/sys/arch/hppa/hppa/ipifuncs.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.4 2014/05/23 08:17:08 skrll Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.5 2019/04/15 20:45:08 skrll Exp $ */
/* $OpenBSD: ipi.c,v 1.4 2011/01/14 13:20:06 jsing Exp $ */
/*
@@ -128,8 +128,8 @@ hppa_ipi_broadcast(u_long ipi)
if (hppa_ipi_send(ci, ipi))
count++;
}
-
- return count;
+
+ return count;
}
static void
Index: src/sys/arch/hppa/hppa/kgdb_hppa.c
diff -u src/sys/arch/hppa/hppa/kgdb_hppa.c:1.8 src/sys/arch/hppa/hppa/kgdb_hppa.c:1.9
--- src/sys/arch/hppa/hppa/kgdb_hppa.c:1.8 Sat Jan 22 19:35:48 2011
+++ src/sys/arch/hppa/hppa/kgdb_hppa.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_hppa.c,v 1.8 2011/01/22 19:35:48 skrll Exp $ */
+/* $NetBSD: kgdb_hppa.c,v 1.9 2019/04/15 20:45:08 skrll Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_hppa.c,v 1.8 2011/01/22 19:35:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_hppa.c,v 1.9 2019/04/15 20:45:08 skrll Exp $");
#include <sys/param.h>
#include <sys/kgdb.h>
@@ -68,7 +68,7 @@ kgdb_acc(vaddr_t va, size_t ulen)
* Translate a trap number into a unix compatible signal value.
* (gdb only understands unix signal numbers).
*/
-int
+int
kgdb_signal(int type)
{
int sigval;
@@ -119,7 +119,7 @@ kgdb_signal(int type)
case T_OVERFLOW: /* overflow */
case T_CONDITION: /* conditional */
case T_EXCEPTION: /* assist exception */
- case T_TLB_DIRTY: /* TLB dirty bit */
+ case T_TLB_DIRTY: /* TLB dirty bit */
case T_PAGEREF: /* page reference */
case T_HIGHERPL: /* higher-privelege transfer */
case T_LOWERPL: /* lower-privilege transfer */
@@ -139,11 +139,11 @@ kgdb_signal(int type)
* Translate the values stored in the kernel regs struct to/from
* the format understood by gdb.
*
- * When configured for the PA, GDB is set up to expect a buffer
+ * When configured for the PA, GDB is set up to expect a buffer
* of registers in the HP/UX struct save_state format, described
- * in HP/UX's machine/save_state.h header. The register order is
+ * in HP/UX's machine/save_state.h header. The register order is
* very different from our struct trapframe, so we have to do some
- * moving around of values.
+ * moving around of values.
*
* The constants in the macro below should correspond to the
* register numbers in gdb's config/pa/tm-pa.h register macros.
@@ -253,13 +253,13 @@ kgdb_connect(int verbose)
kgdb_debug_panic = 1;
}
-/*
+/*
* Decide what to do on panic.
* (This is called by panic, like Debugger())
*/
void
kgdb_panic(void)
-{
+{
if (kgdb_dev >= 0 && kgdb_debug_panic) {
printf("entering kgdb\n");
kgdb_connect(kgdb_active == 0);
Index: src/sys/arch/hppa/hppa/lock_stubs.S
diff -u src/sys/arch/hppa/hppa/lock_stubs.S:1.26 src/sys/arch/hppa/hppa/lock_stubs.S:1.27
--- src/sys/arch/hppa/hppa/lock_stubs.S:1.26 Tue Apr 3 14:18:14 2012
+++ src/sys/arch/hppa/hppa/lock_stubs.S Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.26 2012/04/03 14:18:14 skrll Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.27 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -219,7 +219,7 @@ STRONG_ALIAS(atomic_cas_ptr_ni,_lock_cas
.word __SIMPLELOCK_RAW_UNLOCKED ! \
#define I8 \
- IL IL IL IL IL IL IL IL
+ IL IL IL IL IL IL IL IL
#define I64 \
I8 I8 I8 I8 I8 I8 I8 I8
Index: src/sys/arch/hppa/hppa/sig_machdep.c
diff -u src/sys/arch/hppa/hppa/sig_machdep.c:1.26 src/sys/arch/hppa/hppa/sig_machdep.c:1.27
--- src/sys/arch/hppa/hppa/sig_machdep.c:1.26 Tue Nov 27 14:09:53 2018
+++ src/sys/arch/hppa/hppa/sig_machdep.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.26 2018/11/27 14:09:53 maxv Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.27 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.26 2018/11/27 14:09:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.27 2019/04/15 20:45:08 skrll Exp $");
#include "opt_compat_netbsd.h"
@@ -100,7 +100,7 @@ getframe(struct lwp *l, int sig, int *on
{
struct proc *p = l->l_proc;
struct trapframe *tf = l->l_md.md_regs;
-
+
/* Do we need to jump onto the signal stack? */
*onstack = (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0
&& (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0;
Index: src/sys/arch/hppa/hppa/machdep.h
diff -u src/sys/arch/hppa/hppa/machdep.h:1.17 src/sys/arch/hppa/hppa/machdep.h:1.18
--- src/sys/arch/hppa/hppa/machdep.h:1.17 Thu Mar 6 19:02:58 2014
+++ src/sys/arch/hppa/hppa/machdep.h Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.17 2014/03/06 19:02:58 skrll Exp $ */
+/* $NetBSD: machdep.h,v 1.18 2019/04/15 20:45:08 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
/*
- * Definitions for the hppa that are completely private
+ * Definitions for the hppa that are completely private
* to the machine-dependent code. Anything needed by
* machine-independent code is covered in cpu.h or in
* other headers.
*/
/*
- * XXX there is a lot of stuff in various headers under
+ * XXX there is a lot of stuff in various headers under
* hppa/include, and a lot of one-off `extern's in C files
* that could probably be moved here.
*/
@@ -103,7 +103,7 @@ extern u_int os_toc_end;
void hppa_machine_check(int);
/* BTLB handling. */
-int hppa_btlb_insert(pa_space_t, vaddr_t, paddr_t, vsize_t *, u_int);
+int hppa_btlb_insert(pa_space_t, vaddr_t, paddr_t, vsize_t *, u_int);
int hppa_btlb_reload(void);
int hppa_btlb_purge(pa_space_t, vaddr_t, vsize_t *);
Index: src/sys/arch/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.110 src/sys/arch/hppa/hppa/trap.c:1.111
--- src/sys/arch/hppa/hppa/trap.c:1.110 Sat Apr 6 11:54:20 2019
+++ src/sys/arch/hppa/hppa/trap.c Mon Apr 15 20:45:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.110 2019/04/06 11:54:20 kamil Exp $ */
+/* $NetBSD: trap.c,v 1.111 2019/04/15 20:45:08 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.110 2019/04/06 11:54:20 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.111 2019/04/15 20:45:08 skrll Exp $");
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -118,7 +118,7 @@ int ss_get_value(struct lwp *, vaddr_t,
* 0x6fc1000 is a stwm r1, d(sr0, sp), which is the last
* instruction in the function prologue that gcc -O0 uses.
* When we have this instruction we know the relationship
- * between the stack pointer and the gcc -O0 frame pointer
+ * between the stack pointer and the gcc -O0 frame pointer
* (in r3, loaded with the initial sp) for the body of a
* function.
*
@@ -301,7 +301,7 @@ trap_kdebug(int type, int code, struct t
}
frame->tf_rctr = 0;
}
-
+
/* We handled this trap. */
return (1);
}
@@ -325,11 +325,11 @@ user_backtrace_raw(u_int pc, u_int fp)
int arg_number;
uint32_t val;
- for (frame_number = 0;
+ for (frame_number = 0;
frame_number < 100 && pc > HPPA_PC_PRIV_MASK && fp;
frame_number++) {
- printf("%3d: pc=%08x%s fp=0x%08x", frame_number,
+ printf("%3d: pc=%08x%s fp=0x%08x", frame_number,
pc & ~HPPA_PC_PRIV_MASK, USERMODE(pc) ? " " : "**", fp);
for (arg_number = 0; arg_number < 4; arg_number++) {
if (ufetch_32(HPPA_FRAME_CARG(arg_number, fp),
@@ -362,7 +362,7 @@ user_backtrace(struct trapframe *tf, str
* Display any trap type that we have.
*/
if (type >= 0)
- printf("pid %d (%s) trap #%d\n",
+ printf("pid %d (%s) trap #%d\n",
p->p_pid, p->p_comm, type & ~T_USER);
/*
@@ -527,7 +527,7 @@ trap(int type, struct trapframe *frame)
/*
* If we are on the emergency stack, then we either got
* a fault on the kernel stack, or we're just handling
- * a trap for the machine check handler (which also
+ * a trap for the machine check handler (which also
* runs on the emergency stack).
*
* We *very crudely* differentiate between the two cases
@@ -539,7 +539,7 @@ trap(int type, struct trapframe *frame)
* In this case, not completing that instruction will
* probably confuse backtraces in kgdb/ddb. Completing
* it would be difficult, because we already faulted on
- * that part of the stack, so instead we fix up the
+ * that part of the stack, so instead we fix up the
* frame as if the function called has just returned.
* This has peculiar knowledge about what values are in
* what registers during the "normal gcc -g" prologue.
@@ -555,7 +555,7 @@ trap(int type, struct trapframe *frame)
goto dead_end;
}
#endif /* DIAGNOSTIC */
-
+
#ifdef DEBUG
frame_sanity_check(__func__, __LINE__, type, frame, l);
#endif /* DEBUG */
@@ -750,7 +750,7 @@ do_onfault:
ksi.ksi_addr = (void *)va;
trapsignal(l, &ksi);
break;
-
+
case T_CONDITION | T_USER:
KSI_INIT_TRAP(&ksi);
ksi.ksi_signo = SIGFPE;
@@ -895,7 +895,7 @@ do_onfault:
printf("UVM: pid %d (%s), uid %d "
"killed: out of swap\n",
p->p_pid, p->p_comm,
- l->l_cred ?
+ l->l_cred ?
kauth_cred_geteuid(l->l_cred)
: -1);
break;
@@ -1161,7 +1161,7 @@ syscall(struct trapframe *frame, int *ar
frame->tf_arg3 = args[3];
/*
- * Some special handling for the syscall(2) and
+ * Some special handling for the syscall(2) and
* __syscall(2) system calls.
*/
switch (code) {
@@ -1284,7 +1284,7 @@ syscall(struct trapframe *frame, int *ar
#endif /* DEBUG */
}
-/*
+/*
* Start a new LWP
*/
void
