Misc. cleanup.
This commit is contained in:
eeh
parent
4a42b68e25
commit
b5e87ba833
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: db_disasm.c,v 1.3 1998/09/05 23:57:27 eeh Exp $ */
|
||||
/* $NetBSD: db_disasm.c,v 1.4 1998/09/07 23:59:07 eeh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 David S. Miller, davem@nadzieja.rutgers.edu
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
#define IMM22(x) ((x) & 0x3fffff)
|
||||
#define DISP19(x) ((x) & 0x7ffff)
|
||||
#define DISP22(x) ((x) & 0x3fffff)
|
||||
#define DISP30(x) ((x) & 0x3fffffff)
|
||||
#define DISP30(x) ((x) & 0x3fffffffL)
|
||||
|
||||
/* Register Operand Fields */
|
||||
#define RS1(x) (((x) & 0x1f) << 14)
|
||||
|
|
@ -907,23 +907,23 @@ db_disasm(loc, altfmt)
|
|||
break;
|
||||
case 'l':
|
||||
db_printsym(
|
||||
(db_addr_t)(loc + (4 * ((insn & 0x1fff) |
|
||||
(db_addr_t)(loc + (int)(4 * ((insn & 0x1fff) |
|
||||
((insn >> 20) & 0x3)))),
|
||||
DB_STGY_ANY);
|
||||
break;
|
||||
case 'm':
|
||||
db_printsym(
|
||||
(db_addr_t)(loc + (4 * (insn & 0x3fffff))),
|
||||
(db_addr_t)(loc + (int)(4 * (insn & 0x3fffff))),
|
||||
DB_STGY_ANY);
|
||||
break;
|
||||
case 'u':
|
||||
db_printsym(
|
||||
(db_addr_t)(loc + (4 * (insn & 0x7ffff))),
|
||||
(db_addr_t)(loc + (int)(4 * (insn & 0x7ffff))),
|
||||
DB_STGY_ANY);
|
||||
break;
|
||||
case 'n':
|
||||
db_printsym(
|
||||
(db_addr_t)(loc + (4 * (insn & 0x3fffffff))),
|
||||
(db_addr_t)(loc + (int)(4 * (insn & 0x3fffffff))),
|
||||
DB_STGY_PROC);
|
||||
break;
|
||||
case 's':
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.10 1998/09/06 21:53:43 eeh Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.11 1998/09/07 23:59:07 eeh Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -522,9 +522,10 @@ setregs(p, pack, stack)
|
|||
bzero((caddr_t)tf, sizeof *tf);
|
||||
tf->tf_tstate = tstate;
|
||||
tf->tf_global[1] = (vaddr_t)PS_STRINGS;
|
||||
/* %g4 needs to point to the start of the data segment */
|
||||
tf->tf_global[4] = 0;
|
||||
tf->tf_pc = pack->ep_entry & ~3;
|
||||
tf->tf_npc = tf->tf_pc + 4;
|
||||
/* XXXX Needs to support 64-bit frames */
|
||||
stack -= sizeof(struct rwindow);
|
||||
tf->tf_out[6] = stack - STACK_OFFSET;
|
||||
tf->tf_out[7] = NULL;
|
||||
|
|
@ -741,7 +742,6 @@ sys_sigreturn(p, v, retval)
|
|||
struct sigcontext *scp;
|
||||
struct sigcontext sc;
|
||||
register struct trapframe *tf;
|
||||
struct rwindow *rwstack, *kstack;
|
||||
#ifndef TRAPWIN
|
||||
int i;
|
||||
#endif
|
||||
|
|
@ -800,7 +800,6 @@ sys_sigreturn(p, v, retval)
|
|||
tf->tf_global[1] = (int64_t)sc.sc_g1;
|
||||
tf->tf_out[0] = (int64_t)sc.sc_o0;
|
||||
tf->tf_out[6] = (int64_t)sc.sc_sp;
|
||||
rwstack = (struct rwindow32 *)tf->tf_out[6];
|
||||
#ifdef DEBUG
|
||||
if (sigdebug & SDB_FOLLOW) {
|
||||
printf("sys_sigreturn: return trapframe pc=%p sp=%p tstate=%llx\n",
|
||||
|
|
@ -1102,7 +1101,7 @@ stackdump()
|
|||
fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2],
|
||||
fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6],
|
||||
fp->fr_fp);
|
||||
fp = (struct frame32*)fp->fr_fp;
|
||||
fp = (struct frame32*)(u_long)(u_short)fp->fr_fp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1496,7 +1495,6 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
|
|||
int flags;
|
||||
{
|
||||
vaddr_t low, high;
|
||||
bus_addr_t dvmaddr;
|
||||
struct pglist *mlist;
|
||||
int error;
|
||||
|
||||
|
|
@ -1554,8 +1552,6 @@ _bus_dmamem_free(t, segs, nsegs)
|
|||
bus_dma_segment_t *segs;
|
||||
int nsegs;
|
||||
{
|
||||
bus_addr_t addr;
|
||||
bus_size_t len;
|
||||
|
||||
if (nsegs != 1)
|
||||
panic("bus_dmamem_free: nsegs = %d", nsegs);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pmap.c,v 1.12 1998/09/06 21:53:43 eeh Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.13 1998/09/07 23:59:08 eeh Exp $ */
|
||||
/* #define NO_VCACHE /* Don't forget the locked TLB in dostart */
|
||||
#define HWREF
|
||||
/* #define BOOT_DEBUG */
|
||||
|
|
@ -62,7 +62,6 @@
|
|||
#include <machine/kcore.h>
|
||||
|
||||
#include "cache.h"
|
||||
#include "asm.h"
|
||||
|
||||
#ifdef DDB
|
||||
#include <machine/db_machdep.h>
|
||||
|
|
@ -1358,7 +1357,7 @@ pmap_collect(pm)
|
|||
if ((pdir = (paddr_t *)ldxa(&pm->pm_segs[i], ASI_PHYS_CACHED))) {
|
||||
m = 0;
|
||||
for (k=0; k<PDSZ; k++) {
|
||||
if ((ptbl = (paddr_t)ldxa(&pdir[k], ASI_PHYS_CACHED))) {
|
||||
if ((ptbl = (paddr_t *)ldxa(&pdir[k], ASI_PHYS_CACHED))) {
|
||||
m++;
|
||||
n = 0;
|
||||
for (j=0; j<PTSZ; j++) {
|
||||
|
|
@ -3131,7 +3130,7 @@ pmap_count_res(pm)
|
|||
for (i=0; i<STSZ; i++) {
|
||||
if((pdir = (paddr_t *)ldxa(&pm->pm_segs[i], ASI_PHYS_CACHED))) {
|
||||
for (k=0; k<PDSZ; k++) {
|
||||
if (ptbl = (paddr_t *)ldxa(&pdir[k], ASI_PHYS_CACHED)) {
|
||||
if ((ptbl = (paddr_t *)ldxa(&pdir[k], ASI_PHYS_CACHED))) {
|
||||
for (j=0; j<PTSZ; j++) {
|
||||
int64_t data = ldxa(&ptbl[j], ASI_PHYS_CACHED);
|
||||
if (data&TLB_V)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: process_machdep.c,v 1.2 1998/08/30 15:32:19 eeh Exp $ */
|
||||
/* $NetBSD: process_machdep.c,v 1.3 1998/09/07 23:59:08 eeh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 The Regents of the University of California.
|
||||
|
|
@ -139,8 +139,8 @@ process_set_pc(p, addr)
|
|||
struct proc *p;
|
||||
caddr_t addr;
|
||||
{
|
||||
p->p_md.md_tf->tf_pc = addr;
|
||||
p->p_md.md_tf->tf_npc = addr + 4;
|
||||
p->p_md.md_tf->tf_pc = (vaddr_t)addr;
|
||||
p->p_md.md_tf->tf_npc = (vaddr_t)addr + 4;
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue