[llvm-branch-commits] [llvm-branch] r98621 - in /llvm/branches/Apple/Morbo: ./ lib/Target/X86/X86Instr64bit.td lib/Target/X86/X86InstrInfo.td

[Bill Wendling]

Author: void
Date: Tue Mar 16 01:55:12 2010
New Revision: 98621

URL: http://llvm.org/viewvc/llvm-project?rev=98621&view=rev
Log:
$ svn merge -c 98615 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r98615 into '.':
U    lib/Target/X86/X86InstrInfo.td
$ svn merge -c 98616 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r98616 into '.':
U    lib/Target/X86/X86Instr64bit.td


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/lib/Target/X86/X86Instr64bit.td
    llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.td

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 01:55:12 2010
@@ -1 +1 @@
-/llvm/trunk:98602,98604
+/llvm/trunk:98602,98604,98615-98616

Modified: llvm/branches/Apple/Morbo/lib/Target/X86/X86Instr64bit.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/X86Instr64bit.td?rev=98621&r1=98620&r2=98621&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/X86Instr64bit.td (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/X86Instr64bit.td Tue Mar 16 01:55:12 2010
@@ -202,7 +202,7 @@
                        (ins i64mem_TC:$dst, i32imm:$offset, variable_ops),
                        "#TC_RETURN $dst $offset", []>;
 
-  def TAILJMPd64 : Ii32<0xE9, RawFrm, (outs),
+  def TAILJMPd64 : Ii32PCRel<0xE9, RawFrm, (outs),
                                       (ins i64i32imm_pcrel:$dst, variable_ops),
                    "jmp\t$dst  # TAILCALL", []>;
   def TAILJMPr64 : I<0xFF, MRM4r, (outs), (ins GR64_TC:$dst, variable_ops),

Modified: llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.td?rev=98621&r1=98620&r2=98621&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.td (original)
+++ llvm/branches/Apple/Morbo/lib/Target/X86/X86InstrInfo.td Tue Mar 16 01:55:12 2010
@@ -724,8 +724,8 @@
 
   // FIXME: The should be pseudo instructions that are lowered when going to
   // mcinst.
-  def TAILJMPd : Ii32<0xE9, RawFrm, (outs),
-                                    (ins i32imm_pcrel:$dst, variable_ops),
+  def TAILJMPd : Ii32PCRel<0xE9, RawFrm, (outs),
+                           (ins i32imm_pcrel:$dst, variable_ops),
                  "jmp\t$dst  # TAILCALL",
                  []>;
   def TAILJMPr : I<0xFF, MRM4r, (outs), (ins GR32_TC:$dst, variable_ops),