Prune CRLF.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220678 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2014-10-27 12:37:26 +00:00
parent b1d8e7e77c
commit af628cc0b8
8 changed files with 146 additions and 146 deletions

View File

@ -29,7 +29,7 @@ class DenseSet {
public: public:
typedef ValueT key_type; typedef ValueT key_type;
typedef ValueT value_type; typedef ValueT value_type;
typedef unsigned size_type; typedef unsigned size_type;
explicit DenseSet(unsigned NumInitBuckets = 0) : TheMap(NumInitBuckets) {} explicit DenseSet(unsigned NumInitBuckets = 0) : TheMap(NumInitBuckets) {}
@ -45,7 +45,7 @@ public:
TheMap.clear(); TheMap.clear();
} }
/// Return 1 if the specified key is in the set, 0 otherwise. /// Return 1 if the specified key is in the set, 0 otherwise.
size_type count(const ValueT &V) const { size_type count(const ValueT &V) const {
return TheMap.count(V); return TheMap.count(V);
} }

View File

@ -148,7 +148,7 @@ public:
/// ScopeTy - This is a helpful typedef that allows clients to get easy access /// ScopeTy - This is a helpful typedef that allows clients to get easy access
/// to the name of the scope for this hash table. /// to the name of the scope for this hash table.
typedef ScopedHashTableScope<K, V, KInfo, AllocatorTy> ScopeTy; typedef ScopedHashTableScope<K, V, KInfo, AllocatorTy> ScopeTy;
typedef unsigned size_type; typedef unsigned size_type;
private: private:
typedef ScopedHashTableVal<K, V> ValTy; typedef ScopedHashTableVal<K, V> ValTy;
DenseMap<K, ValTy*, KInfo> TopLevelMap; DenseMap<K, ValTy*, KInfo> TopLevelMap;
@ -171,7 +171,7 @@ public:
AllocatorTy &getAllocator() { return Allocator; } AllocatorTy &getAllocator() { return Allocator; }
const AllocatorTy &getAllocator() const { return Allocator; } const AllocatorTy &getAllocator() const { return Allocator; }
/// Return 1 if the specified key is in the table, 0 otherwise. /// Return 1 if the specified key is in the table, 0 otherwise.
size_type count(const K &Key) const { size_type count(const K &Key) const {
return TopLevelMap.count(Key); return TopLevelMap.count(Key);
} }

View File

