mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-13 14:47:00 +00:00
Patches to make this file actually compile under windows.
Patches submitted by Jeff Cohen. Thanks Jeff! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16362 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
parent
90418436c0
commit
b016a376ab
@ -2,7 +2,7 @@
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Jeff Cohen and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -12,34 +12,43 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include <llvm/System/Process.h>
|
||||
#include "windows.h"
|
||||
#include "Win32.h"
|
||||
#include "llvm/System/Memory.h"
|
||||
#include "llvm/System/Process.h"
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code.
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be UNIX code
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
MemoryBlock Memory::AllocateRWX(unsigned NumBytes) {
|
||||
if (NumBytes == 0) return MemoryBlock();
|
||||
|
||||
unsigned pageSize = Process::GetPageSize();
|
||||
static const long pageSize = Process::GetPageSize();
|
||||
unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
|
||||
void *P = VirtualAlloc(0, NumPages*pageSize, MEM_COMMIT,
|
||||
PAGE_EXECUTE_READWRITE);
|
||||
if (P == 0) {
|
||||
throw std::string("Couldn't allocate ") + utostr(NumBytes) +
|
||||
" bytes of executable memory!";
|
||||
|
||||
void *pa = VirtualAlloc(NULL, NumPages*pageSize, MEM_COMMIT,
|
||||
PAGE_EXECUTE_READWRITE);
|
||||
if (pa == NULL) {
|
||||
ThrowError("Can't allocate RWX Memory: ");
|
||||
}
|
||||
|
||||
MemoryBlock result;
|
||||
result.Address = P;
|
||||
result.Size = NumBytes;
|
||||
result.Address = pa;
|
||||
result.Size = NumPages*pageSize;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Memory::ReleaseRWX(MemoryBlock& M) {
|
||||
if (M.Address == 0 || M.Size == 0) return;
|
||||
VirtualFree(M.Address, M.Size, MEM_DECOMMIT, PAGE_NOACCESS);
|
||||
if (!VirtualFree(M.Address, 0, MEM_RELEASE)) {
|
||||
ThrowError("Can't release RWX Memory: ");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Jeff Cohen and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -12,34 +12,43 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include <llvm/System/Process.h>
|
||||
#include "windows.h"
|
||||
#include "Win32.h"
|
||||
#include "llvm/System/Memory.h"
|
||||
#include "llvm/System/Process.h"
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code.
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be UNIX code
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
MemoryBlock Memory::AllocateRWX(unsigned NumBytes) {
|
||||
if (NumBytes == 0) return MemoryBlock();
|
||||
|
||||
unsigned pageSize = Process::GetPageSize();
|
||||
static const long pageSize = Process::GetPageSize();
|
||||
unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
|
||||
void *P = VirtualAlloc(0, NumPages*pageSize, MEM_COMMIT,
|
||||
PAGE_EXECUTE_READWRITE);
|
||||
if (P == 0) {
|
||||
throw std::string("Couldn't allocate ") + utostr(NumBytes) +
|
||||
" bytes of executable memory!";
|
||||
|
||||
void *pa = VirtualAlloc(NULL, NumPages*pageSize, MEM_COMMIT,
|
||||
PAGE_EXECUTE_READWRITE);
|
||||
if (pa == NULL) {
|
||||
ThrowError("Can't allocate RWX Memory: ");
|
||||
}
|
||||
|
||||
MemoryBlock result;
|
||||
result.Address = P;
|
||||
result.Size = NumBytes;
|
||||
result.Address = pa;
|
||||
result.Size = NumPages*pageSize;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Memory::ReleaseRWX(MemoryBlock& M) {
|
||||
if (M.Address == 0 || M.Size == 0) return;
|
||||
VirtualFree(M.Address, M.Size, MEM_DECOMMIT, PAGE_NOACCESS);
|
||||
if (!VirtualFree(M.Address, 0, MEM_RELEASE)) {
|
||||
ThrowError("Can't release RWX Memory: ");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
//===- Win32/Path.cpp - Win32 Path Implementation ---------------*- C++ -*-===//
|
||||
//
|
||||
//===- llvm/System/Linux/Path.cpp - Linux Path Implementation ---*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//
|
||||
// Modified by Henrik Bach to comply with at least MinGW.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// This file provides the Win32 specific implementation of the Path class.
|
||||
@ -12,22 +14,343 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
|
||||
//=== WARNING: Implementation here must contain only generic Win32 code that
|
||||
//=== is guaranteed to work on *all* Win32 variants.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// Include the generic Unix implementation
|
||||
#include "../Unix/Path.cpp"
|
||||
#include <llvm/Config/config.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <llvm/System/Path.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
|
||||
#define MAXPATHLEN PATH_MAX
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
namespace sys {
|
||||
|
||||
|
||||
std::string
|
||||
Path::GetDLLSuffix() {
|
||||
return "dll";
|
||||
bool
|
||||
Path::is_valid() const {
|
||||
if (path.empty())
|
||||
return false;
|
||||
/*hb: char pathname[MAXPATHLEN];
|
||||
if (0 == realpath(path.c_str(), pathname))
|
||||
if (errno != EACCES && errno != EIO && errno != ENOENT && errno !=
|
||||
ENOTDIR)
|
||||
return false;*/
|
||||
return true;
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetTemporaryDirectory() {
|
||||
char pathname[MAXPATHLEN];
|
||||
if (0 == GetTempPath(MAXPATHLEN,pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't create temporary directory");
|
||||
Path result;
|
||||
result.set_directory(pathname);
|
||||
assert(result.is_valid() && "GetTempPath didn't create a valid pathname!");
|
||||
return result;
|
||||
}
|
||||
|
||||
Path::Path(std::string unverified_path)
|
||||
: path(unverified_path)
|
||||
{
|
||||
if (unverified_path.empty())
|
||||
return;
|
||||
if (this->is_valid())
|
||||
return;
|
||||
// oops, not valid.
|
||||
path.clear();
|
||||
ThrowError(unverified_path + ": path is not valid");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetRootDirectory() {
|
||||
Path result;
|
||||
result.set_directory("/");
|
||||
return result;
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetSystemLibraryPath1() {
|
||||
return Path("/lib/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetSystemLibraryPath2() {
|
||||
return Path("/usr/lib/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetLLVMDefaultConfigDir() {
|
||||
return Path("/etc/llvm/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetLLVMConfigDir() {
|
||||
Path result;
|
||||
if (result.set_directory(LLVM_ETCDIR))
|
||||
return result;
|
||||
return GetLLVMDefaultConfigDir();
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetUserHomeDirectory() {
|
||||
const char* home = getenv("HOME");
|
||||
if (home) {
|
||||
Path result;
|
||||
if (result.set_directory(home))
|
||||
return result;
|
||||
}
|
||||
return GetRootDirectory();
|
||||
}
|
||||
|
||||
bool
|
||||
Path::exists() const {
|
||||
return 0 == access(path.c_str(), F_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::readable() const {
|
||||
return 0 == access(path.c_str(), F_OK | R_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::writable() const {
|
||||
return 0 == access(path.c_str(), F_OK | W_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::executable() const {
|
||||
return 0 == access(path.c_str(), R_OK | X_OK );
|
||||
}
|
||||
|
||||
std::string
|
||||
Path::getLast() const {
|
||||
// Find the last slash
|
||||
size_t pos = path.rfind('/');
|
||||
|
||||
// Handle the corner cases
|
||||
if (pos == std::string::npos)
|
||||
return path;
|
||||
|
||||
// If the last character is a slash
|
||||
if (pos == path.length()-1) {
|
||||
// Find the second to last slash
|
||||
size_t pos2 = path.rfind('/', pos-1);
|
||||
if (pos2 == std::string::npos)
|
||||
return path.substr(0,pos);
|
||||
else
|
||||
return path.substr(pos2+1,pos-pos2-1);
|
||||
}
|
||||
// Return everything after the last slash
|
||||
return path.substr(pos+1);
|
||||
}
|
||||
|
||||
bool
|
||||
Path::set_directory(const std::string& a_path) {
|
||||
if (a_path.size() == 0)
|
||||
return false;
|
||||
Path save(*this);
|
||||
path = a_path;
|
||||
size_t last = a_path.size() -1;
|
||||
if (last != 0 && a_path[last] != '/')
|
||||
path += '/';
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::set_file(const std::string& a_path) {
|
||||
if (a_path.size() == 0)
|
||||
return false;
|
||||
Path save(*this);
|
||||
path = a_path;
|
||||
size_t last = a_path.size() - 1;
|
||||
while (last > 0 && a_path[last] == '/')
|
||||
last--;
|
||||
path.erase(last+1);
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_directory(const std::string& dir) {
|
||||
if (is_file())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path += dir;
|
||||
path += "/";
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_directory() {
|
||||
if (is_file())
|
||||
return false;
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos == 0 || slashpos == std::string::npos)
|
||||
return false;
|
||||
if (slashpos == path.size() - 1)
|
||||
slashpos = path.rfind('/',slashpos-1);
|
||||
if (slashpos == std::string::npos)
|
||||
return false;
|
||||
path.erase(slashpos);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_file(const std::string& file) {
|
||||
if (!is_directory())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path += file;
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_file() {
|
||||
if (is_directory())
|
||||
return false;
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos == std::string::npos)
|
||||
return false;
|
||||
path.erase(slashpos+1);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_suffix(const std::string& suffix) {
|
||||
if (is_directory())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path.append(".");
|
||||
path.append(suffix);
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_suffix() {
|
||||
if (is_directory()) return false;
|
||||
size_t dotpos = path.rfind('.',path.size());
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos != std::string::npos && dotpos != std::string::npos &&
|
||||
dotpos > slashpos) {
|
||||
path.erase(dotpos, path.size()-dotpos);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
Path::create_directory( bool create_parents) {
|
||||
// Make sure we're dealing with a directory
|
||||
if (!is_directory()) return false;
|
||||
|
||||
// Get a writeable copy of the path name
|
||||
char pathname[MAXPATHLEN];
|
||||
path.copy(pathname,MAXPATHLEN);
|
||||
|
||||
// Null-terminate the last component
|
||||
int lastchar = path.length() - 1 ;
|
||||
if (pathname[lastchar] == '/')
|
||||
pathname[lastchar] = 0;
|
||||
|
||||
// If we're supposed to create intermediate directories
|
||||
if ( create_parents ) {
|
||||
// Find the end of the initial name component
|
||||
char * next = strchr(pathname,'/');
|
||||
if ( pathname[0] == '/')
|
||||
next = strchr(&pathname[1],'/');
|
||||
|
||||
// Loop through the directory components until we're done
|
||||
while ( next != 0 ) {
|
||||
*next = 0;
|
||||
if (0 != access(pathname, F_OK | R_OK | W_OK))
|
||||
if (0 != mkdir(pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't create directory");
|
||||
char* save = next;
|
||||
next = strchr(pathname,'/');
|
||||
*save = '/';
|
||||
}
|
||||
} else if (0 != mkdir(pathname)) {
|
||||
ThrowError(std::string(pathname) + ": Can't create directory");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::create_file() {
|
||||
// Make sure we're dealing with a file
|
||||
if (!is_file()) return false;
|
||||
|
||||
// Create the file
|
||||
if (0 != creat(path.c_str(), S_IRUSR | S_IWUSR))
|
||||
ThrowError(std::string(path.c_str()) + ": Can't create file");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::destroy_directory(bool remove_contents) {
|
||||
// Make sure we're dealing with a directory
|
||||
if (!is_directory()) return false;
|
||||
|
||||
// If it doesn't exist, we're done.
|
||||
if (!exists()) return true;
|
||||
|
||||
if (remove_contents) {
|
||||
// Recursively descend the directory to remove its content
|
||||
std::string cmd("/bin/rm -rf ");
|
||||
cmd += path;
|
||||
system(cmd.c_str());
|
||||
} else {
|
||||
// Otherwise, try to just remove the one directory
|
||||
char pathname[MAXPATHLEN];
|
||||
path.copy(pathname,MAXPATHLEN);
|
||||
int lastchar = path.length() - 1 ;
|
||||
if (pathname[lastchar] == '/')
|
||||
pathname[lastchar] = 0;
|
||||
if ( 0 != rmdir(pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't destroy directory");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::destroy_file() {
|
||||
if (!is_file()) return false;
|
||||
if (0 != unlink(path.c_str()))
|
||||
ThrowError(std::string(path.c_str()) + ": Can't destroy file");
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
//===- Win32/Path.cpp - Win32 Path Implementation ---------------*- C++ -*-===//
|
||||
//
|
||||
//===- llvm/System/Linux/Path.cpp - Linux Path Implementation ---*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//
|
||||
// Modified by Henrik Bach to comply with at least MinGW.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// This file provides the Win32 specific implementation of the Path class.
|
||||
@ -12,22 +14,343 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be generic UNIX code (see ../Unix/Path.cpp)
|
||||
//=== WARNING: Implementation here must contain only generic Win32 code that
|
||||
//=== is guaranteed to work on *all* Win32 variants.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// Include the generic Unix implementation
|
||||
#include "../Unix/Path.cpp"
|
||||
#include <llvm/Config/config.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <llvm/System/Path.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
|
||||
#define MAXPATHLEN PATH_MAX
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
namespace sys {
|
||||
|
||||
|
||||
std::string
|
||||
Path::GetDLLSuffix() {
|
||||
return "dll";
|
||||
bool
|
||||
Path::is_valid() const {
|
||||
if (path.empty())
|
||||
return false;
|
||||
/*hb: char pathname[MAXPATHLEN];
|
||||
if (0 == realpath(path.c_str(), pathname))
|
||||
if (errno != EACCES && errno != EIO && errno != ENOENT && errno !=
|
||||
ENOTDIR)
|
||||
return false;*/
|
||||
return true;
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetTemporaryDirectory() {
|
||||
char pathname[MAXPATHLEN];
|
||||
if (0 == GetTempPath(MAXPATHLEN,pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't create temporary directory");
|
||||
Path result;
|
||||
result.set_directory(pathname);
|
||||
assert(result.is_valid() && "GetTempPath didn't create a valid pathname!");
|
||||
return result;
|
||||
}
|
||||
|
||||
Path::Path(std::string unverified_path)
|
||||
: path(unverified_path)
|
||||
{
|
||||
if (unverified_path.empty())
|
||||
return;
|
||||
if (this->is_valid())
|
||||
return;
|
||||
// oops, not valid.
|
||||
path.clear();
|
||||
ThrowError(unverified_path + ": path is not valid");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetRootDirectory() {
|
||||
Path result;
|
||||
result.set_directory("/");
|
||||
return result;
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetSystemLibraryPath1() {
|
||||
return Path("/lib/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetSystemLibraryPath2() {
|
||||
return Path("/usr/lib/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetLLVMDefaultConfigDir() {
|
||||
return Path("/etc/llvm/");
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetLLVMConfigDir() {
|
||||
Path result;
|
||||
if (result.set_directory(LLVM_ETCDIR))
|
||||
return result;
|
||||
return GetLLVMDefaultConfigDir();
|
||||
}
|
||||
|
||||
Path
|
||||
Path::GetUserHomeDirectory() {
|
||||
const char* home = getenv("HOME");
|
||||
if (home) {
|
||||
Path result;
|
||||
if (result.set_directory(home))
|
||||
return result;
|
||||
}
|
||||
return GetRootDirectory();
|
||||
}
|
||||
|
||||
bool
|
||||
Path::exists() const {
|
||||
return 0 == access(path.c_str(), F_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::readable() const {
|
||||
return 0 == access(path.c_str(), F_OK | R_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::writable() const {
|
||||
return 0 == access(path.c_str(), F_OK | W_OK );
|
||||
}
|
||||
|
||||
bool
|
||||
Path::executable() const {
|
||||
return 0 == access(path.c_str(), R_OK | X_OK );
|
||||
}
|
||||
|
||||
std::string
|
||||
Path::getLast() const {
|
||||
// Find the last slash
|
||||
size_t pos = path.rfind('/');
|
||||
|
||||
// Handle the corner cases
|
||||
if (pos == std::string::npos)
|
||||
return path;
|
||||
|
||||
// If the last character is a slash
|
||||
if (pos == path.length()-1) {
|
||||
// Find the second to last slash
|
||||
size_t pos2 = path.rfind('/', pos-1);
|
||||
if (pos2 == std::string::npos)
|
||||
return path.substr(0,pos);
|
||||
else
|
||||
return path.substr(pos2+1,pos-pos2-1);
|
||||
}
|
||||
// Return everything after the last slash
|
||||
return path.substr(pos+1);
|
||||
}
|
||||
|
||||
bool
|
||||
Path::set_directory(const std::string& a_path) {
|
||||
if (a_path.size() == 0)
|
||||
return false;
|
||||
Path save(*this);
|
||||
path = a_path;
|
||||
size_t last = a_path.size() -1;
|
||||
if (last != 0 && a_path[last] != '/')
|
||||
path += '/';
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::set_file(const std::string& a_path) {
|
||||
if (a_path.size() == 0)
|
||||
return false;
|
||||
Path save(*this);
|
||||
path = a_path;
|
||||
size_t last = a_path.size() - 1;
|
||||
while (last > 0 && a_path[last] == '/')
|
||||
last--;
|
||||
path.erase(last+1);
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_directory(const std::string& dir) {
|
||||
if (is_file())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path += dir;
|
||||
path += "/";
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_directory() {
|
||||
if (is_file())
|
||||
return false;
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos == 0 || slashpos == std::string::npos)
|
||||
return false;
|
||||
if (slashpos == path.size() - 1)
|
||||
slashpos = path.rfind('/',slashpos-1);
|
||||
if (slashpos == std::string::npos)
|
||||
return false;
|
||||
path.erase(slashpos);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_file(const std::string& file) {
|
||||
if (!is_directory())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path += file;
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_file() {
|
||||
if (is_directory())
|
||||
return false;
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos == std::string::npos)
|
||||
return false;
|
||||
path.erase(slashpos+1);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::append_suffix(const std::string& suffix) {
|
||||
if (is_directory())
|
||||
return false;
|
||||
Path save(*this);
|
||||
path.append(".");
|
||||
path.append(suffix);
|
||||
if (!is_valid()) {
|
||||
path = save.path;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::elide_suffix() {
|
||||
if (is_directory()) return false;
|
||||
size_t dotpos = path.rfind('.',path.size());
|
||||
size_t slashpos = path.rfind('/',path.size());
|
||||
if (slashpos != std::string::npos && dotpos != std::string::npos &&
|
||||
dotpos > slashpos) {
|
||||
path.erase(dotpos, path.size()-dotpos);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
Path::create_directory( bool create_parents) {
|
||||
// Make sure we're dealing with a directory
|
||||
if (!is_directory()) return false;
|
||||
|
||||
// Get a writeable copy of the path name
|
||||
char pathname[MAXPATHLEN];
|
||||
path.copy(pathname,MAXPATHLEN);
|
||||
|
||||
// Null-terminate the last component
|
||||
int lastchar = path.length() - 1 ;
|
||||
if (pathname[lastchar] == '/')
|
||||
pathname[lastchar] = 0;
|
||||
|
||||
// If we're supposed to create intermediate directories
|
||||
if ( create_parents ) {
|
||||
// Find the end of the initial name component
|
||||
char * next = strchr(pathname,'/');
|
||||
if ( pathname[0] == '/')
|
||||
next = strchr(&pathname[1],'/');
|
||||
|
||||
// Loop through the directory components until we're done
|
||||
while ( next != 0 ) {
|
||||
*next = 0;
|
||||
if (0 != access(pathname, F_OK | R_OK | W_OK))
|
||||
if (0 != mkdir(pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't create directory");
|
||||
char* save = next;
|
||||
next = strchr(pathname,'/');
|
||||
*save = '/';
|
||||
}
|
||||
} else if (0 != mkdir(pathname)) {
|
||||
ThrowError(std::string(pathname) + ": Can't create directory");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::create_file() {
|
||||
// Make sure we're dealing with a file
|
||||
if (!is_file()) return false;
|
||||
|
||||
// Create the file
|
||||
if (0 != creat(path.c_str(), S_IRUSR | S_IWUSR))
|
||||
ThrowError(std::string(path.c_str()) + ": Can't create file");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::destroy_directory(bool remove_contents) {
|
||||
// Make sure we're dealing with a directory
|
||||
if (!is_directory()) return false;
|
||||
|
||||
// If it doesn't exist, we're done.
|
||||
if (!exists()) return true;
|
||||
|
||||
if (remove_contents) {
|
||||
// Recursively descend the directory to remove its content
|
||||
std::string cmd("/bin/rm -rf ");
|
||||
cmd += path;
|
||||
system(cmd.c_str());
|
||||
} else {
|
||||
// Otherwise, try to just remove the one directory
|
||||
char pathname[MAXPATHLEN];
|
||||
path.copy(pathname,MAXPATHLEN);
|
||||
int lastchar = path.length() - 1 ;
|
||||
if (pathname[lastchar] == '/')
|
||||
pathname[lastchar] = 0;
|
||||
if ( 0 != rmdir(pathname))
|
||||
ThrowError(std::string(pathname) + ": Can't destroy directory");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
Path::destroy_file() {
|
||||
if (!is_file()) return false;
|
||||
if (0 != unlink(path.c_str()))
|
||||
ThrowError(std::string(path.c_str()) + ": Can't destroy file");
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
//===- Win32/Program.cpp - Win32 Program Implelementation ----- -*- C++ -*-===//
|
||||
//===- Win32/Program.cpp - Win32 Program Implementation ------- -*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Jeff Cohen and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -11,9 +11,143 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// Include the generic Unix implementation
|
||||
#include "Win32.h"
|
||||
#include "llvm/System/Program.h"
|
||||
#include <malloc.h>
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only generic Win32 code that
|
||||
//=== is guaranteed to work on *all* Win32 variants.
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be UNIX code
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
|
||||
// This function just uses the PATH environment variable to find the program.
|
||||
Path
|
||||
Program::FindProgramByName(const std::string& progName) {
|
||||
|
||||
// Check some degenerate cases
|
||||
if (progName.length() == 0) // no program
|
||||
return Path();
|
||||
Path temp;
|
||||
if (!temp.set_file(progName)) // invalid name
|
||||
return Path();
|
||||
if (temp.executable()) // already executable as is
|
||||
return temp;
|
||||
|
||||
// At this point, the file name is valid and its not executable.
|
||||
// Let Windows search for it.
|
||||
char buffer[MAX_PATH];
|
||||
char *dummy = NULL;
|
||||
DWORD len = SearchPath(NULL, progName.c_str(), ".exe", MAX_PATH,
|
||||
buffer, &dummy);
|
||||
|
||||
// See if it wasn't found.
|
||||
if (len == 0)
|
||||
return Path();
|
||||
|
||||
// See if we got the entire path.
|
||||
if (len < MAX_PATH)
|
||||
return Path(buffer);
|
||||
|
||||
// Buffer was too small; grow and retry.
|
||||
while (true) {
|
||||
char *b = reinterpret_cast<char *>(_alloca(len+1));
|
||||
DWORD len2 = SearchPath(NULL, progName.c_str(), ".exe", len+1, b, &dummy);
|
||||
|
||||
// It is unlikely the search failed, but it's always possible some file
|
||||
// was added or removed since the last search, so be paranoid...
|
||||
if (len2 == 0)
|
||||
return Path();
|
||||
else if (len2 <= len)
|
||||
return Path(b);
|
||||
|
||||
len = len2;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
int
|
||||
Program::ExecuteAndWait(const Path& path,
|
||||
const std::vector<std::string>& args) {
|
||||
if (!path.executable())
|
||||
throw path.get() + " is not executable";
|
||||
|
||||
// Windows wants a command line, not an array of args, to pass to the new
|
||||
// process. We have to concatenate them all, while quoting the args that
|
||||
// have embedded spaces.
|
||||
|
||||
// First, determine the length of the command line.
|
||||
std::string progname(path.getLast());
|
||||
unsigned len = progname.length() + 1;
|
||||
if (progname.find(' ') != std::string::npos)
|
||||
len += 2;
|
||||
|
||||
for (unsigned i = 0; i < args.size(); i++) {
|
||||
len += args[i].length() + 1;
|
||||
if (args[i].find(' ') != std::string::npos)
|
||||
len += 2;
|
||||
}
|
||||
|
||||
// Now build the command line.
|
||||
char *command = reinterpret_cast<char *>(_alloca(len));
|
||||
char *p = command;
|
||||
|
||||
bool needsQuoting = progname.find(' ') != std::string::npos;
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
memcpy(p, progname.c_str(), progname.length());
|
||||
p += progname.length();
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
*p++ = ' ';
|
||||
|
||||
for (unsigned i = 0; i < args.size(); i++) {
|
||||
const std::string& arg = args[i];
|
||||
needsQuoting = arg.find(' ') != std::string::npos;
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
memcpy(p, arg.c_str(), arg.length());
|
||||
p += arg.length();
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
*p++ = ' ';
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
// Create a child process.
|
||||
STARTUPINFO si;
|
||||
memset(&si, 0, sizeof(si));
|
||||
si.cb = sizeof(si);
|
||||
|
||||
PROCESS_INFORMATION pi;
|
||||
memset(&pi, 0, sizeof(pi));
|
||||
|
||||
if (!CreateProcess(path.get().c_str(), command, NULL, NULL, FALSE, 0,
|
||||
NULL, NULL, &si, &pi))
|
||||
{
|
||||
ThrowError(std::string("Couldn't execute program '") + path.get() + "'");
|
||||
}
|
||||
|
||||
// Wait for it to terminate.
|
||||
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||
|
||||
// Get its exit status.
|
||||
DWORD status;
|
||||
BOOL rc = GetExitCodeProcess(pi.hProcess, &status);
|
||||
|
||||
// Done with the handles; go close them.
|
||||
CloseHandle(pi.hProcess);
|
||||
CloseHandle(pi.hThread);
|
||||
|
||||
if (!rc)
|
||||
ThrowError(std::string("Failed getting status for program '") + path.get() + "'");
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
}
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
//===- Win32/Program.cpp - Win32 Program Implelementation ----- -*- C++ -*-===//
|
||||
//===- Win32/Program.cpp - Win32 Program Implementation ------- -*- C++ -*-===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file was developed by Reid Spencer and is distributed under the
|
||||
// This file was developed by Jeff Cohen and is distributed under the
|
||||
// University of Illinois Open Source License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -11,9 +11,143 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// Include the generic Unix implementation
|
||||
#include "Win32.h"
|
||||
#include "llvm/System/Program.h"
|
||||
#include <malloc.h>
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
//=== WARNING: Implementation here must contain only generic Win32 code that
|
||||
//=== is guaranteed to work on *all* Win32 variants.
|
||||
//=== WARNING: Implementation here must contain only Win32 specific code
|
||||
//=== and must not be UNIX code
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
namespace llvm {
|
||||
using namespace sys;
|
||||
|
||||
// This function just uses the PATH environment variable to find the program.
|
||||
Path
|
||||
Program::FindProgramByName(const std::string& progName) {
|
||||
|
||||
// Check some degenerate cases
|
||||
if (progName.length() == 0) // no program
|
||||
return Path();
|
||||
Path temp;
|
||||
if (!temp.set_file(progName)) // invalid name
|
||||
return Path();
|
||||
if (temp.executable()) // already executable as is
|
||||
return temp;
|
||||
|
||||
// At this point, the file name is valid and its not executable.
|
||||
// Let Windows search for it.
|
||||
char buffer[MAX_PATH];
|
||||
char *dummy = NULL;
|
||||
DWORD len = SearchPath(NULL, progName.c_str(), ".exe", MAX_PATH,
|
||||
buffer, &dummy);
|
||||
|
||||
// See if it wasn't found.
|
||||
if (len == 0)
|
||||
return Path();
|
||||
|
||||
// See if we got the entire path.
|
||||
if (len < MAX_PATH)
|
||||
return Path(buffer);
|
||||
|
||||
// Buffer was too small; grow and retry.
|
||||
while (true) {
|
||||
char *b = reinterpret_cast<char *>(_alloca(len+1));
|
||||
DWORD len2 = SearchPath(NULL, progName.c_str(), ".exe", len+1, b, &dummy);
|
||||
|
||||
// It is unlikely the search failed, but it's always possible some file
|
||||
// was added or removed since the last search, so be paranoid...
|
||||
if (len2 == 0)
|
||||
return Path();
|
||||
else if (len2 <= len)
|
||||
return Path(b);
|
||||
|
||||
len = len2;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
int
|
||||
Program::ExecuteAndWait(const Path& path,
|
||||
const std::vector<std::string>& args) {
|
||||
if (!path.executable())
|
||||
throw path.get() + " is not executable";
|
||||
|
||||
// Windows wants a command line, not an array of args, to pass to the new
|
||||
// process. We have to concatenate them all, while quoting the args that
|
||||
// have embedded spaces.
|
||||
|
||||
// First, determine the length of the command line.
|
||||
std::string progname(path.getLast());
|
||||
unsigned len = progname.length() + 1;
|
||||
if (progname.find(' ') != std::string::npos)
|
||||
len += 2;
|
||||
|
||||
for (unsigned i = 0; i < args.size(); i++) {
|
||||
len += args[i].length() + 1;
|
||||
if (args[i].find(' ') != std::string::npos)
|
||||
len += 2;
|
||||
}
|
||||
|
||||
// Now build the command line.
|
||||
char *command = reinterpret_cast<char *>(_alloca(len));
|
||||
char *p = command;
|
||||
|
||||
bool needsQuoting = progname.find(' ') != std::string::npos;
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
memcpy(p, progname.c_str(), progname.length());
|
||||
p += progname.length();
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
*p++ = ' ';
|
||||
|
||||
for (unsigned i = 0; i < args.size(); i++) {
|
||||
const std::string& arg = args[i];
|
||||
needsQuoting = arg.find(' ') != std::string::npos;
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
memcpy(p, arg.c_str(), arg.length());
|
||||
p += arg.length();
|
||||
if (needsQuoting)
|
||||
*p++ = '"';
|
||||
*p++ = ' ';
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
// Create a child process.
|
||||
STARTUPINFO si;
|
||||
memset(&si, 0, sizeof(si));
|
||||
si.cb = sizeof(si);
|
||||
|
||||
PROCESS_INFORMATION pi;
|
||||
memset(&pi, 0, sizeof(pi));
|
||||
|
||||
if (!CreateProcess(path.get().c_str(), command, NULL, NULL, FALSE, 0,
|
||||
NULL, NULL, &si, &pi))
|
||||
{
|
||||
ThrowError(std::string("Couldn't execute program '") + path.get() + "'");
|
||||
}
|
||||
|
||||
// Wait for it to terminate.
|
||||
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||
|
||||
// Get its exit status.
|
||||
DWORD status;
|
||||
BOOL rc = GetExitCodeProcess(pi.hProcess, &status);
|
||||
|
||||
// Done with the handles; go close them.
|
||||
CloseHandle(pi.hProcess);
|
||||
CloseHandle(pi.hThread);
|
||||
|
||||
if (!rc)
|
||||
ThrowError(std::string("Failed getting status for program '") + path.get() + "'");
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
}
|
||||
// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user