about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorDan Liew <delcypher@gmail.com>2014-10-31 15:41:15 +0000
committerDan Liew <delcypher@gmail.com>2014-10-31 15:41:15 +0000
commit458c6b04be8357859464d22fed09b476ca38e116 (patch)
treeec2f9e355b29303f2af9595e2ac737180c92078e
parent10b800db2c0639399ca2bdc041959519c54f89e5 (diff)
parenta6ce7bb9a8c01c62411f8484f13002f66e990293 (diff)
downloadklee-458c6b04be8357859464d22fed09b476ca38e116.tar.gz
Merge pull request #167 from willemp/willem/fix_64bit_printing_bug_in_testingUtils
Fix 64bit printing bug in testing utils
-rw-r--r--test/Concrete/ConstantExpr.ll4
-rw-r--r--test/Concrete/_testingUtils.c61
2 files changed, 52 insertions, 13 deletions
diff --git a/test/Concrete/ConstantExpr.ll b/test/Concrete/ConstantExpr.ll
index 3a151a0f..351223e7 100644
--- a/test/Concrete/ConstantExpr.ll
+++ b/test/Concrete/ConstantExpr.ll
@@ -24,8 +24,8 @@ define void @"test_int_to_ptr"() {
 
 define void @"test_constant_ops"() {
   %t1 = add i8 trunc(i64 add(i64 ptrtoint(i32* @gInt to i64), i64 -10) to i8), 10
-  %t2 = sub i64 sext(i32 ptrtoint(i32* @gInt to i32) to i64), ptrtoint(i32* @gInt to i64)
-  %t3 = sub i64 zext(i32 ptrtoint(i32* @gInt to i32) to i64), ptrtoint(i32* @gInt to i64)
+  %t2 = and i64 sub(i64 sext(i32 ptrtoint(i32* @gInt to i32) to i64), i64 ptrtoint(i32* @gInt to i64)), 4294967295
+  %t3 = and i64 sub(i64 zext(i32 ptrtoint(i32* @gInt to i32) to i64), i64 ptrtoint(i32* @gInt to i64)), 4294967295
 
   %t4 = icmp eq i8 trunc(i64 ptrtoint(i32* @gInt to i64) to i8), %t1
   %t5 = zext i1 %t4 to i8
diff --git a/test/Concrete/_testingUtils.c b/test/Concrete/_testingUtils.c
index 693a5a09..ef99f908 100644
--- a/test/Concrete/_testingUtils.c
+++ b/test/Concrete/_testingUtils.c
@@ -1,27 +1,28 @@
-// This isn't a real test, just common code for the other ones.
-//
-// RUN: true
+// RUN: %llvmgcc -D_TESTINGUTILS_TEST %s -o %t
+// RUN: %t | FileCheck %s
+
+#include <stdint.h>
 
 int printf(const char *fmt, ...);
 
-void print_int(unsigned long long val);
+void print_int(uint64_t val);
 
 #define TYPED_PRINT(_name_type, _arg_type)  \
     void print_ ## _name_type(_arg_type val) { print_int(val); }
  
-TYPED_PRINT(i1, unsigned char)
-TYPED_PRINT(i8, unsigned char)
-TYPED_PRINT(i16, unsigned short)
-TYPED_PRINT(i32, unsigned int)
-TYPED_PRINT(i64, unsigned long long)
+TYPED_PRINT(i1, uint8_t)
+TYPED_PRINT(i8, uint8_t)
+TYPED_PRINT(i16, uint16_t)
+TYPED_PRINT(i32, uint32_t)
+TYPED_PRINT(i64, uint64_t)
 
 // This is a workaround to hide the "%c" only format string from the compiler --
 // llvm-gcc can optimize this into putchar even at -O0, and the LLVM JIT doesn't
 // recognize putchar() as a valid external function.
 char *char_format_string = "%c";
 
-void print_int(unsigned long long val) {
-    int cur = 1;
+void print_int(uint64_t val) {
+    uint64_t cur = 1;
 
     // effectively do a log (can't call log because it returns floats)
     // do the nasty divide to prevent overflow
@@ -39,3 +40,41 @@ void print_int(unsigned long long val) {
     
     printf(char_format_string, '\n');
 }
+
+
+#ifdef _TESTINGUTILS_TEST
+int main(int argc, char *argv[])
+{
+        print_i64(0xf000000000000064);
+        // CHECK: 17293822569102704740
+        print_i64(0x7000000000000064);
+        // CHECK: 8070450532247928932
+
+        print_i32(0xf0000032);
+        // CHECK: 4026531890
+        print_i32(0x70000032);
+        // CHECK: 1879048242
+
+        print_i16(0xf016);
+        // CHECK: 61462
+        print_i16(0x7016);
+        // CHECK: 28694
+
+
+        print_i8(0xf8);
+        // CHECK: 248
+        print_i8(0x78);
+        // CHECK: 120
+
+        printf("print_i1(0)\n");
+        print_i1(0);
+        // CHECK: i1(0)
+        // CHECK_NEXT: 0
+
+        printf("print_i1(1)\n");
+        print_i1(1);
+        // CHECK: i1(1)
+        // CHECK_NEXT: 1
+
+}
+#endif