VE: Merge MCExpr into MCAsmInfo

Author: MaskRay

llvm/lib/Target/VE/AsmParser/VEAsmParser.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MCTargetDesc/VEMCExpr.h"
+#include "MCTargetDesc/VEMCAsmInfo.h"
 #include "MCTargetDesc/VEMCTargetDesc.h"
 #include "TargetInfo/VETargetInfo.h"
 #include "VE.h"

llvm/lib/Target/VE/MCTargetDesc/CMakeLists.txt

@@ -4,7 +4,6 @@ add_llvm_component_library(LLVMVEDesc
   VEInstPrinter.cpp
   VEMCAsmInfo.cpp
   VEMCCodeEmitter.cpp
-  VEMCExpr.cpp
   VEMCTargetDesc.cpp
   VETargetStreamer.cpp
 

llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp

@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MCTargetDesc/VEMCExpr.h"
+#include "MCTargetDesc/VEMCAsmInfo.h"
 #include "VEFixupKinds.h"
-#include "VEMCExpr.h"
+#include "VEMCAsmInfo.h"
 #include "VEMCTargetDesc.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFObjectWriter.h"

llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.cpp

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "VEMCAsmInfo.h"
-#include "VEMCExpr.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCValue.h"
@@ -36,6 +35,43 @@ const MCAsmInfo::AtSpecifier atSpecifiers[] = {
     {VE::S_TPOFF_LO32, "tpoff_lo"},
 };
 
+VE::Fixups VE::getFixupKind(uint8_t S) {
+  switch (S) {
+  default:
+    llvm_unreachable("Unhandled VEMCExpr::Specifier");
+  case VE::S_REFLONG:
+    return VE::fixup_ve_reflong;
+  case VE::S_HI32:
+    return VE::fixup_ve_hi32;
+  case VE::S_LO32:
+    return VE::fixup_ve_lo32;
+  case VE::S_PC_HI32:
+    return VE::fixup_ve_pc_hi32;
+  case VE::S_PC_LO32:
+    return VE::fixup_ve_pc_lo32;
+  case VE::S_GOT_HI32:
+    return VE::fixup_ve_got_hi32;
+  case VE::S_GOT_LO32:
+    return VE::fixup_ve_got_lo32;
+  case VE::S_GOTOFF_HI32:
+    return VE::fixup_ve_gotoff_hi32;
+  case VE::S_GOTOFF_LO32:
+    return VE::fixup_ve_gotoff_lo32;
+  case VE::S_PLT_HI32:
+    return VE::fixup_ve_plt_hi32;
+  case VE::S_PLT_LO32:
+    return VE::fixup_ve_plt_lo32;
+  case VE::S_TLS_GD_HI32:
+    return VE::fixup_ve_tls_gd_hi32;
+  case VE::S_TLS_GD_LO32:
+    return VE::fixup_ve_tls_gd_lo32;
+  case VE::S_TPOFF_HI32:
+    return VE::fixup_ve_tpoff_hi32;
+  case VE::S_TPOFF_LO32:
+    return VE::fixup_ve_tpoff_lo32;
+  }
+}
+
 void VEELFMCAsmInfo::anchor() {}
 
 VEELFMCAsmInfo::VEELFMCAsmInfo(const Triple &TheTriple) {

llvm/lib/Target/VE/MCTargetDesc/VEMCAsmInfo.h

@@ -13,7 +13,9 @@
 #ifndef LLVM_LIB_TARGET_VE_MCTARGETDESC_VEMCASMINFO_H
 #define LLVM_LIB_TARGET_VE_MCTARGETDESC_VEMCASMINFO_H
 
+#include "VEFixupKinds.h"
 #include "llvm/MC/MCAsmInfoELF.h"
+#include "llvm/MC/MCExpr.h"
 
 namespace llvm {
 
@@ -30,6 +32,29 @@ class VEELFMCAsmInfo : public MCAsmInfoELF {
                                  const MCAssembler *Asm) const override;
 };
 
+namespace VE {
+enum Specifier {
+  S_None,
+
+  S_REFLONG = MCSymbolRefExpr::FirstTargetSpecifier,
+  S_HI32,        // @hi
+  S_LO32,        // @lo
+  S_PC_HI32,     // @pc_hi
+  S_PC_LO32,     // @pc_lo
+  S_GOT_HI32,    // @got_hi
+  S_GOT_LO32,    // @got_lo
+  S_GOTOFF_HI32, // @gotoff_hi
+  S_GOTOFF_LO32, // @gotoff_lo
+  S_PLT_HI32,    // @plt_hi
+  S_PLT_LO32,    // @plt_lo
+  S_TLS_GD_HI32, // @tls_gd_hi
+  S_TLS_GD_LO32, // @tls_gd_lo
+  S_TPOFF_HI32,  // @tpoff_hi
+  S_TPOFF_LO32,  // @tpoff_lo
+};
+
+VE::Fixups getFixupKind(uint8_t S);
+} // namespace VE
 } // namespace llvm
 
 #endif // LLVM_LIB_TARGET_VE_MCTARGETDESC_VEMCASMINFO_H

llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp

@@ -12,7 +12,7 @@
 
 #include "MCTargetDesc/VEFixupKinds.h"
 #include "VE.h"
-#include "VEMCExpr.h"
+#include "VEMCAsmInfo.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/MC/MCCodeEmitter.h"

llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.cpp

@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/VEInstPrinter.h"
-#include "MCTargetDesc/VEMCExpr.h"
+#include "MCTargetDesc/VEMCAsmInfo.h"
 #include "MCTargetDesc/VETargetStreamer.h"
 #include "TargetInfo/VETargetInfo.h"
 #include "VE.h"

llvm/lib/Target/VE/MCTargetDesc/VEMCExpr.h

@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "VEISelLowering.h"
-#include "MCTargetDesc/VEMCExpr.h"
+#include "MCTargetDesc/VEMCAsmInfo.h"
 #include "VECustomDAG.h"
 #include "VEInstrBuilder.h"
 #include "VEMachineFunctionInfo.h"