[llvm-commits] [llvm] r156774 - in /llvm/trunk: docs/LangRef.html include/llvm/CodeGen/ISDOpcodes.h include/llvm/Intrinsics.td include/llvm/Target/TargetSelectionDAG.td lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp lib/Target/X86/X86InstrSystem.td test/CodeGen/X86/trap.ll

Dan Gohman gohman at apple.com
Mon May 14 11:58:11 PDT 2012


Author: djg
Date: Mon May 14 13:58:10 2012
New Revision: 156774

URL: http://llvm.org/viewvc/llvm-project?rev=156774&view=rev
Log:
Rename @llvm.debugger to @llvm.debugtrap.

Modified:
    llvm/trunk/docs/LangRef.html
    llvm/trunk/include/llvm/CodeGen/ISDOpcodes.h
    llvm/trunk/include/llvm/Intrinsics.td
    llvm/trunk/include/llvm/Target/TargetSelectionDAG.td
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
    llvm/trunk/lib/Target/X86/X86InstrSystem.td
    llvm/trunk/test/CodeGen/X86/trap.ll

Modified: llvm/trunk/docs/LangRef.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/docs/LangRef.html (original)
+++ llvm/trunk/docs/LangRef.html Mon May 14 13:58:10 2012
@@ -307,8 +307,8 @@
             '<tt>llvm.annotation.*</tt>' Intrinsic</a></li>
           <li><a href="#int_trap">
             '<tt>llvm.trap</tt>' Intrinsic</a></li>
-          <li><a href="#int_debugger">
-            '<tt>llvm.debugger</tt>' Intrinsic</a></li>
+          <li><a href="#int_debugtrap">
+            '<tt>llvm.debugtrap</tt>' Intrinsic</a></li>
           <li><a href="#int_stackprotector">
             '<tt>llvm.stackprotector</tt>' Intrinsic</a></li>
 	  <li><a href="#int_objectsize">
@@ -8402,18 +8402,18 @@
 
 <!-- _______________________________________________________________________ -->
 <h4>
-  <a name="int_debugger">'<tt>llvm.debugger</tt>' Intrinsic</a>
+  <a name="int_debugtrap">'<tt>llvm.debugtrap</tt>' Intrinsic</a>
 </h4>
 
 <div>
 
 <h5>Syntax:</h5>
 <pre>
-  declare void @llvm.debugger()
+  declare void @llvm.debugtrap()
 </pre>
 
 <h5>Overview:</h5>
-<p>The '<tt>llvm.debugger</tt>' intrinsic.</p>
+<p>The '<tt>llvm.debugtrap</tt>' intrinsic.</p>
 
 <h5>Arguments:</h5>
 <p>None.</p>

Modified: llvm/trunk/include/llvm/CodeGen/ISDOpcodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ISDOpcodes.h?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ISDOpcodes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ISDOpcodes.h Mon May 14 13:58:10 2012
@@ -582,8 +582,8 @@
     // TRAP - Trapping instruction
     TRAP,
 
-    // DEBUGGER - Trap intented to get the attention of a debugger.
-    DEBUGGER,
+    // DEBUGTRAP - Trap intented to get the attention of a debugger.
+    DEBUGTRAP,
 
     // PREFETCH - This corresponds to a prefetch intrinsic. It takes chains are
     // their first operand. The other operands are the address to prefetch,

Modified: llvm/trunk/include/llvm/Intrinsics.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Intrinsics.td?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Intrinsics.td (original)
+++ llvm/trunk/include/llvm/Intrinsics.td Mon May 14 13:58:10 2012
@@ -399,8 +399,8 @@
                      GCCBuiltin<"__builtin_flt_rounds">;
 def int_trap : Intrinsic<[]>,
                GCCBuiltin<"__builtin_trap">;
-def int_debugger : Intrinsic<[]>,
-                   GCCBuiltin<"__builtin_debugger">;
+def int_debugtrap : Intrinsic<[]>,
+                    GCCBuiltin<"__builtin_debugtrap">;
 
 // Intrisics to support half precision floating point format
 let Properties = [IntrNoMem] in {

Modified: llvm/trunk/include/llvm/Target/TargetSelectionDAG.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetSelectionDAG.td?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetSelectionDAG.td (original)
+++ llvm/trunk/include/llvm/Target/TargetSelectionDAG.td Mon May 14 13:58:10 2012
@@ -404,7 +404,7 @@
 def br         : SDNode<"ISD::BR"         , SDTBr,     [SDNPHasChain]>;
 def trap       : SDNode<"ISD::TRAP"       , SDTNone,
                         [SDNPHasChain, SDNPSideEffect]>;
-def debugger   : SDNode<"ISD::DEBUGGER"   , SDTNone,
+def debugtrap  : SDNode<"ISD::DEBUGTRAP"  , SDTNone,
                         [SDNPHasChain, SDNPSideEffect]>;
 
 def prefetch   : SDNode<"ISD::PREFETCH"   , SDTPrefetch,

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Mon May 14 13:58:10 2012
@@ -5087,8 +5087,8 @@
     DAG.setRoot(Result.second);
     return 0;
   }
-  case Intrinsic::debugger: {
-    DAG.setRoot(DAG.getNode(ISD::DEBUGGER, dl,MVT::Other, getRoot()));
+  case Intrinsic::debugtrap: {
+    DAG.setRoot(DAG.getNode(ISD::DEBUGTRAP, dl,MVT::Other, getRoot()));
     return 0;
   }
   case Intrinsic::uadd_with_overflow:

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp Mon May 14 13:58:10 2012
@@ -265,7 +265,7 @@
   case ISD::STACKSAVE:                  return "stacksave";
   case ISD::STACKRESTORE:               return "stackrestore";
   case ISD::TRAP:                       return "trap";
-  case ISD::DEBUGGER:                   return "debugger";
+  case ISD::DEBUGTRAP:                  return "debugtrap";
 
   // Bit manipulation
   case ISD::BSWAP:                      return "bswap";

Modified: llvm/trunk/lib/Target/X86/X86InstrSystem.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSystem.td?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSystem.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSystem.td Mon May 14 13:58:10 2012
@@ -36,7 +36,7 @@
 def INT3 : I<0xcc, RawFrm, (outs), (ins), "int3",
               [(int_x86_int (i8 3))], IIC_INT3>;
 
-def : Pat<(debugger),
+def : Pat<(debugtrap),
           (INT3)>;
 
 // The long form of "int $3" turns into int3 as a size optimization.

Modified: llvm/trunk/test/CodeGen/X86/trap.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/trap.ll?rev=156774&r1=156773&r2=156774&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/trap.ll (original)
+++ llvm/trunk/test/CodeGen/X86/trap.ll Mon May 14 13:58:10 2012
@@ -12,10 +12,10 @@
 ; CHECK: int3
 define i32 @test1() noreturn nounwind  {
 entry:
-	tail call void @llvm.debugger( )
+	tail call void @llvm.debugtrap( )
 	unreachable
 }
 
 declare void @llvm.trap() nounwind 
-declare void @llvm.debugger() nounwind 
+declare void @llvm.debugtrap() nounwind 
 





More information about the llvm-commits mailing list