Skip to contentSkip to conversation

target-i386: MMReg struct cleanup

PATCH In review Eduardo Habkost 2 participants 5 messages Dec 2, 2015 – Dec 3, 2015

lore
Share & tools
lore
#0 lore raw

v2 cover target-i386: MMReg struct cleanup

Changes v1 -> v2:
* Other patches from v1 are already in x86-next branch
* MMREG_UNION argument is now the number of bits
* Removed [RFC] tag

Eduardo Habkost (2):
target-i386: Define MMREG_UNION macro
target-i386: Add suffixes to MMReg struct fields

 target-i386/cpu.h | 73 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH v2 1/2 target-i386: Define MMREG_UNION macro

This will simplify the definitions of ZMMReg and MMXReg.

---
Changes v1 -> v2:
* Change MMREG_UNION argument to be number of bits

---
 target-i386/cpu.h | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)
target-i386/cpu.h +11 -16
index e8e99e2..ab3ae5b 100644
@@ -725,23 +725,18 @@ typedef struct SegmentCache {
     uint32_t flags;
 } SegmentCache;
 
-typedef union {
-    uint8_t _b[64];
-    uint16_t _w[32];
-    uint32_t _l[16];
-    uint64_t _q[8];
-    float32 _s[16];
-    float64 _d[8];
-} ZMMReg;
+#define MMREG_UNION(bits)       \
+    union {                     \
+        uint8_t  _b[(bits)/8];  \
+        uint16_t _w[(bits)/16]; \
+        uint32_t _l[(bits)/32]; \
+        uint64_t _q[(bits)/64]; \
+        float32  _s[(bits)/32]; \
+        float64  _d[(bits)/64]; \
+    }
 
-typedef union {
-    uint8_t _b[8];
-    uint16_t _w[4];
-    uint32_t _l[2];
-    uint64_t _q[1];
-    float32 _s[2];
-    float64 _d[1];
-} MMXReg;
+typedef MMREG_UNION(512) ZMMReg;
+typedef MMREG_UNION(64)  MMXReg;
 
 typedef struct BNDReg {
     uint64_t lb;
Signature · 1 line
2.1.0
#2 lore raw

PATCH v2 2/2 target-i386: Add suffixes to MMReg struct fields

In reply to Eduardo Habkost

This will ensure we never use the MMX_* and ZMM_* macros with the wrong struct type.

---
 target-i386/cpu.h | 66 +++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)
target-i386/cpu.h +33 -33
index ab3ae5b..278c724 100644
@@ -725,18 +725,18 @@ typedef struct SegmentCache {
     uint32_t flags;
 } SegmentCache;
 
