6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-13 08:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Check not only for MO_VirtualRegister, but MO_MachineRegister as well when

Browse Source 
printing out assembly. After all, we want the real thing too.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4783 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Misha Brukman 2002-11-20 18:56:41 +00:00
parent b7825bc725
commit e1f0d8113a
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Target/X86/Printer.cpp
View File

@ -71,6 +71,7 @@ static void printOp(std::ostream &O, const MachineOperand &MO,
const MRegisterInfo &RI) { const MRegisterInfo &RI) {
switch (MO.getType()) { switch (MO.getType()) {
case MachineOperand::MO_VirtualRegister: case MachineOperand::MO_VirtualRegister:
case MachineOperand::MO_MachineRegister:
if (MO.getReg() < MRegisterInfo::FirstVirtualRegister) if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
O << RI.get(MO.getReg()).Name; O << RI.get(MO.getReg()).Name;
else else
@ -137,14 +138,20 @@ void X86InstrInfo::print(const MachineInstr *MI, std::ostream &O,
// 2 Operands: this is for things like mov that do not read a second input // 2 Operands: this is for things like mov that do not read a second input
// //
assert(((MI->getNumOperands() == 3 && assert(((MI->getNumOperands() == 3 &&
(MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister&& (MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister||
MI->getOperand(1).getType()==MachineOperand::MO_VirtualRegister))|| MI->getOperand(0).getType()==MachineOperand::MO_MachineRegister)
&&
(MI->getOperand(1).getType()==MachineOperand::MO_VirtualRegister||
MI->getOperand(1).getType()==MachineOperand::MO_MachineRegister))
||
(MI->getNumOperands() == 2 && (MI->getNumOperands() == 2 &&
(MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister))) (MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister||
&& MI->getOperand(MI->getNumOperands()-1).getType() == MI->getOperand(0).getType()==MachineOperand::MO_MachineRegister)
MachineOperand::MO_VirtualRegister && && (MI->getOperand(MI->getNumOperands()-1).getType() ==
"Bad format for MRMDestReg!"); MachineOperand::MO_VirtualRegister||
MI->getOperand(MI->getNumOperands()-1).getType() ==
MachineOperand::MO_MachineRegister)))
&& "Bad format for MRMDestReg!");
if (MI->getNumOperands() == 3 && if (MI->getNumOperands() == 3 &&
MI->getOperand(0).getReg() != MI->getOperand(1).getReg()) MI->getOperand(0).getReg() != MI->getOperand(1).getReg())
O << "**"; O << "**";

21
lib/Target/X86/X86AsmPrinter.cpp
View File

@ -71,6 +71,7 @@ static void printOp(std::ostream &O, const MachineOperand &MO,
const MRegisterInfo &RI) { const MRegisterInfo &RI) {
switch (MO.getType()) { switch (MO.getType()) {
case MachineOperand::MO_VirtualRegister: case MachineOperand::MO_VirtualRegister:
case MachineOperand::MO_MachineRegister:
if (MO.getReg() < MRegisterInfo::FirstVirtualRegister) if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
O << RI.get(MO.getReg()).Name; O << RI.get(MO.getReg()).Name;
else else
@ -137,14 +138,20 @@ void X86InstrInfo::print(const MachineInstr *MI, std::ostream &O,
// 2 Operands: this is for things like mov that do not read a second input // 2 Operands: this is for things like mov that do not read a second input
// //
assert(((MI->getNumOperands() == 3 && assert(((MI->getNumOperands() == 3 &&
(MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister&& (MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister||
MI->getOperand(1).getType()==MachineOperand::MO_VirtualRegister))|| MI->getOperand(0).getType()==MachineOperand::MO_MachineRegister)
&&
(MI->getOperand(1).getType()==MachineOperand::MO_VirtualRegister||
MI->getOperand(1).getType()==MachineOperand::MO_MachineRegister))
||
(MI->getNumOperands() == 2 && (MI->getNumOperands() == 2 &&
(MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister))) (MI->getOperand(0).getType()==MachineOperand::MO_VirtualRegister||
&& MI->getOperand(MI->getNumOperands()-1).getType() == MI->getOperand(0).getType()==MachineOperand::MO_MachineRegister)
MachineOperand::MO_VirtualRegister && && (MI->getOperand(MI->getNumOperands()-1).getType() ==
"Bad format for MRMDestReg!"); MachineOperand::MO_VirtualRegister||
MI->getOperand(MI->getNumOperands()-1).getType() ==
MachineOperand::MO_MachineRegister)))
&& "Bad format for MRMDestReg!");
if (MI->getNumOperands() == 3 && if (MI->getNumOperands() == 3 &&
MI->getOperand(0).getReg() != MI->getOperand(1).getReg()) MI->getOperand(0).getReg() != MI->getOperand(1).getReg())
O << "**"; O << "**";