[llvm-commits] CVS: llvm/utils/TableGen/AsmWriterEmitter.cpp CodeEmitterGen.cpp InstrInfoEmitter.cpp InstrSelectorEmitter.cpp RegisterInfoEmitter.cpp TableGenBackend.cpp TableGenBackend.h
Chris Lattner
lattner at cs.uiuc.edu
Mon Aug 16 20:08:40 PDT 2004
Changes in directory llvm/utils/TableGen:
AsmWriterEmitter.cpp updated: 1.6 -> 1.7
CodeEmitterGen.cpp updated: 1.36 -> 1.37
InstrInfoEmitter.cpp updated: 1.12 -> 1.13
InstrSelectorEmitter.cpp updated: 1.40 -> 1.41
RegisterInfoEmitter.cpp updated: 1.19 -> 1.20
TableGenBackend.cpp updated: 1.6 -> 1.7
TableGenBackend.h updated: 1.6 -> 1.7
---
Log message:
Do not #include files into the llvm namespace
---
Diffs of the changes: (+20 -18)
Index: llvm/utils/TableGen/AsmWriterEmitter.cpp
diff -u llvm/utils/TableGen/AsmWriterEmitter.cpp:1.6 llvm/utils/TableGen/AsmWriterEmitter.cpp:1.7
--- llvm/utils/TableGen/AsmWriterEmitter.cpp:1.6 Sat Aug 14 17:50:53 2004
+++ llvm/utils/TableGen/AsmWriterEmitter.cpp Mon Aug 16 22:08:27 2004
@@ -27,6 +27,7 @@
void AsmWriterEmitter::run(std::ostream &O) {
EmitSourceFileHeader("Assembly Writer Source Fragment", O);
+ O << "namespace llvm {\n\n";
CodeGenTarget Target;
@@ -103,5 +104,5 @@
O << " }\n"
" return true;\n"
"}\n";
- EmitSourceFileTail(O);
+ O << "} // End llvm namespace \n";
}
Index: llvm/utils/TableGen/CodeEmitterGen.cpp
diff -u llvm/utils/TableGen/CodeEmitterGen.cpp:1.36 llvm/utils/TableGen/CodeEmitterGen.cpp:1.37
--- llvm/utils/TableGen/CodeEmitterGen.cpp:1.36 Tue Aug 10 15:54:58 2004
+++ llvm/utils/TableGen/CodeEmitterGen.cpp Mon Aug 16 22:08:27 2004
@@ -24,6 +24,7 @@
std::vector<Record*> Insts = Records.getAllDerivedDefinitions("Instruction");
EmitSourceFileHeader("Machine Code Emitter", o);
+ o << "namespace llvm {\n\n";
std::string Namespace = Insts[0]->getValueAsString("Namespace") + "::";
// Emit function declaration
@@ -225,5 +226,5 @@
<< " return Value;\n"
<< "}\n";
- EmitSourceFileTail(o);
+ o << "} // End llvm namespace \n";
}
Index: llvm/utils/TableGen/InstrInfoEmitter.cpp
diff -u llvm/utils/TableGen/InstrInfoEmitter.cpp:1.12 llvm/utils/TableGen/InstrInfoEmitter.cpp:1.13
--- llvm/utils/TableGen/InstrInfoEmitter.cpp:1.12 Sun Aug 1 03:38:17 2004
+++ llvm/utils/TableGen/InstrInfoEmitter.cpp Mon Aug 16 22:08:27 2004
@@ -20,6 +20,7 @@
// runEnums - Print out enum values for all of the instructions.
void InstrInfoEmitter::runEnums(std::ostream &OS) {
EmitSourceFileHeader("Target Instruction Enum Values", OS);
+ OS << "namespace llvm {\n\n";
CodeGenTarget Target;
@@ -45,7 +46,7 @@
OS << " };\n";
if (!Namespace.empty())
OS << "}\n";
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
void InstrInfoEmitter::printDefList(ListInit *LI, const std::string &Name,
@@ -63,6 +64,8 @@
// run - Emit the main instruction description records for the target...
void InstrInfoEmitter::run(std::ostream &OS) {
EmitSourceFileHeader("Target Instruction Descriptors", OS);
+ OS << "namespace llvm {\n\n";
+
CodeGenTarget Target;
const std::string &TargetName = Target.getName();
Record *InstrInfo = Target.getInstructionSet();
@@ -92,7 +95,7 @@
if (II->second.TheDef != PHI)
emitRecord(II->second, ++i, InstrInfo, OS);
OS << "};\n";
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
void InstrInfoEmitter::emitRecord(const CodeGenInstruction &Inst, unsigned Num,
Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.40 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.41
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.40 Sat Jul 31 23:04:35 2004
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp Mon Aug 16 22:08:27 2004
@@ -982,6 +982,7 @@
EmitSourceFileHeader("Instruction Selector for the " + Target.getName() +
" target", OS);
+ OS << "namespace llvm {\n\n";
// Output the slot number enums...
OS << "\nenum { // Slot numbers...\n"
@@ -1291,6 +1292,5 @@
<< " }\n\n N->addValue(Val); // Do not ever recalculate this\n"
<< " return Val;\n}\n\n";
}
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
-
Index: llvm/utils/TableGen/RegisterInfoEmitter.cpp
diff -u llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.19 llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.20
--- llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.19 Sun Aug 15 20:10:21 2004
+++ llvm/utils/TableGen/RegisterInfoEmitter.cpp Mon Aug 16 22:08:28 2004
@@ -29,6 +29,7 @@
std::string Namespace = Registers[0].TheDef->getValueAsString("Namespace");
EmitSourceFileHeader("Target Register Enum Values", OS);
+ OS << "namespace llvm {\n\n";
if (!Namespace.empty())
OS << "namespace " << Namespace << " {\n";
@@ -40,7 +41,7 @@
OS << " };\n";
if (!Namespace.empty())
OS << "}\n";
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
void RegisterInfoEmitter::runHeader(std::ostream &OS) {
@@ -51,6 +52,8 @@
OS << "#include \"llvm/Target/MRegisterInfo.h\"\n\n";
+ OS << "namespace llvm {\n\n";
+
OS << "struct " << ClassName << " : public MRegisterInfo {\n"
<< " " << ClassName
<< "(int CallFrameSetupOpcode = -1, int CallFrameDestroyOpcode = -1);\n"
@@ -67,7 +70,7 @@
OS << " extern TargetRegisterClass *" << Name << "RegisterClass;\n";
}
OS << "} // end of namespace " << TargetName << "\n\n";
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
// RegisterInfoEmitter::run - Main register file description emitter.
@@ -76,6 +79,8 @@
CodeGenTarget Target;
EmitSourceFileHeader("Register Information Source Fragment", OS);
+ OS << "namespace llvm {\n\n";
+
// Start out by emitting each of the register classes... to do this, we build
// a set of registers which belong to a register class, this is to ensure that
// each register is only in a single register class.
@@ -236,5 +241,5 @@
for (unsigned i = 0, e = CSR.size(); i != e; ++i)
OS << getQualifiedName(CSR[i]) << ", ";
OS << " 0\n };\n return CalleeSaveRegs;\n}\n\n";
- EmitSourceFileTail(OS);
+ OS << "} // End llvm namespace \n";
}
Index: llvm/utils/TableGen/TableGenBackend.cpp
diff -u llvm/utils/TableGen/TableGenBackend.cpp:1.6 llvm/utils/TableGen/TableGenBackend.cpp:1.7
--- llvm/utils/TableGen/TableGenBackend.cpp:1.6 Sat Jul 31 22:55:39 2004
+++ llvm/utils/TableGen/TableGenBackend.cpp Mon Aug 16 22:08:28 2004
@@ -21,11 +21,7 @@
OS << "//===- TableGen'erated file -------------------------------------*-"
" C++ -*-===//\n//\n// " << Desc << "\n//\n// Automatically generate"
"d file, do not edit!\n//\n//===------------------------------------"
- "----------------------------------===//\n\nnamespace llvm {\n\n";
-}
-
-void TableGenBackend::EmitSourceFileTail( std::ostream& OS ) const {
- OS << "} // End llvm namespace \n";
+ "----------------------------------===//\n\n";
}
/// getQualifiedName - Return the name of the specified record, with a
Index: llvm/utils/TableGen/TableGenBackend.h
diff -u llvm/utils/TableGen/TableGenBackend.h:1.6 llvm/utils/TableGen/TableGenBackend.h:1.7
--- llvm/utils/TableGen/TableGenBackend.h:1.6 Tue Nov 11 16:41:34 2003
+++ llvm/utils/TableGen/TableGenBackend.h Mon Aug 16 22:08:28 2004
@@ -36,10 +36,6 @@
/// ostream.
void EmitSourceFileHeader(const std::string &Desc, std::ostream &OS) const;
- /// EmitSourceFileTail - Output an LLVm styelf ile tail to the specified
- /// ostream.
- void EmitSourceFileTail( std::ostream& OS ) const;
-
/// getQualifiedName - Return the name of the specified record, with a
/// namespace qualifier if the record contains one.
std::string getQualifiedName(Record *R) const;
More information about the llvm-commits
mailing list