diff options
| -rw-r--r-- | lib/Target/X86/InstSelectSimple.cpp | 25 | ||||
| -rw-r--r-- | lib/Target/X86/X86ISelSimple.cpp | 25 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.td | 4 |
3 files changed, 32 insertions, 22 deletions
diff --git a/lib/Target/X86/InstSelectSimple.cpp b/lib/Target/X86/InstSelectSimple.cpp index 4988a0dc4c..3ceefe7ccd 100644 --- a/lib/Target/X86/InstSelectSimple.cpp +++ b/lib/Target/X86/InstSelectSimple.cpp @@ -1670,8 +1670,10 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { // First, determine that the size of the operand falls within the // acceptable range for this architecture. // - assert (((CI.getOperand(1)->getType()->getPrimitiveSize()) == 2) && - "llvm.readport operand size is not a 16 bit value!"); + if ((CI.getOperand(1)->getType()->getPrimitiveSize()) != 2) { + std::cerr << "llvm.readport: Address size is not 16 bits\n"; + exit (1); + } // // Now, move the I/O port address into the DX register and use the IN @@ -1680,13 +1682,13 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { BuildMI(BB, X86::MOV16rr, 1, X86::DX).addReg(getReg(CI.getOperand(1))); switch (CI.getCalledFunction()->getReturnType()->getPrimitiveSize()) { case 1: - BuildMI(BB, X86::IN8, 1); + BuildMI(BB, X86::IN8, 0); break; case 2: - BuildMI(BB, X86::IN16, 1); + BuildMI(BB, X86::IN16, 0); break; case 4: - BuildMI(BB, X86::IN32, 1); + BuildMI(BB, X86::IN32, 0); break; default: assert (0 && "Cannot do input on this data type"); @@ -1698,8 +1700,11 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { // First, determine that the size of the operand falls within the // acceptable range for this architecture. // - assert (((CI.getOperand(1)->getType()->getPrimitiveSize()) == 2) && - "llvm.readport operand size is not a 16 bit value!"); + // + if ((CI.getOperand(1)->getType()->getPrimitiveSize()) != 2) { + std::cerr << "llvm.writeport: Address size is not 16 bits\n"; + exit (1); + } // // Now, move the I/O port address into the DX register and the value to @@ -1709,15 +1714,15 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { switch (CI.getOperand(2)->getType()->getPrimitiveSize()) { case 1: BuildMI(BB, X86::MOV8rr, 1, X86::AL).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT8, 1); + BuildMI(BB, X86::OUT8, 0); break; case 2: BuildMI(BB, X86::MOV16rr, 1, X86::AX).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT16, 1); + BuildMI(BB, X86::OUT16, 0); break; case 4: BuildMI(BB, X86::MOV32rr, 1, X86::EAX).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT32, 1); + BuildMI(BB, X86::OUT32, 0); break; default: assert (0 && "Cannot do input on this data type"); diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp index 4988a0dc4c..3ceefe7ccd 100644 --- a/lib/Target/X86/X86ISelSimple.cpp +++ b/lib/Target/X86/X86ISelSimple.cpp @@ -1670,8 +1670,10 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { // First, determine that the size of the operand falls within the // acceptable range for this architecture. // - assert (((CI.getOperand(1)->getType()->getPrimitiveSize()) == 2) && - "llvm.readport operand size is not a 16 bit value!"); + if ((CI.getOperand(1)->getType()->getPrimitiveSize()) != 2) { + std::cerr << "llvm.readport: Address size is not 16 bits\n"; + exit (1); + } // // Now, move the I/O port address into the DX register and use the IN @@ -1680,13 +1682,13 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { BuildMI(BB, X86::MOV16rr, 1, X86::DX).addReg(getReg(CI.getOperand(1))); switch (CI.getCalledFunction()->getReturnType()->getPrimitiveSize()) { case 1: - BuildMI(BB, X86::IN8, 1); + BuildMI(BB, X86::IN8, 0); break; case 2: - BuildMI(BB, X86::IN16, 1); + BuildMI(BB, X86::IN16, 0); break; case 4: - BuildMI(BB, X86::IN32, 1); + BuildMI(BB, X86::IN32, 0); break; default: assert (0 && "Cannot do input on this data type"); @@ -1698,8 +1700,11 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { // First, determine that the size of the operand falls within the // acceptable range for this architecture. // - assert (((CI.getOperand(1)->getType()->getPrimitiveSize()) == 2) && - "llvm.readport operand size is not a 16 bit value!"); + // + if ((CI.getOperand(1)->getType()->getPrimitiveSize()) != 2) { + std::cerr << "llvm.writeport: Address size is not 16 bits\n"; + exit (1); + } // // Now, move the I/O port address into the DX register and the value to @@ -1709,15 +1714,15 @@ void ISel::visitIntrinsicCall(Intrinsic::ID ID, CallInst &CI) { switch (CI.getOperand(2)->getType()->getPrimitiveSize()) { case 1: BuildMI(BB, X86::MOV8rr, 1, X86::AL).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT8, 1); + BuildMI(BB, X86::OUT8, 0); break; case 2: BuildMI(BB, X86::MOV16rr, 1, X86::AX).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT16, 1); + BuildMI(BB, X86::OUT16, 0); break; case 4: BuildMI(BB, X86::MOV32rr, 1, X86::EAX).addReg(getReg(CI.getOperand(2))); - BuildMI(BB, X86::OUT32, 1); + BuildMI(BB, X86::OUT32, 0); break; default: assert (0 && "Cannot do input on this data type"); diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td index 1ddaaabd82..12d10c333b 100644 --- a/lib/Target/X86/X86InstrInfo.td +++ b/lib/Target/X86/X86InstrInfo.td @@ -249,11 +249,11 @@ def REP_STOSD : I<"rep stosd", 0xAB, RawFrm>, REP, // Input/Output Instructions... // def IN8 : I<"in", 0xEC, RawFrm>, Imp<[DX],[AL]>, PrintImpUsesAfter, PrintImpDefsAfter; // in AL = I/O address DX -def IN16 : I<"in", 0xED, RawFrm>, Imp<[DX],[AX]>, PrintImpUsesAfter, PrintImpDefsAfter; // in AX = I/O address DX +def IN16 : I<"in", 0xED, RawFrm>, Imp<[DX],[AX]>, OpSize, PrintImpUsesAfter, PrintImpDefsAfter; // in AX = I/O address DX def IN32 : I<"in", 0xED, RawFrm>, Imp<[DX],[EAX]>, PrintImpUsesAfter, PrintImpDefsAfter; // in EAX = I/O address DX def OUT8 : I<"out", 0xEE, RawFrm>, Imp<[DX, AL], []>, PrintImpUsesAfter; -def OUT16 : I<"out", 0xEF, RawFrm>, Imp<[DX, AX], []>, PrintImpUsesAfter; +def OUT16 : I<"out", 0xEF, RawFrm>, Imp<[DX, AX], []>, OpSize, PrintImpUsesAfter; def OUT32 : I<"out", 0xEF, RawFrm>, Imp<[DX, EAX], []>, PrintImpUsesAfter; //===----------------------------------------------------------------------===// |