This is an archive of the discontinued LLVM Phabricator instance.

Differential D5881

[mips] MIPS branch instructions offset fix in disassembler
Needs RevisionPublic

Authored by ipetkovic on Oct 21 2014, 1:57 AM.

Details

Reviewers
sdardis
zoran.jovanovic
seanbruno
dsanders
Summary

This patch corrects the way llvm disassembler computes the offset of MIPS branch instructions.

Diff Detail

Event Timeline

ipetkovic updated this revision to Diff 15171.Oct 21 2014, 1:57 AM
ipetkovic retitled this revision from to [mips] MIPS branch instructions offset fix in disassembler.
ipetkovic updated this object.
ipetkovic edited the test plan for this revision. (Show Details)
ipetkovic added reviewers: zoran.jovanovic, dsanders.
ipetkovic added a subscriber: petarj.
dsanders accepted this revision.Nov 3 2014, 2:52 AM
dsanders edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Nov 3 2014, 2:52 AM
seanbruno requested changes to this revision.Sep 26 2016, 7:00 AM
seanbruno added a reviewer: seanbruno.
seanbruno added a subscriber: seanbruno.

This looks to have been committed already, this review should be closed IMO.

This revision now requires changes to proceed.Sep 26 2016, 7:00 AM
seanbruno added a reviewer: sdardis.Feb 1 2017, 7:46 AM
dsanders resigned from this revision.Jul 18 2019, 7:04 PM
Herald added subscribers: atanasyan, arichardson. · View Herald TranscriptJul 18 2019, 7:04 PM

Revision Contents

PathSize
lib/
Target/
Mips/
Disassembler/
2 lines
test/
MC/
Disassembler/
Mips/
22 lines
22 lines
22 lines
22 lines

Diff 15171

lib/Target/Mips/Disassembler/MipsDisassembler.cpp

