6899987 sparc simulator cleanup

6 files changed, 5 insertions, 84 deletions

diff --git a/usr/src/psm/stand/boot/common/readfile.c b/usr/src/psm/stand/boot/common/readfile.c
index daacc98d7a..b06173fe3d 100644
--- a/usr/src/psm/stand/boot/common/readfile.c
+++ b/usr/src/psm/stand/boot/common/readfile.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/exechdr.h>
@@ -178,10 +176,6 @@ extern int	boothowto;
 extern int	pagesize;
 extern char	filename[];
 
-#ifdef MPSAS
-extern void sas_symtab(int start, int end);
-#endif
-
 /*
  * repeat reads (forever) until size of request is satisfied
  * (Thus, you don't want to use this cases where short reads are ok)
@@ -587,10 +581,6 @@ read_elf32(int fd, int print, Elf32_Ehdr *elfhdrp)
 				    (caddr_t)(uintptr_t)phdr->p_vaddr,
 				    phdr->p_memsz);
 			}
-#ifdef	MPSAS
-			sas_symtab(phdr->p_vaddr,
-			    phdr->p_vaddr + phdr->p_memsz);
-#endif
 		} else if (phdr->p_type == PT_INTERP) {
 			/*
 			 * Dynamically-linked executable.
@@ -981,10 +971,6 @@ read_elf64(int fd, int print, Elf64_Ehdr *elfhdrp)
 				sync_instruction_memory((caddr_t)(uintptr_t)
 				    phdr->p_vaddr, phdr->p_memsz);
 
-#ifdef	MPSAS
-			sas_symtab(phdr->p_vaddr,
-			    phdr->p_vaddr + phdr->p_memsz);
-#endif
 		} else if (phdr->p_type == PT_INTERP) {
 			/*
 			 * Dynamically-linked executable.
diff --git a/usr/src/psm/stand/boot/sparc/common/boot_plat.c b/usr/src/psm/stand/boot/sparc/common/boot_plat.c
index 9a9423cf1b..2abc69b687 100644
--- a/usr/src/psm/stand/boot/sparc/common/boot_plat.c
+++ b/usr/src/psm/stand/boot/sparc/common/boot_plat.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <sys/fcntl.h>
 #include <sys/obpdefs.h>
@@ -202,9 +200,6 @@ post_mountroot(char *bootfile, char *redirect)
 
 		if ((go2 = readfile(fd, boothowto & RB_VERBOSE)) !=
 		    (int(*)()) -1) {
-#ifdef MPSAS
-			sas_bpts();
-#endif
 			(void) close(fd);
 		} else {
 			printf("boot failed\n");
diff --git a/usr/src/psm/stand/boot/sparc/common/boot_plat.h b/usr/src/psm/stand/boot/sparc/common/boot_plat.h
index e6dffbedc4..393b3188b5 100644
--- a/usr/src/psm/stand/boot/sparc/common/boot_plat.h
+++ b/usr/src/psm/stand/boot/sparc/common/boot_plat.h
@@ -19,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef _BOOT_PLAT_H
 #define	_BOOT_PLAT_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -85,11 +83,6 @@ extern int  vac;
 
 extern void	fiximp(void);
 extern void	retain_nvram_page();
-
-#ifdef MPSAS
-extern void	sas_bpts(void);
-#endif
-
 extern int	cpu_is_ultrasparc_1(void);
 
 
diff --git a/usr/src/psm/stand/boot/sparc/common/sun4dep.c b/usr/src/psm/stand/boot/sparc/common/sun4dep.c
index e4dbcc2d7b..a80cc3d60d 100644
--- a/usr/src/psm/stand/boot/sparc/common/sun4dep.c
+++ b/usr/src/psm/stand/boot/sparc/common/sun4dep.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -92,47 +90,6 @@ setup_aux(void)
 		prom_panic("no cpu node");
 }
 
-
-#ifdef MPSAS
-
-void sas_symtab(int start, int end);
-extern int sas_command(char *cmdstr);
-
-/*
- * SAS support - inform SAS of new symbols being dynamically added
- * during simulation via the first standalone.
- */
-
-#ifndef	BUFSIZ
-#define	BUFSIZ	1024		/* for cmd string buffer allocation */
-#endif
-
-int	sas_symdebug = 0;		/* SAS support */
-
-void
-sas_symtab(int start, int end)
-{
-	char *addstr = "symtab add $LD_KERNEL_PATH/%s%s 0x%x 0x%x\n";
-	char *file, *prefix, cmdstr[BUFSIZ];
-	extern char filename[];
-
-	file = filename;
-	prefix = *file == '/' ? "../../.." : "";
-
-	(void) sprintf(cmdstr, addstr, prefix, file, start, end);
-
-	/* add the symbol table */
-	if (sas_symdebug) (void) printf("sas_symtab: %s", cmdstr);
-	sas_command(cmdstr);
-}
-
-void
-sas_bpts()
-{
-	sas_command("file $KERN_SCRIPT_FILE\n");
-}
-#endif	/* MPSAS */
-
 /*
  * Allocate a region of virtual address space, unmapped.
  */
diff --git a/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile b/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
index 455cf316cd..6f68499e0a 100644
--- a/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
+++ b/usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
@@ -100,11 +100,6 @@ LIBPLAT_DEP_L =	$(LIBPLAT_DIR)/$(LIBPLAT_L_LIBS)
 PSMLIBS +=      $(LIBPLAT_LIBS:lib%.a=-l%)
 PSMLIB_DIRS +=  $(LIBPLAT_DIR)
 
-
-#	MPSAS support
-MPSAS_BUILD:sh=		echo \\043
-$(MPSAS_BUILD)ARCHOPTS += -DMPSAS
-
 include ../Makefile.com
 
 # re-define ELFCONV for 4u--- sun4u can boot ELF directly
diff --git a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
index 56efb6bbad..fc204fbeab 100644
--- a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
+++ b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -79,11 +79,6 @@ LIBPLAT_DEP_L =	$(LIBPLAT_DIR)/$(LIBPLAT_L_LIBS)
 PSMLIBS +=      $(LIBPLAT_LIBS:lib%.a=-l%)
 PSMLIB_DIRS +=  $(LIBPLAT_DIR)
 
-
-#	MPSAS support
-MPSAS_BUILD:sh=		echo \\043
-$(MPSAS_BUILD)ARCHOPTS += -DMPSAS
-
 include ../Makefile.com
 
 CPPINCS		+= -I$(SRC)/uts/sun4u