2001-09-17 graydon hoare <graydon@redhat.com>

	* insn.scm (syntax-break-out): Change $ escape specifier
	from \$ to $$, to reduce interactions with scheme and C escaping
	conventions.
	* doc/rtl.texi (Instructions): Document change.

diff --git a/ChangeLog b/ChangeLog
index 7221faa5339d94d387aac291789a6f0b8720b4f8..f3bbf4f41ba2b0f38eb8ba341ccace9b4451844e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-17  graydon hoare  <graydon@redhat.com>
+
+       * insn.scm (syntax-break-out): Change $ escape specifier
+       from \$ to $$, to reduce interactions with scheme and C escaping
+       conventions.
+       * doc/rtl.texi (Instructions): Document change.
+
 2001-07-12  Jeff Johnston  <jjohnstn@redhat.com>
 
         * opc-itab.scm (@arch@_cgen_init_opcode_table): Unconditionally

diff --git a/doc/rtl.texi b/doc/rtl.texi
index a781b09817fefa66a001e3254387e55af1089934..d9dceb00443ebb4bd22ddb1b0a352596faf172ba 100644 (file)
--- a/doc/rtl.texi
+++ b/doc/rtl.texi
@@ -1806,7 +1806,7 @@ This is a character string consisting of raw characters and operands.
 Fields are denoted by @code{$operand} or
 @code{$@{operand@}}@footnote{Support for @code{$@{operand@}} is
 work-in-progress.}.  If a @samp{$} is required in the syntax, it is
-specified with @samp{\$}.  At most one white-space character may be
+specified with @samp{$$}.  At most one white-space character may be
 present and it must be a blank separating the instruction mnemonic from
 the operands.  This doesn't restrict the user's assembler, this is
 @c Is this reasonable?

diff --git a/insn.scm b/insn.scm
index bef0995514191e7c29c3179323eb2d8cc23a1315..c0fb420e7c3f77224cf917a3eaf803283cc8f90f 100644 (file)
--- a/insn.scm
+++ b/insn.scm
@@ -848,9 +848,10 @@
          (begin
            (cond 
             ; Handle escaped syntax metacharacters 
-            ((char=? #\\ (string-ref syntax 0))
-             (set! result (cons (substring syntax 0 1) result))
-             (set! result (cons (substring syntax 1 1) result))
+            ((and 
+              (char=? #\$ (string-ref syntax 0))
+              (char=? #\$ (string-ref syntax 1)))
+             (set! result (cons "$" result))
              (set! syntax (string-drop 2 syntax)))
             ; Handle operand reference
             ((char=? #\$ (string-ref syntax 0))