From b3b0727032e58c8b8f3017c2b3f560616c6905af Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sat, 21 Apr 2007 17:11:45 +0000 Subject: [PATCH] We only need one putchar which gives it a shot at getting matched by its users. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36305 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Interpreter/ExternalFunctions.cpp | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp index 99b3fd6a61a..53f5deb13a2 100644 --- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp +++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp @@ -112,20 +112,8 @@ GenericValue Interpreter::callExternalFunction(Function *F, // extern "C" { // Don't add C++ manglings to llvm mangling :) -// void putchar(sbyte) -GenericValue lle_VB_putchar(FunctionType *FT, const vector &Args){ - cout << ((char)Args[0].IntVal.getZExtValue()); - return GenericValue(); -} - -// int putchar(int) -GenericValue lle_ii_putchar(FunctionType *FT, const vector &Args){ - cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; - return Args[0]; -} - // void putchar(ubyte) -GenericValue lle_Vb_putchar(FunctionType *FT, const vector &Args){ +GenericValue lle_X_putchar(FunctionType *FT, const vector &Args){ cout << ((char)Args[0].IntVal.getZExtValue()) << std::flush; return Args[0]; } @@ -354,13 +342,14 @@ GenericValue lle_X_sprintf(FunctionType *FT, const vector &Args) { break; } } + return GV; } // int printf(sbyte *, ...) - a very rough implementation to make output useful. GenericValue lle_X_printf(FunctionType *FT, const vector &Args) { char Buffer[10000]; vector NewArgs; - NewArgs.push_back(PTOGV(Buffer)); + NewArgs.push_back(PTOGV((void*)&Buffer[0])); NewArgs.insert(NewArgs.end(), Args.begin(), Args.end()); GenericValue GV = lle_X_sprintf(FT, NewArgs); cout << Buffer; @@ -704,9 +693,7 @@ GenericValue lle_X_fprintf(FunctionType *FT, const vector &Args) { void Interpreter::initializeExternalFunctions() { - FuncNames["lle_Vb_putchar"] = lle_Vb_putchar; - FuncNames["lle_ii_putchar"] = lle_ii_putchar; - FuncNames["lle_VB_putchar"] = lle_VB_putchar; + FuncNames["lle_X_putchar"] = lle_X_putchar; FuncNames["lle_X_exit"] = lle_X_exit; FuncNames["lle_X_abort"] = lle_X_abort; FuncNames["lle_X_malloc"] = lle_X_malloc; -- 2.34.1