From 6a3283bbb20ea156cb7daa399d10b255e313fc5d Mon Sep 17 00:00:00 2001 From: Nicolas Derumigny Date: Thu, 2 Jul 2020 16:39:15 +0200 Subject: [PATCH] Correcting X86 Imm Size --- arch/X86/X86ImmSize.inc | 192 ++++++++++++++++++++-------------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/arch/X86/X86ImmSize.inc b/arch/X86/X86ImmSize.inc index db8927dd..33243e7b 100644 --- a/arch/X86/X86ImmSize.inc +++ b/arch/X86/X86ImmSize.inc @@ -2,19 +2,19 @@ {1, 1, X86_AAM8i8}, {2, 2, X86_ADC16i16}, {2, 2, X86_ADC16mi}, -{1, 2, X86_ADC16mi8}, +{2, 1, X86_ADC16mi8}, {2, 2, X86_ADC16ri}, -{1, 2, X86_ADC16ri8}, +{2, 1, X86_ADC16ri8}, {4, 4, X86_ADC32i32}, {4, 4, X86_ADC32mi}, -{1, 4, X86_ADC32mi8}, +{4, 1, X86_ADC32mi8}, {4, 4, X86_ADC32ri}, -{1, 4, X86_ADC32ri8}, -{4, 8, X86_ADC64i32}, -{4, 8, X86_ADC64mi32}, -{1, 8, X86_ADC64mi8}, -{4, 8, X86_ADC64ri32}, -{1, 8, X86_ADC64ri8}, +{4, 1, X86_ADC32ri8}, +{8, 4, X86_ADC64i32}, +{8, 4, X86_ADC64mi32}, +{8, 1, X86_ADC64mi8}, +{8, 4, X86_ADC64ri32}, +{8, 1, X86_ADC64ri8}, {1, 1, X86_ADC8i8}, {1, 1, X86_ADC8mi}, {1, 1, X86_ADC8mi8}, @@ -22,19 +22,19 @@ {1, 1, X86_ADC8ri8}, {2, 2, X86_ADD16i16}, {2, 2, X86_ADD16mi}, -{1, 2, X86_ADD16mi8}, +{2, 1, X86_ADD16mi8}, {2, 2, X86_ADD16ri}, -{1, 2, X86_ADD16ri8}, +{2, 1, X86_ADD16ri8}, {4, 4, X86_ADD32i32}, {4, 4, X86_ADD32mi}, -{1, 4, X86_ADD32mi8}, +{4, 1, X86_ADD32mi8}, {4, 4, X86_ADD32ri}, -{1, 4, X86_ADD32ri8}, -{4, 8, X86_ADD64i32}, -{4, 8, X86_ADD64mi32}, -{1, 8, X86_ADD64mi8}, -{4, 8, X86_ADD64ri32}, -{1, 8, X86_ADD64ri8}, +{4, 1, X86_ADD32ri8}, +{8, 4, X86_ADD64i32}, +{8, 4, X86_ADD64mi32}, +{8, 1, X86_ADD64mi8}, +{8, 4, X86_ADD64ri32}, +{8, 1, X86_ADD64ri8}, {1, 1, X86_ADD8i8}, {1, 1, X86_ADD8mi}, {1, 1, X86_ADD8mi8}, @@ -42,19 +42,19 @@ {1, 1, X86_ADD8ri8}, {2, 2, X86_AND16i16}, {2, 2, X86_AND16mi}, -{1, 2, X86_AND16mi8}, +{2, 1, X86_AND16mi8}, {2, 2, X86_AND16ri}, -{1, 2, X86_AND16ri8}, +{2, 1, X86_AND16ri8}, {4, 4, X86_AND32i32}, {4, 4, X86_AND32mi}, -{1, 4, X86_AND32mi8}, +{4, 1, X86_AND32mi8}, {4, 4, X86_AND32ri}, -{1, 4, X86_AND32ri8}, -{4, 8, X86_AND64i32}, -{4, 8, X86_AND64mi32}, -{1, 8, X86_AND64mi8}, -{4, 8, X86_AND64ri32}, -{1, 8, X86_AND64ri8}, +{4, 1, X86_AND32ri8}, +{8, 4, X86_AND64i32}, +{8, 4, X86_AND64mi32}, +{8, 1, X86_AND64mi8}, +{8, 4, X86_AND64ri32}, +{8, 1, X86_AND64ri8}, {1, 1, X86_AND8i8}, {1, 1, X86_AND8mi}, {1, 1, X86_AND8mi8}, @@ -85,35 +85,35 @@ {1, 1, X86_BTS64mi8}, {1, 1, X86_BTS64ri8}, {2, 2, X86_CALLpcrel16}, -{2, 4, X86_CALLpcrel32}, +{4, 2, X86_CALLpcrel32}, {2, 2, X86_CMP16i16}, {2, 2, X86_CMP16mi}, -{1, 2, X86_CMP16mi8}, +{2, 1, X86_CMP16mi8}, {2, 2, X86_CMP16ri}, -{1, 2, X86_CMP16ri8}, +{2, 1, X86_CMP16ri8}, {4, 4, X86_CMP32i32}, {4, 4, X86_CMP32mi}, -{1, 4, X86_CMP32mi8}, +{4, 1, X86_CMP32mi8}, {4, 4, X86_CMP32ri}, -{1, 4, X86_CMP32ri8}, -{4, 8, X86_CMP64i32}, -{4, 8, X86_CMP64mi32}, -{1, 8, X86_CMP64mi8}, -{4, 8, X86_CMP64ri32}, -{1, 8, X86_CMP64ri8}, +{4, 1, X86_CMP32ri8}, +{8, 4, X86_CMP64i32}, +{8, 4, X86_CMP64mi32}, +{8, 1, X86_CMP64mi8}, +{8, 4, X86_CMP64ri32}, +{8, 1, X86_CMP64ri8}, {1, 1, X86_CMP8i8}, {1, 1, X86_CMP8mi}, {1, 1, X86_CMP8mi8}, {1, 1, X86_CMP8ri}, {1, 1, X86_CMP8ri8}, -{1, 2, X86_IMUL16rmi8}, -{1, 2, X86_IMUL16rri8}, -{1, 4, X86_IMUL32rmi8}, -{1, 4, X86_IMUL32rri8}, -{4, 8, X86_IMUL64rmi32}, -{1, 8, X86_IMUL64rmi8}, -{4, 8, X86_IMUL64rri32}, -{1, 8, X86_IMUL64rri8}, +{2, 1, X86_IMUL16rmi8}, +{2, 1, X86_IMUL16rri8}, +{4, 1, X86_IMUL32rmi8}, +{4, 1, X86_IMUL32rri8}, +{8, 4, X86_IMUL64rmi32}, +{8, 1, X86_IMUL64rmi8}, +{8, 4, X86_IMUL64rri32}, +{8, 1, X86_IMUL64rri8}, {2, 2, X86_IN16ri}, {4, 4, X86_IN32ri}, {1, 1, X86_IN8ri}, @@ -124,36 +124,36 @@ {4, 4, X86_MOV32mi}, {4, 4, X86_MOV32ri}, {4, 4, X86_MOV32ri_alt}, -{4, 8, X86_MOV64mi32}, +{8, 4, X86_MOV64mi32}, {8, 8, X86_MOV64ri}, -{4, 8, X86_MOV64ri32}, +{8, 4, X86_MOV64ri32}, {1, 1, X86_MOV8mi}, {1, 1, X86_MOV8ri}, {1, 1, X86_MOV8ri_alt}, {2, 2, X86_OR16i16}, {2, 2, X86_OR16mi}, -{1, 2, X86_OR16mi8}, +{2, 1, X86_OR16mi8}, {2, 2, X86_OR16ri}, -{1, 2, X86_OR16ri8}, +{2, 1, X86_OR16ri8}, {4, 4, X86_OR32i32}, {4, 4, X86_OR32mi}, -{1, 4, X86_OR32mi8}, +{4, 1, X86_OR32mi8}, {4, 4, X86_OR32ri}, -{1, 4, X86_OR32ri8}, -{4, 8, X86_OR64i32}, -{4, 8, X86_OR64mi32}, -{1, 8, X86_OR64mi8}, -{4, 8, X86_OR64ri32}, -{1, 8, X86_OR64ri8}, +{4, 1, X86_OR32ri8}, +{8, 4, X86_OR64i32}, +{8, 4, X86_OR64mi32}, +{8, 1, X86_OR64mi8}, +{8, 4, X86_OR64ri32}, +{8, 1, X86_OR64ri8}, {1, 1, X86_OR8i8}, {1, 1, X86_OR8mi}, {1, 1, X86_OR8mi8}, {1, 1, X86_OR8ri}, {1, 1, X86_OR8ri8}, -{1, 2, X86_PUSH16i8}, -{1, 4, X86_PUSH32i8}, -{4, 8, X86_PUSH64i32}, -{1, 8, X86_PUSH64i8}, +{2, 1, X86_PUSH16i8}, +{4, 1, X86_PUSH32i8}, +{8, 4, X86_PUSH64i32}, +{8, 1, X86_PUSH64i8}, {2, 2, X86_PUSHi16}, {4, 4, X86_PUSHi32}, {1, 1, X86_RCL16mi}, @@ -173,20 +173,20 @@ {1, 1, X86_RCR8mi}, {1, 1, X86_RCR8ri}, //{4, 4, X86_RELEASE_ADD32mi}, -//{4, 8, X86_RELEASE_ADD64mi32}, +//{8, 4, X86_RELEASE_ADD64mi32}, //{1, 1, X86_RELEASE_ADD8mi}, //{4, 4, X86_RELEASE_AND32mi}, -//{4, 8, X86_RELEASE_AND64mi32}, +//{8, 4, X86_RELEASE_AND64mi32}, //{1, 1, X86_RELEASE_AND8mi}, //{2, 2, X86_RELEASE_MOV16mi}, //{4, 4, X86_RELEASE_MOV32mi}, -//{4, 8, X86_RELEASE_MOV64mi32}, +//{8, 4, X86_RELEASE_MOV64mi32}, //{1, 1, X86_RELEASE_MOV8mi}, //{4, 4, X86_RELEASE_OR32mi}, -//{4, 8, X86_RELEASE_OR64mi32}, +//{8, 4, X86_RELEASE_OR64mi32}, //{1, 1, X86_RELEASE_OR8mi}, //{4, 4, X86_RELEASE_XOR32mi}, -//{4, 8, X86_RELEASE_XOR64mi32}, +//{8, 4, X86_RELEASE_XOR64mi32}, //{1, 1, X86_RELEASE_XOR8mi}, {1, 1, X86_ROL16mi}, {1, 1, X86_ROL16ri}, @@ -226,19 +226,19 @@ {1, 1, X86_SAR8ri}, {2, 2, X86_SBB16i16}, {2, 2, X86_SBB16mi}, -{1, 2, X86_SBB16mi8}, +{2, 1, X86_SBB16mi8}, {2, 2, X86_SBB16ri}, -{1, 2, X86_SBB16ri8}, +{2, 1, X86_SBB16ri8}, {4, 4, X86_SBB32i32}, {4, 4, X86_SBB32mi}, -{1, 4, X86_SBB32mi8}, +{4, 1, X86_SBB32mi8}, {4, 4, X86_SBB32ri}, -{1, 4, X86_SBB32ri8}, -{4, 8, X86_SBB64i32}, -{4, 8, X86_SBB64mi32}, -{1, 8, X86_SBB64mi8}, -{4, 8, X86_SBB64ri32}, -{1, 8, X86_SBB64ri8}, +{4, 1, X86_SBB32ri8}, +{8, 4, X86_SBB64i32}, +{8, 4, X86_SBB64mi32}, +{8, 1, X86_SBB64mi8}, +{8, 4, X86_SBB64ri32}, +{8, 1, X86_SBB64ri8}, {1, 1, X86_SBB8i8}, {1, 1, X86_SBB8mi}, {1, 1, X86_SBB8mi8}, @@ -274,19 +274,19 @@ {1, 1, X86_SHRD64rri8}, {2, 2, X86_SUB16i16}, {2, 2, X86_SUB16mi}, -{1, 2, X86_SUB16mi8}, +{2, 1, X86_SUB16mi8}, {2, 2, X86_SUB16ri}, -{1, 2, X86_SUB16ri8}, +{2, 1, X86_SUB16ri8}, {4, 4, X86_SUB32i32}, {4, 4, X86_SUB32mi}, -{1, 4, X86_SUB32mi8}, +{4, 1, X86_SUB32mi8}, {4, 4, X86_SUB32ri}, -{1, 4, X86_SUB32ri8}, -{4, 8, X86_SUB64i32}, -{4, 8, X86_SUB64mi32}, -{1, 8, X86_SUB64mi8}, -{4, 8, X86_SUB64ri32}, -{1, 8, X86_SUB64ri8}, +{4, 1, X86_SUB32ri8}, +{8, 4, X86_SUB64i32}, +{8, 4, X86_SUB64mi32}, +{8, 1, X86_SUB64mi8}, +{8, 4, X86_SUB64ri32}, +{8, 1, X86_SUB64ri8}, {1, 1, X86_SUB8i8}, {1, 1, X86_SUB8mi}, {1, 1, X86_SUB8mi8}, @@ -294,7 +294,7 @@ {1, 1, X86_SUB8ri8}, {2, 2, X86_TEST16i16}, {2, 2, X86_TEST16mi}, -// {2, 2, X86_TEST16mi_alt}, +//{2, 2, X86_TEST16mi_alt}, {2, 2, X86_TEST16ri}, //{2, 2, X86_TEST16ri_alt}, {4, 4, X86_TEST32i32}, @@ -302,10 +302,10 @@ //{4, 4, X86_TEST32mi_alt}, {4, 4, X86_TEST32ri}, //{4, 4, X86_TEST32ri_alt}, -{4, 8, X86_TEST64i32}, -{4, 8, X86_TEST64mi32}, +{8, 4, X86_TEST64i32}, +{8, 4, X86_TEST64mi32}, //{4, 4, X86_TEST64mi32_alt}, -{4, 8, X86_TEST64ri32}, +{8, 4, X86_TEST64ri32}, //{4, 4, X86_TEST64ri32_alt}, {1, 1, X86_TEST8i8}, {1, 1, X86_TEST8mi}, @@ -315,19 +315,19 @@ //{1, 1, X86_TEST8ri_alt}, {2, 2, X86_XOR16i16}, {2, 2, X86_XOR16mi}, -{1, 2, X86_XOR16mi8}, +{2, 1, X86_XOR16mi8}, {2, 2, X86_XOR16ri}, -{1, 2, X86_XOR16ri8}, +{2, 1, X86_XOR16ri8}, {4, 4, X86_XOR32i32}, {4, 4, X86_XOR32mi}, -{1, 4, X86_XOR32mi8}, +{4, 1, X86_XOR32mi8}, {4, 4, X86_XOR32ri}, -{1, 4, X86_XOR32ri8}, -{4, 8, X86_XOR64i32}, -{4, 8, X86_XOR64mi32}, -{1, 8, X86_XOR64mi8}, -{4, 8, X86_XOR64ri32}, -{1, 8, X86_XOR64ri8}, +{4, 1, X86_XOR32ri8}, +{8, 4, X86_XOR64i32}, +{8, 4, X86_XOR64mi32}, +{8, 1, X86_XOR64mi8}, +{8, 4, X86_XOR64ri32}, +{8, 1, X86_XOR64ri8}, {1, 1, X86_XOR8i8}, {1, 1, X86_XOR8mi}, {1, 1, X86_XOR8mi8},