From 03b4d69b08b55f32dc36ed024b8283ca9a021d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=B6ner?= <athre0z@zyantific.com>
Date: Sat, 26 Nov 2016 01:16:08 +0100
Subject: [PATCH] regs and flags PTWRITE - PXOR

---
 assets/instructions.json | 442 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 413 insertions(+), 29 deletions(-)

diff --git a/assets/instructions.json b/assets/instructions.json
index 69a9027..6ba9b07 100644
--- a/assets/instructions.json
+++ b/assets/instructions.json
@@ -53516,6 +53516,12 @@
           "type": "es"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53529,6 +53535,12 @@
           "type": "cs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53542,6 +53554,12 @@
           "type": "ss"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53555,6 +53573,12 @@
           "type": "ds"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53570,6 +53594,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53585,6 +53615,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53600,6 +53636,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53615,6 +53657,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53630,6 +53678,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53645,6 +53699,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53660,6 +53720,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53675,6 +53741,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53690,6 +53762,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53705,6 +53783,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53720,6 +53804,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53735,6 +53825,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53750,6 +53846,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53765,6 +53867,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53780,6 +53888,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53795,6 +53909,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53810,6 +53930,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53825,6 +53951,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53840,6 +53972,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53855,6 +53993,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53870,6 +54014,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53885,6 +54035,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53900,6 +54056,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53915,6 +54077,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53930,6 +54098,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53945,6 +54119,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53960,6 +54140,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53975,6 +54161,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -53990,6 +54182,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54005,6 +54203,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54020,6 +54224,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54035,6 +54245,12 @@
           "encoding": "opcode"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54050,6 +54266,12 @@
           "encoding": "imm16"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54065,6 +54287,12 @@
           "encoding": "imm32"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54080,6 +54308,12 @@
           "encoding": "imm16"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54095,6 +54329,12 @@
           "encoding": "imm32"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "cd8scale": 0
     },
     {
@@ -54110,6 +54350,12 @@
           "encoding": "imm8"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push $i16i8imm (PUSH16i8)",
       "cd8scale": 0
     },
@@ -54126,6 +54372,12 @@
           "encoding": "imm8"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push $i64i8imm (PUSH64i8)",
       "cd8scale": 0
     },
@@ -54142,6 +54394,12 @@
           "encoding": "imm8"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push $i16i8imm (PUSH16i8)",
       "cd8scale": 0
     },
@@ -54158,6 +54416,12 @@
           "encoding": "imm8"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push $i32i8imm (PUSH32i8)",
       "cd8scale": 0
     },
@@ -54177,10 +54441,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $i16mem (PUSH16rmm)",
       "cd8scale": 0
@@ -54225,10 +54489,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $GR16 (PUSH16rmr)",
       "cd8scale": 0
@@ -54273,10 +54537,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $i16mem (PUSH16rmm)",
       "cd8scale": 0
@@ -54297,10 +54561,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $i32mem (PUSH32rmm)",
       "cd8scale": 0
@@ -54321,10 +54585,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $GR16 (PUSH16rmr)",
       "cd8scale": 0
@@ -54345,10 +54609,10 @@
         }
       },
       "implicit_read": [
-        "esp"
+        "rsp"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
       "comment": "push $GR32 (PUSH32rmr)",
       "cd8scale": 0
@@ -54366,6 +54630,12 @@
           "type": "fs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push fs (PUSHFS16)",
       "cd8scale": 0
     },
@@ -54382,6 +54652,12 @@
           "type": "fs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push fs (PUSHFS16)",
       "cd8scale": 0
     },
@@ -54398,6 +54674,12 @@
           "type": "fs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push fs (PUSHFS16)",
       "cd8scale": 0
     },
@@ -54414,6 +54696,12 @@
           "type": "fs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push fs (PUSHFS16)",
       "cd8scale": 0
     },
@@ -54430,6 +54718,12 @@
           "type": "gs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push gs (PUSHGS16)",
       "cd8scale": 0
     },
