6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-30 17:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Make IC_VEX* not inherit from IC_*. Prevents instructions with no VEX form from disassembling to their non-VEX form. Also prevents weak filter collisons that were keeping valid VEX instructions from decoding properly. Make VEX_L* not inherit from VEX_* because the VEX.L bit always important. This stops packed int VEX encodings from being disassembled when specified with VEX.L=1. Fixes PR10831 and PR10806.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138997 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2011-09-02 04:17:54 +00:00
parent 24fbb5875c
commit 5ffedb9352
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/MC/Disassembler/X86/simple-tests.txt
View File

@ -99,3 +99,6 @@
# CHECK: vmaskmovpd %xmm0, %xmm1, (%rax) # CHECK: vmaskmovpd %xmm0, %xmm1, (%rax)
0xc4 0xe2 0x71 0x2f 0x00 0xc4 0xe2 0x71 0x2f 0x00
# CHECK: vmovapd %xmm0, %xmm2
0xc5 0xf9 0x28 0xd0

51
utils/TableGen/X86DisassemblerTables.cpp
View File

@ -38,20 +38,21 @@ static inline bool inheritsFrom(InstructionContext child,
switch (parent) { switch (parent) {
case IC: case IC:
return true; return(inheritsFrom(child, IC_64BIT) ||
inheritsFrom(child, IC_OPSIZE) ||
inheritsFrom(child, IC_XD) ||
inheritsFrom(child, IC_XS));
case IC_64BIT: case IC_64BIT:
return(inheritsFrom(child, IC_64BIT_REXW) || return(inheritsFrom(child, IC_64BIT_REXW) ||
inheritsFrom(child, IC_64BIT_OPSIZE) || inheritsFrom(child, IC_64BIT_OPSIZE) ||
inheritsFrom(child, IC_64BIT_XD) || inheritsFrom(child, IC_64BIT_XD) ||
inheritsFrom(child, IC_64BIT_XS)); inheritsFrom(child, IC_64BIT_XS));
case IC_OPSIZE: case IC_OPSIZE:
return(inheritsFrom(child, IC_64BIT_OPSIZE)); return inheritsFrom(child, IC_64BIT_OPSIZE);
case IC_XD: case IC_XD:
return(inheritsFrom(child, IC_64BIT_XD) || return inheritsFrom(child, IC_64BIT_XD);
inheritsFrom(child, IC_VEX_XD));
case IC_XS: case IC_XS:
return(inheritsFrom(child, IC_64BIT_XS) || return inheritsFrom(child, IC_64BIT_XS);
inheritsFrom(child, IC_VEX_XS));
case IC_64BIT_REXW: case IC_64BIT_REXW:
return(inheritsFrom(child, IC_64BIT_REXW_XS) || return(inheritsFrom(child, IC_64BIT_REXW_XS) ||
inheritsFrom(child, IC_64BIT_REXW_XD) || inheritsFrom(child, IC_64BIT_REXW_XD) ||
@ -69,35 +70,31 @@ static inline bool inheritsFrom(InstructionContext child,
case IC_64BIT_REXW_OPSIZE: case IC_64BIT_REXW_OPSIZE:
return false; return false;
case IC_VEX: case IC_VEX:
return(inheritsFrom(child, IC_VEX_XS) || return inheritsFrom(child, IC_VEX_W);
inheritsFrom(child, IC_VEX_XD) ||
inheritsFrom(child, IC_VEX_L) ||
inheritsFrom(child, IC_VEX_W) ||
inheritsFrom(child, IC_VEX_OPSIZE));
case IC_VEX_XS: case IC_VEX_XS:
return(inheritsFrom(child, IC_VEX_L_XS) || return inheritsFrom(child, IC_VEX_W_XS);
inheritsFrom(child, IC_VEX_W_XS));
case IC_VEX_XD: case IC_VEX_XD:
return(inheritsFrom(child, IC_VEX_L_XD) || return inheritsFrom(child, IC_VEX_W_XD);
inheritsFrom(child, IC_VEX_W_XD)); case IC_VEX_OPSIZE:
case IC_VEX_L: return inheritsFrom(child, IC_VEX_W_OPSIZE);
return(inheritsFrom(child, IC_VEX_L_XS) ||
inheritsFrom(child, IC_VEX_L_XD));
case IC_VEX_L_XS:
return false;
case IC_VEX_L_XD:
return false;
case IC_VEX_W: case IC_VEX_W:
return(inheritsFrom(child, IC_VEX_W_XS) || return false;
inheritsFrom(child, IC_VEX_W_XD) ||
inheritsFrom(child, IC_VEX_W_OPSIZE));
case IC_VEX_W_XS: case IC_VEX_W_XS:
return false; return false;
case IC_VEX_W_XD: case IC_VEX_W_XD:
return false; return false;
case IC_VEX_OPSIZE: case IC_VEX_W_OPSIZE:
return inheritsFrom(child, IC_VEX_W_OPSIZE); return false;
case IC_VEX_L:
return false;
case IC_VEX_L_XS:
return false;
case IC_VEX_L_XD:
return false;
case IC_VEX_L_OPSIZE:
return false;
default: default:
llvm_unreachable("Unknown instruction class");
return false; return false;
} }
} }