Index: sim-test.scm
===================================================================
--- sim-test.scm	(revision 145)
+++ sim-test.scm	(working copy)
@@ -128,14 +128,14 @@
 					(lambda () (display sl)))))))
 	      syntax-list)
 	 ", test data: "
-	 (map (lambda (td) (list " " td))
+	 (map (lambda (td) (list " " (->string td)))
 	      test-data)
 	 "\n")
   (let loop ((result nil) (sl syntax-list) (td test-data))
     ;(display (list result sl td "\n"))
     (cond ((null? sl)
 	   (string-append "\t"
-			  (apply string-append (reverse result))
+			  (apply string-append (map (lambda (x) (->string x)) (reverse result)))
 			  "\n"))
 	  ((string? (car sl))
 	   (loop (cons (car sl) result) (cdr sl) td))
@@ -175,7 +175,7 @@
   (string-append
    "\
 #/bin/sh
-# Generate test result data for " (current-arch-name) " simulator testing.
+# Generate test result data for " (->string (current-arch-name)) " simulator testing.
 # This script is machine generated.
 # It is intended to be run in the testsuite source directory.
 #
@@ -191,7 +191,7 @@ cd tmpdir
 		  (string-append
 		   "cat <<EOF > " (gen-file-name (obj:name insn)) ".cgs\n"
 		   ; FIXME: Need to record assembler line comment char in .cpu.
-		   "# " (current-arch-name) " testcase for " (backslash "$" (insn-syntax insn)) " -*- Asm -*-\n"
+		   "# " (->string (current-arch-name)) " testcase for " (backslash "$" (insn-syntax insn)) " -*- Asm -*-\n"
 		   "# mach: "
 		   (let ((machs (insn-machs insn)))
 		     (if (null? machs)
@@ -215,9 +215,9 @@ cd tmpdir
   (logit 1 "Generating sim-allinsn.exp ...\n")
   (string-append
    "\
-# " (string-upcase (current-arch-name)) " simulator testsuite.
+# " (string-upcase (->string (current-arch-name))) " simulator testsuite.
 
-if [istarget " (current-arch-name) "*-*-*] {
+if [istarget " (->string (current-arch-name)) "*-*-*] {
     # load support procs (none yet)
     # load_lib cgen.exp