6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-01 01:30:36 +00:00
Code Issues Projects Releases Wiki Activity

Simplify code

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10613 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-12-26 06:36:20 +00:00
parent ddceeb720d
commit 3ef3dd36fe
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tools/lli/lli.cpp
View File

@ -44,52 +44,32 @@ namespace {
" program"), cl::value_desc("executable")); " program"), cl::value_desc("executable"));
} }
static std::vector<std::string> makeStringVector(char * const *envp) {
std::vector<std::string> rv;
for (unsigned i = 0; envp[i]; ++i)
rv.push_back(envp[i]);
return rv;
}
static void *CreateArgv(ExecutionEngine *EE, static void *CreateArgv(ExecutionEngine *EE,
const std::vector<std::string> &InputArgv) { const std::vector<std::string> &InputArgv) {
if (EE->getTargetData().getPointerSize() == 8) { // 64 bit target? unsigned PtrSize = EE->getTargetData().getPointerSize();
PointerTy *Result = new PointerTy[InputArgv.size()+1]; char *Result = new char[(InputArgv.size()+1)*PtrSize];
DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
for (unsigned i = 0; i < InputArgv.size(); ++i) { DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
unsigned Size = InputArgv[i].size()+1; const Type *SBytePtr = PointerType::get(Type::SByteTy);
char *Dest = new char[Size];
DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
std::copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0;
// Endian safe: Result[i] = (PointerTy)Dest;
EE->StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i),
Type::LongTy);
}
Result[InputArgv.size()] = 0;
return Result;
} else { // 32 bit target?
int *Result = new int[InputArgv.size()+1];
DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n");
for (unsigned i = 0; i < InputArgv.size(); ++i) { for (unsigned i = 0; i != InputArgv.size(); ++i) {
unsigned Size = InputArgv[i].size()+1; unsigned Size = InputArgv[i].size()+1;
char *Dest = new char[Size]; char *Dest = new char[Size];
DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n"); DEBUG(std::cerr << "ARGV[" << i << "] = " << (void*)Dest << "\n");
std::copy(InputArgv[i].begin(), InputArgv[i].end(), Dest); std::copy(InputArgv[i].begin(), InputArgv[i].end(), Dest);
Dest[Size-1] = 0; Dest[Size-1] = 0;
// Endian safe: Result[i] = (PointerTy)Dest; // Endian safe: Result[i] = (PointerTy)Dest;
EE->StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i), EE->StoreValueToMemory(PTOGV(Dest), (GenericValue*)(Result+i*PtrSize),
Type::IntTy); SBytePtr);
}
Result[InputArgv.size()] = 0; // null terminate it
return Result;
} }
// Null terminate it
EE->StoreValueToMemory(PTOGV(0),
(GenericValue*)(Result+InputArgv.size()*PtrSize),
SBytePtr);
return Result;
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -145,7 +125,9 @@ int main(int argc, char **argv, char * const *envp) {
GVArgs.push_back(PTOGV(CreateArgv(EE, InputArgv))); // Arg #1 = argv. GVArgs.push_back(PTOGV(CreateArgv(EE, InputArgv))); // Arg #1 = argv.
assert(((char **)GVTOP(GVArgs[1]))[0] && "argv[0] was null after CreateArgv"); assert(((char **)GVTOP(GVArgs[1]))[0] && "argv[0] was null after CreateArgv");
std::vector<std::string> EnvVars = makeStringVector(envp); std::vector<std::string> EnvVars;
for (unsigned i = 0; envp[i]; ++i)
EnvVars.push_back(envp[i]);
GVArgs.push_back(PTOGV(CreateArgv(EE, EnvVars))); // Arg #2 = envp. GVArgs.push_back(PTOGV(CreateArgv(EE, EnvVars))); // Arg #2 = envp.
GenericValue Result = EE->runFunction(Fn, GVArgs); GenericValue Result = EE->runFunction(Fn, GVArgs);