Commit 65b3b6c0 authored by Mikhail Maltsev's avatar Mikhail Maltsev
Browse files

[ARM] Make ARM::ArchExtKind use 64-bit underlying type (part 2), NFCI 

Summary:
After following Simon's suggestion about additional testing posted at
https://reviews.llvm.org/D73906, I found several more places that
need to be updated.

Reviewers: simon_tatham, dmgreen, ostannard, eli.friedman

Reviewed By: simon_tatham

Subscribers: merge_guards_bot, kristof.beyls, hiraditya, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D73963
parent ed98994f

llvm/include/llvm/MC/MCStreamer.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public: 
                                    StringRef StringValue = "");

  virtual void emitFPU(unsigned FPU);

  virtual void emitArch(ARM::ArchKind Arch);

  virtual void emitArchExtension(unsigned ArchExt);

  virtual void emitArchExtension(uint64_t ArchExt);

  virtual void emitObjectArch(ARM::ArchKind Arch);

  void emitTargetAttributes(const MCSubtargetInfo &STI);

  virtual void finishAttributeSection();

llvm/include/llvm/Support/ARMTargetParser.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ const ExtName ARCHExtNames[] = { 
const struct {

  const char *NameCStr;

  size_t NameLength;

  unsigned ID;

  uint64_t ID;



  StringRef getName() const { return StringRef(NameCStr, NameLength); }

} HWDivNames[] = {

llvm/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class ARMTargetAsmStreamer : public ARMTargetStreamer { 
  void emitIntTextAttribute(unsigned Attribute, unsigned IntValue,

                            StringRef StringValue) override;

  void emitArch(ARM::ArchKind Arch) override;

  void emitArchExtension(unsigned ArchExt) override;

  void emitArchExtension(uint64_t ArchExt) override;

  void emitObjectArch(ARM::ArchKind Arch) override;

  void emitFPU(unsigned FPU) override;

  void emitInst(uint32_t Inst, char Suffix = '\0') override;
@@ -222,7 +222,7 @@ void ARMTargetAsmStreamer::emitArch(ARM::ArchKind Arch) { 
  OS << "\t.arch\t" << ARM::getArchName(Arch) << "\n";

}



void ARMTargetAsmStreamer::emitArchExtension(unsigned ArchExt) {

void ARMTargetAsmStreamer::emitArchExtension(uint64_t ArchExt) {

  OS << "\t.arch_extension\t" << ARM::getArchExtName(ArchExt) << "\n";

}

llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void ARMTargetStreamer::emitIntTextAttribute(unsigned Attribute, 
                                             unsigned IntValue,

                                             StringRef StringValue) {}

void ARMTargetStreamer::emitArch(ARM::ArchKind Arch) {}

void ARMTargetStreamer::emitArchExtension(unsigned ArchExt) {}

void ARMTargetStreamer::emitArchExtension(uint64_t ArchExt) {}

void ARMTargetStreamer::emitObjectArch(ARM::ArchKind Arch) {}

void ARMTargetStreamer::emitFPU(unsigned FPU) {}

void ARMTargetStreamer::finishAttributeSection() {}