Remove support for running in SimOS. The support has rotted over

time and there's no indication that it will improve anytime soon.
By removing support for SimOS it is possible to build LINT on
Alpha, which is considered more important at the moment.

Not objected to on: alpha@

8 files changed, 1 insertions, 96 deletions

diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index e9deca9..4e38f4b 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -31,8 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_simos.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/termios.h>
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 3e7dcbb..98afcd1 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -90,7 +90,6 @@
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
-#include "opt_simos.h"
 #include "opt_msgbuf.h"
 #include "opt_maxmem.h"
 
@@ -477,27 +476,13 @@ alpha_init(pfn, ptb, bim, bip, biv)
 	nobootinfo:
 		bootinfo.ssym = (u_long)&_end;
 		bootinfo.esym = (u_long)&_end;
-#ifdef SIMOS
-		{
-			char* p = (char*)bootinfo.ssym + 8;
-			if (p[EI_MAG0] == ELFMAG0
-			    && p[EI_MAG1] == ELFMAG1
-			    && p[EI_MAG2] == ELFMAG2
-			    && p[EI_MAG3] == ELFMAG3) {
-				bootinfo.ssym = (u_long) p;
-				bootinfo.esym = (u_long)p + *(u_long*)(p - 8);
-			}
-		}
-#endif
 		bootinfo.hwrpb_phys = ((struct rpb *)HWRPB_ADDR)->rpb_phys;
 		bootinfo.hwrpb_size = ((struct rpb *)HWRPB_ADDR)->rpb_size;
 		init_prom_interface((struct rpb *)HWRPB_ADDR);
 		prom_getenv(PROM_E_BOOTED_OSFLAGS, bootinfo.boot_flags,
 			    sizeof bootinfo.boot_flags);
-#ifndef SIMOS
 		prom_getenv(PROM_E_BOOTED_FILE, bootinfo.booted_kernel,
 			    sizeof bootinfo.booted_kernel);
-#endif
 		prom_getenv(PROM_E_BOOTED_DEV, bootinfo.booted_dev,
 			    sizeof bootinfo.booted_dev);
 	}
@@ -634,12 +619,6 @@ alpha_init(pfn, ptb, bim, bip, biv)
 
 	kernstartpfn = atop(ALPHA_K0SEG_TO_PHYS(kernstart));
 	kernendpfn = atop(ALPHA_K0SEG_TO_PHYS(kernend));
-#ifdef SIMOS
-	/* 
-	 * SimOS console puts the bootstrap stack after kernel
-	 */
-	kernendpfn += 4;
-#endif
 
 	/*
 	 * Find out how much memory is available, by looking at
@@ -1092,7 +1071,6 @@ bzero(void *buf, size_t len)
 void
 DELAY(int n)
 {
-#ifndef	SIMOS
 	unsigned long pcc0, pcc1, curcycle, cycles;
         int usec;
 
@@ -1129,7 +1107,6 @@ DELAY(int n)
 		}
 		pcc0 = pcc1;
         }
-#endif
 }
 
 /*
diff --git a/sys/alpha/alpha/prom.c b/sys/alpha/alpha/prom.c
index 58c9cf9..ea7ab44 100644
--- a/sys/alpha/alpha/prom.c
+++ b/sys/alpha/alpha/prom.c
@@ -27,8 +27,6 @@
  * $FreeBSD$
  */
 
-#include "opt_simos.h"
-
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
 /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */
@@ -99,18 +97,12 @@ static int alpha_console;
 void
 init_bootstrap_console()
 {
-#ifndef SIMOS
 	char buf[4];
-#endif
 
 	init_prom_interface(hwrpb);
 
-#ifdef SIMOS
-	alpha_console = 0;
-#else
 	prom_getenv(PROM_E_TTY_DEV, buf, 4);
 	alpha_console = buf[0] - '0';
-#endif
 	promcnattach(alpha_console);
 }
 
@@ -194,20 +186,6 @@ enter_prom()
 	s = intr_disable();
 
 	if (!prom_mapped) {
-#ifdef SIMOS
-		/*
-		 * SimOS console uses floating point.
-		 */
-		if (curthread != PCPU_GET(fpcurthread)) {
-			alpha_pal_wrfen(1);
-			if (PCPU_GET(fpcurthread)) {
-				savefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp);
-				PCPU_GET(fpcurthread)->td_pcb->pcb_hw.apcb_flags &= ~ALPHA_PCB_FLAGS_FEN;
-			}
-			PCPU_SET(fpcurthread, curthread);
-			restorefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp);
-		}
-#endif
 		if (!pmap_uses_prom_console())
 			panic("enter_prom");
 		lev1map = rom_lev1map();	/* XXX */
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index e1e8f99..70f673e 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -31,7 +31,6 @@
 /* #include "opt_fix_unaligned_vax_fp.h" */
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
-#include "opt_simos.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -380,11 +379,7 @@ trap(a0, a1, a2, entry, framep)
 			 * might have set a breakpoint.
 			 */
 			if (a0 == ALPHA_IF_CODE_BUGCHK ||
-			    a0 == ALPHA_IF_CODE_BPT
-#ifdef SIMOS
-			    || a0 == ALPHA_IF_CODE_GENTRAP
-#endif
-			    ) {
+			    a0 == ALPHA_IF_CODE_BPT) {
 				if (kdb_trap(a0, a1, a2, entry, framep))
 					goto out;
 			}
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 2ce42d4..4f79310 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -253,7 +253,3 @@ device		cardbus
 
 #####################################################################
 # SIMULATOR OPTIONS