@ -54,7 +54,7 @@ class SmallBitVector {
}; };
public: public:
typedef unsigned size_type; typedef unsigned size_type;
// Encapsulation of a single bit. // Encapsulation of a single bit.
class reference { class reference {
SmallBitVector &TheVector; SmallBitVector &TheVector;

View File

@ -45,7 +45,7 @@ struct SparseBitVectorElement
: public ilist_node<SparseBitVectorElement<ElementSize> > { : public ilist_node<SparseBitVectorElement<ElementSize> > {
public: public:
typedef unsigned long BitWord; typedef unsigned long BitWord;
typedef unsigned size_type; typedef unsigned size_type;
enum { enum {
BITWORD_SIZE = sizeof(BitWord) * CHAR_BIT, BITWORD_SIZE = sizeof(BitWord) * CHAR_BIT,
BITWORDS_PER_ELEMENT = (ElementSize + BITWORD_SIZE - 1) / BITWORD_SIZE, BITWORDS_PER_ELEMENT = (ElementSize + BITWORD_SIZE - 1) / BITWORD_SIZE,

View File

@ -185,7 +185,7 @@ public:
typedef const ValueT &const_reference; typedef const ValueT &const_reference;
typedef ValueT *pointer; typedef ValueT *pointer;
typedef const ValueT *const_pointer; typedef const ValueT *const_pointer;
typedef unsigned size_type; typedef unsigned size_type;
SparseMultiSet() SparseMultiSet()
: Sparse(nullptr), Universe(0), FreelistIdx(SMSNode::INVALID), NumFree(0) {} : Sparse(nullptr), Universe(0), FreelistIdx(SMSNode::INVALID), NumFree(0) {}

View File

@ -124,7 +124,7 @@ class SparseSet {
typedef typename KeyFunctorT::argument_type KeyT; typedef typename KeyFunctorT::argument_type KeyT;
typedef SmallVector<ValueT, 8> DenseT; typedef SmallVector<ValueT, 8> DenseT;
typedef unsigned size_type; typedef unsigned size_type;
DenseT Dense; DenseT Dense;
SparseT *Sparse; SparseT *Sparse;
unsigned Universe; unsigned Universe;

View File

@ -1,115 +1,115 @@
//===-- HexagonDisassembler.cpp - Disassembler for Hexagon ISA ------------===// //===-- HexagonDisassembler.cpp - Disassembler for Hexagon ISA ------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is distributed under the University of Illinois Open Source // This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details. // License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "MCTargetDesc/HexagonBaseInfo.h" #include "MCTargetDesc/HexagonBaseInfo.h"
#include "MCTargetDesc/HexagonMCTargetDesc.h" #include "MCTargetDesc/HexagonMCTargetDesc.h"
#include "llvm/MC/MCContext.h" #include "llvm/MC/MCContext.h"
#include "llvm/MC/MCDisassembler.h" #include "llvm/MC/MCDisassembler.h"
#include "llvm/MC/MCExpr.h" #include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCFixedLenDisassembler.h" #include "llvm/MC/MCFixedLenDisassembler.h"
#include "llvm/MC/MCInst.h" #include "llvm/MC/MCInst.h"
#include "llvm/MC/MCInstrDesc.h" #include "llvm/MC/MCInstrDesc.h"
#include "llvm/MC/MCSubtargetInfo.h" #include "llvm/MC/MCSubtargetInfo.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/LEB128.h" #include "llvm/Support/LEB128.h"
#include "llvm/Support/MemoryObject.h" #include "llvm/Support/MemoryObject.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/Endian.h" #include "llvm/Support/Endian.h"
#include <vector> #include <vector>
#include <array> #include <array>
using namespace llvm; using namespace llvm;
#define DEBUG_TYPE "hexagon-disassembler" #define DEBUG_TYPE "hexagon-disassembler"
// Pull DecodeStatus and its enum values into the global namespace. // Pull DecodeStatus and its enum values into the global namespace.
typedef llvm::MCDisassembler::DecodeStatus DecodeStatus; typedef llvm::MCDisassembler::DecodeStatus DecodeStatus;
namespace { namespace {
/// \brief Hexagon disassembler for all Hexagon platforms. /// \brief Hexagon disassembler for all Hexagon platforms.
class HexagonDisassembler : public MCDisassembler { class HexagonDisassembler : public MCDisassembler {
public: public:
HexagonDisassembler(MCSubtargetInfo const &STI, MCContext &Ctx) HexagonDisassembler(MCSubtargetInfo const &STI, MCContext &Ctx)
: MCDisassembler(STI, Ctx) {} : MCDisassembler(STI, Ctx) {}
DecodeStatus getInstruction(MCInst &instr, uint64_t &size, DecodeStatus getInstruction(MCInst &instr, uint64_t &size,
MemoryObject const &region, uint64_t address, MemoryObject const &region, uint64_t address,
raw_ostream &vStream, raw_ostream &cStream) const override; raw_ostream &vStream, raw_ostream &cStream) const override;
}; };
} }
static const uint16_t IntRegDecoderTable[] = { static const uint16_t IntRegDecoderTable[] = {
Hexagon::R0, Hexagon::R1, Hexagon::R2, Hexagon::R3, Hexagon::R4, Hexagon::R0, Hexagon::R1, Hexagon::R2, Hexagon::R3, Hexagon::R4,
Hexagon::R5, Hexagon::R6, Hexagon::R7, Hexagon::R8, Hexagon::R9, Hexagon::R5, Hexagon::R6, Hexagon::R7, Hexagon::R8, Hexagon::R9,
Hexagon::R10, Hexagon::R11, Hexagon::R12, Hexagon::R13, Hexagon::R14, Hexagon::R10, Hexagon::R11, Hexagon::R12, Hexagon::R13, Hexagon::R14,
Hexagon::R15, Hexagon::R16, Hexagon::R17, Hexagon::R18, Hexagon::R19, Hexagon::R15, Hexagon::R16, Hexagon::R17, Hexagon::R18, Hexagon::R19,
Hexagon::R20, Hexagon::R21, Hexagon::R22, Hexagon::R23, Hexagon::R24, Hexagon::R20, Hexagon::R21, Hexagon::R22, Hexagon::R23, Hexagon::R24,
Hexagon::R25, Hexagon::R26, Hexagon::R27, Hexagon::R28, Hexagon::R29, Hexagon::R25, Hexagon::R26, Hexagon::R27, Hexagon::R28, Hexagon::R29,
Hexagon::R30, Hexagon::R31}; Hexagon::R30, Hexagon::R31};
static const uint16_t PredRegDecoderTable[] = {Hexagon::P0, Hexagon::P1, static const uint16_t PredRegDecoderTable[] = {Hexagon::P0, Hexagon::P1,
Hexagon::P2, Hexagon::P3}; Hexagon::P2, Hexagon::P3};
static DecodeStatus DecodeIntRegsRegisterClass(MCInst &Inst, unsigned RegNo, static DecodeStatus DecodeIntRegsRegisterClass(MCInst &Inst, unsigned RegNo,
uint64_t /*Address*/, uint64_t /*Address*/,
void const *Decoder) { void const *Decoder) {
if (RegNo > 31) if (RegNo > 31)
return MCDisassembler::Fail; return MCDisassembler::Fail;
unsigned Register = IntRegDecoderTable[RegNo]; unsigned Register = IntRegDecoderTable[RegNo];
Inst.addOperand(MCOperand::CreateReg(Register)); Inst.addOperand(MCOperand::CreateReg(Register));
return MCDisassembler::Success; return MCDisassembler::Success;
} }
static DecodeStatus DecodePredRegsRegisterClass(MCInst &Inst, unsigned RegNo, static DecodeStatus DecodePredRegsRegisterClass(MCInst &Inst, unsigned RegNo,
uint64_t /*Address*/, uint64_t /*Address*/,
void const *Decoder) { void const *Decoder) {
if (RegNo > 3) if (RegNo > 3)
return MCDisassembler::Fail; return MCDisassembler::Fail;
unsigned Register = PredRegDecoderTable[RegNo]; unsigned Register = PredRegDecoderTable[RegNo];
Inst.addOperand(MCOperand::CreateReg(Register)); Inst.addOperand(MCOperand::CreateReg(Register));
return MCDisassembler::Success; return MCDisassembler::Success;
} }
#include "HexagonGenDisassemblerTables.inc" #include "HexagonGenDisassemblerTables.inc"
static MCDisassembler *createHexagonDisassembler(Target const &T, static MCDisassembler *createHexagonDisassembler(Target const &T,
MCSubtargetInfo const &STI, MCSubtargetInfo const &STI,
MCContext &Ctx) { MCContext &Ctx) {
return new HexagonDisassembler(STI, Ctx); return new HexagonDisassembler(STI, Ctx);
} }
extern "C" void LLVMInitializeHexagonDisassembler() { extern "C" void LLVMInitializeHexagonDisassembler() {
TargetRegistry::RegisterMCDisassembler(TheHexagonTarget, TargetRegistry::RegisterMCDisassembler(TheHexagonTarget,
createHexagonDisassembler); createHexagonDisassembler);
} }
DecodeStatus HexagonDisassembler::getInstruction(MCInst &MI, uint64_t &Size, DecodeStatus HexagonDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
MemoryObject const &Region, MemoryObject const &Region,
uint64_t Address, uint64_t Address,
raw_ostream &os, raw_ostream &os,
raw_ostream &cs) const { raw_ostream &cs) const {
std::array<uint8_t, 4> Bytes; std::array<uint8_t, 4> Bytes;
Size = 4; Size = 4;
if (Region.readBytes(Address, Bytes.size(), Bytes.data()) == -1) { if (Region.readBytes(Address, Bytes.size(), Bytes.data()) == -1) {
return MCDisassembler::Fail; return MCDisassembler::Fail;
} }
uint32_t insn = uint32_t insn =
llvm::support::endian::read<uint32_t, llvm::support::little, llvm::support::endian::read<uint32_t, llvm::support::little,
llvm::support::unaligned>(Bytes.data()); llvm::support::unaligned>(Bytes.data());
// Remove parse bits. // Remove parse bits.
insn &= ~static_cast<uint32_t>(HexagonII::InstParseBits::INST_PARSE_MASK); insn &= ~static_cast<uint32_t>(HexagonII::InstParseBits::INST_PARSE_MASK);
return decodeInstruction(DecoderTable32, MI, insn, Address, this, STI); return decodeInstruction(DecoderTable32, MI, insn, Address, this, STI);
} }

View File

@ -17,14 +17,14 @@
#ifndef LLVM_LIB_TARGET_HEXAGON_MCTARGETDESC_HEXAGONBASEINFO_H #ifndef LLVM_LIB_TARGET_HEXAGON_MCTARGETDESC_HEXAGONBASEINFO_H
#define LLVM_LIB_TARGET_HEXAGON_MCTARGETDESC_HEXAGONBASEINFO_H #define LLVM_LIB_TARGET_HEXAGON_MCTARGETDESC_HEXAGONBASEINFO_H
#include "HexagonMCTargetDesc.h" #include "HexagonMCTargetDesc.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include <stdint.h> #include <stdint.h>
namespace llvm { namespace llvm {
/// HexagonII - This namespace holds all of the target specific flags that /// HexagonII - This namespace holds all of the target specific flags that
/// instruction info tracks. /// instruction info tracks.
/// ///
namespace HexagonII { namespace HexagonII {
@ -188,20 +188,20 @@ namespace HexagonII {
MO_LO16, MO_HI16, MO_LO16, MO_HI16,
// Offset from the base of the SDA. // Offset from the base of the SDA.
MO_GPREL MO_GPREL
}; };
enum class InstParseBits : uint32_t { enum class InstParseBits : uint32_t {
INST_PARSE_MASK = 0x0000c000, INST_PARSE_MASK = 0x0000c000,
INST_PARSE_PACKET_END = 0x0000c000, INST_PARSE_PACKET_END = 0x0000c000,
INST_PARSE_LOOP_END = 0x00008000, INST_PARSE_LOOP_END = 0x00008000,
INST_PARSE_NOT_END = 0x00004000, INST_PARSE_NOT_END = 0x00004000,
INST_PARSE_DUPLEX = 0x00000000, INST_PARSE_DUPLEX = 0x00000000,
INST_PARSE_EXTENDER = 0x00000000 INST_PARSE_EXTENDER = 0x00000000
}; };
} // End namespace HexagonII. } // End namespace HexagonII.
} // End namespace llvm. } // End namespace llvm.
#endif #endif