This is the mail archive of the
cgen@sourceware.org
mailing list for the CGEN project.
[commit] deprecate {add,sub}-[co]flag
- From: Doug Evans <dje at sebabeach dot org>
- To: cgen at sourceware dot org
- Date: Sun, 19 Jul 2009 12:20:54 -0700 (PDT)
- Subject: [commit] deprecate {add,sub}-[co]flag
Hi.
There's a FIXME to replace {add,sub}-[co]flag with {add,sub}c-[co]flag.
Committed.
2009-07-19 Doug Evans <dje@sebabeach.org>
* rtl-c.scm (addc-cflag, addc-oflag, subc-cflag, subc-oflag): Define.
(add-cflag, add-oflag, sub-cflag, sub-oflag): Deprecate.
* rtx-funcs.scm (addc-cflag, addc-oflag, subc-cflag, subc-oflag):
Define.
(add-cflag, add-oflag, sub-cflag, sub-oflag): Deprecate.
* doc/rtl.texi: Update.
Index: rtl-c.scm
===================================================================
RCS file: /cvs/src/src/cgen/rtl-c.scm,v
retrieving revision 1.10
diff -u -p -r1.10 rtl-c.scm
--- rtl-c.scm 24 Jun 2009 15:03:09 -0000 1.10
+++ rtl-c.scm 19 Jul 2009 18:46:38 -0000
@@ -1546,15 +1546,32 @@
(define-fn addc (estate options mode s1 s2 s3)
(s-binop-with-bit estate "ADDC" mode s1 s2 s3)
)
-(define-fn add-cflag (estate options mode s1 s2 s3)
+;; ??? Whether to rename ADDCF/ADDOF -> ADDCCF/ADDCOF is debatable.
+(define-fn addc-cflag (estate options mode s1 s2 s3)
(s-binop-with-bit estate "ADDCF" mode s1 s2 s3)
)
-(define-fn add-oflag (estate options mode s1 s2 s3)
+(define-fn addc-oflag (estate options mode s1 s2 s3)
(s-binop-with-bit estate "ADDOF" mode s1 s2 s3)
)
+
(define-fn subc (estate options mode s1 s2 s3)
(s-binop-with-bit estate "SUBC" mode s1 s2 s3)
)
+;; ??? Whether to rename SUBCF/SUBOF -> SUBCCF/SUBCOF is debatable.
+(define-fn subc-cflag (estate options mode s1 s2 s3)
+ (s-binop-with-bit estate "SUBCF" mode s1 s2 s3)
+)
+(define-fn subc-oflag (estate options mode s1 s2 s3)
+ (s-binop-with-bit estate "SUBOF" mode s1 s2 s3)
+)
+
+;; ??? These are deprecated. Delete in time.
+(define-fn add-cflag (estate options mode s1 s2 s3)
+ (s-binop-with-bit estate "ADDCF" mode s1 s2 s3)
+)
+(define-fn add-oflag (estate options mode s1 s2 s3)
+ (s-binop-with-bit estate "ADDOF" mode s1 s2 s3)
+)
(define-fn sub-cflag (estate options mode s1 s2 s3)
(s-binop-with-bit estate "SUBCF" mode s1 s2 s3)
)
Index: rtx-funcs.scm
===================================================================
RCS file: /cvs/src/src/cgen/rtx-funcs.scm,v
retrieving revision 1.5
diff -u -p -r1.5 rtx-funcs.scm
--- rtx-funcs.scm 24 Jun 2009 15:03:09 -0000 1.5
+++ rtx-funcs.scm 19 Jul 2009 18:46:38 -0000
@@ -618,12 +618,12 @@
TRINARY
#f
)
-(drn (add-cflag &options &mode s1 s2 s3) ; FIXME: rename to addc-cflag
+(drn (addc-cflag &options &mode s1 s2 s3)
(OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
TRINARY
#f
)
-(drn (add-oflag &options &mode s1 s2 s3) ; FIXME: rename to addc-vflag
+(drn (addc-oflag &options &mode s1 s2 s3)
(OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
TRINARY
#f
@@ -633,12 +633,34 @@
TRINARY
#f
)
-(drn (sub-cflag &options &mode s1 s2 s3) ; FIXME: rename to subc-cflag
+(drn (subc-cflag &options &mode s1 s2 s3)
(OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
TRINARY
#f
)
-(drn (sub-oflag &options &mode s1 s2 s3) ; FIXME: rename to subc-vflag
+(drn (subc-oflag &options &mode s1 s2 s3)
+ (OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
+ TRINARY
+ #f
+)
+
+;; ??? These are deprecated. Delete in time.
+(drn (add-cflag &options &mode s1 s2 s3)
+ (OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
+ TRINARY
+ #f
+)
+(drn (add-oflag &options &mode s1 s2 s3)
+ (OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
+ TRINARY
+ #f
+)
+(drn (sub-cflag &options &mode s1 s2 s3)
+ (OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
+ TRINARY
+ #f
+)
+(drn (sub-oflag &options &mode s1 s2 s3)
(OPTIONS ANYMODE RTX RTX RTX) (NA NA OP0 MATCH1 BI)
TRINARY
#f
Index: doc/rtl.texi
===================================================================
RCS file: /cvs/src/src/cgen/doc/rtl.texi,v
retrieving revision 1.27
diff -u -p -r1.27 rtl.texi
--- doc/rtl.texi 16 Jul 2009 18:50:53 -0000 1.27
+++ doc/rtl.texi 19 Jul 2009 18:46:39 -0000
@@ -2362,8 +2362,17 @@ Perform a binary arithmetic operation. @
@item (binop-with-bit mode operand1 operand2 operand3)
Same as @samp{binop}, except taking 3 operands. The third operand is
always a single bit. @samp{binop-with-bit} is one of @code{addc},
-@code{add-cflag}, @code{add-oflag}, @code{subc}, @code{sub-cflag},
-@code{sub-oflag}.
+@code{addc-cflag}, @code{addc-oflag}, @code{subc}, @code{subc-cflag},
+@code{subc-oflag}.
+
+Note: The following are deprecated:
+
+@itemize @bullet
+@item @code{add-cflag}, replaced with @code{addc-cflag}
+@item @code{add-oflag}, replaced with @code{addc-oflag}
+@item @code{sub-cflag}, replaced with @code{subc-cflag}
+@item @code{sub-cflag}, replaced with @code{subc-oflag}
+@end itemize
@item (shiftop mode operand1 operand2)
Perform a shift operation.