[llvm-commits] CVS: llvm/lib/CodeGen/MachineCodeEmitter.cpp MachineInstr.cpp MachineInstrAnnot.cpp PHIElimination.cpp
Chris Lattner
lattner at cs.uiuc.edu
Mon Feb 23 12:39:02 PST 2004
Changes in directory llvm/lib/CodeGen:
MachineCodeEmitter.cpp updated: 1.14 -> 1.15
MachineInstr.cpp updated: 1.91 -> 1.92
MachineInstrAnnot.cpp updated: 1.10 -> 1.11
PHIElimination.cpp updated: 1.19 -> 1.20
---
Log message:
Finegrainify namespacification
---
Diffs of the changes: (+12 -22)
Index: llvm/lib/CodeGen/MachineCodeEmitter.cpp
diff -u llvm/lib/CodeGen/MachineCodeEmitter.cpp:1.14 llvm/lib/CodeGen/MachineCodeEmitter.cpp:1.15
--- llvm/lib/CodeGen/MachineCodeEmitter.cpp:1.14 Tue Nov 11 16:41:32 2003
+++ llvm/lib/CodeGen/MachineCodeEmitter.cpp Mon Feb 23 12:38:20 2004
@@ -15,8 +15,7 @@
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/Function.h"
#include <fstream>
-
-namespace llvm {
+using namespace llvm;
namespace {
struct DebugMachineCodeEmitter : public MachineCodeEmitter {
@@ -173,5 +172,3 @@
MachineCodeEmitter::createFilePrinterEmitter(MachineCodeEmitter &MCE) {
return new FilePrinterEmitter(MCE, std::cerr);
}
-
-} // End llvm namespace
Index: llvm/lib/CodeGen/MachineInstr.cpp
diff -u llvm/lib/CodeGen/MachineInstr.cpp:1.91 llvm/lib/CodeGen/MachineInstr.cpp:1.92
--- llvm/lib/CodeGen/MachineInstr.cpp:1.91 Thu Feb 19 10:17:08 2004
+++ llvm/lib/CodeGen/MachineInstr.cpp Mon Feb 23 12:38:20 2004
@@ -21,8 +21,7 @@
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/MRegisterInfo.h"
#include "Support/LeakDetector.h"
-
-namespace llvm {
+using namespace llvm;
// Global variable holding an array of descriptors for machine instructions.
// The actual object needs to be created separately for each target machine.
@@ -31,7 +30,9 @@
// FIXME: This should be a property of the target so that more than one target
// at a time can be active...
//
-extern const TargetInstrDescriptor *TargetInstrDescriptors;
+namespace {
+ extern const TargetInstrDescriptor *TargetInstrDescriptors;
+}
// Constructor for instructions with variable #operands
MachineInstr::MachineInstr(short opcode, unsigned numOperands)
@@ -291,7 +292,7 @@
// Specialize printing if op#0 is definition
if (getNumOperands() && getOperand(0).isDef() && !getOperand(0).isUse()) {
- llvm::print(getOperand(0), OS, TM);
+ ::print(getOperand(0), OS, TM);
OS << " = ";
++StartOp; // Don't print this operand again!
}
@@ -302,7 +303,7 @@
if (i != StartOp)
OS << ",";
OS << " ";
- llvm::print(mop, OS, TM);
+ ::print(mop, OS, TM);
if (mop.isDef())
if (mop.isUse())
@@ -441,12 +442,9 @@
break;
}
- if (MO.flags &
- (MachineOperand::HIFLAG32 | MachineOperand::LOFLAG32 |
- MachineOperand::HIFLAG64 | MachineOperand::LOFLAG64))
+ if (MO.isHiBits32() || MO.isLoBits32() || MO.isHiBits64() || MO.isLoBits64())
OS << ")";
return OS;
}
-} // End llvm namespace
Index: llvm/lib/CodeGen/MachineInstrAnnot.cpp
diff -u llvm/lib/CodeGen/MachineInstrAnnot.cpp:1.10 llvm/lib/CodeGen/MachineInstrAnnot.cpp:1.11
--- llvm/lib/CodeGen/MachineInstrAnnot.cpp:1.10 Tue Nov 11 16:41:32 2003
+++ llvm/lib/CodeGen/MachineInstrAnnot.cpp Mon Feb 23 12:38:20 2004
@@ -17,8 +17,7 @@
#include "llvm/CodeGen/MachineCodeForInstruction.h"
#include "llvm/iOther.h"
#include "llvm/Type.h"
-
-namespace llvm {
+using namespace llvm;
CallArgsDescriptor::CallArgsDescriptor(CallInst* _callInstr,
TmpInstruction* _retAddrReg,
@@ -77,5 +76,3 @@
assert(desc->getCallInst()==callInstr && "Incorrect call args descriptor?");
return desc;
}
-
-} // End llvm namespace
Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.19 llvm/lib/CodeGen/PHIElimination.cpp:1.20
--- llvm/lib/CodeGen/PHIElimination.cpp:1.19 Mon Feb 23 12:14:48 2004
+++ llvm/lib/CodeGen/PHIElimination.cpp Mon Feb 23 12:38:20 2004
@@ -13,6 +13,7 @@
//
//===----------------------------------------------------------------------===//
+#include "llvm/CodeGen/Passes.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/SSARegMap.h"
@@ -21,8 +22,7 @@
#include "llvm/Target/TargetMachine.h"
#include "llvm/Support/CFG.h"
#include "Support/STLExtras.h"
-
-namespace llvm {
+using namespace llvm;
namespace {
struct PNE : public MachineFunctionPass {
@@ -56,7 +56,7 @@
}
-const PassInfo *PHIEliminationID = X.getPassInfo();
+const PassInfo *llvm::PHIEliminationID = X.getPassInfo();
/// EliminatePHINodes - Eliminate phi nodes by inserting copy instructions in
/// predecessor basic blocks.
@@ -250,5 +250,3 @@
}
return true;
}
-
-} // End llvm namespace
More information about the llvm-commits
mailing list