RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Need only one set of debug info versions enum.

Browse Source 
llvm-svn: 62602
This commit is contained in:
Devang Patel 2009-01-20 19:22:03 +00:00
parent b3c82db63d
commit ccc3162f69
5 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/llvm/Analysis/DebugInfo.h
View File

@ -32,15 +32,6 @@ namespace llvm {
class Instruction;
class DIDescriptor {
public:
enum {
Version7 = 7 << 16, // Current version of debug information.
Version6 = 6 << 16, // Constant for version 6.
Version5 = 5 << 16, // Constant for version 5.
Version4 = 4 << 16, // Constant for version 4.
VersionMask = 0xffff0000 // Mask for version number.
};
protected:
GlobalVariable *GV;
@ -72,11 +63,11 @@ namespace llvm {
GlobalVariable *getGV() const { return GV; }
unsigned getVersion() const {
return getUnsignedField(0) & VersionMask;
return getUnsignedField(0) & LLVMDebugVersionMask;
}
unsigned getTag() const {
return getUnsignedField(0) & ~VersionMask;
return getUnsignedField(0) & ~LLVMDebugVersionMask;
}
};

11
include/llvm/CodeGen/MachineModuleInfo.h
View File

@ -54,17 +54,6 @@ class Module;
class PointerType;
class StructType;
//===----------------------------------------------------------------------===//
// Debug info constants.
enum {
LLVMDebugVersion = (7 << 16), // Current version of debug information.
LLVMDebugVersion6 = (6 << 16), // Constant for version 6.
LLVMDebugVersion5 = (5 << 16), // Constant for version 5.
LLVMDebugVersion4 = (4 << 16), // Constant for version 4.
LLVMDebugVersionMask = 0xffff0000 // Mask for version number.
};
//===----------------------------------------------------------------------===//
/// SourceLineInfo - This class is used to record source line correspondence.
///

11
include/llvm/Support/Dwarf.h
View File

@ -18,6 +18,17 @@
namespace llvm {
//===----------------------------------------------------------------------===//
// Debug info constants.
enum {
LLVMDebugVersion = (7 << 16), // Current version of debug information.
LLVMDebugVersion6 = (6 << 16), // Constant for version 6.
LLVMDebugVersion5 = (5 << 16), // Constant for version 5.
LLVMDebugVersion4 = (4 << 16), // Constant for version 4.
LLVMDebugVersionMask = 0xffff0000 // Mask for version number.
};
namespace dwarf {
//===----------------------------------------------------------------------===//

4
lib/Analysis/DebugInfo.cpp
View File

@ -291,9 +291,9 @@ Constant *DIFactory::getCastToEmpty(DIDescriptor D) {
}
Constant *DIFactory::GetTagConstant(unsigned TAG) {
assert((TAG & DIDescriptor::VersionMask) == 0 &&
assert((TAG & LLVMDebugVersionMask) == 0 &&
"Tag too large for debug encoding!");
return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version7);
return ConstantInt::get(Type::Int32Ty, TAG | LLVMDebugVersion);
}
Constant *DIFactory::GetStringConstant(const std::string &String) {

8
lib/CodeGen/AsmPrinter/DwarfWriter.cpp
View File

@ -1559,7 +1559,7 @@ private:
void AddSourceLine(DIE *Die, const DIVariable *V) {
unsigned FileID = 0;
unsigned Line = V->getLineNumber();
if (V->getVersion() < DIDescriptor::Version7) {
if (V->getVersion() <= LLVMDebugVersion6) {
// Version6 or earlier. Use compile unit info to get file id.
CompileUnit *Unit = FindCompileUnit(V->getCompileUnit());
FileID = Unit->getID();
@ -1578,7 +1578,7 @@ private:
void AddSourceLine(DIE *Die, const DIGlobal *G) {
unsigned FileID = 0;
unsigned Line = G->getLineNumber();
if (G->getVersion() < DIDescriptor::Version7) {
if (G->getVersion() < LLVMDebugVersion6) {
// Version6 or earlier. Use compile unit info to get file id.
CompileUnit *Unit = FindCompileUnit(G->getCompileUnit());
FileID = Unit->getID();
@ -1595,7 +1595,7 @@ private:
void AddSourceLine(DIE *Die, const DIType *Ty) {
unsigned FileID = 0;
unsigned Line = Ty->getLineNumber();
if (Ty->getVersion() < DIDescriptor::Version7) {
if (Ty->getVersion() <= LLVMDebugVersion6) {
// Version6 or earlier. Use compile unit info to get file id.
CompileUnit *Unit = FindCompileUnit(Ty->getCompileUnit());
FileID = Unit->getID();
@ -3046,7 +3046,7 @@ public:
DIDescriptor DI(GV);
// Check current version. Allow Version6 for now.
unsigned Version = DI.getVersion();
if (Version != DIDescriptor::Version7 && Version != DIDescriptor::Version6)
if (Version != LLVMDebugVersion && Version != LLVMDebugVersion6)
return false;
unsigned Tag = DI.getTag();