Fix bug: Jello/2003-05-07-ArgumentTest.llx

Also fixes yacr2/ks benchmarks


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6017 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-05-07 20:31:37 +00:00
parent 761b47180e
commit b2abb5a586

View File

@ -193,26 +193,42 @@ void ExecutionEngine::InitializeMemory(const Constant *Init, void *Addr) {
void *ExecutionEngine::CreateArgv(const std::vector<std::string> &InputArgv) {
// Pointers are 64 bits...
// FIXME: Assumes 64 bit target
PointerTy *Result = new PointerTy[InputArgv.size()+1];
DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
if (getTargetData().getPointerSize() == 8) { // 64 bit target?
PointerTy *Result = new PointerTy[InputArgv.size()+1];
DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
for (unsigned i = 0; i < InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size];
DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
// Endian safe: Result[i] = (PointerTy)Dest;
StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i), Type::LongTy);
}
Result[InputArgv.size()] = 0;
return Result;
for (unsigned i = 0; i < InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size];
DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
} else { // 32 bit target?
int *Result = new int[InputArgv.size()+1];
DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
// Endian safe: Result[i] = (PointerTy)Dest;
StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i),
Type::LongTy); // 64 bit assumption
for (unsigned i = 0; i < InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size];
DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
// Endian safe: Result[i] = (PointerTy)Dest;
StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i), Type::IntTy);
}
Result[InputArgv.size()] = 0; // null terminate it
return Result;
}
Result[InputArgv.size()] = 0;
return Result;
}
/// EmitGlobals - Emit all of the global variables to memory, storing their