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

Object: Get rid of sys::Path, Triple, and cleanup namespace.

Browse Source 
llvm-svn: 119309
This commit is contained in:
Michael J. Spencer 2010-11-16 01:06:51 +00:00
parent af9558a178
commit 5c5cfac314
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Object/ObjectFile.h
View File

@ -14,12 +14,13 @@
#ifndef LLVM_OBJECT_OBJECT_FILE_H
#define LLVM_OBJECT_OBJECT_FILE_H
#include "llvm/ADT/Triple.h"
#include "llvm/System/Path.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/System/DataTypes.h"
namespace llvm {
class MemoryBuffer;
class StringRef;
namespace object {
@ -155,7 +156,7 @@ public:
virtual uint8_t getBytesInAddress() const = 0;
virtual StringRef getFileFormatName() const = 0;
virtual Triple::ArchType getArch() const = 0;
virtual /* Triple::ArchType */ unsigned getArch() const = 0;
StringRef getFilename() const;
@ -163,7 +164,7 @@ public:
/// @param ObjectPath The path to the object file. ObjectPath.isObject must
/// return true.
/// @brief Create ObjectFile from path.
static ObjectFile *createObjectFile(const sys::Path &ObjectPath);
static ObjectFile *createObjectFile(StringRef ObjectPath);
static ObjectFile *createObjectFile(MemoryBuffer *Object);
private:

12
lib/Object/ObjectFile.cpp
View File

@ -14,9 +14,10 @@
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/System/Path.h"
namespace llvm {
namespace object {
using namespace llvm;
using namespace object;
ObjectFile::ObjectFile(MemoryBuffer *Object)
: MapFile(Object) {
@ -60,9 +61,6 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) {
}
}
ObjectFile *ObjectFile::createObjectFile(const sys::Path &ObjectPath) {
return createObjectFile(MemoryBuffer::getFile(ObjectPath.c_str()));
ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) {
return createObjectFile(MemoryBuffer::getFile(ObjectPath));
}
} // end namespace object
} // end namespace llvm