PowerPC: Move PPCMCExpr into PPCMCAsmInfo

to align with targets that have made the transition.

Author: MaskRay

llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MCTargetDesc/PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "MCTargetDesc/PPCTargetStreamer.h"
 #include "PPCInstrInfo.h"

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

@@ -4,7 +4,6 @@ add_llvm_component_library(LLVMPowerPCDesc
   PPCMCTargetDesc.cpp
   PPCMCAsmInfo.cpp
   PPCMCCodeEmitter.cpp
-  PPCMCExpr.cpp
   PPCPredicates.cpp
   PPCELFObjectWriter.cpp
   PPCXCOFFObjectWriter.cpp

llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/PPCFixupKinds.h"
-#include "MCTargetDesc/PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/BinaryFormat/MachO.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/PPCFixupKinds.h"
-#include "MCTargetDesc/PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCELFObjectWriter.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFStreamer.cpp

@@ -18,8 +18,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "PPCELFStreamer.h"
+#include "PPCMCAsmInfo.h"
 #include "PPCMCCodeEmitter.h"
-#include "PPCMCExpr.h"
 #include "PPCMCTargetDesc.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/MC/MCAsmBackend.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCInstPrinter.cpp

@@ -13,7 +13,7 @@
 #include "MCTargetDesc/PPCInstPrinter.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "MCTargetDesc/PPCPredicates.h"
-#include "PPCMCExpr.h"
+#include "PPCMCAsmInfo.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCInst.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp

@@ -10,8 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "PPCMCAsmInfo.h"
-#include "PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/TargetParser/Triple.h"
@@ -99,6 +98,66 @@ const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
     {PPC::S_U, "u"},
 };
 
