rename packed field to fail-on-first

diff --git a/riscv/processor.cc b/riscv/processor.cc
index f84aa8f91e9c85fec755061b7863594a78f82bda..a30c2e36d527665393896b4ac31d9dc5f7fa5d89 100644 (file)
--- a/riscv/processor.cc
+++ b/riscv/processor.cc
@@ -478,7 +478,7 @@ void state_t::sv_csr_pred_unpack()
         r->regidx = c->b.regidx;
         r->zero   = c->b.zero;
         r->inv    = c->b.inv;
-        r->packed = c->b.packed;
+        r->ffirst = c->b.ffirst;
         r->active = true;
         fprintf(stderr, "setting PREDCFG %d type:%d zero:%d %d %d\n",
                         i, c->b.type, r->zero, (int)idx, (int)r->regidx);

diff --git a/riscv/sv.h b/riscv/sv.h
index 3df72d2f858dc95fc26545a39c106425fb29c0de..3b6c2e8a2ee88241189cd6ad969398b10248bde1 100644 (file)
--- a/riscv/sv.h
+++ b/riscv/sv.h
@@ -8,8 +8,8 @@
 // useful macros for constructing SV reg and predicate CSR CAM entries
 #define SV_REG_CSR(type, regkey, elwidth, regidx, isvec) \
   (regkey | (elwidth<<5) | (type<<7) | (regidx<<8) | (isvec<<15))
-#define SV_PRED_CSR(type, regkey, zero, inv, regidx, packed) \
-  (regkey | (zero<<5) | (inv<<6) | (type<<7) | (regidx<<8) | (packed<<15))
+#define SV_PRED_CSR(type, regkey, zero, inv, regidx, ffirst) \
+  (regkey | (zero<<5) | (inv<<6) | (type<<7) | (regidx<<8) | (ffirst<<15))
 
 // this table is for the CSRs (4? for RV32E, 16 for other types)
 // it's a CAM that's used to generate 2 tables (below)
@@ -55,7 +55,7 @@ union sv_pred_csr_entry {
         unsigned int inv   : 1; // inversion=1
         unsigned int type  : 1; // 1=INT, 0=FP
         uint64_t     regidx: 7; // 7 bits
-        unsigned int packed : 1; // Packed SIMD=1
+        unsigned int ffirst: 1; // Fail on first
     } b;
     unsigned short u;
 };
@@ -66,7 +66,7 @@ typedef struct {
     unsigned int inv   : 1; // inversion=1
     uint64_t     regidx: 7; // 7 bits
     unsigned int active: 1; // enabled=1, disabled=0
-    unsigned int packed : 1; // Packed SIMD=1
+    unsigned int ffirst: 1; // Fail on first
 } sv_pred_entry;
 
 bool sv_check_reg(bool intreg, uint64_t reg);