Show First 20 Lines • Show All 1,285 Lines • ▼ Show 20 Linesstatic DecodeStatus DecodeCOP2RegisterClass(MCInst &Inst,
Inst.addOperand(MCOperand::CreateReg(Reg)); Inst.addOperand(MCOperand::CreateReg(Reg));
return MCDisassembler::Success; return MCDisassembler::Success;
} }
static DecodeStatus DecodeBranchTarget(MCInst &Inst, static DecodeStatus DecodeBranchTarget(MCInst &Inst,
unsigned Offset, unsigned Offset,
uint64_t Address, uint64_t Address,
const void *Decoder) { const void *Decoder) {
int32_t BranchOffset = (SignExtend32<16>(Offset) * 4) + 4; int32_t BranchOffset = SignExtend32<16>(Offset) * 4;
Inst.addOperand(MCOperand::CreateImm(BranchOffset)); Inst.addOperand(MCOperand::CreateImm(BranchOffset));
return MCDisassembler::Success; return MCDisassembler::Success;
} }
static DecodeStatus DecodeJumpTarget(MCInst &Inst, static DecodeStatus DecodeJumpTarget(MCInst &Inst,
unsigned Insn, unsigned Insn,
uint64_t Address, uint64_t Address,
const void *Decoder) { const void *Decoder) {
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

test/MC/Disassembler/Mips/mips32.txt

Show All 25 Lines
# CHECK: and $9, $6, $7 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x24 0x00 0xc7 0x48 0x24
# CHECK: andi $9, $6, 17767 # CHECK: andi $9, $6, 17767
0x30 0xc9 0x45 0x67 0x30 0xc9 0x45 0x67
# CHECK: b 1332 # CHECK: b 1332
0x10 0x00 0x01 0x4c 0x10 0x00 0x01 0x4d
# CHECK: bc1f 1332 # CHECK: bc1f 1332
0x45 0x00 0x01 0x4c 0x45 0x00 0x01 0x4d
# CHECK: bc1f $fcc7, 1332 # CHECK: bc1f $fcc7, 1332
0x45 0x1c 0x01 0x4c 0x45 0x1c 0x01 0x4d
# CHECK: bc1t 1332 # CHECK: bc1t 1332
0x45 0x01 0x01 0x4c 0x45 0x01 0x01 0x4d
# CHECK: bc1t $fcc7, 1332 # CHECK: bc1t $fcc7, 1332
0x45 0x1d 0x01 0x4c 0x45 0x1d 0x01 0x4d
# CHECK: beq $9, $6, 1332 # CHECK: beq $9, $6, 1332
0x11 0x26 0x01 0x4c 0x11 0x26 0x01 0x4d
# CHECK: bgez $6, 1332 # CHECK: bgez $6, 1332
0x04 0xc1 0x01 0x4c 0x04 0xc1 0x01 0x4d
# CHECK: bgezal $6, 1332 # CHECK: bgezal $6, 1332
0x04 0xd1 0x01 0x4c 0x04 0xd1 0x01 0x4d
# CHECK: bgtz $6, 1332 # CHECK: bgtz $6, 1332
0x1c 0xc0 0x01 0x4c 0x1c 0xc0 0x01 0x4d
# CHECK: blez $6, 1332 # CHECK: blez $6, 1332
0x18 0xc0 0x01 0x4c 0x18 0xc0 0x01 0x4d
# CHECK: bne $9, $6, 1332 # CHECK: bne $9, $6, 1332
0x15 0x26 0x01 0x4c 0x15 0x26 0x01 0x4d
# CHECK: c.eq.d $f12, $f14 # CHECK: c.eq.d $f12, $f14
0x46 0x2e 0x60 0x32 0x46 0x2e 0x60 0x32
# CHECK: c.eq.s $f6, $f7 # CHECK: c.eq.s $f6, $f7
0x46 0x07 0x30 0x32 0x46 0x07 0x30 0x32
# CHECK: c.f.d $f12, $f14 # CHECK: c.f.d $f12, $f14
▲ Show 20 Lines • Show All 379 Lines • Show Last 20 Lines

test/MC/Disassembler/Mips/mips32_le.txt

Show All 24 Lines
# CHECK: and $9, $6, $7 # CHECK: and $9, $6, $7
0x24 0x48 0xc7 0x00 0x24 0x48 0xc7 0x00
# CHECK: andi $9, $6, 17767 # CHECK: andi $9, $6, 17767
0x67 0x45 0xc9 0x30 0x67 0x45 0xc9 0x30
# CHECK: b 1332 # CHECK: b 1332
0x4c 0x01 0x00 0x10 0x4d 0x01 0x00 0x10
# CHECK: bc1f 1332 # CHECK: bc1f 1332
0x4c 0x01 0x00 0x45 0x4d 0x01 0x00 0x45
# CHECK: bc1f $fcc7, 1332 # CHECK: bc1f $fcc7, 1332
0x4c 0x01 0x1c 0x45 0x4d 0x01 0x1c 0x45
# CHECK: bc1t 1332 # CHECK: bc1t 1332
0x4c 0x01 0x01 0x45 0x4d 0x01 0x01 0x45
# CHECK: bc1t $fcc7, 1332 # CHECK: bc1t $fcc7, 1332
0x4c 0x01 0x1d 0x45 0x4d 0x01 0x1d 0x45
# CHECK: beq $9, $6, 1332 # CHECK: beq $9, $6, 1332
0x4c 0x01 0x26 0x11 0x4d 0x01 0x26 0x11
# CHECK: bgez $6, 1332 # CHECK: bgez $6, 1332
0x4c 0x01 0xc1 0x04 0x4d 0x01 0xc1 0x04
# CHECK: bgezal $6, 1332 # CHECK: bgezal $6, 1332
0x4c 0x01 0xd1 0x04 0x4d 0x01 0xd1 0x04
# CHECK: bgtz $6, 1332 # CHECK: bgtz $6, 1332
0x4c 0x01 0xc0 0x1c 0x4d 0x01 0xc0 0x1c
# CHECK: blez $6, 1332 # CHECK: blez $6, 1332
0x4c 0x01 0xc0 0x18 0x4d 0x01 0xc0 0x18
# CHECK: bne $9, $6, 1332 # CHECK: bne $9, $6, 1332
0x4c 0x01 0x26 0x15 0x4d 0x01 0x26 0x15
# CHECK: c.eq.d $f12, $f14 # CHECK: c.eq.d $f12, $f14
0x32 0x60 0x2e 0x46 0x32 0x60 0x2e 0x46
# CHECK: c.eq.s $f6, $f7 # CHECK: c.eq.s $f6, $f7
0x32 0x30 0x07 0x46 0x32 0x30 0x07 0x46
# CHECK: c.f.d $f12, $f14 # CHECK: c.f.d $f12, $f14
▲ Show 20 Lines • Show All 373 Lines • Show Last 20 Lines

test/MC/Disassembler/Mips/mips32r2.txt

Show All 24 Lines
# CHECK: and $9, $6, $7 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x24 0x00 0xc7 0x48 0x24
# CHECK: andi $9, $6, 17767 # CHECK: andi $9, $6, 17767
0x30 0xc9 0x45 0x67 0x30 0xc9 0x45 0x67
# CHECK: b 1332 # CHECK: b 1332
0x10 0x00 0x01 0x4c 0x10 0x00 0x01 0x4d
# CHECK: bc1f 1332 # CHECK: bc1f 1332
0x45 0x00 0x01 0x4c 0x45 0x00 0x01 0x4d
# CHECK: bc1f $fcc7, 1332 # CHECK: bc1f $fcc7, 1332
0x45 0x1c 0x01 0x4c 0x45 0x1c 0x01 0x4d
# CHECK: bc1t 1332 # CHECK: bc1t 1332
0x45 0x01 0x01 0x4c 0x45 0x01 0x01 0x4d
# CHECK: bc1t $fcc7, 1332 # CHECK: bc1t $fcc7, 1332
0x45 0x1d 0x01 0x4c 0x45 0x1d 0x01 0x4d
# CHECK: beq $9, $6, 1332 # CHECK: beq $9, $6, 1332
0x11 0x26 0x01 0x4c 0x11 0x26 0x01 0x4d
# CHECK: bgez $6, 1332 # CHECK: bgez $6, 1332
0x04 0xc1 0x01 0x4c 0x04 0xc1 0x01 0x4d
# CHECK: bgezal $6, 1332 # CHECK: bgezal $6, 1332
0x04 0xd1 0x01 0x4c 0x04 0xd1 0x01 0x4d
# CHECK: bgtz $6, 1332 # CHECK: bgtz $6, 1332
0x1c 0xc0 0x01 0x4c 0x1c 0xc0 0x01 0x4d
# CHECK: blez $6, 1332 # CHECK: blez $6, 1332
0x18 0xc0 0x01 0x4c 0x18 0xc0 0x01 0x4d
# CHECK: bne $9, $6, 1332 # CHECK: bne $9, $6, 1332
0x15 0x26 0x01 0x4c 0x15 0x26 0x01 0x4d
# CHECK: c.eq.d $f12, $f14 # CHECK: c.eq.d $f12, $f14
0x46 0x2e 0x60 0x32 0x46 0x2e 0x60 0x32
# CHECK: c.eq.s $f6, $f7 # CHECK: c.eq.s $f6, $f7
0x46 0x07 0x30 0x32 0x46 0x07 0x30 0x32
# CHECK: c.f.d $f12, $f14 # CHECK: c.f.d $f12, $f14
▲ Show 20 Lines • Show All 379 Lines • Show Last 20 Lines

test/MC/Disassembler/Mips/mips32r2_le.txt

Show All 24 Lines
# CHECK: and $9, $6, $7 # CHECK: and $9, $6, $7
0x24 0x48 0xc7 0x00 0x24 0x48 0xc7 0x00
# CHECK: andi $9, $6, 17767 # CHECK: andi $9, $6, 17767
0x67 0x45 0xc9 0x30 0x67 0x45 0xc9 0x30
# CHECK: b 1332 # CHECK: b 1332
0x4c 0x01 0x00 0x10 0x4d 0x01 0x00 0x10
# CHECK: bc1f 1332 # CHECK: bc1f 1332
0x4c 0x01 0x00 0x45 0x4d 0x01 0x00 0x45
# CHECK: bc1f $fcc7, 1332 # CHECK: bc1f $fcc7, 1332
0x4c 0x01 0x1c 0x45 0x4d 0x01 0x1c 0x45
# CHECK: bc1t 1332 # CHECK: bc1t 1332
0x4c 0x01 0x01 0x45 0x4d 0x01 0x01 0x45
# CHECK: bc1t $fcc7, 1332 # CHECK: bc1t $fcc7, 1332
0x4c 0x01 0x1d 0x45 0x4d 0x01 0x1d 0x45
# CHECK: beq $9, $6, 1332 # CHECK: beq $9, $6, 1332
0x4c 0x01 0x26 0x11 0x4d 0x01 0x26 0x11
# CHECK: bgez $6, 1332 # CHECK: bgez $6, 1332
0x4c 0x01 0xc1 0x04 0x4d 0x01 0xc1 0x04
# CHECK: bgezal $6, 1332 # CHECK: bgezal $6, 1332
0x4c 0x01 0xd1 0x04 0x4d 0x01 0xd1 0x04
# CHECK: bgtz $6, 1332 # CHECK: bgtz $6, 1332
0x4c 0x01 0xc0 0x1c 0x4d 0x01 0xc0 0x1c
# CHECK: blez $6, 1332 # CHECK: blez $6, 1332
0x4c 0x01 0xc0 0x18 0x4d 0x01 0xc0 0x18
# CHECK: bne $9, $6, 1332 # CHECK: bne $9, $6, 1332
0x4c 0x01 0x26 0x15 0x4d 0x01 0x26 0x15
# CHECK: c.eq.d $f12, $f14 # CHECK: c.eq.d $f12, $f14
0x32 0x60 0x2e 0x46 0x32 0x60 0x2e 0x46
# CHECK: c.eq.s $f6, $f7 # CHECK: c.eq.s $f6, $f7
0x32 0x30 0x07 0x46 0x32 0x30 0x07 0x46
# CHECK: c.f.d $f12, $f14 # CHECK: c.f.d $f12, $f14
▲ Show 20 Lines • Show All 379 Lines • Show Last 20 Lines