[llvm] r238101 - [AArch64] Move AArch64TargetStreamer out of MCStreamer.h

[Rafael Espíndola]

Thanks!

On 23 May 2015 at 12:15, Benjamin Kramer <benny.kra at googlemail.com> wrote:
> Author: d0k
> Date: Sat May 23 11:15:10 2015
> New Revision: 238101
>
> URL: http://llvm.org/viewvc/llvm-project?rev=238101&view=rev
> Log:
> [AArch64] Move AArch64TargetStreamer out of MCStreamer.h
>
> It doesn't belong in the shared MC layer. NFC.
>
> Added:
>     llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h
> Modified:
>     llvm/trunk/include/llvm/MC/MCStreamer.h
>     llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
>     llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
>     llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
>
> Modified: llvm/trunk/include/llvm/MC/MCStreamer.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCStreamer.h?rev=238101&r1=238100&r2=238101&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCStreamer.h (original)
> +++ llvm/trunk/include/llvm/MC/MCStreamer.h Sat May 23 11:15:10 2015
> @@ -87,29 +87,6 @@ public:
>    virtual void finish();
>  };
>
> -class AArch64TargetStreamer : public MCTargetStreamer {
> -public:
> -  AArch64TargetStreamer(MCStreamer &S);
> -  ~AArch64TargetStreamer() override;
> -
> -  void finish() override;
> -
> -  /// Callback used to implement the ldr= pseudo.
> -  /// Add a new entry to the constant pool for the current section and return an
> -  /// MCExpr that can be used to refer to the constant pool location.
> -  const MCExpr *addConstantPoolEntry(const MCExpr *, unsigned Size);
> -
> -  /// Callback used to implemnt the .ltorg directive.
> -  /// Emit contents of constant pool for the current section.
> -  void emitCurrentConstantPool();
> -
> -  /// Callback used to implement the .inst directive.
> -  virtual void emitInst(uint32_t Inst);
> -
> -private:
> -  std::unique_ptr<AssemblerConstantPools> ConstantPools;
> -};
> -
>  // FIXME: declared here because it is used from
>  // lib/CodeGen/AsmPrinter/ARMException.cpp.
>  class ARMTargetStreamer : public MCTargetStreamer {
>
> Modified: llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp?rev=238101&r1=238100&r2=238101&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp (original)
> +++ llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp Sat May 23 11:15:10 2015
> @@ -9,6 +9,7 @@
>
>  #include "MCTargetDesc/AArch64AddressingModes.h"
>  #include "MCTargetDesc/AArch64MCExpr.h"
> +#include "MCTargetDesc/AArch64TargetStreamer.h"
>  #include "Utils/AArch64BaseInfo.h"
>  #include "llvm/ADT/APInt.h"
>  #include "llvm/ADT/STLExtras.h"
>
> Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp?rev=238101&r1=238100&r2=238101&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp (original)
> +++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp Sat May 23 11:15:10 2015
> @@ -13,6 +13,7 @@
>  //
>  //===----------------------------------------------------------------------===//
>
> +#include "AArch64TargetStreamer.h"
>  #include "llvm/MC/MCELFStreamer.h"
>  #include "llvm/ADT/SmallPtrSet.h"
>  #include "llvm/ADT/StringExtras.h"
>
> Modified: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp?rev=238101&r1=238100&r2=238101&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp (original)
> +++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp Sat May 23 11:15:10 2015
> @@ -1,4 +1,4 @@
> -//===- AArch64TargetStreamer.cpp - AArch64TargetStreamer class --*- C++ -*---------===//
> +//===- AArch64TargetStreamer.cpp - AArch64TargetStreamer class ------------===//
>  //
>  //                     The LLVM Compiler Infrastructure
>  //
> @@ -10,12 +10,9 @@
>  // This file implements the AArch64TargetStreamer class.
>  //
>  //===----------------------------------------------------------------------===//
> -#include "llvm/ADT/MapVector.h"
> -#include "llvm/MC/ConstantPools.h"
> -#include "llvm/MC/MCContext.h"
> -#include "llvm/MC/MCExpr.h"
> -#include "llvm/MC/MCStreamer.h"
>
> +#include "AArch64TargetStreamer.h"
> +#include "llvm/MC/ConstantPools.h"
>  using namespace llvm;
>
>  //
>
> Added: llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h?rev=238101&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h (added)
> +++ llvm/trunk/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.h Sat May 23 11:15:10 2015
> @@ -0,0 +1,42 @@
> +//===-- AArch64TargetStreamer.h - AArch64 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_LIB_TARGET_AARCH64_MCTARGETDESC_AARCH64TARGETSTREAMER_H
> +#define LLVM_LIB_TARGET_AARCH64_MCTARGETDESC_AARCH64TARGETSTREAMER_H
> +
> +#include "llvm/MC/MCStreamer.h"
> +
> +namespace llvm {
> +
> +class AArch64TargetStreamer : public MCTargetStreamer {
> +public:
> +  AArch64TargetStreamer(MCStreamer &S);
> +  ~AArch64TargetStreamer() override;
> +
> +  void finish() override;
> +
> +  /// Callback used to implement the ldr= pseudo.
> +  /// Add a new entry to the constant pool for the current section and return an
> +  /// MCExpr that can be used to refer to the constant pool location.
> +  const MCExpr *addConstantPoolEntry(const MCExpr *, unsigned Size);
> +
> +  /// Callback used to implemnt the .ltorg directive.
> +  /// Emit contents of constant pool for the current section.
> +  void emitCurrentConstantPool();
> +
> +  /// Callback used to implement the .inst directive.
> +  virtual void emitInst(uint32_t Inst);
> +
> +private:
> +  std::unique_ptr<AssemblerConstantPools> ConstantPools;
> +};
> +
> +} // end namespace llvm
> +
> +#endif
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits