adapt CompletInstr field length to display vp4dpwssd properly

BeaEngine · BeaEngine · commit 80a752135569 · 2020-12-08T13:57:40.000+01:00
diff --git a/headers/BeaEngine.h b/headers/BeaEngine.h
@@ -16,7 +16,7 @@
 #endif
 
 
-#define INSTRUCT_LENGTH 64
+#define INSTRUCT_LENGTH 80
 
 #pragma pack(1)
 typedef struct {
diff --git a/headers/BeaEngineDelphi32.pas b/headers/BeaEngineDelphi32.pas
@@ -39,7 +39,7 @@ interface
 uses Windows,SysUtils;
 
   const
-     INSTRUCT_LENGTH = 64;
+     INSTRUCT_LENGTH = 80;
 
 
   type
diff --git a/headers/BeaEngineDelphi64.pas b/headers/BeaEngineDelphi64.pas
@@ -38,7 +38,7 @@ interface
 uses Windows,SysUtils;
 
   const
-     INSTRUCT_LENGTH = 64;
+     INSTRUCT_LENGTH = 80;
 
 
   type
diff --git a/headers/BeaEngineFasm32.inc b/headers/BeaEngineFasm32.inc
@@ -111,7 +111,7 @@ struct _Disasm
     EIP             dd   0
     VirtualAddr     dq   0
     SecurityBlock   dd   0
-    CompleteInstr   db   64 dup(0)
+    CompleteInstr   db   80 dup(0)
     Archi           dd   0
     Options         dq   0
     Instruction     INSTRTYPE
diff --git a/headers/BeaEngineFasm64.inc b/headers/BeaEngineFasm64.inc
@@ -111,7 +111,7 @@ struct _Disasm
     EIP             dq   0
     VirtualAddr     dq   0
     SecurityBlock   dd   0
-    CompleteInstr   db   64 dup(0)
+    CompleteInstr   db   80 dup(0)
     Archi           dd   0
     Options         dq   0
     Instruction     INSTRTYPE
diff --git a/headers/BeaEngineGoAsm32.inc b/headers/BeaEngineGoAsm32.inc
@@ -105,7 +105,7 @@ _Disasm STRUCT
     EIP             dd   0
     VirtualAddr     dq   0
     SecurityBlock   dd   0
-    CompleteInstr   db   64 dup 0
+    CompleteInstr   db   80 dup 0
     Archi           dd   0
     Options         dq   0
     Instruction     INSTRTYPE <0>
diff --git a/headers/BeaEngineGoAsm64.inc b/headers/BeaEngineGoAsm64.inc
@@ -105,7 +105,7 @@ _Disasm STRUCT
     EIP             dq   0
     VirtualAddr     dq   0
     SecurityBlock   dd   0
-    CompleteInstr   db   64 dup 0
+    CompleteInstr   db   80 dup 0
     Archi           dd   0
     Options         dq   0
     Instruction     INSTRTYPE <0>
diff --git a/headers/BeaEngineMasm32.inc b/headers/BeaEngineMasm32.inc
@@ -104,7 +104,7 @@ _Disasm STRUCT
     EIP             DWORD   0
     VirtualAddr     QWORD   0
     SecurityBlock   DWORD   0
-    CompleteInstr   BYTE    64 dup(0)
+    CompleteInstr   BYTE    80 dup(0)
     Archi           DWORD   0
     Options         QWORD   0
     Instruction     INSTRTYPE <0>
diff --git a/headers/BeaEngineMasm64.inc b/headers/BeaEngineMasm64.inc
@@ -104,7 +104,7 @@ _Disasm STRUCT
     EIP             QWORD   0
     VirtualAddr     QWORD   0
     SecurityBlock   DWORD   0
-    CompleteInstr   BYTE    64 dup(0)
+    CompleteInstr   BYTE    80 dup(0)
     Archi           DWORD   0
     Options         QWORD   0
     Instruction     INSTRTYPE <0>
diff --git a/headers/BeaEngineNasm32.inc b/headers/BeaEngineNasm32.inc
@@ -110,7 +110,7 @@ STRUC _Disasm
     EIP:             resd   1
     VirtualAddr:     resq   1
     SecurityBlock:   resd   1
-    CompleteInstr:   resb   64
+    CompleteInstr:   resb   80
     Archi:           resd   1
     Options:         resq   1
     Instruction:     resb   INSTRTYPE_size
diff --git a/headers/BeaEngineNasm64.inc b/headers/BeaEngineNasm64.inc
@@ -109,7 +109,7 @@ STRUC _Disasm
     EIP:             resq   1
     VirtualAddr:     resq   1
     SecurityBlock:   resd   1
-    CompleteInstr:   resb   64
+    CompleteInstr:   resb   80
     Archi:           resd   1
     Options:         resq   1
     Instruction:     resb   INSTRTYPE_size
diff --git a/headers/BeaEnginePureBasic32.pb b/headers/BeaEnginePureBasic32.pb
@@ -106,7 +106,7 @@ Structure _Disasm
   EIP.l
   VirtualAddr.q
   SecurityBlock.l
-  CompleteInstr.b[64]
+  CompleteInstr.b[80]
   Archi.l
   Options.q
   Instruction.INSTRTYPE
diff --git a/headers/BeaEnginePureBasic64.pb b/headers/BeaEnginePureBasic64.pb
@@ -106,7 +106,7 @@ Structure _Disasm
   EIP.q
   VirtualAddr.q
   SecurityBlock.l
-  CompleteInstr.b[64]
+  CompleteInstr.b[80]
   Archi.l
   Options.q
   Instruction.INSTRTYPE
diff --git a/headers/BeaEnginePython.py b/headers/BeaEnginePython.py
@@ -9,7 +9,7 @@
 import re
 import json
 
-INSTRUCT_LENGTH = 64
+INSTRUCT_LENGTH = 80
 
 class REX_Struct(Structure):
    _pack_= 1
diff --git a/headers/C# headers/Constants.cs b/headers/C# headers/Constants.cs
@@ -3,7 +3,7 @@ namespace Bea
 {
   public class BeaConstants
   {
-    public static int INSTRUCT_LENGTH = 64;
+    public static int INSTRUCT_LENGTH = 80;
 
     public enum SegmentRegister : byte
     {
diff --git a/include/beaengine/BeaEngine.h b/include/beaengine/BeaEngine.h
@@ -20,7 +20,7 @@ namespace BeaEngine {
 #endif
 
 
-#define INSTRUCT_LENGTH 64
+#define INSTRUCT_LENGTH 80
 
 #pragma pack(1)
 typedef struct {
diff --git a/src/Includes/BeaEngine.h b/src/Includes/BeaEngine.h
@@ -20,7 +20,7 @@ namespace BeaEngine {
 #endif
 
 
-#define INSTRUCT_LENGTH 64
+#define INSTRUCT_LENGTH 80
 
 #pragma pack(1)
 typedef struct {
diff --git a/src/Includes/instr_set/instructions_list.c b/src/Includes/instr_set/instructions_list.c
@@ -16654,6 +16654,7 @@ void __bea_callspec__ vpdpwssd_(PDISASM pMyDisasm)
           if (!Security(2, pMyDisasm)) return;
           GV.MOD_= ((*((UInt8*) (GV.EIP_+1))) >> 6) & 0x3;
           if ((GV.EVEX.b == 1) || (GV.MOD_ == 3)) GV.ERROR_OPCODE = UD_;
+          GV.EVEX.tupletype = TUPLE4;
           #ifndef BEA_LIGHT_DISASSEMBLY
             (void) strcpy (pMyDisasm->Instruction.Mnemonic, "vp4dpwssd");
           #endif
@@ -16723,6 +16724,7 @@ void __bea_callspec__ vpdpwssds_(PDISASM pMyDisasm)
         if (GV.VEX.L == 2) {
           if (!Security(2, pMyDisasm)) return;
           GV.MOD_= ((*((UInt8*) (GV.EIP_+1))) >> 6) & 0x3;
+          GV.EVEX.tupletype = TUPLE4;
           if ((GV.EVEX.b == 1) || (GV.MOD_ == 3)) GV.ERROR_OPCODE = UD_;
           #ifndef BEA_LIGHT_DISASSEMBLY
             (void) strcpy (pMyDisasm->Instruction.Mnemonic, "vp4dpwssds");
