1 files changed, 29 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 4c2039ded4..7be3336c58 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -91,10 +91,32 @@ void Interpreter::callExternalMethod(Method *M,
 //
 extern "C" {  // Don't add C++ manglings to llvm mangling :)
 
+// Implement void printstr([ubyte {x N}] *)
+GenericValue lle_VP_printstr(MethodType *M, const vector<GenericValue> &ArgVal){
+  assert(ArgVal.size() == 1 && "printstr only takes one argument!");
+  cout << (char*)ArgVal[0].PointerVal;
+  return GenericValue();
+}
+
 // Implement 'void print(X)' for every type...
 GenericValue lle_X_print(MethodType *M, const vector<GenericValue> &ArgVals) {
   assert(ArgVals.size() == 1 && "generic print only takes one argument!");
-  Interpreter::printValue(M->getParamTypes()[0], ArgVals[0]);
+
+  Interpreter::print(M->getParamTypes()[0], ArgVals[0]);
+  return GenericValue();
+}
+
+// Implement 'void printVal(X)' for every type...
+GenericValue lle_X_printVal(MethodType *M, const vector<GenericValue> &ArgVal) {
+  assert(ArgVal.size() == 1 && "generic print only takes one argument!");
+
+  // Specialize print([ubyte {x N} ] *)
+  if (PointerType *PTy = dyn_cast<PointerType>(M->getParamTypes()[0].get()))
+    if (const ArrayType *ATy = dyn_cast<ArrayType>(PTy->getValueType())) {
+      return lle_VP_printstr(M, ArgVal);
+    }
+
+  Interpreter::printValue(M->getParamTypes()[0], ArgVal[0]);
   return GenericValue();
 }
 
@@ -104,4 +126,10 @@ GenericValue lle_Vb_putchar(MethodType *M, const vector<GenericValue> &Args) {
   return GenericValue();
 }
 
+// void "putchar"(ubyte)
+GenericValue lle_VB_putchar(MethodType *M, const vector<GenericValue> &Args) {
+  cout << Args[0].UByteVal;
+  return GenericValue();
+}
+
 } // End extern "C"