mirror of
https://github.com/RPCS3/llvm.git
synced 2025-04-09 17:41:10 +00:00
Use new getFileSize function instead of sys/stat.h directly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10650 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
316cb083d6
commit
b70abe1c5a
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "Config/sys/stat.h"
|
#include "Support/FileUtilities.h"
|
||||||
#include "Config/sys/mman.h"
|
#include "Config/sys/mman.h"
|
||||||
#include "Config/fcntl.h"
|
#include "Config/fcntl.h"
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
@ -164,17 +164,15 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
|
|||||||
//
|
//
|
||||||
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
||||||
std::string *ErrorStr) {
|
std::string *ErrorStr) {
|
||||||
|
int Length = getFileSize(Filename);
|
||||||
|
if (Length == -1)
|
||||||
|
return Error(ErrorStr, "Error getting file length!");
|
||||||
|
|
||||||
int FD = open(Filename.c_str(), O_RDONLY);
|
int FD = open(Filename.c_str(), O_RDONLY);
|
||||||
if (FD == -1)
|
if (FD == -1)
|
||||||
return Error(ErrorStr, "Error opening file!");
|
return Error(ErrorStr, "Error opening file!");
|
||||||
|
|
||||||
// Stat the file to get its length...
|
|
||||||
struct stat StatBuf;
|
|
||||||
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
|
|
||||||
return Error(ErrorStr, "Error stat'ing file!");
|
|
||||||
|
|
||||||
// mmap in the file all at once...
|
// mmap in the file all at once...
|
||||||
int Length = StatBuf.st_size;
|
|
||||||
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
||||||
MAP_PRIVATE, FD, 0);
|
MAP_PRIVATE, FD, 0);
|
||||||
if (Buffer == (unsigned char*)MAP_FAILED)
|
if (Buffer == (unsigned char*)MAP_FAILED)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "Config/sys/stat.h"
|
#include "Support/FileUtilities.h"
|
||||||
#include "Config/sys/mman.h"
|
#include "Config/sys/mman.h"
|
||||||
#include "Config/fcntl.h"
|
#include "Config/fcntl.h"
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
@ -164,17 +164,15 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
|
|||||||
//
|
//
|
||||||
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
||||||
std::string *ErrorStr) {
|
std::string *ErrorStr) {
|
||||||
|
int Length = getFileSize(Filename);
|
||||||
|
if (Length == -1)
|
||||||
|
return Error(ErrorStr, "Error getting file length!");
|
||||||
|
|
||||||
int FD = open(Filename.c_str(), O_RDONLY);
|
int FD = open(Filename.c_str(), O_RDONLY);
|
||||||
if (FD == -1)
|
if (FD == -1)
|
||||||
return Error(ErrorStr, "Error opening file!");
|
return Error(ErrorStr, "Error opening file!");
|
||||||
|
|
||||||
// Stat the file to get its length...
|
|
||||||
struct stat StatBuf;
|
|
||||||
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
|
|
||||||
return Error(ErrorStr, "Error stat'ing file!");
|
|
||||||
|
|
||||||
// mmap in the file all at once...
|
// mmap in the file all at once...
|
||||||
int Length = StatBuf.st_size;
|
|
||||||
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
||||||
MAP_PRIVATE, FD, 0);
|
MAP_PRIVATE, FD, 0);
|
||||||
if (Buffer == (unsigned char*)MAP_FAILED)
|
if (Buffer == (unsigned char*)MAP_FAILED)
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "llvm/Bytecode/Reader.h"
|
#include "llvm/Bytecode/Reader.h"
|
||||||
#include "llvm/Module.h"
|
#include "llvm/Module.h"
|
||||||
#include "Config/sys/stat.h"
|
#include "Support/FileUtilities.h"
|
||||||
#include "Config/sys/mman.h"
|
#include "Config/sys/mman.h"
|
||||||
#include "Config/fcntl.h"
|
#include "Config/fcntl.h"
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
@ -164,17 +164,15 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
|
|||||||
//
|
//
|
||||||
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
|
||||||
std::string *ErrorStr) {
|
std::string *ErrorStr) {
|
||||||
|
int Length = getFileSize(Filename);
|
||||||
|
if (Length == -1)
|
||||||
|
return Error(ErrorStr, "Error getting file length!");
|
||||||
|
|
||||||
int FD = open(Filename.c_str(), O_RDONLY);
|
int FD = open(Filename.c_str(), O_RDONLY);
|
||||||
if (FD == -1)
|
if (FD == -1)
|
||||||
return Error(ErrorStr, "Error opening file!");
|
return Error(ErrorStr, "Error opening file!");
|
||||||
|
|
||||||
// Stat the file to get its length...
|
|
||||||
struct stat StatBuf;
|
|
||||||
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
|
|
||||||
return Error(ErrorStr, "Error stat'ing file!");
|
|
||||||
|
|
||||||
// mmap in the file all at once...
|
// mmap in the file all at once...
|
||||||
int Length = StatBuf.st_size;
|
|
||||||
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
|
||||||
MAP_PRIVATE, FD, 0);
|
MAP_PRIVATE, FD, 0);
|
||||||
if (Buffer == (unsigned char*)MAP_FAILED)
|
if (Buffer == (unsigned char*)MAP_FAILED)
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
#include "Config/fcntl.h"
|
#include "Config/fcntl.h"
|
||||||
#include "Config/unistd.h"
|
#include "Config/unistd.h"
|
||||||
#include "Config/sys/mman.h"
|
#include "Config/sys/mman.h"
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
@ -51,17 +50,15 @@ static std::string ErrnoMessage (int savedErrNum, std::string descr) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
BytecodeFileReader::BytecodeFileReader(const std::string &Filename) {
|
BytecodeFileReader::BytecodeFileReader(const std::string &Filename) {
|
||||||
|
Length = getFileSize(Filename);
|
||||||
|
if (Length == -1)
|
||||||
|
throw ErrnoMessage(errno, "stat '" + Filename + "'");
|
||||||
|
|
||||||
FDHandle FD(open(Filename.c_str(), O_RDONLY));
|
FDHandle FD(open(Filename.c_str(), O_RDONLY));
|
||||||
if (FD == -1)
|
if (FD == -1)
|
||||||
throw ErrnoMessage(errno, "open '" + Filename + "'");
|
throw ErrnoMessage(errno, "open '" + Filename + "'");
|
||||||
|
|
||||||
// Stat the file to get its length...
|
|
||||||
struct stat StatBuf;
|
|
||||||
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
|
|
||||||
throw ErrnoMessage(errno, "stat '" + Filename + "'");
|
|
||||||
|
|
||||||
// mmap in the file all at once...
|
// mmap in the file all at once...
|
||||||
Length = StatBuf.st_size;
|
|
||||||
Buffer = (unsigned char*)mmap(0, Length, PROT_READ, MAP_PRIVATE, FD, 0);
|
Buffer = (unsigned char*)mmap(0, Length, PROT_READ, MAP_PRIVATE, FD, 0);
|
||||||
|
|
||||||
if (Buffer == (unsigned char*)MAP_FAILED)
|
if (Buffer == (unsigned char*)MAP_FAILED)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user