commit 3c66c355b6e88407fd77a90bf8be0e2f7297409e
author Brian Gaeke <gaeke@uiuc.edu> Sat May 01 06:42:15 2004 +0000
committer Brian Gaeke <gaeke@uiuc.edu> Sat May 01 06:42:15 2004 +0000
tree e733f4d815b49aa097cfa9cec427fefed45273b7
parent 4b538b911e942b890aa1b83b02ee5598203e0e02

Generalize the strlen size_t hack, for the benefit of the other external
functions with wrappers that either take or return size_ts.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13296 91177308-0d34-0410-b5e6-96231b3b80d8

lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp

diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 1fe0c01..9246c0b 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -481,18 +481,33 @@
   return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1])));
 }
 
+static GenericValue size_t_to_GV (size_t n) {
+  GenericValue Ret;
+  if (sizeof (size_t) == sizeof (uint64_t)) {
+    Ret.ULongVal = n;
+  } else {
+    assert (sizeof (size_t) == sizeof (unsigned int));
+    Ret.UIntVal = n;
+  }
+  return Ret;
+}
+
+static size_t GV_to_size_t (GenericValue GV) { 
+  size_t count;
+  if (sizeof (size_t) == sizeof (uint64_t)) {
+    count = GV.ULongVal;
+  } else {
+    assert (sizeof (size_t) == sizeof (unsigned int));
+    count = GV.UIntVal;
+  }
+  return count;
+}
+
 // size_t strlen(const char *src);
 GenericValue lle_X_strlen(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 1);
   size_t strlenResult = strlen ((char *) GVTOP (Args[0]));
-  GenericValue Ret;
-  if (sizeof (size_t) == sizeof (uint64_t)) {
-    Ret.ULongVal = strlenResult;
-  } else {
-    assert (sizeof (size_t) == sizeof (unsigned int));
-    Ret.UIntVal = strlenResult;
-  }
-  return Ret;
+  return size_t_to_GV (strlenResult);
 }
 
 // char *strdup(const char *src);
@@ -510,14 +525,15 @@
 // void *memset(void *S, int C, size_t N)
 GenericValue lle_X_memset(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 3);
-  return PTOGV(memset(GVTOP(Args[0]), Args[1].IntVal, Args[2].UIntVal));
+  size_t count = GV_to_size_t (Args[2]);
+  return PTOGV(memset(GVTOP(Args[0]), Args[1].IntVal, count));
 }
 
 // void *memcpy(void *Dest, void *src, size_t Size);
 GenericValue lle_X_memcpy(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 3);
-  return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]),
-                      Args[2].UIntVal));
+  size_t count = GV_to_size_t (Args[2]);
+  return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), count));
 }
 
 //===----------------------------------------------------------------------===//
@@ -594,21 +610,21 @@
 // size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream);
 GenericValue lle_X_fread(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 4);
-  GenericValue GV;
+  size_t result;
 
-  GV.UIntVal = fread((void*)GVTOP(Args[0]), Args[1].UIntVal,
-                     Args[2].UIntVal, getFILE(GVTOP(Args[3])));
-  return GV;
+  result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]),
+                 GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3])));
+  return size_t_to_GV (result);
 }
 
 // size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream);
 GenericValue lle_X_fwrite(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 4);
-  GenericValue GV;
+  size_t result;
 
-  GV.UIntVal = fwrite((void*)GVTOP(Args[0]), Args[1].UIntVal,
-                      Args[2].UIntVal, getFILE(GVTOP(Args[3])));
-  return GV;
+  result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]),
+                  GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3])));
+  return size_t_to_GV (result);
 }
 
 // char *fgets(char *s, int n, FILE *stream);