* Makefile.am (ARCHFILE): Fix path.

	* Makefile.in: Regenerate.
	* html.scm: Use "pre" instead of "plaintext".

diff --git a/ChangeLog b/ChangeLog
index d6c7cb8a12d3485501b87143d0fdda84a58bc5de..1a3e07d7ed78d9fe5470165b77d0146b93fd6adf 100644 (file)
--- a/ChangeLog
+++ b/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/Makefile.am b/Makefile.am
index 454baaca6ac45bd24e464b2a85da8ebd64adf459..55a17f5d353ebeb9e16f5195b04dfb7a5a8a4787 100644 (file)
--- a/Makefile.am
+++ b/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/Makefile.in b/Makefile.in
index f95a62b03b8df89cc68d8c488832beefc0ae2655..1e2cdf374568c1c5de6d13eb093f773d6bf5afe4 100644 (file)
--- a/Makefile.in
+++ b/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/html.scm b/html.scm
index cdbc417b01d0e41cc31cd99f48c7590decab9f3c..9509be868d0695a497a34efa1e1f06a0a5fec2a1 100644 (file)
--- a/html.scm
+++ b/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"
    )