From 1ee07e9cfba93fafc17fdc2ef25dac42494502a6 Mon Sep 17 00:00:00 2001
From: devans <devans>
Date: Sat, 12 Sep 2009 17:07:48 +0000
Subject: [PATCH] 	* sim-test.scm (*): Symbols no longer can be passed to
 string-append.

---
 cgen/ChangeLog    |  4 ++++
 cgen/sim-test.scm | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 7824b947b3..72edd33d93 100644
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-12  Doug Evans  <dje@sebabeach.org>
+
+	* sim-test.scm (*): Symbols no longer can be passed to string-append.
+
 2009-09-10  Doug Evans  <dje@sebabeach.org>
 
 	* insn.scm (/parse-insn-format): New arg `verify?', all callers updated.
diff --git a/cgen/sim-test.scm b/cgen/sim-test.scm
index 125d23c331..00baa52fd7 100644
--- a/cgen/sim-test.scm
+++ b/cgen/sim-test.scm
@@ -122,7 +122,7 @@
 			       (cond ((string? sl)
 				      sl)
 				     ((operand? sl)
-				      (obj:name sl))
+				      (obj:str-name sl))
 				     (else
 				      (with-output-to-string
 					(lambda () (display sl)))))))
@@ -139,7 +139,7 @@
 			  "\n"))
 	  ((string? (car sl))
 	   (loop (cons (car sl) result) (cdr sl) td))
-	  (else (loop (cons (car td) result) (cdr sl) (cdr td)))))
+	  (else (loop (cons (->string (car td)) result) (cdr sl) (cdr td)))))
 )
 
 ; Generate a set of testcases for INSN.
@@ -175,7 +175,9 @@
   (string-append
    "\
 #/bin/sh
-# Generate test result data for " (current-arch-name) " simulator testing.
+# Generate test result data for "
+(symbol->string (current-arch-name))
+" simulator testing.
 # This script is machine generated.
 # It is intended to be run in the testsuite source directory.
 #
@@ -191,14 +193,18 @@ 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"
+		   "# "
+		   (symbol->string (current-arch-name))
+		   " testcase for " (backslash "$" (insn-syntax insn))
+		   " -*- Asm -*-\n"
 		   "# mach: "
 		   (let ((machs (insn-machs insn)))
 		     (if (null? machs)
 			 "all"
-			 (string-drop1 (string-map (lambda (mach)
-						     (string-append "," mach))
-						   machs))))
+			 (string-drop1
+			  (string-map (lambda (mach)
+					(string-append "," (symbol->string mach)))
+				      machs))))
 		   "\n\n"
 		   "\t.include \"testutils.inc\"\n\n"
 		   "\tstart\n\n"
@@ -215,9 +221,9 @@ cd tmpdir
   (logit 1 "Generating sim-allinsn.exp ...\n")
   (string-append
    "\
-# " (string-upcase (current-arch-name)) " simulator testsuite.
+# " (string-upcase (symbol->string (current-arch-name))) " simulator testsuite.
 
-if [istarget " (current-arch-name) "*-*-*] {
+if [istarget " (symbol->string (current-arch-name)) "*-*-*] {
     # load support procs (none yet)
     # load_lib cgen.exp
 
-- 
2.11.0