Make command line arguments setup be endian correct!!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4605 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-11-07 19:29:31 +00:00
parent 1cc1ad7171
commit ab2dea5687
3 changed files with 24 additions and 20 deletions

View File

@ -980,6 +980,28 @@ static void executeStoreInst(StoreInst &I, ExecutionContext &SF) {
}
GenericValue Interpreter::CreateArgv(const std::vector<std::string> &InputArgv){
// Pointers are 64 bits...
PointerTy *Result = new PointerTy[InputArgv.size()+1]; // 64 bit assumption
for (unsigned i = 0; i < InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size];
copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
GenericValue GV; GV.PointerVal = (PointerTy)Dest;
// Endian safe: Result[i] = (PointerTy)Dest;
StoreValueToMemory(GV, (GenericValue*)(Result+i),
Type::LongTy); // 64 bit assumption
}
Result[InputArgv.size()] = 0;
GenericValue GV; GV.PointerVal = (PointerTy)Result;
return GV;
}
//===----------------------------------------------------------------------===//
// Miscellaneous Instruction Implementations
//===----------------------------------------------------------------------===//

View File

@ -126,9 +126,9 @@ public:
static void print(const Type *Ty, GenericValue V);
static void printValue(const Type *Ty, GenericValue V);
// Hack until we can parse command line args...
bool callMainMethod(const std::string &MainName,
const std::vector<std::string> &InputFilename);
GenericValue CreateArgv(const std::vector<std::string> &InputArgv);
void list(); // Do the 'list' command
void printStackTrace(); // Do the 'backtrace' command

View File

@ -238,23 +238,6 @@ bool Interpreter::callMethod(const string &Name) {
return false;
}
static void *CreateArgv(const std::vector<string> &InputArgv) {
// Pointers are 64 bits...
uint64_t *Result = new PointerTy[InputArgv.size()+1];
for (unsigned i = 0; i < InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size];
copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
Result[i] = (PointerTy)Dest;
}
Result[InputArgv.size()] = 0;
return Result;
}
// callMainMethod - This is a nasty gross hack that will dissapear when
// callMethod can parse command line options and stuff for us.
//
@ -289,8 +272,7 @@ bool Interpreter::callMainMethod(const string &Name,
return true;
}
GenericValue GV; GV.PointerVal = (uint64_t)CreateArgv(InputArgv);
Args.push_back(GV);
Args.push_back(CreateArgv(InputArgv));
}
// fallthrough
case 1: