[AVR] Add AVRTargetStreamers

[dylanmckay]

Summary

Add AVR target streamer classes. A fairly trivial patch.

[arsenm]

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp

36–37

This should probably be a function rather than just marking a region with braces

[dylanmckay]

Move EFlag calculation into separate function

[dylanmckay]

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp

38–39

Done - cheers Matt.

[dylanmckay]

Ping.

[arsenm]

I'm not particularly familiar with MC bits, but besides these minor cleanups this looks OK to me

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp

22–23

Convention is for new functions to start with a lowercase letter, and to use static functions instead of an anonymous namespace.

75–77

Convention is also that the ELF / other specific object format Streamer be kept in a separate file

[dylanmckay]

Second round of code review

[dylanmckay]

@arsenm fixed up your points - cheers :)

[dylanmckay]

Ping.

[dylanmckay]

Ping.

[dylanmckay]

Ping

[dylanmckay]

Ping

[dylanmckay]

Ping.

[dylanmckay]

Ping

[dylanmckay]

Ping

[arsenm]

LGTM with comment fixes + makefile dropped

lib/Target/AVR/MCTargetDesc/AVRELFStreamer.h

17–19 ↗

(On Diff #47960)

C++ style comments

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h

17–19

Ditto

lib/Target/AVR/MCTargetDesc/Makefile

2–17

Not necessary anymore

[dylanmckay]

Removed Makefile and C++ style comments

[dylanmckay]

Committed in r270171

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h

+//===-- AVRTargetStreamer.h - AVR Target Streamer --------------*- C++ -*--===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_AVR_TARGET_STREAMER_H
+#define LLVM_AVR_TARGET_STREAMER_H
+
+#include "llvm/MC/MCELFStreamer.h"
+#include "llvm/MC/MCStreamer.h"
+
+namespace llvm {
+
+/**
+ * A generic AVR target output stream.
+ */
+class AVRTargetStreamer : public MCTargetStreamer {
+public:
+  explicit AVRTargetStreamer(MCStreamer &S);
+};
+
+/**
+ * A target streamer for textual AVR assembly code.
+ */
+class AVRTargetAsmStreamer : public AVRTargetStreamer {
+public:
+  explicit AVRTargetAsmStreamer(MCStreamer &S);
+};
+
+/**
+ * A target streamer for an AVR ELF object file.
+ */
+class AVRTargetELFStreamer : public AVRTargetStreamer {
+public:
+  AVRTargetELFStreamer(MCStreamer &S, const MCSubtargetInfo &STI);
+
+  /// Gets the ELF streamer.
+  MCELFStreamer &getStreamer() {
+    return static_cast<MCELFStreamer &>(Streamer);
+  }
+};
+
+} // end namespace llvm
+
+#endif // LLVM_AVR_TARGET_STREAMER_H

lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp

+//===-- AVRTargetStreamer.cpp - AVR Target Streamer Methods ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides AVR specific target streamer methods.
+//
+//===----------------------------------------------------------------------===//
+
+#include "AVRTargetStreamer.h"
+
+#include "llvm/Support/ELF.h"
+#include "llvm/Support/FormattedStream.h"
+
+#include "InstPrinter/AVRInstPrinter.h"
+
+namespace llvm {
+
+AVRTargetStreamer::AVRTargetStreamer(MCStreamer &S) : MCTargetStreamer(S) {}
+
+AVRTargetAsmStreamer::AVRTargetAsmStreamer(MCStreamer &S)
+    : AVRTargetStreamer(S) {}
+
+AVRTargetELFStreamer::AVRTargetELFStreamer(MCStreamer &S,
+                                           const MCSubtargetInfo &STI)
+    : AVRTargetStreamer(S) {
+
+  MCAssembler &MCA = getStreamer().getAssembler();
+
+  const FeatureBitset &Features = STI.getFeatureBits();
+
+  // Set e_flags
+  {
+    unsigned EFlags = MCA.getELFHeaderEFlags();
+
+    // Set architecture
+    if (Features[AVR::ELFArchAVR1])
+      EFlags |= ELF::EF_AVR_ARCH_AVR1;
+    else if (Features[AVR::ELFArchAVR2])
+      EFlags |= ELF::EF_AVR_ARCH_AVR2;
+    else if (Features[AVR::ELFArchAVR25])
+      EFlags |= ELF::EF_AVR_ARCH_AVR25;
+    else if (Features[AVR::ELFArchAVR3])
+      EFlags |= ELF::EF_AVR_ARCH_AVR3;
+    else if (Features[AVR::ELFArchAVR31])
+      EFlags |= ELF::EF_AVR_ARCH_AVR31;
+    else if (Features[AVR::ELFArchAVR35])
+      EFlags |= ELF::EF_AVR_ARCH_AVR35;
+    else if (Features[AVR::ELFArchAVR4])
+      EFlags |= ELF::EF_AVR_ARCH_AVR4;
+    else if (Features[AVR::ELFArchAVR5])
+      EFlags |= ELF::EF_AVR_ARCH_AVR5;
+    else if (Features[AVR::ELFArchAVR51])
+      EFlags |= ELF::EF_AVR_ARCH_AVR51;
+    else if (Features[AVR::ELFArchAVR6])
+      EFlags |= ELF::EF_AVR_ARCH_AVR6;
+    else if (Features[AVR::ELFArchAVRTiny])
+      EFlags |= ELF::EF_AVR_ARCH_AVRTINY;
+    else if (Features[AVR::ELFArchXMEGA1])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA1;
+    else if (Features[AVR::ELFArchXMEGA2])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA2;
+    else if (Features[AVR::ELFArchXMEGA3])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA3;
+    else if (Features[AVR::ELFArchXMEGA4])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA4;
+    else if (Features[AVR::ELFArchXMEGA5])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA5;
+    else if (Features[AVR::ELFArchXMEGA6])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA6;
+    else if (Features[AVR::ELFArchXMEGA7])
+      EFlags |= ELF::EF_AVR_ARCH_XMEGA7;
+
+    MCA.setELFHeaderEFlags(EFlags);
+  }
+}
+} // end namespace llvm

lib/Target/AVR/MCTargetDesc/CMakeLists.txt

+add_llvm_library(LLVMAVRDesc
+  AVRTargetStreamer.cpp
+  )
+
+add_dependencies(LLVMAVRDesc AVRCommonTableGen)

lib/Target/AVR/MCTargetDesc/LLVMBuild.txt

+;===- ./lib/Target/AVR/MCTargetDesc/LLVMBuild.txt --------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Library
+name = AVRDesc
+parent = AVR
+required_libraries = MC AVRInfo Support
+add_to_library_groups = AVR

lib/Target/AVR/MCTargetDesc/Makefile

+##===- lib/Target/AVR/TargetDesc/Makefile ------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../../..
+LIBRARYNAME = LLVMAVRDesc
+
+# Hack: we need to include 'main' target directory to grab private headers
+CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..
+
+include $(LEVEL)/Makefile.common