+static std::optional<int64_t> evaluateAsInt64(uint16_t specifier,
+                                              int64_t Value) {
+  switch (specifier) {
+  case PPC::S_LO:
+    return Value & 0xffff;
+  case PPC::S_HI:
+    return (Value >> 16) & 0xffff;
+  case PPC::S_HA:
+    return ((Value + 0x8000) >> 16) & 0xffff;
+  case PPC::S_HIGH:
+    return (Value >> 16) & 0xffff;
+  case PPC::S_HIGHA:
+    return ((Value + 0x8000) >> 16) & 0xffff;
+  case PPC::S_HIGHER:
+    return (Value >> 32) & 0xffff;
+  case PPC::S_HIGHERA:
+    return ((Value + 0x8000) >> 32) & 0xffff;
+  case PPC::S_HIGHEST:
+    return (Value >> 48) & 0xffff;
+  case PPC::S_HIGHESTA:
+    return ((Value + 0x8000) >> 48) & 0xffff;
+  default:
+    return {};
+  }
+}
+
+bool PPC::evaluateAsConstant(const MCSpecifierExpr &Expr, int64_t &Res) {
+  MCValue Value;
+
+  if (!Expr.getSubExpr()->evaluateAsRelocatable(Value, nullptr))
+    return false;
+
+  if (!Value.isAbsolute())
+    return false;
+  auto Tmp = evaluateAsInt64(Expr.getSpecifier(), Value.getConstant());
+  if (!Tmp)
+    return false;
+  Res = *Tmp;
+  return true;
+}
+
+static bool evaluateAsRelocatable(const MCSpecifierExpr &Expr, MCValue &Res,
+                                  const MCAssembler *Asm) {
+  if (!Expr.getSubExpr()->evaluateAsRelocatable(Res, Asm))
+    return false;
+
+  // The signedness of the result is dependent on the instruction operand. E.g.
+  // in addis 3,3,65535@l, 65535@l is signed. In the absence of information at
+  // parse time (!Asm), disable the folding.
+  std::optional<int64_t> MaybeInt =
+      evaluateAsInt64(Expr.getSpecifier(), Res.getConstant());
+  if (Res.isAbsolute() && MaybeInt) {
+    Res = MCValue::get(*MaybeInt);
+  } else {
+    Res.setSpecifier(Expr.getSpecifier());
+  }
+
+  return true;
+}
+
 PPCELFMCAsmInfo::PPCELFMCAsmInfo(bool is64Bit, const Triple& T) {
   // FIXME: This is not always needed. For example, it is not needed in the
   // v2 abi.
@@ -146,7 +205,7 @@ void PPCELFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
 bool PPCELFMCAsmInfo::evaluateAsRelocatableImpl(const MCSpecifierExpr &Expr,
                                                 MCValue &Res,
                                                 const MCAssembler *Asm) const {
-  return PPC::evaluateAsRelocatableImpl(Expr, Res, Asm);
+  return evaluateAsRelocatable(Expr, Res, Asm);
 }
 
 void PPCXCOFFMCAsmInfo::anchor() {}
@@ -181,5 +240,5 @@ void PPCXCOFFMCAsmInfo::printSpecifierExpr(raw_ostream &OS,
 
 bool PPCXCOFFMCAsmInfo::evaluateAsRelocatableImpl(
     const MCSpecifierExpr &Expr, MCValue &Res, const MCAssembler *Asm) const {
-  return PPC::evaluateAsRelocatableImpl(Expr, Res, Asm);
+  return evaluateAsRelocatable(Expr, Res, Asm);
 }

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.h

@@ -15,6 +15,8 @@
 
 #include "llvm/MC/MCAsmInfoELF.h"
 #include "llvm/MC/MCAsmInfoXCOFF.h"
+#include "llvm/MC/MCExpr.h"
+#include "llvm/MC/MCValue.h"
 
 namespace llvm {
 class Triple;
@@ -123,8 +125,17 @@ enum Specifier {
   S_TPREL_LO,       // symbol@tprel@l
   S_U,              // symbol@u
 };
+
+bool evaluateAsConstant(const MCSpecifierExpr &Expr, int64_t &Res);
+}
+
+namespace PPCMCExpr {
+using Specifier = uint16_t;
 }
 
+static inline uint16_t getSpecifier(const MCSymbolRefExpr *SRE) {
+  return SRE->getKind();
+}
 } // namespace llvm
 
 #endif

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp

@@ -12,7 +12,7 @@
 
 #include "PPCMCCodeEmitter.h"
 #include "MCTargetDesc/PPCFixupKinds.h"
-#include "PPCMCExpr.h"
+#include "PPCMCAsmInfo.h"
 #include "PPCMCTargetDesc.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp

@@ -14,7 +14,7 @@
 #include "MCTargetDesc/PPCInstPrinter.h"
 #include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "PPCELFStreamer.h"
-#include "PPCMCExpr.h"
+#include "PPCMCAsmInfo.h"
 #include "PPCTargetStreamer.h"
 #include "PPCXCOFFStreamer.h"
 #include "TargetInfo/PowerPCTargetInfo.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h

@@ -9,7 +9,7 @@
 #ifndef LLVM_LIB_TARGET_POWERPC_PPCTARGETSTREAMER_H
 #define LLVM_LIB_TARGET_POWERPC_PPCTARGETSTREAMER_H
 
-#include "PPCMCExpr.h"
+#include "PPCMCAsmInfo.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/MC/MCExpr.h"
 #include "llvm/MC/MCStreamer.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp

@@ -9,7 +9,7 @@
 
 #include "MCTargetDesc/PPCFixupKinds.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
-#include "PPCMCExpr.h"
+#include "PPCMCAsmInfo.h"
 #include "llvm/BinaryFormat/XCOFF.h"
 #include "llvm/MC/MCFixup.h"
 #include "llvm/MC/MCValue.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCTargetStreamer.h

@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "MCTargetDesc/PPCInstPrinter.h"
-#include "MCTargetDesc/PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "MCTargetDesc/PPCMCTargetDesc.h"
 #include "MCTargetDesc/PPCPredicates.h"
 #include "MCTargetDesc/PPCTargetStreamer.h"

llvm/lib/Target/PowerPC/MCTargetDesc/PPCXCOFFObjectWriter.cpp

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "MCTargetDesc/PPCMCExpr.h"
+#include "MCTargetDesc/PPCMCAsmInfo.h"
 #include "PPC.h"
 #include "PPCMachineFunctionInfo.h"
 #include "PPCSubtarget.h"

llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

@@ -58,7 +58,6 @@ static_library("MCTargetDesc") {
     "PPCInstPrinter.cpp",
     "PPCMCAsmInfo.cpp",
     "PPCMCCodeEmitter.cpp",
-    "PPCMCExpr.cpp",
     "PPCMCTargetDesc.cpp",
     "PPCPredicates.cpp",
     "PPCXCOFFObjectWriter.cpp",