@@ -54446,6 +54740,12 @@
           "type": "gs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push gs (PUSHGS16)",
       "cd8scale": 0
     },
@@ -54462,6 +54762,12 @@
           "type": "gs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push gs (PUSHGS16)",
       "cd8scale": 0
     },
@@ -54478,25 +54784,51 @@
           "type": "gs"
         }
       },
+      "implicit_read": [
+        "rsp"
+      ],
+      "implicit_write": [
+        "rsp"
+      ],
       "comment": "push gs (PUSHGS16)",
       "cd8scale": 0
     },
     {
-      "mnemonic": "pushal",
-      "opcode": "60",
-      "extensions": {
-        "mode": "exclude64",
-        "opsize": "32"
-      },
-      "cd8scale": 0
-    },
-    {
-      "mnemonic": "pushaw",
+      "mnemonic": "pusha",
       "opcode": "60",
       "extensions": {
         "mode": "exclude64",
         "opsize": "16"
       },
+      "implicit_read": [
+        "ax",
+        "cx",
+        "dx",
+        "bx",
+        "sp",
+        "bp",
+        "si",
+        "di"
+      ],
+      "cd8scale": 0
+    },
+    {
+      "mnemonic": "pushad",
+      "opcode": "60",
+      "extensions": {
+        "mode": "exclude64",
+        "opsize": "32"
+      },
+      "implicit_read": [
+        "eax",
+        "ecx",
+        "edx",
+        "ebx",
+        "esp",
+        "ebp",
+        "esi",
+        "edi"
+      ],
       "cd8scale": 0
     },
     {
@@ -54507,12 +54839,23 @@
         "opsize": "16"
       },
       "implicit_read": [
-        "esp",
+        "rsp",
         "eflags"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
+      "x86flags": {
+        "cf": "tested",
+        "pf": "tested",
+        "af": "tested",
+        "zf": "tested",
+        "sf": "tested",
+        "tf": "tested",
+        "if": "tested",
+        "df": "tested",
+        "of": "tested"
+      },
       "comment": "pushf (PUSHF16)",
       "cd8scale": 0
     },
@@ -54524,12 +54867,23 @@
         "opsize": "16"
       },
       "implicit_read": [
-        "esp",
+        "rsp",
         "eflags"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
+      "x86flags": {
+        "cf": "tested",
+        "pf": "tested",
+        "af": "tested",
+        "zf": "tested",
+        "sf": "tested",
+        "tf": "tested",
+        "if": "tested",
+        "df": "tested",
+        "of": "tested"
+      },
       "comment": "pushf (PUSHF16)",
       "cd8scale": 0
     },
@@ -54541,12 +54895,27 @@
         "opsize": "32"
       },
       "implicit_read": [
-        "esp",
+        "rsp",
         "eflags"
       ],
       "implicit_write": [
-        "esp"
+        "rsp"
       ],
+      "x86flags": {
+        "cf": "tested",
+        "pf": "tested",
+        "af": "tested",
+        "zf": "tested",
+        "sf": "tested",
+        "tf": "tested",
+        "if": "tested",
+        "df": "tested",
+        "of": "tested",
+        "ac": "tested",
+        "vif": "tested",
+        "vip": "tested",
+        "id": "tested"
+      },
       "comment": "pushfd (PUSHF32)",
       "cd8scale": 0
     },
@@ -54559,11 +54928,26 @@
       },
       "implicit_read": [
         "rsp",
-        "eflags"
+        "rflags"
       ],
       "implicit_write": [
         "rsp"
       ],
+      "x86flags": {
+        "cf": "tested",
+        "pf": "tested",
+        "af": "tested",
+        "zf": "tested",
+        "sf": "tested",
+        "tf": "tested",
+        "if": "tested",
+        "df": "tested",
+        "of": "tested",
+        "ac": "tested",
+        "vif": "tested",
+        "vip": "tested",
+        "id": "tested"
+      },
       "comment": "pushfq (PUSHF64)",
       "cd8scale": 0
     },