From 261ff3a2ad9f5dc7465a3fc64a5ecdff8a49d115 Mon Sep 17 00:00:00 2001
From: devans <devans>
Date: Mon, 15 Jun 2009 05:00:26 +0000
Subject: [PATCH] 	* Makefile.am (ARCHFILE): Fix path. 	* Makefile.in:
 Regenerate. 	* html.scm: Use "pre" instead of "plaintext".

---
 cgen/ChangeLog   |  4 ++++
 cgen/Makefile.am |  2 +-
 cgen/Makefile.in |  2 +-
 cgen/html.scm    | 20 ++++++++++----------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index d6c7cb8a12..1a3e07d7ed 100644
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-14  Doug Evans  <dje@sebabeach.org>
 
+	* Makefile.am (ARCHFILE): Fix path.
+	* Makefile.in: Regenerate.
+	* html.scm: Use "pre" instead of "plaintext".
+
 	* doc/cgenint.texi: Renamed from internals.texi.  Several cleanups.
 	* doc/app.texi: Cleanup pass.
 	* doc/cgen.texi: Cleanup pass.
diff --git a/cgen/Makefile.am b/cgen/Makefile.am
index 454baaca6a..55a17f5d35 100644
--- a/cgen/Makefile.am
+++ b/cgen/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = doc
 GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`" -l $(srcdir)/guile.scm -s
 CGENFLAGS = -v
 ARCH = @arch@
-ARCHFILE = $(srcroot)/../cpu/$(ARCH).cpu
+ARCHFILE = $(srcroot)/cpu/$(ARCH).cpu
 
 # for various utility rules
 MACHS = all
diff --git a/cgen/Makefile.in b/cgen/Makefile.in
index f95a62b03b..1e2cdf3745 100644
--- a/cgen/Makefile.in
+++ b/cgen/Makefile.in
@@ -140,7 +140,7 @@ SUBDIRS = doc
 GUILE = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`" -l $(srcdir)/guile.scm -s
 CGENFLAGS = -v
 ARCH = @arch@
-ARCHFILE = $(srcroot)/../cpu/$(ARCH).cpu
+ARCHFILE = $(srcroot)/cpu/$(ARCH).cpu
 
 # for various utility rules
 MACHS = all
diff --git a/cgen/html.scm b/cgen/html.scm
index cdbc417b01..9509be868d 100644
--- a/cgen/html.scm
+++ b/cgen/html.scm
@@ -289,22 +289,22 @@ See the input .cpu file(s) for copyright information.
 		      "<br>\n"
 		      "<li>condition:\n"
 		      "<font size=+2>\n"
-		      "<plaintext>" ; no trailing newline here on purpose
+		      "<pre>" ; no trailing newline here on purpose
 		      (with-output-to-string
 			(lambda ()
 			  (pretty-print (cadr (isa-condition isa)))))
-		      "</plaintext></font>\n"
+		      "</pre></font>\n"
 		      "</li>\n"
 		      "<br>\n")
        "")
    (if (isa-setup-semantics isa)
        (string-append "<li>setup-semantics:\n"
 		      "<font size=+2>\n"
-		      "<plaintext>" ; no trailing newline here on purpose
+		      "<pre>" ; no trailing newline here on purpose
 		      (with-output-to-string
 			(lambda ()
 			  (pretty-print (cdr (isa-setup-semantics isa)))))
-		      "</plaintext></font>\n"
+		      "</pre></font>\n"
 		      "</li>\n"
 		      "<br>\n")
        "")
@@ -595,23 +595,23 @@ See the input .cpu file(s) for copyright information.
        (string-append "<li>\n"
 		      "instruction field constraint:\n"
 		      "<font size=+2>\n"
-		      "<plaintext>" ; no trailing newline here on purpose
+		      "<pre>" ; no trailing newline here on purpose
 		      (with-output-to-string
 			(lambda ()
 			  (pretty-print (insn-ifield-assertion insn))))
-		      "</plaintext></font>\n"
+		      "</pre></font>\n"
 		      "</li>\n"
 		      "<br>\n")
        "")
    "<li>\n"
    "semantics:\n"
    "<font size=+2>\n"
-   "<plaintext>" ; no trailing newline here on purpose
+   "<pre>" ; no trailing newline here on purpose
    (with-output-to-string
      (lambda ()
        ; Print the const-folded semantics, computed in `tmp'.
        (pretty-print (rtx-trim-for-doc (insn-tmp insn)))))
-   "</plaintext></font>\n"
+   "</pre></font>\n"
    "</li>\n"
    ; "<br>\n" ; not present on purpose
    (if (not (null? (insn-timing insn)))
@@ -896,11 +896,11 @@ See the input .cpu file(s) for copyright information.
    "<li>\n"
    "transformation:\n"
    "<font size=+2>\n"
-   "<plaintext>" ; no trailing newline here on purpose
+   "<pre>" ; no trailing newline here on purpose
    (with-output-to-string
      (lambda ()
        (pretty-print (minsn-expansions minsn))))
-   "</plaintext></font>\n"
+   "</pre></font>\n"
    "</li>\n"
    "</ul>\n"
    )
-- 
2.11.0