From a3ac427507e078e683d059820496c3dc52e8cac8 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 22 Oct 2010 17:35:07 +0000 Subject: Make some symbols static, move classes into anonymous namespaces. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117111 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/RegionInfo.cpp | 2 +- lib/MC/MCDisassembler/EDOperand.cpp | 23 ++++++++++------------- lib/Target/PTX/PTXISelLowering.cpp | 8 +++++--- lib/VMCore/PassRegistry.cpp | 2 ++ lib/VMCore/Verifier.cpp | 2 +- utils/TableGen/X86DisassemblerTables.cpp | 8 +++----- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/lib/Analysis/RegionInfo.cpp b/lib/Analysis/RegionInfo.cpp index 2622c8966c..6725cfd28f 100644 --- a/lib/Analysis/RegionInfo.cpp +++ b/lib/Analysis/RegionInfo.cpp @@ -45,7 +45,7 @@ STATISTIC(numSimpleRegions, "The # of simple regions"); /// PrintStyle - Print region in difference ways. enum PrintStyle { PrintNone, PrintBB, PrintRN }; -cl::opt printStyle("print-region-style", cl::Hidden, +static cl::opt printStyle("print-region-style", cl::Hidden, cl::desc("style of printing regions"), cl::values( clEnumValN(PrintNone, "none", "print no details"), diff --git a/lib/MC/MCDisassembler/EDOperand.cpp b/lib/MC/MCDisassembler/EDOperand.cpp index 2aed123368..cfeb56fa3d 100644 --- a/lib/MC/MCDisassembler/EDOperand.cpp +++ b/lib/MC/MCDisassembler/EDOperand.cpp @@ -260,23 +260,20 @@ int EDOperand::isMemory() { } #ifdef __BLOCKS__ -struct RegisterReaderWrapper { - EDOperand::EDRegisterBlock_t regBlock; -}; +namespace { + struct RegisterReaderWrapper { + EDOperand::EDRegisterBlock_t regBlock; + }; +} -int readerWrapperCallback(uint64_t *value, - unsigned regID, - void *arg) { - struct RegisterReaderWrapper *wrapper = (struct RegisterReaderWrapper *)arg; +static int readerWrapperCallback(uint64_t *value, unsigned regID, void *arg) { + RegisterReaderWrapper *wrapper = (RegisterReaderWrapper *)arg; return wrapper->regBlock(value, regID); } -int EDOperand::evaluate(uint64_t &result, - EDRegisterBlock_t regBlock) { - struct RegisterReaderWrapper wrapper; +int EDOperand::evaluate(uint64_t &result, EDRegisterBlock_t regBlock) { + RegisterReaderWrapper wrapper; wrapper.regBlock = regBlock; - return evaluate(result, - readerWrapperCallback, - (void*)&wrapper); + return evaluate(result, readerWrapperCallback, (void*)&wrapper); } #endif diff --git a/lib/Target/PTX/PTXISelLowering.cpp b/lib/Target/PTX/PTXISelLowering.cpp index 6e68c37601..0ee4bf01ee 100644 --- a/lib/Target/PTX/PTXISelLowering.cpp +++ b/lib/Target/PTX/PTXISelLowering.cpp @@ -44,7 +44,8 @@ const char *PTXTargetLowering::getTargetNodeName(unsigned Opcode) const { // Calling Convention Implementation //===----------------------------------------------------------------------===// -static struct argmap_entry { +namespace { +struct argmap_entry { MVT::SimpleValueType VT; TargetRegisterClass *RC; TargetRegisterClass::iterator loc; @@ -52,12 +53,13 @@ static struct argmap_entry { argmap_entry(MVT::SimpleValueType _VT, TargetRegisterClass *_RC) : VT(_VT), RC(_RC), loc(_RC->begin()) {} - void reset(void) { loc = RC->begin(); } - bool operator==(MVT::SimpleValueType _VT) { return VT == _VT; } + void reset() { loc = RC->begin(); } + bool operator==(MVT::SimpleValueType _VT) const { return VT == _VT; } } argmap[] = { argmap_entry(MVT::i1, PTX::PredsRegisterClass), argmap_entry(MVT::i32, PTX::RRegs32RegisterClass) }; +} // end anonymous namespace static SDValue lower_kernel_argument(int i, SDValue Chain, diff --git a/lib/VMCore/PassRegistry.cpp b/lib/VMCore/PassRegistry.cpp index 95ca681409..1fc26b0648 100644 --- a/lib/VMCore/PassRegistry.cpp +++ b/lib/VMCore/PassRegistry.cpp @@ -40,6 +40,7 @@ static ManagedStatic > Lock; // PassRegistryImpl // +namespace { struct PassRegistryImpl { /// PassInfoMap - Keep track of the PassInfo object for each registered pass. typedef DenseMap MapType; @@ -57,6 +58,7 @@ struct PassRegistryImpl { std::vector ToFree; std::vector Listeners; }; +} // end anonymous namespace void *PassRegistry::getImpl() const { if (!pImpl) diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index c779578b9b..2b87619038 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -106,7 +106,7 @@ namespace { // Anonymous namespace for class char PreVerifier::ID = 0; INITIALIZE_PASS(PreVerifier, "preverify", "Preliminary module verification", false, false) -char &PreVerifyID = PreVerifier::ID; +static char &PreVerifyID = PreVerifier::ID; namespace { class TypeSet : public AbstractTypeUser { diff --git a/utils/TableGen/X86DisassemblerTables.cpp b/utils/TableGen/X86DisassemblerTables.cpp index 2176224523..8a32f4af66 100644 --- a/utils/TableGen/X86DisassemblerTables.cpp +++ b/utils/TableGen/X86DisassemblerTables.cpp @@ -365,7 +365,7 @@ void DisassemblerTables::emitContextDecision( uint32_t &i2, ContextDecision &decision, const char* name) const { - o2.indent(i2) << "struct ContextDecision " << name << " = {" << "\n"; + o2.indent(i2) << "static struct ContextDecision " << name << " = {\n"; i2++; o2.indent(i2) << "{ /* opcodeDecisions */" << "\n"; i2++; @@ -392,8 +392,7 @@ void DisassemblerTables::emitContextDecision( void DisassemblerTables::emitInstructionInfo(raw_ostream &o, uint32_t &i) const { - o.indent(i * 2) << "struct InstructionSpecifier "; - o << INSTRUCTIONS_STR << "["; + o.indent(i * 2) << "static struct InstructionSpecifier " INSTRUCTIONS_STR "["; o << InstructionSpecifiers.size(); o << "] = {" << "\n"; @@ -456,8 +455,7 @@ void DisassemblerTables::emitInstructionInfo(raw_ostream &o, uint32_t &i) void DisassemblerTables::emitContextTable(raw_ostream &o, uint32_t &i) const { uint16_t index; - o.indent(i * 2) << "InstructionContext "; - o << CONTEXTS_STR << "[256] = {" << "\n"; + o.indent(i * 2) << "static InstructionContext " CONTEXTS_STR "[256] = {\n"; i++; for (index = 0; index < 256; ++index) { -- cgit v1.2.3