-
-# Include support for running under the SIMOS simulator.
-device		simos
-options 	SIMOS
diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h
index 6c57783..ccd033e 100644
--- a/sys/alpha/include/db_machdep.h
+++ b/sys/alpha/include/db_machdep.h
@@ -36,7 +36,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_simos.h"
 
 #include <sys/param.h>
 #include <vm/vm.h>
@@ -55,11 +54,7 @@ extern db_regs_t	ddb_regs;	/* register state */
 
 #define	PC_REGS(regs)	((db_addr_t)(regs)->tf_regs[FRAME_PC])
 
-#ifdef SIMOS
-#define	BKPT_INST	0x000000aa	/* gentrap instruction */
-#else
 #define	BKPT_INST	0x00000080	/* breakpoint instruction */
-#endif
 #define	BKPT_SIZE	(4)		/* size of breakpoint inst */
 #define	BKPT_SET(inst)	(BKPT_INST)
 
@@ -67,13 +62,8 @@ extern db_regs_t	ddb_regs;	/* register state */
 	(ddb_regs.tf_regs[FRAME_PC] -= BKPT_SIZE);
 
 #define	SOFTWARE_SSTEP	1		/* no hardware support */
-#ifdef SIMOS
-#define	IS_BREAKPOINT_TRAP(type, code)	((type) == ALPHA_KENTRY_IF && \
-					 (code) == ALPHA_IF_CODE_GENTRAP)
-#else
 #define	IS_BREAKPOINT_TRAP(type, code)	((type) == ALPHA_KENTRY_IF && \
 					 (code) == ALPHA_IF_CODE_BPT)
-#endif
 #define	IS_WATCHPOINT_TRAP(type, code)	0
 
 /*
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index cae0648..8917c7e 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -58,8 +58,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_simos.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -123,11 +121,7 @@ struct dwlpx_softc {
 static driver_intr_t dwlpx_intr;
 
 static u_int32_t imaskcache[DWLPX_NIONODE][DWLPX_NHOSE][NHPC];
-#ifdef SIMOS
-extern void simos_intr(int);
-#else
 static void dwlpx_eintr(unsigned long);
-#endif
 
 /*
  * Direct-mapped window: 2G at 2G
@@ -745,16 +739,6 @@ dwlpx_dma_init(struct dwlpx_softc *sc)
 /*
  */
 
-#ifdef SIMOS
-static void
-dwlpx_intr(void *arg)
-{
-
-	simos_intr(0);
-}
-
-#else /* !SIMOS */
-
 static void
 dwlpx_intr(void *arg)
 {
@@ -842,7 +826,6 @@ dwlpx_eintr(unsigned long vec)
 		REGVAL(PCIA_ERR(i) + sc->sysbase) = hpcs[i].err;
 	}
 }
-#endif /* SIMOS */
 
 static device_method_t dwlpx_methods[] = {
 	/* Device interface */
diff --git a/sys/alpha/tlsb/tlsb.c b/sys/alpha/tlsb/tlsb.c
index ea4ff54..e9f6976 100644
--- a/sys/alpha/tlsb/tlsb.c
+++ b/sys/alpha/tlsb/tlsb.c
@@ -36,8 +36,6 @@
  * found on AlphaServer 8200 and 8400 systems.
  */
 
-#include "opt_simos.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -130,19 +128,9 @@ tlsb_probe(device_t dev)
 		/*
 		 * Check for invalid address.
 		 */
-#ifdef SIMOS
-		if (node != 0 && node != 8) {
-			continue;
-		} else if (node == 0) {
-			tldev = TLDEV_DTYPE_SCPU4;
-		} else {
-			tldev = TLDEV_DTYPE_KFTIA;
-		}
-#else
 		if (badaddr(TLSB_NODE_REG_ADDR(node, TLDEV), sizeof(u_int32_t)))
 			continue;
 		tldev = TLSB_GET_NODEREG(node, TLDEV);
-#endif
 		if (tldev == 0) {
 			/* Nothing at this node. */
 			continue;