repair pcxs/t confoosion

3 files changed, 8 insertions, 22 deletions

diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S
index 30649fdb602..27faffefaa0 100644
--- a/sys/arch/hppa/hppa/locore.S
+++ b/sys/arch/hppa/hppa/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.126 2004/04/07 18:24:19 mickey Exp $	*/
+/*	$OpenBSD: locore.S,v 1.127 2004/04/08 17:10:18 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -920,14 +920,6 @@ $syscall_end
 	ldo	R%$name(%r1), %r1
 
 #ifdef HP7000_CPU
-LDILDO(itlb_x)
-LDILDO(itlbna_x)
-LDILDO(dtlb_x)
-LDILDO(dtlbna_x)
-LDILDO(tlbd_x)
-#endif
-
-#ifdef HP7100_CPU
 LDILDO(itlb_s)
 LDILDO(itlbna_s)
 LDILDO(dtlb_s)
@@ -935,7 +927,7 @@ LDILDO(dtlbna_s)
 LDILDO(tlbd_s)
 #endif
 
-#ifdef HP7200_CPU
+#if defined(HP7100_CPU) || defined(HP7200_CPU)
 LDILDO(itlb_t)
 LDILDO(itlbna_t)
 LDILDO(dtlb_t)
@@ -1261,7 +1253,6 @@ EXIT(TLABEL(emu))
 	extru	r17, 24, 25, r17
 
 	.align	32
-$tlbd_x
 $tlbd_s
 $tlbd_t
 	TLB_STATS_PRE(tlbd)
@@ -1275,8 +1266,6 @@ $tlbd_t
 	rfir
 	nop
 
-$itlb_x
-$itlbna_x
 $itlb_s
 $itlbna_s
 $itlb_t
@@ -1294,8 +1283,6 @@ $itlbna_t
 	rfir
 	nop
 
-$dtlb_x
-$dtlbna_x
 $dtlb_s
 $dtlbna_s
 	/*
@@ -1737,7 +1724,6 @@ EXIT(TLABEL(all))
  * void desidhash_s(void)
  */
 LEAF_ENTRY(desidhash_s)
-ALTENTRY(desidhash_x)
 	sync
 	MFCPU_T(DR_CPUCFG,22)	/* t1 */
 	MFCPU_T(DR_CPUCFG,22)
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 95f0558d354..860968537bd 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.126 2004/04/07 18:24:19 mickey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.127 2004/04/08 17:10:18 mickey Exp $	*/
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -228,18 +228,18 @@ const struct hppa_cpu_typed {
 	int (*hptinit)(vaddr_t hpt, vsize_t hptsize);
 } cpu_types[] = {
 #ifdef HP7000_CPU
-	{ "PCXS",  hpcx,  0, 0,
+	{ "PCXS",  hpcxs,  0, 0,
 	  desidhash_s, itlb_s, itlbna_s, dtlb_s, dtlbna_s, tlbd_s,
 	  ibtlb_g, NULL, pbtlb_g},
 #endif
 #ifdef HP7100_CPU
-	{ "PCXT",  hpcxs, 0, HPPA_FTRS_BTLBU,
+	{ "PCXT",  hpcxt, 0, HPPA_FTRS_BTLBU,
 	  desidhash_t, itlb_t, itlbna_t, dtlb_t, dtlbna_t, tlbd_t,
 	  ibtlb_g, NULL, pbtlb_g},
 #endif
 #ifdef HP7200_CPU
 	{ "PCXT'", hpcxta,HPPA_CPU_PCXT2, HPPA_FTRS_BTLBU,
-	  desidhash_t, itlb_t, itlbna_l, dtlb_t, dtlbna_t, tlbd_t,
+	  desidhash_t, itlb_t, itlbna_t, dtlb_t, dtlbna_t, tlbd_t,
 	  ibtlb_g, NULL, pbtlb_g},
 #endif
 #ifdef HP7100LC_CPU
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h
index ba1ab59731b..eff31c9d750 100644
--- a/sys/arch/hppa/include/cpu.h
+++ b/sys/arch/hppa/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.41 2004/04/07 18:24:19 mickey Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.42 2004/04/08 17:10:18 mickey Exp $	*/
 
 /*
  * Copyright (c) 2000-2004 Michael Shalayeff
@@ -65,7 +65,7 @@
 #ifndef _LOCORE
 /* types */
 enum hppa_cpu_type {
-	hpcx, hpcxs, hpcxt, hpcxta, hpcxl, hpcxl2, hpcxu, hpcxu2, hpcxw
+	hpcxs, hpcxt, hpcxta, hpcxl, hpcxl2, hpcxu, hpcxu2, hpcxw
 };
 extern enum hppa_cpu_type cpu_type;
 extern const char *cpu_typename;