From: Tom Tromey <tom@tromey.com>
To: cgen@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFC 07/14] Use define-macro in rtl.scm
Date: Sat, 19 Aug 2023 11:42:06 -0600 [thread overview]
Message-ID: <20230819174900.866436-8-tom@tromey.com> (raw)
In-Reply-To: <20230819174900.866436-1-tom@tromey.com>
rtl.scm uses defmacro:syntax-transformer, but that no longer exists in
more recent versions of Guile.
Replace these uses with define-macro -- which IMO is clearer anyway.
Note that defmacro could not be used here, as Guile's implementation
has a bug that prevents it from being used with non-canonical lists.
---
rtl.scm | 37 +++++++++++++------------------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/rtl.scm b/rtl.scm
index c74fea1..beda406 100644
--- a/rtl.scm
+++ b/rtl.scm
@@ -283,12 +283,9 @@
*UNSPECIFIED*))
)
-(define define-rtx-node
- ; Written this way so Hobbit can handle it.
- (defmacro:syntax-transformer (lambda arg-list
- (apply def-rtx-node arg-list)
- nil))
-)
+(define-macro (define-rtx-node . args)
+ (cons 'def-rtx-node
+ (map (lambda (arg) `',arg) args)))
; Same as define-rtx-node but don't pre-evaluate the arguments.
; Remember that `mode' must be the first argument.
@@ -314,12 +311,9 @@
*UNSPECIFIED*))
)
-(define define-rtx-syntax-node
- ; Written this way so Hobbit can handle it.
- (defmacro:syntax-transformer (lambda arg-list
- (apply def-rtx-syntax-node arg-list)
- nil))
-)
+(define-macro (define-rtx-syntax-node . args)
+ (cons 'def-rtx-syntax-node
+ (map (lambda (arg) `',arg) args)))
; Same as define-rtx-node but return an operand (usually an <operand> object).
; ??? `mode' must be the first argument?
@@ -345,12 +339,9 @@
*UNSPECIFIED*))
)
-(define define-rtx-operand-node
- ; Written this way so Hobbit can handle it.
- (defmacro:syntax-transformer (lambda arg-list
- (apply def-rtx-operand-node arg-list)
- nil))
-)
+(define-macro (define-rtx-operand-node . args)
+ (cons 'def-rtx-operand-node
+ (map (lambda (arg) `',arg) args)))
; Convert one rtx expression into another.
; NAME-ARGS is a list of the operation name and arguments.
@@ -374,12 +365,10 @@
*UNSPECIFIED*))
)
-(define define-rtx-macro-node
- ; Written this way so Hobbit can handle it.
- (defmacro:syntax-transformer (lambda arg-list
- (apply def-rtx-macro-node arg-list)
- nil))
-)
+(define-macro (define-rtx-macro-node . args)
+ (cons 'def-rtx-macro-node
+ (map (lambda (arg) `',arg) args)))
+
\f
; RTL macro expansion.
; RTL macros are different than pmacros. The difference is that the expansion
--
2.41.0
next prev parent reply other threads:[~2023-08-19 19:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-19 17:41 [RFC 00/14] Port to Guile 3.0 Tom Tromey
2023-08-19 17:42 ` [RFC 01/14] Add a .gitignore Tom Tromey
2023-08-20 8:04 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 02/14] Remove some 'fastcall' code Tom Tromey
2023-08-20 8:13 ` Jose E. Marchesi
2023-08-22 16:52 ` Tom Tromey
2023-08-19 17:42 ` [RFC 03/14] Remove bound-symbol? Tom Tromey
2023-08-20 8:14 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 04/14] Remove =? and >=? aliases Tom Tromey
2023-08-20 8:15 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 05/14] Fix bug in insn.scm Tom Tromey
2023-08-20 8:15 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 06/14] Remove support for old versions of Guile Tom Tromey
2023-08-19 17:42 ` Tom Tromey [this message]
2023-08-19 17:42 ` [RFC 08/14] Remove let bindings of macros Tom Tromey
2023-08-20 8:33 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 09/14] Remove define-in-define Tom Tromey
2023-08-19 17:42 ` [RFC 10/14] Hack cos.scm to work with new Guile Tom Tromey
2023-08-19 17:42 ` [RFC 11/14] Invalid code in rtx-traverse.scm Tom Tromey
2023-08-20 8:42 ` Jose E. Marchesi
2023-08-19 17:42 ` [RFC 12/14] Nuke cgen-call-with-debugging and cgen-debugging-stack-start Tom Tromey
2023-08-19 17:42 ` [RFC 13/14] Load macros before uses Tom Tromey
2023-08-19 17:42 ` [RFC 14/14] Remove pprint.scm and cos-pprint.scm Tom Tromey
2023-08-20 8:03 ` [RFC 00/14] Port to Guile 3.0 Jose E. Marchesi
2023-08-20 17:26 ` Frank Ch. Eigler
2023-08-20 19:52 ` Tom Tromey
2023-08-21 1:38 ` Frank Ch. Eigler
2023-08-21 13:06 ` Julian Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230819174900.866436-8-tom@tromey.com \
--to=tom@tromey.com \
--cc=cgen@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).