[llvm-commits] [llvm] r138982 - in /llvm/trunk/lib/Target/ARM/Disassembler: ARMDisassembler.cpp ARMDisassembler.h

[Jim Grosbach]

Yay! Thank you.

-j
On Sep 1, 2011, at 4:35 PM, Owen Anderson wrote:

> Author: resistor
> Date: Thu Sep  1 18:35:51 2011
> New Revision: 138982
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=138982&view=rev
> Log:
> Merge the ARM disassembler header into the implementation file, since it is not externally exposed.
> 
> Removed:
>    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.h
> Modified:
>    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
> 
> Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp?rev=138982&r1=138981&r2=138982&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp Thu Sep  1 18:35:51 2011
> @@ -9,7 +9,6 @@
> 
> #define DEBUG_TYPE "arm-disassembler"
> 
> -#include "ARMDisassembler.h"
> #include "ARM.h"
> #include "ARMRegisterInfo.h"
> #include "MCTargetDesc/ARMAddressingModes.h"
> @@ -18,6 +17,7 @@
> #include "llvm/MC/MCInst.h"
> #include "llvm/MC/MCExpr.h"
> #include "llvm/MC/MCContext.h"
> +#include "llvm/MC/MCDisassembler.h"
> #include "llvm/Support/Debug.h"
> #include "llvm/Support/MemoryObject.h"
> #include "llvm/Support/ErrorHandling.h"
> @@ -28,6 +28,59 @@
> 
> typedef MCDisassembler::DecodeStatus DecodeStatus;
> 
> +namespace {
> +/// ARMDisassembler - ARM disassembler for all ARM platforms.
> +class ARMDisassembler : public MCDisassembler {
> +public:
> +  /// Constructor     - Initializes the disassembler.
> +  ///
> +  ARMDisassembler() :
> +    MCDisassembler() {
> +  }
> +
> +  ~ARMDisassembler() {
> +  }
> +
> +  /// getInstruction - See MCDisassembler.
> +  DecodeStatus getInstruction(MCInst &instr,
> +                              uint64_t &size,
> +                              const MemoryObject &region,
> +                              uint64_t address,
> +                              raw_ostream &vStream) const;
> +
> +  /// getEDInfo - See MCDisassembler.
> +  EDInstInfo *getEDInfo() const;
> +private:
> +};
> +
> +/// ThumbDisassembler - Thumb disassembler for all Thumb platforms.
> +class ThumbDisassembler : public MCDisassembler {
> +public:
> +  /// Constructor     - Initializes the disassembler.
> +  ///
> +  ThumbDisassembler() :
> +    MCDisassembler() {
> +  }
> +
> +  ~ThumbDisassembler() {
> +  }
> +
> +  /// getInstruction - See MCDisassembler.
> +  DecodeStatus getInstruction(MCInst &instr,
> +                              uint64_t &size,
> +                              const MemoryObject &region,
> +                              uint64_t address,
> +                              raw_ostream &vStream) const;
> +
> +  /// getEDInfo - See MCDisassembler.
> +  EDInstInfo *getEDInfo() const;
> +private:
> +  mutable std::vector<unsigned> ITBlock;
> +  void AddThumbPredicate(MCInst&) const;
> +  void UpdateThumbVFPPredicate(MCInst&) const;
> +};
> +}
> +
> static bool Check(DecodeStatus &Out, DecodeStatus In) {
>   switch (In) {
>     case MCDisassembler::Success:
> 
> Removed: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.h?rev=138981&view=auto
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.h (original)
> +++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.h (removed)
> @@ -1,84 +0,0 @@
> -//===- ARMDisassembler.h - Disassembler for ARM/Thumb ISA -------*- C++ -*-===//
> -//
> -//                     The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -//
> -// This file is part of the ARM Disassembler.
> -// It contains the header for ARMDisassembler and ThumbDisassembler, both are
> -// subclasses of MCDisassembler.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef ARMDISASSEMBLER_H
> -#define ARMDISASSEMBLER_H
> -
> -#include "llvm/MC/MCDisassembler.h"
> -#include <vector>
> -
> -namespace llvm {
> -  
> -class MCInst;
> -class MemoryObject;
> -class raw_ostream;
> -
> -struct EDInstInfo;
> -
> -/// ARMDisassembler - ARM disassembler for all ARM platforms.
> -class ARMDisassembler : public MCDisassembler {
> -public:
> -  /// Constructor     - Initializes the disassembler.
> -  ///
> -  ARMDisassembler() :
> -    MCDisassembler() {
> -  }
> -
> -  ~ARMDisassembler() {
> -  }
> -
> -  /// getInstruction - See MCDisassembler.
> -  DecodeStatus getInstruction(MCInst &instr,
> -                              uint64_t &size,
> -                              const MemoryObject &region,
> -                              uint64_t address,
> -                              raw_ostream &vStream) const;
> -
> -  /// getEDInfo - See MCDisassembler.
> -  EDInstInfo *getEDInfo() const;
> -private:
> -};
> -
> -/// ARMDisassembler - ARM disassembler for all ARM platforms.
> -class ThumbDisassembler : public MCDisassembler {
> -public:
> -  /// Constructor     - Initializes the disassembler.
> -  ///
> -  ThumbDisassembler() :
> -    MCDisassembler() {
> -  }
> -
> -  ~ThumbDisassembler() {
> -  }
> -
> -  /// getInstruction - See MCDisassembler.
> -  DecodeStatus getInstruction(MCInst &instr,
> -                              uint64_t &size,
> -                              const MemoryObject &region,
> -                              uint64_t address,
> -                              raw_ostream &vStream) const;
> -
> -  /// getEDInfo - See MCDisassembler.
> -  EDInstInfo *getEDInfo() const;
> -private:
> -  mutable std::vector<unsigned> ITBlock;
> -  void AddThumbPredicate(MCInst&) const;
> -  void UpdateThumbVFPPredicate(MCInst&) const;
> -};
> -
> -
> -} // namespace llvm
> -
> -#endif
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits