Added dedicated Prefetch operand access type.

Internally, store the access type sepparately than the flags. Dump conditional operand accesses with exi option too.
2024-12-23 06:28:13 +00:00 · 2020-07-25 17:16:35 +03:00 · 2020-07-25 17:16:35 +03:00 · 4b2f2aee66
commit 4b2f2aee66
parent d11fe85599
21 changed files with 7467 additions and 7445 deletions
--- a/bddisasm/bddisasm.c
+++ b/bddisasm/bddisasm.c
@ -1275,7 +1275,7 @@ NdParseOperand(
 {
    NDSTATUS status;
    PND_OPERAND operand;
-    uint8_t opt, ops, opf, opd, opb;
+    uint8_t opt, ops, opf, opa, opd, opb;
    ND_REG_SIZE vsibRegSize;
    uint8_t vsibIndexSize, vsibIndexCount;
    ND_OPERAND_SIZE size, bcstSize;
@ -1294,6 +1294,7 @@ NdParseOperand(
    opt = ND_OP_TYPE(Specifier);
    ops = ND_OP_SIZE(Specifier);
    opf = ND_OP_FLAGS(Specifier);
    opa = ND_OP_ACCESS(Specifier);
    opd = ND_OP_DECORATORS(Specifier);
    opb = ND_OP_BLOCK(Specifier);
@ -1301,10 +1302,10 @@ NdParseOperand(
    operand = &Instrux->Operands[Index];
    // Fill in the flags.
-    operand->Flags.Flags = opf & 0xF;
+    operand->Flags.Flags = opf;
    // Store operand access modes.
-    operand->Access.Access = opf >> 4;
+    operand->Access.Access = opa;
    //
--- a/bddisasm/include/instructions.h
+++ b/bddisasm/include/instructions.h
--- a/bddisasm/include/tabledefs.h
+++ b/bddisasm/include/tabledefs.h
@ -222,14 +222,16 @@ typedef struct _ND_INSTRUCTION
 // Byte 0: operand type
 // Byte 1: operand size
 // Byte 2: operand flags
-// Byte 3: operand decorators
+// Byte 3: operand access
-// Byte 4: operand block addressing mode - 0 if not block addressing
+// Byte 4: operand decorators
 // Byte 5: operand block addressing mode - 0 if not block addressing
 //
-#define ND_OP(type, size, flags, dec, block)    (((uint64_t)((type) & 0xFF) << 0)   |    \
+#define ND_OP(type, size, flags, acc, dec, block)       (((uint64_t)((type) & 0xFF) << 0)   |    \
                                                         ((uint64_t)((size) & 0xFF) << 8)   |    \
                                                         ((uint64_t)((flags) & 0xFF) << 16) |    \
-                                                 ((uint64_t)((dec) & 0xFF) << 24)   |    \
+                                                         ((uint64_t)((acc) & 0xFF) << 24)   |    \
-                                                 ((uint64_t)((block) & 0xFF) << 32))
+                                                         ((uint64_t)((dec) & 0xFF) << 32)   |    \
                                                         ((uint64_t)((block) & 0xFF) << 40))
 #define OP ND_OP
@ -240,8 +242,10 @@ typedef struct _ND_INSTRUCTION
 #define ND_OP_TYPE(op)                      ((op) & 0xFF)
 #define ND_OP_SIZE(op)                      (((op) >> 8) & 0xFF)
 #define ND_OP_FLAGS(op)                     (((op) >> 16) & 0xFF)
-#define ND_OP_DECORATORS(op)                (((op) >> 24) & 0xFF)
+#define ND_OP_ACCESS(op)                    (((op) >> 24) & 0xFF)
-#define ND_OP_BLOCK(op)                     (((op) >> 32) & 0xFF)
+#define ND_OP_DECORATORS(op)                (((op) >> 32) & 0xFF)
 #define ND_OP_BLOCK(op)                     (((op) >> 40) & 0xFF)
@ -450,15 +454,21 @@ typedef enum _ND_OPERAND_TYPE_SPEC
 #define ND_OPF_DEFAULT              0x01    // The operand is default, no need to show it in disassembly.
 #define ND_OPF_SEX_OP1              0x02    // The operand is sign-extended to the first operands' size.
 #define ND_OPF_SEX_DWS              0x04    // The operand is sign-extended to the default word size.
-#define ND_OPF_N                    0x00    // The operand is not accessed.
+
-#define ND_OPF_R                    0x10    // The operand is read.
+
-#define ND_OPF_W                    0x20    // The operand is written.
+//
-#define ND_OPF_CR                   0x40    // The operand is read conditionally.
+// Operand access.
-#define ND_OPF_CW                   0x80    // The operand is written conditionally.
+//
-#define ND_OPF_RW                   0x30    // Read-Write access.
+#define ND_OPA_N                    0x00    // The operand is not accessed.
-#define ND_OPF_RCW                  0x90    // Read-Conditional Write access.
+#define ND_OPA_R                    0x01    // The operand is read.
-#define ND_OPF_CRW                  0X60    // Conditional Read-Write access.
+#define ND_OPA_W                    0x02    // The operand is written.
-#define ND_OPF_CRCW                 0xC0    // Conditional Read-Conditional Write access.
+#define ND_OPA_CR                   0x04    // The operand is read conditionally.
 #define ND_OPA_CW                   0x08    // The operand is written conditionally.
 #define ND_OPA_RW                   0x03    // Read-Write access.
 #define ND_OPA_RCW                  0x09    // Read-Conditional Write access.
 #define ND_OPA_CRW                  0X06    // Conditional Read-Write access.
 #define ND_OPA_CRCW                 0x0C    // Conditional Read-Conditional Write access.
 #define ND_OPA_P                    0x10    // The operand is memory, and it is prefetched.
 //
--- a/bddisasm_test/avx/avx2gather_64.result
+++ b/bddisasm_test/avx/avx2gather_64.result
@ -10,7 +10,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 2
@ -28,7 +28,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 4
@ -46,7 +46,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 2
@ -64,7 +64,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 2
@ -82,7 +82,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 1 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 4
@ -100,7 +100,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 4
@ -118,7 +118,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 2
@ -136,7 +136,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 2
@ -154,7 +154,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 1 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 4
@ -172,7 +172,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  -W,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
+        Operand: 0, Acc:  CRW,  Type:   Register, Size: 16, RawSize: 16, Encoding: R, RegType:           Vector, RegSize: 16, RegId: 2, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 7 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 2
--- a/bddisasm_test/avx512/avx512pf_64.result
+++ b/bddisasm_test/avx512/avx512pf_64.result
@ -12,7 +12,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 17 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -32,7 +32,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 16
                Decorator: Mask k5
@ -52,7 +52,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -72,7 +72,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 8
                Decorator: Mask k5
@ -92,7 +92,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 17 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -112,7 +112,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 16
                Decorator: Mask k5
@ -132,7 +132,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -152,7 +152,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 8
                Decorator: Mask k5
@ -172,7 +172,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 17 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -192,7 +192,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 16
                Decorator: Mask k5
@ -212,7 +212,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -232,7 +232,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 8
                Decorator: Mask k5
@ -252,7 +252,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 17 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -272,7 +272,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 4, VSIB element size: 4, VSIB element count: 16
                Decorator: Mask k5
@ -292,7 +292,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 64, RawSize: 64, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 8, VSIB element count: 8
                Decorator: Mask k5
@ -312,7 +312,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size: 32, RawSize: 32, Encoding: M, VSIB Addressing: yes, 
                Segment: 3, Base: 3, Index: 27 * 8, Displacement: 0x0000000000001000, 
                VSIB index size: 8, VSIB element size: 4, VSIB element count: 8
                Decorator: Mask k5
--- a/bddisasm_test/basic/basic1_64.result
+++ b/bddisasm_test/basic/basic1_64.result
@ -9017,11 +9017,11 @@
                REP: yes, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 0, Acc:  CW,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
        Operand: 1, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000638 f3ac                            REP LODSB
@ -9037,11 +9037,11 @@
                REP: yes, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 3, Base: 6, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 6, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 6, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 000000000000063A f266af                          REPNZ SCASW
@ -9058,10 +9058,10 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  2, RawSize:  2, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  2, RawSize:  2, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
 000000000000063D f348a7                          REPZ CMPSQ
@ -9077,12 +9077,12 @@
                REP: no, REPcc: yes, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:     Memory, Size:  8, RawSize:  8, Encoding: S, String: yes, 
+        Operand: 0, Acc:  CR,  Type:     Memory, Size:  8, RawSize:  8, Encoding: S, String: yes, 
                Segment: 3, Base: 6, 
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  8, RawSize:  8, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  8, RawSize:  8, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 6, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 6, RegCount: 1
-        Operand: 4, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 4, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 5, Acc:  RW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/basic2_64.result
+++ b/bddisasm_test/basic/basic2_64.result
@ -92,7 +92,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
                Segment: 3, Base: 3, 
 0000000000000014 0f1813                          PREFETCHT1 byte ptr [rbx]
@ -107,7 +107,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
                Segment: 3, Base: 3, 
 0000000000000017 0f181b                          PREFETCHT2 byte ptr [rbx]
@ -122,7 +122,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
                Segment: 3, Base: 3, 
 000000000000001A 0f1803                          PREFETCHNTA byte ptr [rbx]
@ -137,7 +137,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
+        Operand: 0, Acc:  P,  Type:     Memory, Size:  1, RawSize:  1, Encoding: M, 
                Segment: 3, Base: 3, 
 000000000000001D 660f42c1                        CMOVC     ax, cx
@ -154,7 +154,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -172,7 +172,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -190,7 +190,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -208,7 +208,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  2, RawSize:  2, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -227,7 +227,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  2, RawSize:  2, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -246,7 +246,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  4, RawSize:  4, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -265,7 +265,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  4, RawSize:  4, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -284,7 +284,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -303,7 +303,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:     Memory, Size:  4, RawSize:  4, Encoding: M, 
                Segment: 3, Base: 3, 
        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -385,7 +385,7 @@
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 3, RegCount: 1
-        Operand: 2, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  CRW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 2, RegCount: 1
 0000000000000050 660facc80a                      SHRD      ax, cx, 0x0a
@ -401,7 +401,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -419,7 +419,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -437,7 +437,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -455,7 +455,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -473,7 +473,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -491,7 +491,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -509,7 +509,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -527,7 +527,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -545,7 +545,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
        Operand: 3, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -563,7 +563,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  2, RawSize:  2, Encoding: M, RegType:  General Purpose, RegSize:  2, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  2, RawSize:  2, Encoding: R, RegType:  General Purpose, RegSize:  2, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:            Flags, RegSize:  2, RegId: 0, RegCount: 1
@ -581,7 +581,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -599,7 +599,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: M, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 2, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 1, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
@ -2010,10 +2010,10 @@
                REP: no, REPcc: no, LOCK: yes
                HLE: yes, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  4, RawSize:  4, Encoding: M, 
+        Operand: 0, Acc:  RCW,  Type:     Memory, Size:  4, RawSize:  4, Encoding: M, 
                Segment: 3, Base: 0, 
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 2, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 00000000000001DF 480fb110                        CMPXCHG   qword ptr [rax], rdx
@ -2029,10 +2029,10 @@
                REP: no, REPcc: no, LOCK: yes
                HLE: yes, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, 
+        Operand: 0, Acc:  RCW,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, 
                Segment: 3, Base: 0, 
        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: R, RegType:  General Purpose, RegSize:  8, RegId: 2, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
 00000000000001E3 0fc70c50                        CMPXCHG8B qword ptr [rax+rdx*2]
@ -2049,10 +2049,10 @@
                REP: no, REPcc: no, LOCK: yes
                HLE: yes, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, 
+        Operand: 0, Acc:  RCW,  Type:     Memory, Size:  8, RawSize:  8, Encoding: M, 
                Segment: 3, Base: 0, Index: 2 * 2, 
-        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 2, RegCount: 1
+        Operand: 1, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 2, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
        Operand: 3, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 1, RegCount: 1
        Operand: 4, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 3, RegCount: 1
        Operand: 5, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -2071,10 +2071,10 @@
                REP: no, REPcc: no, LOCK: yes
                HLE: yes, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  R-,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, 
+        Operand: 0, Acc:  RCW,  Type:     Memory, Size: 16, RawSize: 16, Encoding: M, 
                Segment: 3, Base: 6, Index: 7 * 4, 
-        Operand: 1, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 2, RegCount: 1
+        Operand: 1, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 2, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 0, RegCount: 1
        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
        Operand: 4, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 3, RegCount: 1
        Operand: 5, Acc:  -W,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:            Flags, RegSize:  8, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/fpu_64.result
+++ b/bddisasm_test/basic/fpu_64.result
@ -1029,7 +1029,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1049,7 +1049,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1069,7 +1069,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1089,7 +1089,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1291,7 +1291,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1311,7 +1311,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1331,7 +1331,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
@ -1351,7 +1351,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size: 10, RawSize: 10, Encoding: S, RegType:               FP, RegSize: 10, RegId: 0, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size: 10, RawSize: 10, Encoding: M, RegType:               FP, RegSize: 10, RegId: 7, RegCount: 1
        Operand: 2, Acc:  RW,  Type:   Register, Size:  2, RawSize:  2, Encoding: S, RegType:           System, RegSize:  2, RegId: 2, RegCount: 1
        Operand: 3, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/prefixes_64.result
+++ b/bddisasm_test/basic/prefixes_64.result
@ -571,11 +571,11 @@
                REP: yes, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 0, Acc:  CW,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
        Operand: 1, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000085 f2aa                            REPNZ STOSB
@ -591,11 +591,11 @@
                REP: yes, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 0, Acc:  CW,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
        Operand: 1, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000087 f3ae                            REPZ SCASB
@ -612,10 +612,10 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000089 f2ae                            REPNZ SCASB
@ -632,10 +632,10 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 000000000000008B f3f2ae                          REPNZ SCASB
@ -652,10 +652,10 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 000000000000008E f2f3ae                          REPZ SCASB
@ -672,10 +672,10 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:   Register, Size:  1, RawSize:  1, Encoding: S, RegType:  General Purpose, RegSize:  1, RegId: 0, RegCount: 1
-        Operand: 1, Acc:  --,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
+        Operand: 1, Acc:  CR,  Type:     Memory, Size:  1, RawSize:  1, Encoding: S, String: yes, 
                Segment: 0, Base: 7, 
-        Operand: 2, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
+        Operand: 2, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 1, RegCount: 1
-        Operand: 3, Acc:  R-,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
+        Operand: 3, Acc:  RCW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:  General Purpose, RegSize:  8, RegId: 7, RegCount: 1
        Operand: 4, Acc:  RW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000091 0f10c0                          MOVUPS    xmm0, xmm0
--- a/bddisasm_test/basic/system_16.result
+++ b/bddisasm_test/basic/system_16.result
@ -413,7 +413,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 6, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 6, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 7, RegCount: 1
        Operand: 2, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/system_32.result
+++ b/bddisasm_test/basic/system_32.result
@ -413,7 +413,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 6, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 6, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 7, RegCount: 1
        Operand: 2, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/system_64.result
+++ b/bddisasm_test/basic/system_64.result
@ -441,7 +441,7 @@
                REP: no, REPcc: no, LOCK: no
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
-        Operand: 0, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 14, RegCount: 1
+        Operand: 0, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: R, RegType:  General Purpose, RegSize:  4, RegId: 14, RegCount: 1
        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: M, RegType:  General Purpose, RegSize:  4, RegId: 13, RegCount: 1
        Operand: 2, Acc:  -W,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:            Flags, RegSize:  4, RegId: 0, RegCount: 1
--- a/bddisasm_test/basic/tsx_64.result
+++ b/bddisasm_test/basic/tsx_64.result
@ -12,7 +12,7 @@
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:     Offset, Size:  4, RawSize:  4, Encoding: D
        Operand: 1, Acc:  RW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:               IP, RegSize:  8, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000006 0f01d6                          XTEST
        DSIZE: 32, ASIZE: 64, VLEN: -
@ -43,7 +43,7 @@
                HLE: no, XACQUIRE only: no, XRELEASE only: no
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:  Immediate, Size:  1, RawSize:  1, Encoding: I
-        Operand: 1, Acc:  R-,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 1, Acc:  RCW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
 000000000000000C 0f01d5                          XEND
        DSIZE: 32, ASIZE: 64, VLEN: -
--- a/bddisasm_test/special/regressions_64.result
+++ b/bddisasm_test/special/regressions_64.result
@ -12,7 +12,7 @@
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:     Offset, Size:  2, RawSize:  2, Encoding: D
        Operand: 1, Acc:  RW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:               IP, RegSize:  8, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
 0000000000000006 26c7f800000000                  XBEGIN    0xd
        DSIZE: 32, ASIZE: 64, VLEN: -
@ -28,7 +28,7 @@
                BND: no, BHINT: no, DNT: no
        Operand: 0, Acc:  R-,  Type:     Offset, Size:  4, RawSize:  4, Encoding: D
        Operand: 1, Acc:  RW,  Type:   Register, Size:  8, RawSize:  8, Encoding: S, RegType:               IP, RegSize:  8, RegId: 0, RegCount: 1
-        Operand: 2, Acc:  --,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
+        Operand: 2, Acc:  CW,  Type:   Register, Size:  4, RawSize:  4, Encoding: S, RegType:  General Purpose, RegSize:  4, RegId: 0, RegCount: 1
 000000000000000D 660f01d9                        VMMCALL
        DSIZE: 32, ASIZE: 64, VLEN: -
--- a/disasmtool/disasmtool.c
+++ b/disasmtool/disasmtool.c
@ -862,8 +862,15 @@ print_instruction(
        for (i = 0; i < Instrux->OperandsCount; i++)
        {
            printf("        Operand: %d, Acc:  %s,  Type: %10s, Size: %2d, RawSize: %2d, Encoding: %s", i,
-                Instrux->Operands[i].Access.Read && Instrux->Operands[i].Access.Write ? "RW" :
+                Instrux->Operands[i].Access.Access == ND_ACCESS_READ ? "R-" :
-                Instrux->Operands[i].Access.Write ? "-W" : Instrux->Operands[i].Access.Read ? "R-" : "--",
+                Instrux->Operands[i].Access.Access == ND_ACCESS_WRITE ? "-W" :
                Instrux->Operands[i].Access.Access == (ND_ACCESS_READ|ND_ACCESS_WRITE) ? "RW" :
                Instrux->Operands[i].Access.Access == ND_ACCESS_COND_READ ? "CR" :
                Instrux->Operands[i].Access.Access == ND_ACCESS_COND_WRITE ? "CW" :
                Instrux->Operands[i].Access.Access == (ND_ACCESS_COND_READ|ND_ACCESS_COND_WRITE) ? "CRCW" :
                Instrux->Operands[i].Access.Access == (ND_ACCESS_READ | ND_ACCESS_COND_WRITE) ? "RCW" :
                Instrux->Operands[i].Access.Access == (ND_ACCESS_COND_READ|ND_ACCESS_WRITE) ? "CRW" :
                Instrux->Operands[i].Access.Access == ND_ACCESS_PREFETCH ? "P" : "--",
                optype_to_string(Instrux->Operands[i].Type), Instrux->Operands[i].Size,
                Instrux->Operands[i].RawSize, encoding_to_string(Instrux->Operands[i].Encoding)
            );
--- a/inc/bddisasm.h
+++ b/inc/bddisasm.h
@ -209,13 +209,14 @@ typedef uint32_t ND_REG_SIZE;
 //
 // Operand access flags.
 //
-#define ND_ACCESS_NONE              0           // The operand is not accessed.
+#define ND_ACCESS_NONE              0x00        // The operand is not accessed.
-#define ND_ACCESS_READ              1           // The operand is read.
+#define ND_ACCESS_READ              0x01        // The operand is read.
-#define ND_ACCESS_WRITE             2           // The operand is written.
+#define ND_ACCESS_WRITE             0x02        // The operand is written.
-#define ND_ACCESS_COND_READ         4           // The operand is read only if some conditions are met.
+#define ND_ACCESS_COND_READ         0x04        // The operand is read only if some conditions are met.
-#define ND_ACCESS_COND_WRITE        8           // The operand is written only if some conditions are met (ie: CMOVcc).
+#define ND_ACCESS_COND_WRITE        0x08        // The operand is written only if some conditions are met (ie: CMOVcc).
 #define ND_ACCESS_ANY_READ          (ND_ACCESS_READ | ND_ACCESS_COND_READ)      // Any read mask.
 #define ND_ACCESS_ANY_WRITE         (ND_ACCESS_WRITE | ND_ACCESS_COND_WRITE)    // Any write mask.
 #define ND_ACCESS_PREFETCH          0x10        // The operand is prefetched.
 //
@ -685,6 +686,7 @@ typedef union _ND_OPERAND_ACCESS
        uint8_t         Write : 1;      // The operand is written.
        uint8_t         CondRead : 1;   // The operand is read only under some conditions.
        uint8_t         CondWrite : 1;  // The operand is written only under some conditions.
        uint8_t         Prefetch : 1;   // The operand is prefetched.
    };
 } ND_OPERAND_ACCESS;
--- a/inc/version.h
+++ b/inc/version.h
@ -7,6 +7,6 @@
 #define DISASM_VERSION_MAJOR        1
 #define DISASM_VERSION_MINOR        26
-#define DISASM_VERSION_REVISION     1
+#define DISASM_VERSION_REVISION     2
 #endif // _DISASM_VER_H_
--- a/isagenerator/disasmlib.py
+++ b/isagenerator/disasmlib.py
@ -344,6 +344,7 @@ valid_prefixes = [
 valid_access = [
    'N',            # No access.
    'P',            # Prefetch access.
    'R',            # Read.
    'W',            # Write.
    'CR',           # Conditional read.
--- a/isagenerator/generate_tables.py
+++ b/isagenerator/generate_tables.py
@ -243,15 +243,16 @@ opdecorators = {
 }
 accessmap = {
-    'R'        : 'ND_OPF_R',
+    'R'        : 'ND_OPA_R',
-    'W'        : 'ND_OPF_W',
+    'W'        : 'ND_OPA_W',
-    'CR'       : 'ND_OPF_CR',
+    'CR'       : 'ND_OPA_CR',
-    'CW'       : 'ND_OPF_CW',
+    'CW'       : 'ND_OPA_CW',
-    'RW'       : 'ND_OPF_RW',
+    'RW'       : 'ND_OPA_RW',
-    'RCW'      : 'ND_OPF_RCW',
+    'RCW'      : 'ND_OPA_RCW',
-    'CRW'      : 'ND_OPF_CRW',
+    'CRW'      : 'ND_OPA_CRW',
-    'CRCW'     : 'ND_OPF_CRCW',
+    'CRCW'     : 'ND_OPA_CRCW',
-    'N'        : 'ND_OPF_N',
+    'P'        : 'ND_OPA_P',
    'N'        : 'ND_OPA_N',
 }
 tuples = {
@ -427,8 +428,8 @@ features = []
 # Convert one operand into it's C/C++ representation.
 #
 def cdef_operand(self):
-    return "OP(%s, %s, %s, %s, %d)" % (optype[self.Type], opsize[self.Size], \
+    return "OP(%s, %s, %s, %s, %s, %d)" % (optype[self.Type], opsize[self.Size], \
-           '|'.join([opflags[x] for x in self.Flags] + [accessmap[self.Access]]) or '0', \
+           '|'.join([opflags[x] for x in self.Flags]) or '0', accessmap[self.Access],   \
           '|'.join([opdecorators[x] for x in self.Decorators]) or 0, self.Block)
 disasmlib.Operand.cdef = cdef_operand
--- a/isagenerator/instructions/table_0F.dat
+++ b/isagenerator/instructions/table_0F.dat
@ -81,21 +81,21 @@ WBINVD         nil           nil                       [            0x0F 0x09]
 WBNOINVD       nil           nil                       [      a0xF3 0x0F 0x09]                 s:WBNOINVD, t:WBNOINVD, m:KERNEL|NOV86
 CL1INVMB       nil           nil                       [            0x0F 0x0A]                 s:SCC, t:SYSTEM
 UD2            nil           nil                       [            0x0F 0x0B]                 s:PPRO, t:MISC
-PREFETCHE      Mb            nil                       [            0x0F 0x0D /0:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCHE      Mb            nil                       [            0x0F 0x0D /0:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /0:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCHW      Mb            nil                       [            0x0F 0x0D /1:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCHW      Mb            nil                       [            0x0F 0x0D /1:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /1:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCHWT1    Mb            nil                       [            0x0F 0x0D /2:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCHWT1    Mb            nil                       [            0x0F 0x0D /2:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /2:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCHM      Mb            nil                       [            0x0F 0x0D /3:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCHM      Mb            nil                       [            0x0F 0x0D /3:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /3:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCH       Mb            nil                       [            0x0F 0x0D /4:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCH       Mb            nil                       [            0x0F 0x0D /4:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /4:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCH       Mb            nil                       [            0x0F 0x0D /5:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCH       Mb            nil                       [            0x0F 0x0D /5:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /5:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCH       Mb            nil                       [            0x0F 0x0D /6:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCH       Mb            nil                       [            0x0F 0x0D /6:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /6:reg]          s:PPRO, t:NOP, w:R|R
-PREFETCH       Mb            nil                       [            0x0F 0x0D /7:mem]          s:PREFETCH_NOP, t:PREFETCH, w:R
+PREFETCH       Mb            nil                       [            0x0F 0x0D /7:mem]          s:PREFETCH_NOP, t:PREFETCH, w:P
 NOP            Ev,Gv         nil                       [            0x0F 0x0D /7:reg]          s:PPRO, t:NOP, w:R|R
 FEMMS          nil           nil                       [            0x0F 0x0E]                 s:3DNOW, t:MMX, c:FEMMS
@ -125,13 +125,13 @@ MOVHPD         Vq,Mq         nil                       [       0x66 0x0F 0x16 /r
 MOVSHDUP       Vx,Wx         nil                       [       0xF3 0x0F 0x16 /r]              s:SSE3, t:DATAXFER, w:W|R, e:4
 MOVHPS         Mq,Vq         nil                       [         NP 0x0F 0x17 /r:mem]          s:SSE, t:DATAXFER, w:W|R, e:5
 MOVHPD         Mq,Vq         nil                       [       0x66 0x0F 0x17 /r:mem]          s:SSE2, t:DATAXFER, w:W|R, e:5
-PREFETCHNTA    Mb            nil                       [            0x0F 0x18 /0:mem]          s:SSE, t:PREFETCH, w:R
+PREFETCHNTA    Mb            nil                       [            0x0F 0x18 /0:mem]          s:SSE, t:PREFETCH, w:P
 NOP            Ev            nil                       [            0x0F 0x18 /0:reg]          s:PPRO, t:WIDENOP, w:R
-PREFETCHT0     Mb            nil                       [            0x0F 0x18 /1:mem]          s:SSE, t:PREFETCH, w:R
+PREFETCHT0     Mb            nil                       [            0x0F 0x18 /1:mem]          s:SSE, t:PREFETCH, w:P
 NOP            Ev            nil                       [            0x0F 0x18 /1:reg]          s:PPRO, t:WIDENOP, w:R
-PREFETCHT1     Mb            nil                       [            0x0F 0x18 /2:mem]          s:SSE, t:PREFETCH, w:R
+PREFETCHT1     Mb            nil                       [            0x0F 0x18 /2:mem]          s:SSE, t:PREFETCH, w:P
 NOP            Ev            nil                       [            0x0F 0x18 /2:reg]          s:PPRO, t:WIDENOP, w:R
-PREFETCHT2     Mb            nil                       [            0x0F 0x18 /3:mem]          s:SSE, t:PREFETCH, w:R
+PREFETCHT2     Mb            nil                       [            0x0F 0x18 /3:mem]          s:SSE, t:PREFETCH, w:P
 NOP            Ev            nil                       [            0x0F 0x18 /3:reg]          s:PPRO, t:WIDENOP, w:R
 NOP            Ev            nil                       [            0x0F 0x18 /4]              s:PPRO, t:WIDENOP, w:R
 NOP            Ev            nil                       [            0x0F 0x18 /5]              s:PPRO, t:WIDENOP, w:R
--- a/isagenerator/instructions/table_evex2.dat
+++ b/isagenerator/instructions/table_evex2.dat
@ -303,22 +303,22 @@ VFNMSUB231SD         Vdq{K}{z},Hdq,Wsd{er}        nil       [evex m:2 p:1 l:i w:
 # 0xC0 - 0xCF
 VPCONFLICTD          Vn{K}{z},Wn|B32              nil       [evex m:2 p:1 l:x w:0 0xC4 /r]             s:AVX512CD, t:CONFLICT, l:fv, e:E4NF, w:W|R|R
 VPCONFLICTQ          Vn{K}{z},Wn|B64              nil       [evex m:2 p:1 l:x w:1 0xC4 /r]             s:AVX512CD, t:CONFLICT, l:fv, e:E4NF, w:W|R|R
-VGATHERPF0DPS        Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF0DPS        Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF0DPD        Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF0DPD        Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF1DPS        Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF1DPS        Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF1DPD        Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF1DPD        Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF0DPS       Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF0DPS       Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF0DPD       Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF0DPD       Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF1DPS       Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF1DPS       Mvm32n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC6 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF1DPD       Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF1DPD       Mvm32h{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC6 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF0QPS        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF0QPS        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF0QPD        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF0QPD        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /1:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF1QPS        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF1QPS        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VGATHERPF1QPD        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VGATHERPF1QPD        Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /2:mem vsib]    s:AVX512PF, t:GATHER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF0QPS       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF0QPS       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF0QPD       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF0QPD       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /5:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF1QPS       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF1QPS       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:0 0xC7 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
-VSCATTERPF1QPD       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:R|R
+VSCATTERPF1QPD       Mvm64n{K}                    nil       [evex m:2 p:1 l:2 w:1 0xC7 /6:mem vsib]    s:AVX512PF, t:SCATTER, a:MMASK, l:t1s, e:E12NP, w:P|R
 VEXP2PS              Voq{K}{z},Woq|B32{sae}       nil       [evex m:2 p:1 l:2 w:0 0xC8 /r]             s:AVX512ER, t:KNL, l:fv, e:E2, w:W|R|R
 VEXP2PD              Voq{K}{z},Woq|B64{sae}       nil       [evex m:2 p:1 l:2 w:1 0xC8 /r]             s:AVX512ER, t:KNL, l:fv, e:E2, w:W|R|R