X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/a90d420cbe87490c844ae422c966e746d3134b07..483edf69cdc738c2315040ff9f98e4f25afdf4ae:/base/asm-common.h

diff --git a/base/asm-common.h b/base/asm-common.h
index d162a5d9..18c61fc1 100644
--- a/base/asm-common.h
+++ b/base/asm-common.h
@@ -311,6 +311,7 @@ name:
 // R_r(decor) applies decoration decor to register r, which is an internal
 // register name.  The internal register names are: `ip', `a', `b', `c', `d',
 // `si', `di', `bp', `sp', `r8'--`r15'.
+#define R_nil(decor) nil
 #define R_ip(decor) _DECOR(ip, decor, ip)
 #define R_a(decor) _DECOR(abcd, decor, a)
 #define R_b(decor) _DECOR(abcd, decor, b)
@@ -345,6 +346,8 @@ name:
 // assembler-level register name, in place of any decoration that register
 // name has already.
 
+#define _REGFORM_nil(decor) R_nil(decor)
+
 #define _REGFORM_ip(decor) R_ip(decor)
 #define _REGFORM_eip(decor) R_ip(decor)
 
@@ -667,6 +670,8 @@ name:
 // Internal macros: `_REGFORM_r(decor)' applies decoration decor to register
 // name r.
 
+#define _REGFORM_nil(decor) nil
+
 #define _REGFORM_s0(decor) _DECOR(s, decor, 0)
 #define _REGFORM_s1(decor) _DECOR(s, decor, 1)
 #define _REGFORM_s2(decor) _DECOR(s, decor, 2)
@@ -1109,6 +1114,54 @@ name:
 .macro	endprologue
 .endm
 
+// Notational improvement: write `csel.CC' etc., rather than `csel ..., CC'.
+#define _COND(_)							\
+	_(eq) _(ne) _(cs) _(cc) _(vs) _(vc) _(mi) _(pl)			\
+	_(ge) _(lt) _(gt) _(le) _(hi) _(ls) _(al) _(nv)			\
+	_(hs) _(lo)
+#define _INST(_)							\
+	_(ccmp) _(ccmn)							\
+	_(csel) 							\
+	_(csinc) _(cinc) _(cset)					\
+	_(csneg) _(cneg)						\
+	_(csinv) _(cinv) _(csetm)
+#define _CONDVAR(cc) _definstvar cc;
+#define _INSTVARS(inst)							\
+	.macro _definstvar cc;						\
+	  .macro inst.\cc args:vararg; inst \args, \cc; .endm;		\
+	.endm;								\
+	_COND(_CONDVAR);						\
+	.purgem _definstvar;
+	_INST(_INSTVARS)
+#undef _COND
+#undef _INST
+#undef _CONDVAR
+#undef _INSTVARS
+
+// Flag bits for `ccmp' and friends.
+#define CCMP_N 8
+#define CCMP_Z 4
+#define CCMP_C 2
+#define CCMP_V 1
+
+// Flag settings for satisfying conditions.
+#define CCMP_MI CCMP_N
+#define CCMP_PL 0
+#define CCMP_EQ CCMP_Z
+#define CCMP_NE 0
+#define CCMP_CS CCMP_C
+#define CCMP_HS CCMP_C
+#define CCMP_CC 0
+#define CCMP_LO 0
+#define CCMP_VS CCMP_V
+#define CCMP_VC 0
+#define CCMP_HI CCMP_C
+#define CCMP_LS 0
+#define CCMP_LT CCMP_N
+#define CCMP_GE 0
+#define CCMP_LE CCMP_N
+#define CCMP_GT 0
+
 #endif
 
 ///--------------------------------------------------------------------------