From 2b934507739e6ddfb12788450e4e972ab9b84f1b Mon Sep 17 00:00:00 2001
From: John Regehr <regehr@cs.utah.edu>
Date: Thu, 1 Dec 2011 10:40:43 -0700
Subject: [PATCH] Random minor changes.

---
 utah/scripts/john_driver/evaluate_program.pl | 48 ++++++++++++--------
 utah/scripts/john_driver/random_test.pl      |  2 +
 utah/scripts/reduce/reduce.sh                | 23 +++-------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/utah/scripts/john_driver/evaluate_program.pl b/utah/scripts/john_driver/evaluate_program.pl
index 8589d3120..034536ed7 100755
--- a/utah/scripts/john_driver/evaluate_program.pl
+++ b/utah/scripts/john_driver/evaluate_program.pl
@@ -88,6 +88,14 @@
     "-O3",
     );
 
+my @gcc_opts9 = (
+    "-O0 -fwrapv",
+    "-O1 -fwrapv",
+    "-O2 -fwrapv",
+    "-Os -fwrapv",
+    "-O3 -fwrapv",
+    );
+
 my $DRAGONEGG = "-fplugin=/home/regehr/z/compiler-source/dragonegg/dragonegg.so";
 
 my @dragonegg_opts = (
@@ -531,24 +539,27 @@
 
 my @compilers_to_test = (
     
-    \@gcc320,
-    \@gcc330,
-    \@gcc340,
-    \@gcc400,
-    \@gcc410,
-    \@gcc420,
-    \@gcc430,
-    \@gcc440,
-    \@gcc450,
-    \@gcc460,
-    \@clang26,
-    \@clang27,
-    \@clang28,
-    \@clang29,
+    \@clang,
+    #\@gcccurrent,
     
-    \@icc,
-    \@suncc,
-    \@open64,
+    #\@gcc320,
+    #\@gcc330,
+    #\@gcc340,
+    #\@gcc400,
+    #\@gcc410,
+    #\@gcc420,
+    #\@gcc430,
+    #\@gcc440,
+    #\@gcc450,
+    #\@gcc460,
+    #\@clang26,
+    #\@clang27,
+    #\@clang28,
+    #\@clang29,
+    
+    #\@icc,
+    #\@suncc,
+    #\@open64,
 
     # \@tcc,
 
@@ -558,9 +569,6 @@
 
     #\@gcc,
 
-    #\@clang,
-    #\@gcccurrent,
-    
     #\@clangpp,
     #\@gppcurrent,
 
diff --git a/utah/scripts/john_driver/random_test.pl b/utah/scripts/john_driver/random_test.pl
index b181ddc00..f64febf56 100755
--- a/utah/scripts/john_driver/random_test.pl
+++ b/utah/scripts/john_driver/random_test.pl
@@ -19,8 +19,10 @@
 
 my $PROVIDE_SEED = 1;
 
+
 my $XTRA = "";
 
+#$XTRA .= "--no-safe-math";
 #$XTRA .= "--force-non-uniform-arrays ";
 #$XTRA .= "--no-unions ";
 #$XTRA .= "--no-unions ";
diff --git a/utah/scripts/reduce/reduce.sh b/utah/scripts/reduce/reduce.sh
index 25985cb03..cc175c4d6 100755
--- a/utah/scripts/reduce/reduce.sh
+++ b/utah/scripts/reduce/reduce.sh
@@ -1,20 +1,9 @@
 # optionally preprocess
-# save sequential backup versions instead of hardcoding these
+# save some backup files
 
-DIR=${CSMITH_HOME}/utah/scripts/reduce
-
-cp small.c small-1.c
-perl -pi.bak -e 's/^\s*\n//g' small.c
-${DIR}/godelta
-cp small.c small-2.c
-indent small.c
-${DIR}/c_delta.pl ./test1.sh ./small.c --all
-cp small.c small-3.c
-perl -pi.bak -e 's/^\s*\n//g' small.c
-${DIR}/godelta
-cp small.c small-4.c
+godelta8
+c_delta.pl ./test1.sh small.c --all
+godelta8
 indent small.c
-cp small.c small-5.c
-./test1.sh
-cat small.c
-wc small.c
+
+./test1.sh ; echo $?