[llvm-commits] [llvm] r98513 - in /llvm/trunk/lib/CodeGen/SelectionDAG: InstrEmitter.cpp SDDbgValue.h SDNodeDbgValue.h ScheduleDAGSDNodes.cpp SelectionDAG.cpp

[Evan Cheng]

Author: evancheng
Date: Sun Mar 14 14:56:39 2010
New Revision: 98513

URL: http://llvm.org/viewvc/llvm-project?rev=98513&view=rev
Log:
Rename SDDbgValue.h to SDNodeDbgValue.h for consistency.

Added:
    llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
      - copied, changed from r98496, llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h
Removed:
    llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.cpp?rev=98513&r1=98512&r2=98513&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.cpp Sun Mar 14 14:56:39 2010
@@ -15,7 +15,7 @@
 
 #define DEBUG_TYPE "instr-emitter"
 #include "InstrEmitter.h"
-#include "SDDbgValue.h"
+#include "SDNodeDbgValue.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"

Removed: llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h?rev=98512&view=auto
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h (removed)
@@ -1,104 +0,0 @@
-//===-- llvm/CodeGen/SDDbgValue.h - SD dbg_value handling--------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the SDDbgValue class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CODEGEN_SDDBGVALUE_H
-#define LLVM_CODEGEN_SDDBGVALUE_H
-
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Support/DebugLoc.h"
-
-namespace llvm {
-
-class MDNode;
-class SDNode;
-class Value;
-
-/// SDDbgValue - Holds the information from a dbg_value node through SDISel.
-/// We do not use SDValue here to avoid including its header.
-
-class SDDbgValue {
-public:
-  enum DbgValueKind {
-    SDNODE = 0,             // value is the result of an expression
-    CONST = 1,              // value is a constant
-    FRAMEIX = 2             // value is contents of a stack location
-  };
-private:
-  enum DbgValueKind kind;
-  union {
-    struct {
-      SDNode *Node;         // valid for expressions
-      unsigned ResNo;       // valid for expressions
-    } s;
-    Value *Const;           // valid for constants
-    unsigned FrameIx;       // valid for stack objects
-  } u;
-  MDNode *mdPtr;
-  uint64_t Offset;
-  DebugLoc DL;
-  unsigned Order;
-public:
-  // Constructor for non-constants.
-  SDDbgValue(MDNode *mdP, SDNode *N, unsigned R, uint64_t off, DebugLoc dl,
-             unsigned O) : mdPtr(mdP), Offset(off), DL(dl), Order(O) {
-    kind = SDNODE;
-    u.s.Node = N;
-    u.s.ResNo = R;
-  }
-
-  // Constructor for constants.
-  SDDbgValue(MDNode *mdP, Value *C, uint64_t off, DebugLoc dl, unsigned O) : 
-    mdPtr(mdP), Offset(off), DL(dl), Order(O) {
-    kind = CONST;
-    u.Const = C;
-  }
-
-  // Constructor for frame indices.
-  SDDbgValue(MDNode *mdP, unsigned FI, uint64_t off, DebugLoc dl, unsigned O) : 
-    mdPtr(mdP), Offset(off), DL(dl), Order(O) {
-    kind = FRAMEIX;
-    u.FrameIx = FI;
-  }
-
-  // Returns the kind.
-  DbgValueKind getKind() { return kind; }
-
-  // Returns the MDNode pointer.
-  MDNode *getMDPtr() { return mdPtr; }
-
-  // Returns the SDNode* for a register ref
-  SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; }
-
-  // Returns the ResNo for a register ref
-  unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; }
-
-  // Returns the Value* for a constant
-  Value *getConst() { assert (kind==CONST); return u.Const; }
-
-  // Returns the FrameIx for a stack object
-  unsigned getFrameIx() { assert (kind==FRAMEIX); return u.FrameIx; }
-
-  // Returns the offset.
-  uint64_t getOffset() { return Offset; }
-
-  // Returns the DebugLoc.
-  DebugLoc getDebugLoc() { return DL; }
-
-  // Returns the SDNodeOrder.  This is the order of the preceding node in the
-  // input.
-  unsigned getOrder() { return Order; }
-};
-
-} // end llvm namespace
-
-#endif

Copied: llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h (from r98496, llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h?p2=llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h&p1=llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h&r1=98496&r2=98513&rev=98513&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SDDbgValue.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h Sun Mar 14 14:56:39 2010
@@ -1,4 +1,4 @@
-//===-- llvm/CodeGen/SDDbgValue.h - SD dbg_value handling--------*- C++ -*-===//
+//===-- llvm/CodeGen/SDNodeDbgValue.h - SelectionDAG dbg_value --*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_SDDBGVALUE_H
-#define LLVM_CODEGEN_SDDBGVALUE_H
+#ifndef LLVM_CODEGEN_SDNODEDBGVALUE_H
+#define LLVM_CODEGEN_SDNODEDBGVALUE_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/DebugLoc.h"

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp?rev=98513&r1=98512&r2=98513&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp Sun Mar 14 14:56:39 2010
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "pre-RA-sched"
-#include "SDDbgValue.h"
+#include "SDNodeDbgValue.h"
 #include "ScheduleDAGSDNodes.h"
 #include "InstrEmitter.h"
 #include "llvm/CodeGen/SelectionDAG.h"

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=98513&r1=98512&r2=98513&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Sun Mar 14 14:56:39 2010
@@ -13,7 +13,7 @@
 
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "SDNodeOrdering.h"
-#include "SDDbgValue.h"
+#include "SDNodeDbgValue.h"
 #include "llvm/Constants.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/Function.h"