[llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp X86InstrInfo.td

[John Criswell]

Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.219 -> 1.220
X86InstrInfo.td updated: 1.69 -> 1.70

---
Log message:

Changes recommended by Chris:
InstSelectSimple.cpp:
  Change the checks for proper I/O port address size into an exit() instead
  of an assertion.  Assertions aren't used in Release builds, and handling
  this error should be graceful (not that this counts as graceful, but it's
  more graceful).

  Modified the generation of the IN/OUT instructions to have 0 arguments.
X86InstrInfo.td:
  Added the OpSize attribute to the 16 bit IN and OUT instructions.



---
Diffs of the changes:  (+17 -12)

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.219 llvm/lib/Target/X86/InstSelectSimple.cpp:1.220
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.219	Thu Apr  8 15:31:46 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Thu Apr  8 17:39:13 2004
@@ -1670,8 +1670,10 @@
     // 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 @@
     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 @@
     // 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 @@
     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");


Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.69 llvm/lib/Target/X86/X86InstrInfo.td:1.70
--- llvm/lib/Target/X86/X86InstrInfo.td:1.69	Thu Apr  8 15:31:47 2004
+++ llvm/lib/Target/X86/X86InstrInfo.td	Thu Apr  8 17:39:13 2004
@@ -249,11 +249,11 @@
 //  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;
 
 //===----------------------------------------------------------------------===//