This is an archive of the discontinued LLVM Phabricator instance.

Differential D129867

[MipsInstPrinter] Introduce markup tags emission
ClosedPublic

Authored by antoniofrighetto on Jul 15 2022, 8:45 AM.

Details

Reviewers
MaskRay
Commits
rGcbb2141f7fd7: [MipsInstPrinter] Introduce markup tags emission
Summary

MIPS assembly syntax emission now leverages markup tags, if enabled.

Diff Detail

Event Timeline

antoniofrighetto created this revision.Jul 15 2022, 8:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 15 2022, 8:45 AM
Herald added subscribers: StephenFan, atanasyan, jrtc27 and 3 others. · View Herald Transcript
antoniofrighetto requested review of this revision.Jul 15 2022, 8:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 15 2022, 8:45 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B175653: Diff 444997.Jul 15 2022, 9:54 AM
MaskRay requested changes to this revision.Jul 15 2022, 10:47 AM

This needs tests in llvm/test/MC/Disassembler/Mips/ using -mdis.

This revision now requires changes to proceed.Jul 15 2022, 10:47 AM
antoniofrighetto updated this revision to Diff 455887.Aug 26 2022, 6:20 AM

@MaskRay, test added!

antoniofrighetto updated this revision to Diff 455908.Aug 26 2022, 7:44 AM
Harbormaster completed remote builds in B183602: Diff 455908.Aug 26 2022, 9:43 AM
MaskRay accepted this revision.Aug 29 2022, 2:24 PM

Thanks!

llvm/test/MC/Disassembler/Mips/mips1/marked-up.txt
12

delete blank line

This revision is now accepted and ready to land.Aug 29 2022, 2:24 PM
Closed by commit rGcbb2141f7fd7: [MipsInstPrinter] Introduce markup tags emission (authored by antoniofrighetto, committed by MaskRay). · Explain WhySep 1 2022, 8:52 PM
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rGcbb2141f7fd7: [MipsInstPrinter] Introduce markup tags emission.

Revision Contents

PathSize
llvm/
lib/
Target/
Mips/
MCTargetDesc/
17 lines
test/
MC/
Disassembler/
Mips/
mips1/
11 lines

Diff 455887

llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp

Context not available.
} }
void MipsInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const { void MipsInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const {
OS << '$' << StringRef(getRegisterName(RegNo)).lower(); OS << markup("<reg:") << '$' << StringRef(getRegisterName(RegNo)).lower()
<< markup(">");
} }
void MipsInstPrinter::printInst(const MCInst *MI, uint64_t Address, void MipsInstPrinter::printInst(const MCInst *MI, uint64_t Address,
Context not available.
} }
if (Op.isImm()) { if (Op.isImm()) {
O << formatImm(Op.getImm()); O << markup("<imm:") << formatImm(Op.getImm()) << markup(">");
return; return;
} }
Context not available.
return printOperand(MI, OpNo, STI, O); return printOperand(MI, OpNo, STI, O);
if (PrintBranchImmAsAddress) if (PrintBranchImmAsAddress)
O << formatHex(Op.getImm()); O << markup("<imm:") << formatHex(Op.getImm()) << markup(">");
else else
O << formatImm(Op.getImm()); O << markup("<imm:") << formatImm(Op.getImm()) << markup(">");
} }
void MipsInstPrinter::printBranchOperand(const MCInst *MI, uint64_t Address, void MipsInstPrinter::printBranchOperand(const MCInst *MI, uint64_t Address,
Context not available.
Target &= 0xffffffff; Target &= 0xffffffff;
else if (STI.hasFeature(Mips::FeatureMips16)) else if (STI.hasFeature(Mips::FeatureMips16))
Target &= 0xffff; Target &= 0xffff;
O << formatHex(Target); O << markup("<imm:") << formatHex(Target) << markup(">");
} else { } else {
O << formatImm(Op.getImm()); O << markup("<imm:") << formatImm(Op.getImm()) << markup(">");
} }
} }
Context not available.
Imm -= Offset; Imm -= Offset;
Imm &= (1 << Bits) - 1; Imm &= (1 << Bits) - 1;
Imm += Offset; Imm += Offset;
O << formatImm(Imm); O << markup("<imm:") << formatImm(Imm) << markup(">");
return; return;
} }
Context not available.
break; break;
} }
O << markup("<mem:");
printOperand(MI, opNum + 1, STI, O); printOperand(MI, opNum + 1, STI, O);
O << "("; O << "(";
printOperand(MI, opNum, STI, O); printOperand(MI, opNum, STI, O);
O << ")"; O << ")";
O << markup(">");
} }
void MipsInstPrinter::printMemOperandEA(const MCInst *MI, int opNum, void MipsInstPrinter::printMemOperandEA(const MCInst *MI, int opNum,
Context not available.

llvm/test/MC/Disassembler/Mips/mips1/marked-up.txt

  • This file was added.
# RUN: llvm-mc --mdis %s -triple=mips-unknown-linux -mcpu=mips1 2>&1 | FileCheck %s
# CHECK: j <imm:80478376>
0x09 0x33 0x00 0x2a
# CHECK: addi <reg:$13>, <reg:$9>, <imm:26322>
0x21 0x2d 0x66 0xd2
# CHECK: xor <reg:$18>, <reg:$4>, <reg:$fp>
0x00 0x9e 0x90 0x26
# CHECK: lwr <reg:$zero>, <mem:<imm:-19147>(<reg:$gp>)>
0x9b 0x80 0xb5 0x35
MaskRayUnsubmitted
Not Done
ReplyInline Actions

delete blank line

MaskRay: delete blank line