X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FExecutionEngine%2FInterpreter%2FExternalFunctions.cpp;h=b1c2ee4b6a84f5e0205a44e33ab7655402bcf131;hb=23e28836edaa6750a48dc318c8e2bbe6dc1529c8;hp=9137fc52dafe1de28eae6f36768124e2f2635896;hpb=d1c881a8d4da8b4d99c2a40512fbcca652ab445e;p=oota-llvm.git diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 9137fc52daf..b1c2ee4b6a8 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -22,11 +22,12 @@ #include "Interpreter.h" #include "llvm/DerivedTypes.h" #include "llvm/Module.h" +#include "llvm/Support/Streams.h" #include "llvm/System/DynamicLibrary.h" #include "llvm/Target/TargetData.h" -#include #include #include +#include using std::vector; using namespace llvm; @@ -40,19 +41,19 @@ static Interpreter *TheInterpreter; static char getTypeID(const Type *Ty) { switch (Ty->getTypeID()) { case Type::VoidTyID: return 'V'; - case Type::BoolTyID: return 'o'; - case Type::UByteTyID: return 'B'; - case Type::SByteTyID: return 'b'; - case Type::UShortTyID: return 'S'; - case Type::ShortTyID: return 's'; - case Type::UIntTyID: return 'I'; - case Type::IntTyID: return 'i'; - case Type::ULongTyID: return 'L'; - case Type::LongTyID: return 'l'; + case Type::IntegerTyID: + switch (cast(Ty)->getBitWidth()) { + case 1: return 'o'; + case 8: return 'B'; + case 16: return 'S'; + case 32: return 'I'; + case 64: return 'L'; + default: return 'N'; + } case Type::FloatTyID: return 'F'; case Type::DoubleTyID: return 'D'; case Type::PointerTyID: return 'P'; - case Type::FunctionTyID: return 'M'; + case Type::FunctionTyID:return 'M'; case Type::StructTyID: return 'T'; case Type::ArrayTyID: return 'A'; case Type::OpaqueTyID: return 'O'; @@ -71,11 +72,12 @@ static ExFunc lookupFunction(const Function *F) { ExFunc FnPtr = FuncNames[ExtName]; if (FnPtr == 0) - FnPtr = (ExFunc)sys::DynamicLibrary::SearchForAddressOfSymbol(ExtName); + FnPtr = + (ExFunc)(intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol(ExtName); if (FnPtr == 0) FnPtr = FuncNames["lle_X_"+F->getName()]; if (FnPtr == 0) // Try calling a generic function... if it exists... - FnPtr = (ExFunc)sys::DynamicLibrary::SearchForAddressOfSymbol( + FnPtr = (ExFunc)(intptr_t)sys::DynamicLibrary::SearchForAddressOfSymbol( ("lle_X_"+F->getName()).c_str()); if (FnPtr != 0) Functions.insert(std::make_pair(F, FnPtr)); // Cache for later @@ -91,8 +93,8 @@ GenericValue Interpreter::callExternalFunction(Function *F, std::map::iterator FI = Functions.find(F); ExFunc Fn = (FI == Functions.end()) ? lookupFunction(F) : FI->second; if (Fn == 0) { - std::cout << "Tried to execute an unknown external function: " - << F->getType()->getDescription() << " " << F->getName() << "\n"; + cerr << "Tried to execute an unknown external function: " + << F->getType()->getDescription() << " " << F->getName() << "\n"; if (F->getName() == "__main") return GenericValue(); abort(); @@ -111,20 +113,20 @@ GenericValue Interpreter::callExternalFunction(Function *F, extern "C" { // Don't add C++ manglings to llvm mangling :) // void putchar(sbyte) -GenericValue lle_Vb_putchar(FunctionType *M, const vector &Args) { - std::cout << Args[0].SByteVal; +GenericValue lle_VB_putchar(FunctionType *M, const vector &Args) { + cout << Args[0].Int8Val; return GenericValue(); } // int putchar(int) GenericValue lle_ii_putchar(FunctionType *M, const vector &Args) { - std::cout << ((char)Args[0].IntVal) << std::flush; + cout << ((char)Args[0].Int32Val) << std::flush; return Args[0]; } // void putchar(ubyte) -GenericValue lle_VB_putchar(FunctionType *M, const vector &Args) { - std::cout << Args[0].SByteVal << std::flush; +GenericValue lle_Vb_putchar(FunctionType *M, const vector &Args) { + cout << Args[0].Int8Val << std::flush; return Args[0]; } @@ -133,7 +135,7 @@ GenericValue lle_X_atexit(FunctionType *M, const vector &Args) { assert(Args.size() == 1); TheInterpreter->addAtExitHandler((Function*)GVTOP(Args[0])); GenericValue GV; - GV.IntVal = 0; + GV.Int32Val = 0; return GV; } @@ -152,13 +154,13 @@ GenericValue lle_X_abort(FunctionType *M, const vector &Args) { // void *malloc(uint) GenericValue lle_X_malloc(FunctionType *M, const vector &Args) { assert(Args.size() == 1 && "Malloc expects one argument!"); - return PTOGV(malloc(Args[0].UIntVal)); + return PTOGV(malloc(Args[0].Int32Val)); } // void *calloc(uint, uint) GenericValue lle_X_calloc(FunctionType *M, const vector &Args) { assert(Args.size() == 2 && "calloc expects two arguments!"); - return PTOGV(calloc(Args[0].UIntVal, Args[1].UIntVal)); + return PTOGV(calloc(Args[0].Int32Val, Args[1].Int32Val)); } // void free(void *) @@ -172,7 +174,7 @@ GenericValue lle_X_free(FunctionType *M, const vector &Args) { GenericValue lle_X_atoi(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = atoi((char*)GVTOP(Args[0])); + GV.Int32Val = atoi((char*)GVTOP(Args[0])); return GV; } @@ -230,14 +232,14 @@ GenericValue lle_X_drand48(FunctionType *M, const vector &Args) { GenericValue lle_X_lrand48(FunctionType *M, const vector &Args) { assert(Args.size() == 0); GenericValue GV; - GV.IntVal = lrand48(); + GV.Int32Val = lrand48(); return GV; } // void srand48(long) GenericValue lle_X_srand48(FunctionType *M, const vector &Args) { assert(Args.size() == 1); - srand48(Args[0].IntVal); + srand48(Args[0].Int32Val); return GenericValue(); } @@ -247,14 +249,14 @@ GenericValue lle_X_srand48(FunctionType *M, const vector &Args) { GenericValue lle_X_rand(FunctionType *M, const vector &Args) { assert(Args.size() == 0); GenericValue GV; - GV.IntVal = rand(); + GV.Int32Val = rand(); return GV; } // void srand(uint) GenericValue lle_X_srand(FunctionType *M, const vector &Args) { assert(Args.size() == 1); - srand(Args[0].UIntVal); + srand(Args[0].Int32Val); return GenericValue(); } @@ -262,7 +264,7 @@ GenericValue lle_X_srand(FunctionType *M, const vector &Args) { GenericValue lle_X_puts(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = puts((char*)GVTOP(Args[0])); + GV.Int32Val = puts((char*)GVTOP(Args[0])); return GV; } @@ -275,7 +277,7 @@ GenericValue lle_X_sprintf(FunctionType *M, const vector &Args) { // printf should return # chars printed. This is completely incorrect, but // close enough for now. - GenericValue GV; GV.IntVal = strlen(FmtStr); + GenericValue GV; GV.Int32Val = strlen(FmtStr); while (1) { switch (*FmtStr) { case 0: return GV; // Null terminator... @@ -306,14 +308,14 @@ GenericValue lle_X_sprintf(FunctionType *M, const vector &Args) { case '%': sprintf(Buffer, FmtBuf); break; case 'c': - sprintf(Buffer, FmtBuf, Args[ArgNo++].IntVal); break; + sprintf(Buffer, FmtBuf, Args[ArgNo++].Int32Val); break; case 'd': case 'i': case 'u': case 'o': case 'x': case 'X': if (HowLong >= 1) { if (HowLong == 1 && - TheInterpreter->getModule().getPointerSize()==Module::Pointer64 && - sizeof(long) < sizeof(long long)) { + TheInterpreter->getTargetData()->getPointerSizeInBits() == 64 && + sizeof(long) < sizeof(int64_t)) { // Make sure we use %lld with a 64 bit argument because we might be // compiling LLI on a 32 bit compiler. unsigned Size = strlen(FmtBuf); @@ -321,16 +323,16 @@ GenericValue lle_X_sprintf(FunctionType *M, const vector &Args) { FmtBuf[Size+1] = 0; FmtBuf[Size-1] = 'l'; } - sprintf(Buffer, FmtBuf, Args[ArgNo++].ULongVal); + sprintf(Buffer, FmtBuf, Args[ArgNo++].Int64Val); } else - sprintf(Buffer, FmtBuf, Args[ArgNo++].IntVal); break; + sprintf(Buffer, FmtBuf, Args[ArgNo++].Int32Val); break; case 'e': case 'E': case 'g': case 'G': case 'f': sprintf(Buffer, FmtBuf, Args[ArgNo++].DoubleVal); break; case 'p': sprintf(Buffer, FmtBuf, (void*)GVTOP(Args[ArgNo++])); break; case 's': sprintf(Buffer, FmtBuf, (char*)GVTOP(Args[ArgNo++])); break; - default: std::cout << ""; + default: cerr << ""; ArgNo++; break; } strcpy(OutputBuffer, Buffer); @@ -348,7 +350,7 @@ GenericValue lle_X_printf(FunctionType *M, const vector &Args) { NewArgs.push_back(PTOGV(Buffer)); NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); GenericValue GV = lle_X_sprintf(M, NewArgs); - std::cout << Buffer; + cout << Buffer; return GV; } @@ -392,11 +394,11 @@ static void ByteswapSCANFResults(const char *Fmt, void *Arg0, void *Arg1, case 'i': case 'o': case 'u': case 'x': case 'X': case 'n': case 'p': case 'd': if (Long || LongLong) { - Size = 8; Ty = Type::ULongTy; + Size = 8; Ty = Type::Int64Ty; } else if (Half) { - Size = 4; Ty = Type::UShortTy; + Size = 4; Ty = Type::Int16Ty; } else { - Size = 4; Ty = Type::UIntTy; + Size = 4; Ty = Type::Int32Ty; } break; @@ -411,7 +413,7 @@ static void ByteswapSCANFResults(const char *Fmt, void *Arg0, void *Arg1, case 's': case 'c': case '[': // No byteswap needed Size = 1; - Ty = Type::SByteTy; + Ty = Type::Int8Ty; break; default: break; @@ -437,8 +439,8 @@ GenericValue lle_X_sscanf(FunctionType *M, const vector &args) { Args[i] = (char*)GVTOP(args[i]); GenericValue GV; - GV.IntVal = sscanf(Args[0], Args[1], Args[2], Args[3], Args[4], - Args[5], Args[6], Args[7], Args[8], Args[9]); + GV.Int32Val = sscanf(Args[0], Args[1], Args[2], Args[3], Args[4], + Args[5], Args[6], Args[7], Args[8], Args[9]); ByteswapSCANFResults(Args[1], Args[2], Args[3], Args[4], Args[5], Args[6], Args[7], Args[8], Args[9], 0); return GV; @@ -453,8 +455,8 @@ GenericValue lle_X_scanf(FunctionType *M, const vector &args) { Args[i] = (char*)GVTOP(args[i]); GenericValue GV; - GV.IntVal = scanf(Args[0], Args[1], Args[2], Args[3], Args[4], - Args[5], Args[6], Args[7], Args[8], Args[9]); + GV.Int32Val = scanf( Args[0], Args[1], Args[2], Args[3], Args[4], + Args[5], Args[6], Args[7], Args[8], Args[9]); ByteswapSCANFResults(Args[0], Args[1], Args[2], Args[3], Args[4], Args[5], Args[6], Args[7], Args[8], Args[9]); return GV; @@ -464,7 +466,7 @@ GenericValue lle_X_scanf(FunctionType *M, const vector &args) { // int clock(void) - Profiling implementation GenericValue lle_i_clock(FunctionType *M, const vector &Args) { extern unsigned int clock(void); - GenericValue GV; GV.IntVal = clock(); + GenericValue GV; GV.Int32Val = clock(); return GV; } @@ -477,7 +479,7 @@ GenericValue lle_i_clock(FunctionType *M, const vector &Args) { GenericValue lle_X_strcmp(FunctionType *M, const vector &Args) { assert(Args.size() == 2); GenericValue Ret; - Ret.IntVal = strcmp((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1])); + Ret.Int32Val = strcmp((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1])); return Ret; } @@ -496,10 +498,10 @@ GenericValue lle_X_strcpy(FunctionType *M, const vector &Args) { static GenericValue size_t_to_GV (size_t n) { GenericValue Ret; if (sizeof (size_t) == sizeof (uint64_t)) { - Ret.ULongVal = n; + Ret.Int64Val = n; } else { assert (sizeof (size_t) == sizeof (unsigned int)); - Ret.UIntVal = n; + Ret.Int32Val = n; } return Ret; } @@ -507,10 +509,10 @@ static GenericValue size_t_to_GV (size_t n) { static size_t GV_to_size_t (GenericValue GV) { size_t count; if (sizeof (size_t) == sizeof (uint64_t)) { - count = (size_t)GV.ULongVal; + count = (size_t)GV.Int64Val; } else { assert (sizeof (size_t) == sizeof (unsigned int)); - count = (size_t)GV.UIntVal; + count = (size_t)GV.Int32Val; } return count; } @@ -538,7 +540,7 @@ GenericValue lle_X___strdup(FunctionType *M, const vector &Args) { GenericValue lle_X_memset(FunctionType *M, const vector &Args) { assert(Args.size() == 3); size_t count = GV_to_size_t (Args[2]); - return PTOGV(memset(GVTOP(Args[0]), Args[1].IntVal, count)); + return PTOGV(memset(GVTOP(Args[0]), Args[1].Int32Val, count)); } // void *memcpy(void *Dest, void *src, size_t Size); @@ -560,14 +562,14 @@ GenericValue lle_X_memcpy(FunctionType *M, const vector &Args) { GenericValue lle_X_fopen(FunctionType *M, const vector &Args) { assert(Args.size() == 2); return PTOGV(fopen((const char *)GVTOP(Args[0]), - (const char *)GVTOP(Args[1]))); + (const char *)GVTOP(Args[1]))); } // int fclose(FILE *F); GenericValue lle_X_fclose(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = fclose(getFILE(GVTOP(Args[0]))); + GV.Int32Val = fclose(getFILE(GVTOP(Args[0]))); return GV; } @@ -576,7 +578,7 @@ GenericValue lle_X_feof(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = feof(getFILE(GVTOP(Args[0]))); + GV.Int32Val = feof(getFILE(GVTOP(Args[0]))); return GV; } @@ -603,22 +605,22 @@ GenericValue lle_X_fwrite(FunctionType *M, const vector &Args) { // char *fgets(char *s, int n, FILE *stream); GenericValue lle_X_fgets(FunctionType *M, const vector &Args) { assert(Args.size() == 3); - return GVTOP(fgets((char*)GVTOP(Args[0]), Args[1].IntVal, - getFILE(GVTOP(Args[2])))); + return GVTOP(fgets((char*)GVTOP(Args[0]), Args[1].Int32Val, + getFILE(GVTOP(Args[2])))); } // FILE *freopen(const char *path, const char *mode, FILE *stream); GenericValue lle_X_freopen(FunctionType *M, const vector &Args) { assert(Args.size() == 3); return PTOGV(freopen((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), - getFILE(GVTOP(Args[2])))); + getFILE(GVTOP(Args[2])))); } // int fflush(FILE *stream); GenericValue lle_X_fflush(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = fflush(getFILE(GVTOP(Args[0]))); + GV.Int32Val = fflush(getFILE(GVTOP(Args[0]))); return GV; } @@ -626,7 +628,7 @@ GenericValue lle_X_fflush(FunctionType *M, const vector &Args) { GenericValue lle_X_getc(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = getc(getFILE(GVTOP(Args[0]))); + GV.Int32Val = getc(getFILE(GVTOP(Args[0]))); return GV; } @@ -639,7 +641,7 @@ GenericValue lle_X__IO_getc(FunctionType *F, const vector &Args) { GenericValue lle_X_fputc(FunctionType *M, const vector &Args) { assert(Args.size() == 2); GenericValue GV; - GV.IntVal = fputc(Args[0].IntVal, getFILE(GVTOP(Args[1]))); + GV.Int32Val = fputc(Args[0].Int32Val, getFILE(GVTOP(Args[1]))); return GV; } @@ -647,7 +649,7 @@ GenericValue lle_X_fputc(FunctionType *M, const vector &Args) { GenericValue lle_X_ungetc(FunctionType *M, const vector &Args) { assert(Args.size() == 2); GenericValue GV; - GV.IntVal = ungetc(Args[0].IntVal, getFILE(GVTOP(Args[1]))); + GV.Int32Val = ungetc(Args[0].Int32Val, getFILE(GVTOP(Args[1]))); return GV; } @@ -655,7 +657,7 @@ GenericValue lle_X_ungetc(FunctionType *M, const vector &Args) { GenericValue lle_X_ferror(FunctionType *M, const vector &Args) { assert(Args.size() == 1); GenericValue GV; - GV.IntVal = ferror (getFILE(GVTOP(Args[0]))); + GV.Int32Val = ferror (getFILE(GVTOP(Args[0]))); return GV; }