summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1996-05-01 18:23:56 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1996-05-01 18:23:56 +0000
commit6b6246809ac6053dbb9f493725682d6117fcd3d7 (patch)
tree9613ea4421941dd35bfbb6ee0e637aa5fa12d0f5 /sys/arch
parent6cbb60168a996de51d7554674f06b76eeaaf7afa (diff)
Updated to new configure.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/pica/include/pccons.h6
-rw-r--r--sys/arch/pica/include/pio.h8
-rw-r--r--sys/arch/pica/include/pmap.h8
-rw-r--r--sys/arch/pica/include/profile.h4
-rw-r--r--sys/arch/pica/include/ptrace.h7
-rw-r--r--sys/arch/pica/include/reg.h97
-rw-r--r--sys/arch/pica/include/reloc.h4
-rw-r--r--sys/arch/pica/include/types.h1
8 files changed, 29 insertions, 106 deletions
diff --git a/sys/arch/pica/include/pccons.h b/sys/arch/pica/include/pccons.h
index 53f85653a52..bd8899fa60b 100644
--- a/sys/arch/pica/include/pccons.h
+++ b/sys/arch/pica/include/pccons.h
@@ -1,17 +1,13 @@
/*
* pccons.h -- pccons ioctl definitions
*
- * $Id: pccons.h,v 1.1 1995/10/18 10:39:15 deraadt Exp $
+ * $Id: pccons.h,v 1.2 1996/05/01 18:23:41 pefo Exp $
*/
#ifndef _PCCONS_H_
#define _PCCONS_H_
-#ifndef _KERNEL
#include <sys/ioctl.h>
-#else
-#include "ioctl.h"
-#endif
#define CONSOLE_X_MODE_ON _IO('t',121)
#define CONSOLE_X_MODE_OFF _IO('t',122)
diff --git a/sys/arch/pica/include/pio.h b/sys/arch/pica/include/pio.h
index 88ef8f7f120..80981ef743c 100644
--- a/sys/arch/pica/include/pio.h
+++ b/sys/arch/pica/include/pio.h
@@ -35,12 +35,12 @@
#define outb(a,v) (*(volatile unsigned char*)(a) = (v))
#define outw(a,v) (*(volatile unsigned short*)(a) = (v))
-#define out16(a,v) outh(a,v)
+#define out16(a,v) outw(a,v)
#define outl(a,v) (*(volatile unsigned int*)(a) = (v))
-#define out32(a,v) outw(a,v)
+#define out32(a,v) outl(a,v)
#define inb(a) (*(volatile unsigned char*)(a))
#define inw(a) (*(volatile unsigned short*)(a))
-#define in16(a) inh(a)
+#define in16(a) inw(a)
#define inl(a) (*(volatile unsigned int*)(a))
-#define in32(a) inw(a)
+#define in32(a) inl(a)
diff --git a/sys/arch/pica/include/pmap.h b/sys/arch/pica/include/pmap.h
index 39c51eea199..bc06048c681 100644
--- a/sys/arch/pica/include/pmap.h
+++ b/sys/arch/pica/include/pmap.h
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.h 8.1 (Berkeley) 6/10/93
- * $Id: pmap.h,v 1.1 1995/10/18 10:39:13 deraadt Exp $
+ * $Id: pmap.h,v 1.2 1996/05/01 18:23:46 pefo Exp $
*/
#ifndef _PMAP_MACHINE_
@@ -97,8 +97,12 @@ typedef struct pmap {
extern char *pmap_attributes; /* reference and modify bits */
extern struct pmap kernel_pmap_store;
-#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
+#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
+#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
#define pmap_kernel() (&kernel_pmap_store)
+
+#define PMAP_PREFER(pa, va) pmap_prefer((pa), (va))
+
#endif /* _KERNEL */
#endif /* _PMAP_MACHINE_ */
diff --git a/sys/arch/pica/include/profile.h b/sys/arch/pica/include/profile.h
index f518ceb5827..11e2d0ef118 100644
--- a/sys/arch/pica/include/profile.h
+++ b/sys/arch/pica/include/profile.h
@@ -34,10 +34,10 @@
* SUCH DAMAGE.
*
* from: @(#)profile.h 8.1 (Berkeley) 6/10/93
- * $Id: profile.h,v 1.2 1996/03/24 16:52:37 tholo Exp $
+ * $Id: profile.h,v 1.3 1996/05/01 18:23:48 pefo Exp $
*/
-#define _MCOUNT_DECL static void __mcount
+#define _MCOUNT_DECL static void ___mcount
#define MCOUNT \
__asm(".globl _mcount;" \
diff --git a/sys/arch/pica/include/ptrace.h b/sys/arch/pica/include/ptrace.h
index acc14e79881..3605d68866f 100644
--- a/sys/arch/pica/include/ptrace.h
+++ b/sys/arch/pica/include/ptrace.h
@@ -31,11 +31,14 @@
* SUCH DAMAGE.
*
* from: @(#)ptrace.h 8.1 (Berkeley) 6/10/93
- * $Id: ptrace.h,v 1.1 1995/10/18 10:39:14 deraadt Exp $
+ * $Id: ptrace.h,v 1.2 1996/05/01 18:23:50 pefo Exp $
*/
/*
* Machine dependent trace commands.
*
- * None for the pica at this time.
*/
+
+#define PT_GETREGS (PT_FIRSTMACH+0)
+#define PT_SETREGS (PT_FIRSTMACH+1)
+#define PT_STEP (PT_FIRSTMACH+2)
diff --git a/sys/arch/pica/include/reg.h b/sys/arch/pica/include/reg.h
index 791233b7cf7..f91820dc359 100644
--- a/sys/arch/pica/include/reg.h
+++ b/sys/arch/pica/include/reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: reg.h,v 1.5 1995/01/18 06:40:12 mellon Exp $ */
+/* $NetBSD: reg.h,v 1.6 1995/12/20 02:00:27 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -42,104 +42,21 @@
* @(#)reg.h 8.2 (Berkeley) 1/11/94
*/
+#ifndef _MACHINE_REG_H_
+#define _MACHINE_REG_H_
/*
* Location of the users' stored
* registers relative to ZERO.
* Usage is p->p_regs[XX].
+ *
+ * must be visible to assembly code.
*/
-#define ZERO 0
-#define AST 1
-#define V0 2
-#define V1 3
-#define A0 4
-#define A1 5
-#define A2 6
-#define A3 7
-#define T0 8
-#define T1 9
-#define T2 10
-#define T3 11
-#define T4 12
-#define T5 13
-#define T6 14
-#define T7 15
-#define S0 16
-#define S1 17
-#define S2 18
-#define S3 19
-#define S4 20
-#define S5 21
-#define S6 22
-#define S7 23
-#define T8 24
-#define T9 25
-#define K0 26
-#define K1 27
-#define GP 28
-#define SP 29
-#define S8 30
-#define RA 31
-#define SR 32
-#define PS SR /* alias for SR */
-#define MULLO 33
-#define MULHI 34
-#define BADVADDR 35
-#define CAUSE 36
-#define PC 37
-
-#define FPBASE 38
-#define F0 (FPBASE+0)
-#define F1 (FPBASE+1)
-#define F2 (FPBASE+2)
-#define F3 (FPBASE+3)
-#define F4 (FPBASE+4)
-#define F5 (FPBASE+5)
-#define F6 (FPBASE+6)
-#define F7 (FPBASE+7)
-#define F8 (FPBASE+8)
-#define F9 (FPBASE+9)
-#define F10 (FPBASE+10)
-#define F11 (FPBASE+11)
-#define F12 (FPBASE+12)
-#define F13 (FPBASE+13)
-#define F14 (FPBASE+14)
-#define F15 (FPBASE+15)
-#define F16 (FPBASE+16)
-#define F17 (FPBASE+17)
-#define F18 (FPBASE+18)
-#define F19 (FPBASE+19)
-#define F20 (FPBASE+20)
-#define F21 (FPBASE+21)
-#define F22 (FPBASE+22)
-#define F23 (FPBASE+23)
-#define F24 (FPBASE+24)
-#define F25 (FPBASE+25)
-#define F26 (FPBASE+26)
-#define F27 (FPBASE+27)
-#define F28 (FPBASE+28)
-#define F29 (FPBASE+29)
-#define F30 (FPBASE+30)
-#define F31 (FPBASE+31)
-#define FSR (FPBASE+32)
-
-#ifdef IPCREG
-#define NIPCREG (FSR + 1)
-int ipcreg[NIPCREG] = {
- ZERO, AST, V0, V1, A0, A1, A2, A3, T0, T1, T2, T3, T4, T5, T6, T7,
- S0, S1, S2, S3, S4, S5, S6, S7, T8, T9, K0, K1, GP, SP, S8, RA,
- SR, MULLO, MULHI, BADVADDR, CAUSE, PC,
- F0, F1, F2, F3, F4, F5, F6, F7,
- F8, F9, F10, F11, F12, F13, F14, F15,
- F16, F17, F18, F19, F20, F21, F22, F23,
- F24, F25, F26, F27, F28, F29, F30, F31, FSR,
-};
-#endif
+#include <machine/regnum.h>
-#ifdef LANGUAGE_C
/*
* Register set accessible via /proc/$pid/reg
*/
struct reg {
int r_regs[71]; /* numbered as above */
};
-#endif /* LANGUAGE_C */
+#endif /*_MACHINE_REG_H_*/
diff --git a/sys/arch/pica/include/reloc.h b/sys/arch/pica/include/reloc.h
index 9d679d7611e..4c5c5cd3ceb 100644
--- a/sys/arch/pica/include/reloc.h
+++ b/sys/arch/pica/include/reloc.h
@@ -31,11 +31,12 @@
* SUCH DAMAGE.
*
* from: @(#)reloc.h 8.1 (Berkeley) 6/10/93
- * $Id: reloc.h,v 1.1 1995/10/18 10:39:14 deraadt Exp $
+ * $Id: reloc.h,v 1.2 1996/05/01 18:23:53 pefo Exp $
*
* from: Header: reloc.h,v 1.6 92/06/20 09:59:37 torek Exp
*/
+#if 0
/*
* MIPS relocation types.
*/
@@ -71,3 +72,4 @@ struct reloc_info_pica {
};
#define relocation_info reloc_info_pica
+#endif
diff --git a/sys/arch/pica/include/types.h b/sys/arch/pica/include/types.h
index 6badf6e928c..74135094d9b 100644
--- a/sys/arch/pica/include/types.h
+++ b/sys/arch/pica/include/types.h
@@ -76,5 +76,6 @@ typedef int32_t register_t;
#define __BDEVSW_DUMP_OLD_TYPE
#define __SWAP_BROKEN
+#define __FORK_BRAINDAMAGE
#endif /* _MACHTYPES_H_ */