Merge branch 'llvm-svn'

Conflicts:
	src/dlmalloc.c
	tests/dlmalloc.c
	tests/runner.py
	tools/shared.py

1 files changed, 85 insertions, 12 deletions

diff --git a/tools/autodebugger.py b/tools/autodebugger.py
index 9b51ebc9..f4c580a2 100644
--- a/tools/autodebugger.py
+++ b/tools/autodebugger.py
@@ -7,14 +7,18 @@ compare that to the output when compiled using emscripten.
 
 import os, sys, re
 
+ALLOW_POINTERS = False
+MEMCPY = False
+
 POSTAMBLE = '''
 @.emscripten.autodebug.str = private constant [10 x i8] c"AD:%d,%d\\0A\\00", align 1 ; [#uses=1]
+@.emscripten.autodebug.str.f = private constant [11 x i8] c"AD:%d,%lf\\0A\\00", align 1 ; [#uses=1]
 
 ; [#uses=1]
 define void @emscripten_autodebug_i64(i32 %line, i64 %value) {
 entry:
   %0 = sitofp i64 %value to double ; [#uses=1]
-  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %0) ; [#uses=0]
+  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %0) ; [#uses=0]
   br label %return
 
 return:                                           ; preds = %entry
@@ -57,7 +61,7 @@ return:                                           ; preds = %entry
 define void @emscripten_autodebug_float(i32 %line, float %value) {
 entry:
   %0 = fpext float %value to double ; [#uses=1]
-  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %0) ; [#uses=0]
+  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %0) ; [#uses=0]
   br label %return
 
 return:                                           ; preds = %entry
@@ -67,7 +71,7 @@ return:                                           ; preds = %entry
 ; [#uses=1]
 define void @emscripten_autodebug_double(i32 %line, double %value) {
 entry:
-  %0 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %value) ; [#uses=0]
+  %0 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %value) ; [#uses=0]
   br label %return
 
 return:                                           ; preds = %entry
@@ -77,11 +81,12 @@ return:                                           ; preds = %entry
 
 POSTAMBLE_NEW = '''
 @.emscripten.autodebug.str = private constant [10 x i8] c"AD:%d,%d\\0A\\00", align 1 ; [#uses=1]
+@.emscripten.autodebug.str.f = private constant [11 x i8] c"AD:%d,%lf\\0A\\00", align 1 ; [#uses=1]
 
 ; [#uses=1]
 define void @emscripten_autodebug_i64(i32 %line, i64 %value) {
   %1 = sitofp i64 %value to double
-  %2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %1) ; [#uses=0]
+  %2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %1) ; [#uses=0]
   ret void
 }
 
@@ -108,13 +113,13 @@ define void @emscripten_autodebug_i8(i32 %line, i8 %value) {
 ; [#uses=1]
 define void @emscripten_autodebug_float(i32 %line, float %value) {
   %1 = fpext float %value to double ; [#uses=1]
-  %2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %1) ; [#uses=0]
+  %2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %1) ; [#uses=0]
   ret void
 }
 
 ; [#uses=1]
 define void @emscripten_autodebug_double(i32 %line, double %value) {
-  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([10 x i8]* @.emscripten.autodebug.str, i32 0, i32 0), i32 %line, double %value) ; [#uses=0]
+  %1 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([11 x i8]* @.emscripten.autodebug.str.f, i32 0, i32 0), i32 %line, double %value) ; [#uses=0]
   ret void
 }
 '''
@@ -135,15 +140,83 @@ LLVM_STYLE_OLD = '<label>' not in data and 'entry:' in data
 if not LLVM_STYLE_OLD:
   POSTAMBLE = POSTAMBLE_NEW
 
+if MEMCPY:
+  POSTAMBLE = '''
+@.emscripten.memcpy.str = private constant [7 x i8] c"MC:%d\\0A\\00", align 1 ; [#uses=1]
+
+''' + POSTAMBLE + '''
+; [#uses=1]
+define void @emscripten_memcpy(i8* %destination, i8* %source, i32 %num, i32 %whati, i1 %sthis) nounwind {
+entry:
+  %destination.addr = alloca i8*, align 4         ; [#uses=3]
+  %source.addr = alloca i8*, align 4              ; [#uses=2]
+  %num.addr = alloca i32, align 4                 ; [#uses=3]
+  %i = alloca i32, align 4                        ; [#uses=5]
+  %src = alloca i8*, align 4                      ; [#uses=5]
+  %dst = alloca i8*, align 4                      ; [#uses=4]
+  store i8* %destination, i8** %destination.addr, align 4
+  store i8* %source, i8** %source.addr, align 4
+  store i32 %num, i32* %num.addr, align 4
+  %tmp = load i8** %source.addr, align 4 ; [#uses=1]
+  store i8* %tmp, i8** %src, align 4
+  %tmp2 = load i8** %destination.addr, align 4 ; [#uses=1]
+  store i8* %tmp2, i8** %dst, align 4
+  store i32 0, i32* %i, align 4
+  %tmp31 = load i32* %i, align 4       ; [#uses=1]
+  %tmp42 = load i32* %num.addr, align 4 ; [#uses=1]
+  %cmp3 = icmp ult i32 %tmp31, %tmp42   ; [#uses=1]
+  br i1 %cmp3, label %for.body, label %for.end
+
+for.body:                                         ; preds = %for.body, %entry
+  %tmp5 = load i8** %src, align 4       ; [#uses=1]
+  %tmp6 = load i8* %tmp5                ; [#uses=1]
+  %conv = zext i8 %tmp6 to i32         ; [#uses=1]
+  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([7 x i8]* @.emscripten.memcpy.str, i32 0, i32 0), i32 %conv); [#uses=0]
+  %tmp7 = load i8** %src, align 4     ; [#uses=1]
+  %tmp8 = load i8* %tmp7                ; [#uses=1]
+  %tmp9 = load i8** %dst, align 4      ; [#uses=1]
+  store i8 %tmp8, i8* %tmp9
+  %tmp10 = load i32* %i, align 4       ; [#uses=1]
+  %inc = add i32 %tmp10, 1              ; [#uses=1]
+  store i32 %inc, i32* %i, align 4
+  %tmp11 = load i8** %src, align 4     ; [#uses=1]
+  %incdec.ptr = getelementptr inbounds i8* %tmp11, i32 1 ; [#uses=1]
+  store i8* %incdec.ptr, i8** %src, align 4
+  %tmp12 = load i8** %dst, align 4      ; [#uses=1]
+  %incdec.ptr13 = getelementptr inbounds i8* %tmp12, i32 1 ; [#uses=1]
+  store i8* %incdec.ptr13, i8** %dst, align 4
+  %tmp3 = load i32* %i, align 4         ; [#uses=1]
+  %tmp4 = load i32* %num.addr, align 4  ; [#uses=1]
+  %cmp = icmp ult i32 %tmp3, %tmp4      ; [#uses=1]
+  br i1 %cmp, label %for.body, label %for.end
+
+for.end:                                          ; preds = %for.body, %entry
+  %tmp14 = load i8** %destination.addr, align 4 ; [#uses=1]
+  ret void
+}
+'''
+
 lines_added = 0
 lines = data.split('\n')
 for i in range(len(lines)):
-  #if i == 5:
-  #  lines[i] += '\n
-
-  m = re.match('  store (?P<type>i64|i32|i16|i8|float|double) %(?P<var>[\w.]+), .*', lines[i])
-  if m and m.group('type') in ['i8', 'i16', 'i32', 'i64', 'float', 'double']:
-    lines[i] += '\n  call void @emscripten_autodebug_%s(i32 %d, %s %%%s)' % (m.group('type'), i+1+lines_added, m.group('type'), m.group('var'))
+  if MEMCPY:
+    if not lines[i].startswith('declare void'):
+      lines[i] = lines[i].replace('@llvm.memcpy.p0i8.p0i8.i32', '@emscripten_memcpy')
+  m = re.match('  store (?P<type>i64|i32|i16|i8|float|double|%?[\w\.\*]+) (?P<var>%?[\w.+_]+), .*', lines[i])
+  if m:
+    index = i+1+lines_added
+    if m.group('type') in ['i8', 'i16', 'i32', 'i64', 'float', 'double']:
+      lines[i] += '\n  call void @emscripten_autodebug_%s(i32 %d, %s %s)' % (m.group('type'), index, m.group('type'), m.group('var'))
+      lines_added += 1
+    elif ALLOW_POINTERS and m.group('type').endswith('*') and m.group('type').count('*') == 1:
+      lines[i] += '\n  %%ead.%d = ptrtoint %s %%%s to i32' % (index, m.group('type'), m.group('var'))
+      lines[i] += '\n  call void @emscripten_autodebug_i32(i32 %d, i32 %%ead.%d)' % (index, index)
+      lines_added += 2
+    continue
+  m = re.match('  %(?P<var>[\w_.]+) = load (?P<type>i64|i32|i16|i8|float|double+)\* [^(].*.*', lines[i])
+  if m:
+    index = i+1+lines_added
+    lines[i] += '\n  call void @emscripten_autodebug_%s(i32 %d, %s %%%s)' % (m.group('type'), index, m.group('type'), m.group('var'))
     lines_added += 1
 
 f = open(ofilename, 'w')