RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-25 05:27:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mips] Fix for decoding DINS instruction - disassembler

Browse Source 
This patch fixes decoding of size and position for DINSM
and DINSU instructions.

Differential Revision: https://reviews.llvm.org/D31072


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298593 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Strahinja Petrovic 2017-03-23 13:19:04 +00:00
parent 2e589bb783
commit 8ee8b3b28c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Target/Mips/Disassembler/MipsDisassembler.cpp
View File

@ -2264,7 +2264,14 @@ static DecodeStatus DecodeInsSize(MCInst &Inst,
const void *Decoder) { const void *Decoder) {
// First we need to grab the pos(lsb) from MCInst. // First we need to grab the pos(lsb) from MCInst.
int Pos = Inst.getOperand(2).getImm(); int Pos = Inst.getOperand(2).getImm();
int Size = (int) Insn - Pos + 1; if (Inst.getOpcode() == Mips::DINSU)
Pos += 32;
int Size;
if (Inst.getOpcode() == Mips::DINSM ||
Inst.getOpcode() == Mips::DINSU)
Size = (int) Insn - Pos + 33;
else
Size = (int) Insn - Pos + 1;
Inst.addOperand(MCOperand::createImm(SignExtend32<16>(Size))); Inst.addOperand(MCOperand::createImm(SignExtend32<16>(Size)));
return MCDisassembler::Success; return MCDisassembler::Success;
} }

2
test/MC/Mips/mips64extins.s
View File

@ -5,5 +5,5 @@
dextu $2, $4, 34, 6 # CHECK: dextu ${{[0-9]+}}, ${{[0-9]+}}, 34, 6 dextu $2, $4, 34, 6 # CHECK: dextu ${{[0-9]+}}, ${{[0-9]+}}, 34, 6
dextm $2, $4, 5, 34 # CHECK: dextm ${{[0-9]+}}, ${{[0-9]+}}, 5, 34 dextm $2, $4, 5, 34 # CHECK: dextm ${{[0-9]+}}, ${{[0-9]+}}, 5, 34
dins $4, $5, 8, 10 # CHECK: dins ${{[0-9]+}}, ${{[0-9]+}}, 8, 10 dins $4, $5, 8, 10 # CHECK: dins ${{[0-9]+}}, ${{[0-9]+}}, 8, 10
dinsm $4, $5, 10, 1 # CHECK: dinsm ${{[0-9]+}}, ${{[0-9]+}}, 10, 1 dinsm $4, $5, 30, 6 # CHECK: dinsm ${{[0-9]+}}, ${{[0-9]+}}, 30, 6
dinsu $4, $5, 40, 13 # CHECK: dinsu ${{[0-9]+}}, ${{[0-9]+}}, 40, 13 dinsu $4, $5, 40, 13 # CHECK: dinsu ${{[0-9]+}}, ${{[0-9]+}}, 40, 13