rename MCImm ->MCValue.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74023 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCImm.h b/include/llvm/MC/MCImm.h
deleted file mode 100644 (file)
index 1d836c7..0000000
--- a/include/llvm/MC/MCImm.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===-- llvm/MC/MCImm.h - MCImm class ---------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the declaration of the MCInst and MCOperand classes, which
-// is the basic representation used to represent low-level machine code
-// instructions.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCIMM_H
-#define LLVM_MC_MCIMM_H
-
-#include "llvm/Support/DataTypes.h"
-
-namespace llvm {
-class MCSymbol;
-
-/// MCImm - This represents an "assembler immediate".  In its most general form,
-/// this can hold "SymbolA - SymbolB + imm64".  Not all targets supports
-/// relocations of this general form, but we need to represent this anyway.
-class MCImm {
-  MCSymbol *SymA, *SymB;
-  int64_t Cst;
-public:
-
-  int64_t getCst() const { return Cst; }
-  MCSymbol *getSymA() const { return SymA; }
-  MCSymbol *getSymB() const { return SymB; }
-  
-  
-  static MCImm get(MCSymbol *SymA, MCSymbol *SymB = 0, int64_t Val = 0) {
-    MCImm R;
-    R.Cst = Val;
-    R.SymA = SymA;
-    R.SymB = SymB;
-    return R;
-  }
-  
-  static MCImm get(int64_t Val) {
-    MCImm R;
-    R.Cst = Val;
-    R.SymA = 0;
-    R.SymB = 0;
-    return R;
-  }
-  
-};
-
-} // end namespace llvm
-
-#endif

diff --git a/include/llvm/MC/MCInst.h b/include/llvm/MC/MCInst.h
index 457c2ae2ee650ae6e5b64ecbff74a448d92cfa25..310898587cc0a27299de4a84bdeb279631e534a6 100644 (file)
--- a/include/llvm/MC/MCInst.h
+++ b/include/llvm/MC/MCInst.h
@@ -16,7 +16,7 @@
 #ifndef LLVM_MC_MCINST_H
 #define LLVM_MC_MCINST_H
 
-#include "llvm/MC/MCImm.h"
+#include "llvm/MC/MCValue.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/DebugLoc.h"
@@ -31,14 +31,14 @@ class MCOperand {
     kRegister,                ///< Register operand.
     kImmediate,               ///< Immediate operand.
     kMBBLabel,                ///< Basic block label.
-    kMCImm
+    kMCValue
   };
   unsigned char Kind;
   
   union {
     unsigned RegVal;
     int64_t ImmVal;
-    MCImm MCImmVal;
+    MCValue MCValueVal;
     struct {
       unsigned FunctionNo;
       unsigned BlockNo;

diff --git a/include/llvm/MC/MCValue.h b/include/llvm/MC/MCValue.h
new file mode 100644 (file)
index 0000000..7df12da
--- /dev/null
+++ b/include/llvm/MC/MCValue.h
@@ -0,0 +1,58 @@
+//===-- llvm/MC/MCValue.h - MCValue class -----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the declaration of the MCValue class.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_MC_MCVALUE_H
+#define LLVM_MC_MCVALUE_H
+
+#include "llvm/Support/DataTypes.h"
+
+namespace llvm {
+class MCSymbol;
+
+/// MCValue - This represents an "assembler immediate".  In its most general
+/// form, this can hold "SymbolA - SymbolB + imm64".  Not all targets supports
+/// relocations of this general form, but we need to represent this anyway.
+///
+/// Note that this class must remain a simple POD value class, because we need
+/// it to live in unions etc.
+class MCValue {
+  MCSymbol *SymA, *SymB;
+  int64_t Cst;
+public:
+
+  int64_t getCst() const { return Cst; }
+  MCSymbol *getSymA() const { return SymA; }
+  MCSymbol *getSymB() const { return SymB; }
+  
+  
+  static MCValue get(MCSymbol *SymA, MCSymbol *SymB = 0, int64_t Val = 0) {
+    MCValue R;
+    R.Cst = Val;
+    R.SymA = SymA;
+    R.SymB = SymB;
+    return R;
+  }
+  
+  static MCValue get(int64_t Val) {
+    MCValue R;
+    R.Cst = Val;
+    R.SymA = 0;
+    R.SymB = 0;
+    return R;
+  }
+  
+};
+
+} // end namespace llvm
+
+#endif