-#define MMREG_UNION(bits)       \
-    union {                     \
-        uint8_t  _b[(bits)/8];  \
-        uint16_t _w[(bits)/16]; \
-        uint32_t _l[(bits)/32]; \
-        uint64_t _q[(bits)/64]; \
-        float32  _s[(bits)/32]; \
-        float64  _d[(bits)/64]; \
+#define MMREG_UNION(n, bits)        \
+    union n {                       \
+        uint8_t  _b_##n[(bits)/8];  \
+        uint16_t _w_##n[(bits)/16]; \
+        uint32_t _l_##n[(bits)/32]; \
+        uint64_t _q_##n[(bits)/64]; \
+        float32  _s_##n[(bits)/32]; \
+        float64  _d_##n[(bits)/64]; \
     }
 
-typedef MMREG_UNION(512) ZMMReg;
-typedef MMREG_UNION(64)  MMXReg;
+typedef MMREG_UNION(ZMMReg, 512) ZMMReg;
+typedef MMREG_UNION(MMXReg, 64)  MMXReg;
 
 typedef struct BNDReg {
     uint64_t lb;
@@ -749,31 +749,31 @@ typedef struct BNDCSReg {
 } BNDCSReg;
 
 #ifdef HOST_WORDS_BIGENDIAN
-#define ZMM_B(n) _b[63 - (n)]
-#define ZMM_W(n) _w[31 - (n)]
-#define ZMM_L(n) _l[15 - (n)]
-#define ZMM_S(n) _s[15 - (n)]
-#define ZMM_Q(n) _q[7 - (n)]
-#define ZMM_D(n) _d[7 - (n)]
-
-#define MMX_B(n) _b[7 - (n)]
-#define MMX_W(n) _w[3 - (n)]
-#define MMX_L(n) _l[1 - (n)]
-#define MMX_S(n) _s[1 - (n)]
+#define ZMM_B(n) _b_ZMMReg[63 - (n)]
+#define ZMM_W(n) _w_ZMMReg[31 - (n)]
+#define ZMM_L(n) _l_ZMMReg[15 - (n)]
+#define ZMM_S(n) _s_ZMMReg[15 - (n)]
+#define ZMM_Q(n) _q_ZMMReg[7 - (n)]
+#define ZMM_D(n) _d_ZMMReg[7 - (n)]
+
+#define MMX_B(n) _b_MMXReg[7 - (n)]
+#define MMX_W(n) _w_MMXReg[3 - (n)]
+#define MMX_L(n) _l_MMXReg[1 - (n)]
+#define MMX_S(n) _s_MMXReg[1 - (n)]
 #else
-#define ZMM_B(n) _b[n]
-#define ZMM_W(n) _w[n]
-#define ZMM_L(n) _l[n]
-#define ZMM_S(n) _s[n]
-#define ZMM_Q(n) _q[n]
-#define ZMM_D(n) _d[n]
-
-#define MMX_B(n) _b[n]
-#define MMX_W(n) _w[n]
-#define MMX_L(n) _l[n]
-#define MMX_S(n) _s[n]
+#define ZMM_B(n) _b_ZMMReg[n]
+#define ZMM_W(n) _w_ZMMReg[n]
+#define ZMM_L(n) _l_ZMMReg[n]
+#define ZMM_S(n) _s_ZMMReg[n]
+#define ZMM_Q(n) _q_ZMMReg[n]
+#define ZMM_D(n) _d_ZMMReg[n]
+
+#define MMX_B(n) _b_MMXReg[n]
+#define MMX_W(n) _w_MMXReg[n]
+#define MMX_L(n) _l_MMXReg[n]
+#define MMX_S(n) _s_MMXReg[n]
 #endif
-#define MMX_Q(n) _q[n]
+#define MMX_Q(n) _q_MMXReg[n]
 
 typedef union {
     floatx80 d __attribute__((aligned(16)));
Signature · 1 line
2.1.0
Reviewed-by on the v2 series
#3 lore raw
In reply to Eduardo Habkost
Quoted 5 lines · Eduardo Habkost

Changes v1 -> v2:
* Other patches from v1 are already in x86-next branch
* MMREG_UNION argument is now the number of bits
* Removed [RFC] tag

Quoted 8 lines

Eduardo Habkost (2):
target-i386: Define MMREG_UNION macro
target-i386: Add suffixes to MMReg struct fields

  target-i386/cpu.h | 73 ++++++++++++++++++++++++++-----------------------------
  1 file changed, 34 insertions(+), 39 deletions(-)

-- 2.1.0

r~

author Applied
#4 lore raw
Quoted 10 lines · Richard Henderson
Quoted 9 lines · Eduardo Habkost

Changes v1 -> v2:
* Other patches from v1 are already in x86-next branch
* MMREG_UNION argument is now the number of bits
* Removed [RFC] tag

Eduardo Habkost (2):
target-i386: Define MMREG_UNION macro
target-i386: Add suffixes to MMReg struct fields

Quoted 6 lines
Quoted 4 lines
 target-i386/cpu.h | 73 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

-- 2.1.0

Thanks! Applied to x86-next.

Signature · 1 line
Eduardo