diff --git a/tests/jessie/CA-1999-14-nxtsimp-ok.c b/tests/jessie/CA-1999-14-nxtsimp-ok.c
index aa898fb57f7a73f428b37579fb16db0a93d3ed4e..fabdb0d5fba0682b521981ef357ea37f908bfcf1 100644
--- a/tests/jessie/CA-1999-14-nxtsimp-ok.c
+++ b/tests/jessie/CA-1999-14-nxtsimp-ok.c
@@ -285,7 +285,7 @@ char *strstr(const char *haystack, const char *needle)
   return NULL;
 }
 
-unsigned strlen(char *s)
+unsigned strlen(char *STRING s)
 {
   int i;
   i = 0; 
@@ -496,8 +496,8 @@ int dn_expand(const u_char *msg, const u_char *eomorig,
 extern int nondet_int();
 
 //bind.c
-int dn_expand(const u_char *msg, const u_char *eomorig,
-              const u_char *comp_dn, char *exp_dn, int length)
+int dn_expand(const u_char *STRING msg, const u_char *eomorig,
+              const u_char *STRING comp_dn, char *exp_dn, int length)
 {
   if (nondet_int ())
     return -1;
@@ -511,7 +511,7 @@ int dn_expand(const u_char *msg, const u_char *eomorig,
 #define SPACE_FOR_VARS 2
 
 static int
-rrextract(u_char *msg, int msglen, u_char *rrp, u_char *dname, int namelen)
+rrextract(u_char *STRING msg, int msglen, u_char *STRING rrp, u_char *STRING dname, int namelen)
 {
   u_char *eom, *cp, *cp1, *rdatap;
   u_int class, type, dlen;
diff --git a/tests/jessie/CVE-1999-0368-simple-ok.c b/tests/jessie/CVE-1999-0368-simple-ok.c
index 2b6ee051a52a116a7e5fefc920005813fa5aef88..c1d2359359a0fa0059d8cfffe47b322b0b3b49e9 100644
--- a/tests/jessie/CVE-1999-0368-simple-ok.c
+++ b/tests/jessie/CVE-1999-0368-simple-ok.c
@@ -126,7 +126,7 @@ char *r_memcpy(char *dest, const char *src, size_t n)
   return dest;
 }
 
-char *r_strncpy (char *dest, const char *src, size_t n)
+char *r_strncpy (char *dest, const char *STRING src, size_t n)
 {
   int _i;
 
diff --git a/tests/jessie/Makefile b/tests/jessie/Makefile
index be6b95f6d77bf2d7cf6983bc84b4f0553727f289..fa3fc8e56ee8067fab3afc64ab12034c061f701c 100644
--- a/tests/jessie/Makefile
+++ b/tests/jessie/Makefile
@@ -26,7 +26,7 @@ EXECCADUCEUS=WHYLIB=$(WHYLIB) CADUCEUSLIB=$(CADUCEUSLIB) $(CADUCEUS) \
 
 CFILES=$(shell ls *.c)
 
-PPC_OPTIONS += $(PPCHOME)/src/jessie/prolog.c
+PPC_OPTIONS += -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h" $(PPCHOME)/src/jessie/prolog.c
 
 # generating and type-checking Why files for all C files
 default:
diff --git a/tests/jessie/copy_struct.c b/tests/jessie/copy_struct.c
index d75a0212b3335c25a3e88826fa836743cf94783c..bf109be4d3ece597772557dca5e21ca65ebe2380 100644
--- a/tests/jessie/copy_struct.c
+++ b/tests/jessie/copy_struct.c
@@ -26,8 +26,8 @@ struct T id(struct T p) {
 }
 
 /*@ requires \valid(p);
-  @ ensures \result.a.i == p.a.i && \result.a.j == p.a.j;
-  @ ensures \result.b.i == p.b.i && \result.b.j == p.b.j;
+  @ ensures \result.a.i == p->a.i && \result.a.j == p->a.j;
+  @ ensures \result.b.i == p->b.i && \result.b.j == p->b.j;
   @ */
 struct T idp(struct T* p) {
   return *p;
diff --git a/tests/jessie/dassault_1.c b/tests/jessie/dassault_1.c
index 43f6a352d4549b93a75cd1bb73d97f523fdb35ff..70d9c244d56d212de14e804f6eaae78889e61136 100644
--- a/tests/jessie/dassault_1.c
+++ b/tests/jessie/dassault_1.c
@@ -47,6 +47,8 @@ typedef struct las
 las x;
 las2 y;
 
+/*@ ensures \result == x.a.d.b[0].c + y.b[1].c;
+  @ */
 int f() {
   return x.a.d.b[0].c + y.b[1].c;
 }
diff --git a/tests/jessie/invariant.c b/tests/jessie/invariant.c
index 6dd93e36146776221eb9a974f2f76baf931a25ec..8b49a96a570ac31a03073edd502efa94ac1fd4d5 100644
--- a/tests/jessie/invariant.c
+++ b/tests/jessie/invariant.c
@@ -27,6 +27,11 @@ const struct {
   int y;
 } s;
 
+/*@ ensures \result == s.x + s.y;
+  @*/
+int sum() {
+  return s.x + s.y;
+}
 
 /* 
 Local Variables:
diff --git a/tests/jessie/minix3_memchr.c b/tests/jessie/minix3_memchr.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ba7156ac0db086376573916f15d620077248fcd
--- /dev/null
+++ b/tests/jessie/minix3_memchr.c
@@ -0,0 +1,32 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_memchr.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+void *
+memchr(const void *s, register int c, register size_t n)
+{
+	register const unsigned char *s1 = s;
+
+	c = (unsigned char) c;
+	if (n) {
+		n++;
+		while (--n > 0) {
+			if (*s1++ != c) continue;
+			return (void *) --s1;
+		}
+	}
+	return NULL;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_memchr.c"
+End:
+*/
diff --git a/tests/jessie/minix3_memcmp.c b/tests/jessie/minix3_memcmp.c
new file mode 100644
index 0000000000000000000000000000000000000000..898c357a559db66df29d35ae45c4a3ad6c1f978e
--- /dev/null
+++ b/tests/jessie/minix3_memcmp.c
@@ -0,0 +1,31 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Id: minix3_memcmp.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+int
+memcmp(const void *s1, const void *s2, size_t n)
+{
+	register const unsigned char *p1 = s1, *p2 = s2;
+
+	if (n) {
+		n++;
+		while (--n > 0) {
+			if (*p1++ == *p2++) continue;
+			return *--p1 - *--p2;
+		}
+	}
+	return 0;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_memcmp.c"
+End:
+*/
diff --git a/tests/jessie/minix3_memcpy.c b/tests/jessie/minix3_memcpy.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6742e59a6fb3366af5932ac0bd376d4514f4b50
--- /dev/null
+++ b/tests/jessie/minix3_memcpy.c
@@ -0,0 +1,32 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_memcpy.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+void *
+memcpy(void *s1, const void *s2, register size_t n)
+{
+	register char *p1 = s1;
+	register const char *p2 = s2;
+
+
+	if (n) {
+		n++;
+		while (--n > 0) {
+			*p1++ = *p2++;
+		}
+	}
+	return s1;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_memcpy.c"
+End:
+*/
diff --git a/tests/jessie/minix3_memmove.c b/tests/jessie/minix3_memmove.c
new file mode 100644
index 0000000000000000000000000000000000000000..472369665ab554aa4d48e516eca6b3bbd59a2ebd
--- /dev/null
+++ b/tests/jessie/minix3_memmove.c
@@ -0,0 +1,41 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_memmove.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+void *
+memmove(void *s1, const void *s2, register size_t n)
+{
+	register char *p1 = s1;
+	register const char *p2 = s2;
+
+	if (n>0) {
+		if (p2 <= p1 && p2 + n > p1) {
+			/* overlap, copy backwards */
+			p1 += n;
+			p2 += n;
+			n++;
+			while (--n > 0) {
+				*--p1 = *--p2;
+			}
+		} else {
+			n++;
+			while (--n > 0) {
+				*p1++ = *p2++;
+			}
+		}
+	}
+	return s1;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_memmove.c"
+End:
+*/
diff --git a/tests/jessie/minix3_memset.c b/tests/jessie/minix3_memset.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b4f32eb8e461367d57b706822bb58895ec77b0d
--- /dev/null
+++ b/tests/jessie/minix3_memset.c
@@ -0,0 +1,30 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_memset.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+void *
+memset(void *s, register int c, register size_t n)
+{
+	register char *s1 = s;
+
+	if (n>0) {
+		n++;
+		while (--n > 0) {
+			*s1++ = c;
+		}
+	}
+	return s;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_memset.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strcat.c b/tests/jessie/minix3_strcat.c
new file mode 100644
index 0000000000000000000000000000000000000000..28564fc8d9346de9f614006f3dd24ddce1761963
--- /dev/null
+++ b/tests/jessie/minix3_strcat.c
@@ -0,0 +1,30 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strcat.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strcat(char *STRING ret, register const char *STRING s2)
+{
+	register char *s1 = ret;
+
+	while (*s1++ != '\0')
+		/* EMPTY */ ;
+	s1--;
+	while (*s1++ = *s2++)
+		/* EMPTY */ ;
+	return ret;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strcat.c"
+End:
+*/
+
diff --git a/tests/jessie/minix3_strchr.c b/tests/jessie/minix3_strchr.c
new file mode 100644
index 0000000000000000000000000000000000000000..4831e404c626f93df3177f5727bf897b8b6fbee1
--- /dev/null
+++ b/tests/jessie/minix3_strchr.c
@@ -0,0 +1,27 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strchr.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strchr(register const char *STRING s, register int c)
+{
+	c = (char) c;
+
+	while (c != *s) {
+		if (*s++ == '\0') return NULL;
+	}
+	return (char *)s;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strchr.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strcmp.c b/tests/jessie/minix3_strcmp.c
new file mode 100644
index 0000000000000000000000000000000000000000..a342fbcd1358082bcab152f6f8fa1959432dbd08
--- /dev/null
+++ b/tests/jessie/minix3_strcmp.c
@@ -0,0 +1,29 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Id: minix3_strcmp.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+int
+strcmp(register const char *STRING s1, register const char *STRING s2)
+{
+	while (*s1 == *s2++) {
+		if (*s1++ == '\0') {
+			return 0;
+		}
+	}
+	if (*s1 == '\0') return -1;
+	if (*--s2 == '\0') return 1;
+	return (unsigned char) *s1 - (unsigned char) *s2;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strcmp.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strcoll.c b/tests/jessie/minix3_strcoll.c
new file mode 100644
index 0000000000000000000000000000000000000000..b02d9622234093070b814c0402091eef1188d88d
--- /dev/null
+++ b/tests/jessie/minix3_strcoll.c
@@ -0,0 +1,28 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strcoll.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+#include	<locale.h>
+
+int
+strcoll(register const char *STRING s1, register const char *STRING s2)
+{
+	while (*s1 == *s2++) {
+		if (*s1++ == '\0') {
+			return 0;
+		}
+	}
+	return *s1 - *--s2;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strcoll.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strcpy.c b/tests/jessie/minix3_strcpy.c
new file mode 100644
index 0000000000000000000000000000000000000000..ccc60985d2ff66606551e40271abfda337b3baba
--- /dev/null
+++ b/tests/jessie/minix3_strcpy.c
@@ -0,0 +1,27 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strcpy.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strcpy(char *ret, register const char *STRING s2)
+{
+	register char *s1 = ret;
+
+	while (*s1++ = *s2++)
+		/* EMPTY */ ;
+
+	return ret;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strcpy.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strcspn.c b/tests/jessie/minix3_strcspn.c
new file mode 100644
index 0000000000000000000000000000000000000000..0bce37699d430f1dfbd83b76de963c0320ade265
--- /dev/null
+++ b/tests/jessie/minix3_strcspn.c
@@ -0,0 +1,30 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strcspn.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strcspn(const char *STRING string, const char *STRING notin)
+{
+	register const char *s1, *s2;
+
+	for (s1 = string; *s1; s1++) {
+		for(s2 = notin; *s2 != *s1 && *s2; s2++)
+			/* EMPTY */ ;
+		if (*s2)
+			break;
+	}
+	return s1 - string;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strcspn.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strerror.c b/tests/jessie/minix3_strerror.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2a37276c23d66fb86babc27f534175b59e17234
--- /dev/null
+++ b/tests/jessie/minix3_strerror.c
@@ -0,0 +1,31 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strerror.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+/*
+ * I don't know why, but X3J11 says that strerror() should be in declared
+ * in <string.h>.  That is why the function is defined here.
+ */
+char *
+strerror(register int errnum)
+{
+	extern const char *_sys_errlist[];
+	extern const int _sys_nerr;
+
+  	if (errnum < 0 || errnum >= _sys_nerr)
+		return "unknown error";
+	return (char *)_sys_errlist[errnum];
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strerror.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strftime.c b/tests/jessie/minix3_strftime.c
new file mode 100644
index 0000000000000000000000000000000000000000..988b279dfe5cde938028862953c1025dd19ef469
--- /dev/null
+++ b/tests/jessie/minix3_strftime.c
@@ -0,0 +1,181 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * strftime - convert a structure to a string, controlled by an argument
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strftime.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<time.h>
+#include	"loc_time.h"
+
+/* The width can be -1 in both s_prnt() as in u_prnt(). This
+ * indicates that as many characters as needed should be printed.
+ */
+static char *
+s_prnt(char *s, size_t maxsize, const char *str, int width)
+{
+	while (width > 0 || (width < 0 && *str)) {
+		if (!maxsize) break;
+		*s++ = *str++;
+		maxsize--;
+		width--;
+	}
+	return s;
+}
+
+static char *
+u_prnt(char *s, size_t maxsize, unsigned val, int width)
+{
+	int c;
+
+	c = val % 10;
+	val = val / 10;
+	if (--width > 0 || (width < 0 && val != 0))
+		s = u_prnt(s, (maxsize ? maxsize - 1 : 0), val, width);
+	if (maxsize) *s++ = c + '0';
+	return s;
+}
+
+size_t
+strftime(char *s, size_t maxsize,
+		const char *format, const struct tm *timeptr)
+{
+	size_t n;
+	char *firsts, *olds;
+
+	if (!format) return 0;
+
+	_tzset();	/* for %Z conversion */
+	firsts = s;
+	while (maxsize && *format) {
+		while (maxsize && *format && *format != '%') {
+			*s++ = *format++;
+			maxsize--;
+		}
+		if (!maxsize || !*format) break;
+		format++;
+
+		olds = s;
+		switch (*format++) {
+		case 'a':
+			s = s_prnt(s, maxsize,
+					_days[timeptr->tm_wday], ABB_LEN);
+			maxsize -= s - olds;
+			break;
+		case 'A':
+			s = s_prnt(s, maxsize, _days[timeptr->tm_wday], -1);
+			maxsize -= s - olds;
+			break;
+		case 'b':
+			s = s_prnt(s, maxsize,
+					_months[timeptr->tm_mon], ABB_LEN);
+			maxsize -= s - olds;
+			break;
+		case 'B':
+			s = s_prnt(s, maxsize, _months[timeptr->tm_mon], -1);
+			maxsize -= s - olds;
+			break;
+		case 'c':
+			n = strftime(s, maxsize,
+					"%a %b %d %H:%M:%S %Y", timeptr);
+			if (n) maxsize -= n;
+			else maxsize = 0;
+			s += n;
+			break;
+		case 'd':
+			s = u_prnt(s, maxsize, timeptr->tm_mday, 2);
+			maxsize -= s - olds;
+			break;
+		case 'H':
+			s = u_prnt(s, maxsize, timeptr->tm_hour, 2);
+			maxsize -= s - olds;
+			break;
+		case 'I':
+			s = u_prnt(s, maxsize,
+					(timeptr->tm_hour + 11) % 12 + 1, 2);
+			maxsize -= s - olds;
+			break;
+		case 'j':
+			s = u_prnt(s, maxsize, timeptr->tm_yday + 1, 3);
+			maxsize -= s - olds;
+			break;
+		case 'm':
+			s = u_prnt(s, maxsize, timeptr->tm_mon + 1, 2);
+			maxsize -= s - olds;
+			break;
+		case 'M':
+			s = u_prnt(s, maxsize, timeptr->tm_min, 2);
+			maxsize -= s - olds;
+			break;
+		case 'p':
+			s = s_prnt(s, maxsize,
+				    (timeptr->tm_hour < 12) ? "AM" : "PM", 2);
+			maxsize -= s - olds;
+			break;
+		case 'S':
+			s = u_prnt(s, maxsize, timeptr->tm_sec, 2);
+			maxsize -= s - olds;
+			break;
+		case 'U':
+			s = u_prnt(s, maxsize,		/* ??? */
+			    (timeptr->tm_yday + 7 - timeptr->tm_wday) / 7, 2);
+			maxsize -= s - olds;
+			break;
+		case 'w':
+			s = u_prnt(s, maxsize, timeptr->tm_wday, 1);
+			maxsize -= s - olds;
+			break;
+		case 'W':
+			s = u_prnt(s, maxsize,		/* ??? */
+			    (timeptr->tm_yday+7-(timeptr->tm_wday+6)%7)/7,2);
+			maxsize -= s - olds;
+			break;
+		case 'x':
+			n = strftime(s, maxsize, "%a %b %d %Y", timeptr);
+			if (n) maxsize -= n;
+			else maxsize = 0;
+			s += n;
+			break;
+		case 'X':
+			n = strftime(s, maxsize, "%H:%M:%S", timeptr);
+			if (n) maxsize -= n;
+			else maxsize = 0;
+			s += n;
+			break;
+		case 'y':
+			s = u_prnt(s, maxsize, timeptr->tm_year % 100, 2);
+			maxsize -= s - olds;
+			break;
+		case 'Y':
+			s = u_prnt(s, maxsize, timeptr->tm_year + YEAR0, -1);
+			maxsize -= s - olds;
+			break;
+		case 'Z':
+			s = s_prnt(s, maxsize,
+					_tzname[(timeptr->tm_isdst > 0)], -1);
+			maxsize -= s - olds;
+			break;
+		case '%':
+			*s++ = '%';
+			maxsize--;
+			break;
+		default:
+			/* A conversion error. Leave the loop. */
+			while (*format) format++;
+			break;
+		}
+
+	}
+	if (maxsize) {
+		*s = '\0';
+		return s - firsts;
+	}
+	return 0;	/* The buffer is full */
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strftime.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strlen.c b/tests/jessie/minix3_strlen.c
new file mode 100644
index 0000000000000000000000000000000000000000..3c182a1e68db32c8a71c12fe02bbc26e39a681a6
--- /dev/null
+++ b/tests/jessie/minix3_strlen.c
@@ -0,0 +1,27 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strlen.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strlen(const char *STRING org)
+{
+	register const char *s = org;
+
+	while (*s++)
+		/* EMPTY */ ;
+
+	return --s - org;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strlen.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strncat.c b/tests/jessie/minix3_strncat.c
new file mode 100644
index 0000000000000000000000000000000000000000..249de8515da71f47fd647c5baf30549c58aac573
--- /dev/null
+++ b/tests/jessie/minix3_strncat.c
@@ -0,0 +1,34 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strncat.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strncat(char *STRING ret, register const char *STRING s2, size_t n)
+{
+	register char *s1 = ret;
+
+	if (n > 0) {
+		while (*s1++)
+			/* EMPTY */ ;
+		s1--;
+		while (*s1++ = *s2++)  {
+			if (--n > 0) continue;
+			*s1 = '\0';
+			break;
+		}
+		return ret;
+	} else return s1;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strncat.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strncmp.c b/tests/jessie/minix3_strncmp.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae6e63237e42fb3d6f05e27460f71d79a21a5124
--- /dev/null
+++ b/tests/jessie/minix3_strncmp.c
@@ -0,0 +1,35 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Id: minix3_strncmp.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+int
+strncmp(register const char *STRING s1, register const char *STRING s2, register size_t n)
+{
+	if (n) {
+		do {
+			if (*s1 != *s2++)
+				break;
+			if (*s1++ == '\0')
+				return 0;
+		} while (--n > 0);
+		if (n > 0) {
+			if (*s1 == '\0') return -1;
+			if (*--s2 == '\0') return 1;
+			return (unsigned char) *s1 - (unsigned char) *s2;
+		}
+	}
+	return 0;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strncmp.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strncpy.c b/tests/jessie/minix3_strncpy.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bfce7053232441d1a753c2d55ec088aca6669f5
--- /dev/null
+++ b/tests/jessie/minix3_strncpy.c
@@ -0,0 +1,33 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strncpy.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strncpy(char *ret, register const char *STRING s2, register size_t n)
+{
+	register char *s1 = ret;
+
+	if (n>0) {
+		while((*s1++ = *s2++) && --n > 0)
+			/* EMPTY */ ;
+		if ((*--s2 == '\0') && --n > 0) {
+			do {
+				*s1++ = '\0';
+			} while(--n > 0);
+		}
+	}
+	return ret;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strncpy.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strpbrk.c b/tests/jessie/minix3_strpbrk.c
new file mode 100644
index 0000000000000000000000000000000000000000..e67eadc955555f5c7394fb3cbb53703148fe3148
--- /dev/null
+++ b/tests/jessie/minix3_strpbrk.c
@@ -0,0 +1,31 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strpbrk.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strpbrk(register const char *STRING string, register const char *STRING brk)
+{
+	register const char *s1;
+
+	while (*string) {
+		for (s1 = brk; *s1 && *s1 != *string; s1++)
+			/* EMPTY */ ;
+		if (*s1)
+			return (char *)string;
+		string++;
+	}
+	return (char *)NULL;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strpbrk.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strrchr.c b/tests/jessie/minix3_strrchr.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7b29a7fe623845e325da6745a5e4bc4f34bfd88
--- /dev/null
+++ b/tests/jessie/minix3_strrchr.c
@@ -0,0 +1,31 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strrchr.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+char *
+strrchr(register const char *STRING s, int c)
+{
+	register const char *result = NULL;
+
+	c = (char) c;
+
+	do {
+		if (c == *s)
+			result = s;
+	} while (*s++ != '\0');
+
+	return (char *)result;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strrchr.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strspn.c b/tests/jessie/minix3_strspn.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bdc11e0361dcb4c794a08df96fae9314a4d2a50
--- /dev/null
+++ b/tests/jessie/minix3_strspn.c
@@ -0,0 +1,30 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strspn.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strspn(const char *STRING string, const char *STRING in)
+{
+	register const char *s1, *s2;
+
+	for (s1 = string; *s1; s1++) {
+		for (s2 = in; *s2 && *s2 != *s1; s2++)
+			/* EMPTY */ ;
+		if (*s2 == '\0')
+			break;
+	}
+	return s1 - string;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strspn.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strstr.c b/tests/jessie/minix3_strstr.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ef5e81608a2a62e2d95abf66bbdc32b7a50f898
--- /dev/null
+++ b/tests/jessie/minix3_strstr.c
@@ -0,0 +1,58 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strstr.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strlen(const char *STRING org)
+{
+	register const char *s = org;
+
+	while (*s++)
+		/* EMPTY */ ;
+
+	return --s - org;
+}
+
+int
+strncmp(register const char *STRING s1, register const char *STRING s2, register size_t n)
+{
+	if (n) {
+		do {
+			if (*s1 != *s2++)
+				break;
+			if (*s1++ == '\0')
+				return 0;
+		} while (--n > 0);
+		if (n > 0) {
+			if (*s1 == '\0') return -1;
+			if (*--s2 == '\0') return 1;
+			return (unsigned char) *s1 - (unsigned char) *s2;
+		}
+	}
+	return 0;
+}
+
+char *
+strstr(register const char *STRING s, register const char *STRING wanted)
+{
+	register const size_t len = strlen(wanted);
+
+	if (len == 0) return (char *)s;
+	while (*s != *wanted || strncmp(s, wanted, len))
+		if (*s++ == '\0')
+			return (char *)NULL;
+	return (char *)s;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strstr.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strtok.c b/tests/jessie/minix3_strtok.c
new file mode 100644
index 0000000000000000000000000000000000000000..5973deb5a272cebb551328e6b764ac8e83e643ad
--- /dev/null
+++ b/tests/jessie/minix3_strtok.c
@@ -0,0 +1,69 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strtok.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strspn(const char *STRING string, const char *STRING in)
+{
+	register const char *s1, *s2;
+
+	for (s1 = string; *s1; s1++) {
+		for (s2 = in; *s2 && *s2 != *s1; s2++)
+			/* EMPTY */ ;
+		if (*s2 == '\0')
+			break;
+	}
+	return s1 - string;
+}
+
+char *
+strpbrk(register const char *STRING string, register const char *STRING brk)
+{
+	register const char *s1;
+
+	while (*string) {
+		for (s1 = brk; *s1 && *s1 != *string; s1++)
+			/* EMPTY */ ;
+		if (*s1)
+			return (char *)string;
+		string++;
+	}
+	return (char *)NULL;
+}
+
+char *
+strtok(register char *STRING string, const char *STRING separators)
+{
+	register char *s1, *s2;
+	static char *savestring;
+
+	if (string == NULL) {
+		string = savestring;
+		if (string == NULL) return (char *)NULL;
+	}
+
+	s1 = string + strspn(string, separators);
+	if (*s1 == '\0') {
+		savestring = NULL;
+		return (char *)NULL;
+	}
+
+	s2 = strpbrk(s1, separators);
+	if (s2 != NULL)
+		*s2++ = '\0';
+	savestring = s2;
+	return s1;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strtok.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strtol.c b/tests/jessie/minix3_strtol.c
new file mode 100644
index 0000000000000000000000000000000000000000..991d219b10e8dd05caa90610beb9806b66f636a2
--- /dev/null
+++ b/tests/jessie/minix3_strtol.c
@@ -0,0 +1,110 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strtol.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<ctype.h>
+#include	<errno.h>
+#include	<limits.h>
+#include	<stdlib.h>
+
+static unsigned long
+string2long(register const char *STRING nptr, char **endptr,
+			int base, int is_signed);
+
+long int
+strtol(register const char *STRING nptr, char **endptr, int base)
+{
+	return (signed long)string2long(nptr, endptr, base, 1);
+}
+
+unsigned long int
+strtoul(register const char *STRING nptr, char **endptr, int base)
+{
+	return (unsigned long)string2long(nptr, endptr, base, 0);
+}
+
+#define between(a, c, z)  ((unsigned) ((c) - (a)) <= (unsigned) ((z) - (a)))
+
+static unsigned long
+string2long(register const char *STRING nptr, char ** const endptr,
+			int base, int is_signed)
+{
+	register unsigned int v;
+	register unsigned long val = 0;
+	register int c;
+	int ovfl = 0, sign = 1;
+	const char *startnptr = nptr, *nrstart;
+
+	if (endptr) *endptr = (char *)nptr;
+	while (isspace(*nptr)) nptr++;
+	c = *nptr;
+
+	if (c == '-' || c == '+') {
+		if (c == '-') sign = -1;
+		nptr++;
+	}
+	nrstart = nptr;			/* start of the number */
+
+	/* When base is 0, the syntax determines the actual base */
+	if (base == 0)
+		if (*nptr == '0')
+			if (*++nptr == 'x' || *nptr == 'X') {
+				base = 16;
+				nptr++;
+			}
+			else	base = 8;
+		else	base = 10;
+	else if (base==16 && *nptr=='0' && (*++nptr =='x' || *nptr =='X'))
+		nptr++;
+
+	for (;;) {
+		c = *nptr;
+		if (between('0', c, '9')) {
+			v = c - '0';
+		} else
+		if (between('a', c, 'z')) {
+			v = c - 'a' + 0xa;
+		} else
+		if (between('A', c, 'Z')) {
+			v = c - 'A' + 0xA;
+		} else {
+			break;
+		}
+		if (v >= base) break;
+		if (val > (ULONG_MAX - v) / base) ovfl++;
+		val = (val * base) + v;
+		nptr++;
+	}
+	if (endptr) {
+		if (nrstart == nptr) *endptr = (char *)startnptr;
+		else *endptr = (char *)nptr;
+	}
+
+	if (!ovfl) {
+		/* Overflow is only possible when converting a signed long. */
+		if (is_signed
+		    && (   (sign < 0 && val > -(unsigned long)LONG_MIN)
+			|| (sign > 0 && val > LONG_MAX)))
+		    ovfl++;
+	}
+
+	if (ovfl) {
+		errno = ERANGE;
+		if (is_signed)
+			if (sign < 0) return LONG_MIN;
+			else return LONG_MAX;
+		else return ULONG_MAX;
+	}
+	return (long) sign * val;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strtol.c"
+End:
+*/
diff --git a/tests/jessie/minix3_strxfrm.c b/tests/jessie/minix3_strxfrm.c
new file mode 100644
index 0000000000000000000000000000000000000000..a1f8a3ac38c7b5dda34a9522651a9e2446b3c960
--- /dev/null
+++ b/tests/jessie/minix3_strxfrm.c
@@ -0,0 +1,33 @@
+/*
+@PPC_OPTIONS: -cpp-command "gcc -C -E -I. -I minix3_include -include $(PPCHOME)/src/jessie/prolog.h"
+ */
+/*
+ * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
+ * See the copyright notice in the ACK home directory, in the file "Copyright".
+ */
+/* $Header: /root/MIGRATION/ppc/tests/jessie/minix3_strxfrm.c,v 1.1 2007-11-30 13:04:08 uid570 Exp $ */
+
+#include	<string.h>
+
+size_t
+strxfrm(register char *s1, register const char *STRING save, register size_t n)
+{
+	register const char *s2 = save;
+
+	while (*s2) {
+		if (n > 1) {
+			n--;
+			*s1++ = *s2++;
+		} else
+			s2++;
+	}
+	if (n > 0)
+		*s1++ = '\0';
+	return s2 - save;
+}
+
+/* 
+Local Variables:
+compile-command: "./run_test.sh minix3_strxfrm.c"
+End:
+*/
diff --git a/tests/jessie/minusminus.c b/tests/jessie/minusminus.c
index 11b811c710b20fc2586d588cae35aee613092cd2..3e0c25aa65c789d25fb1d60b1949851963a19e5d 100644
--- a/tests/jessie/minusminus.c
+++ b/tests/jessie/minusminus.c
@@ -22,6 +22,9 @@
 /*                                                                        */
 /**************************************************************************/
 
+/*@ requires *p == 1;
+  @ ensures *p != 0;
+  @ */
 void f(char *p) {
   p--;
 }
diff --git a/tests/jessie/oracle/BID-6679-loop-bad.err.oracle b/tests/jessie/oracle/BID-6679-loop-bad.err.oracle
index 0956d79eba3934f1a9c649912e86418d48ee5a88..ef6b976f52e292acb39c68f25f77ae61c601202f 100644
--- a/tests/jessie/oracle/BID-6679-loop-bad.err.oracle
+++ b/tests/jessie/oracle/BID-6679-loop-bad.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. BID-6679-loop-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h BID-6679-loop-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function message_write
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function message_write
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/BID-6679-loop-bad.res.oracle b/tests/jessie/oracle/BID-6679-loop-bad.res.oracle
index fc2e11107ee986f4e7e6185df2bbe19386e31660..b3ed01a6af1aa9bd0afce111ac0eea996918fbc2 100644
--- a/tests/jessie/oracle/BID-6679-loop-bad.res.oracle
+++ b/tests/jessie/oracle/BID-6679-loop-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/BID-6679-loop-bad_why.why : ......**.*..*......*..*...*.***. (22/10/0/0/0)
-total   :  32
-valid   :  22 ( 69%)
-invalid :  10 ( 31%)
-unknown :   0 (  0%)
+why/BID-6679-loop-bad_why.why : .?????...??............................?............................. (61/0/8/0/0)
+total   :  69
+valid   :  61 ( 88%)
+invalid :   0 (  0%)
+unknown :   8 ( 12%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/BID-6679-loop-ok.err.oracle b/tests/jessie/oracle/BID-6679-loop-ok.err.oracle
index f55a6a32129021a758ef036a862c4dca2ab8c2fd..58d2576a96f23b3aa86e3c52d89e10f9a1e3045f 100644
--- a/tests/jessie/oracle/BID-6679-loop-ok.err.oracle
+++ b/tests/jessie/oracle/BID-6679-loop-ok.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. BID-6679-loop-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h BID-6679-loop-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function message_write
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function message_write
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/BID-6679-loop-ok.res.oracle b/tests/jessie/oracle/BID-6679-loop-ok.res.oracle
index 14a187afce5b5879bfa64f73e86c8261b354695c..a9c88222f64bfcbe7fcff6b491d386de5b7d9f11 100644
--- a/tests/jessie/oracle/BID-6679-loop-ok.res.oracle
+++ b/tests/jessie/oracle/BID-6679-loop-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/BID-6679-loop-ok_why.why  : ......**.*..*.........*...*.***. (23/9/0/0/0)
-total   :  32
-valid   :  23 ( 72%)
-invalid :   9 ( 28%)
-unknown :   0 (  0%)
+why/BID-6679-loop-ok_why.why  : .....??....................................... (44/0/2/0/0)
+total   :  46
+valid   :  44 ( 96%)
+invalid :   0 (  0%)
+unknown :   2 (  4%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.err.oracle b/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.err.oracle
index d650677b09ba38e0f715f4f4ff635d1d71bfb2ba..f5e1c1f15b1055d8d0bc310a1f08772774ae9e39 100644
--- a/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.err.oracle
+++ b/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.err.oracle
@@ -1,4 +1,16 @@
-[preprocessing] running gcc -C -E -I. CA-1999-14-nxtsimp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CA-1999-14-nxtsimp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_memcpy
+FIXME: Warning: ignoring second declaration of function strlen
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function dn_expand
+FIXME: Warning: ignoring second declaration of function nondet_short
+FIXME: Warning: ignoring second declaration of function rrextract
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -12,3 +24,7 @@ FIXME: Warning: ignoring second declaration of function dn_expand
 FIXME: Warning: ignoring second declaration of function nondet_short
 FIXME: Warning: ignoring second declaration of function rrextract
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.res.oracle b/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.res.oracle
index c65a93e534cc533903bceca1eb95e3ed780fb41b..baa44cee3d3e33e3b135f2f08be9ba3be40ed18a 100644
--- a/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.res.oracle
+++ b/tests/jessie/oracle/CA-1999-14-nxtsimp-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CA-1999-14-nxtsimp-bad_why.why: **.........*...****..****.......*..*....** (27/15/0/0/0)
-total   :  42
-valid   :  27 ( 64%)
-invalid :  15 ( 36%)
-unknown :   0 (  0%)
+why/CA-1999-14-nxtsimp-bad_why.why: ....................??.......???..?.?........???.. (40/0/10/0/0)
+total   :  50
+valid   :  40 ( 80%)
+invalid :   0 (  0%)
+unknown :  10 ( 20%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.err.oracle b/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.err.oracle
index 0aced4659524d9182a35ce02a6cbaf270c7e7050..f7eb8ec9cf8a3f2901ad9c02cae3afe8fcecc811 100644
--- a/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.err.oracle
+++ b/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.err.oracle
@@ -1,4 +1,16 @@
-[preprocessing] running gcc -C -E -I. CA-1999-14-nxtsimp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CA-1999-14-nxtsimp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_memcpy
+FIXME: Warning: ignoring second declaration of function strlen
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function dn_expand
+FIXME: Warning: ignoring second declaration of function nondet_short
+FIXME: Warning: ignoring second declaration of function rrextract
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -12,3 +24,7 @@ FIXME: Warning: ignoring second declaration of function dn_expand
 FIXME: Warning: ignoring second declaration of function nondet_short
 FIXME: Warning: ignoring second declaration of function rrextract
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.res.oracle b/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.res.oracle
index 87c5d5177ca243d30c9ca0b8c9fbae35cb04f3ea..64ae55eca5c9447157d106ecf5b55dd826ec1d08 100644
--- a/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.res.oracle
+++ b/tests/jessie/oracle/CA-1999-14-nxtsimp-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CA-1999-14-nxtsimp-ok_why.why: **.........*...****..****.......*..*....** (27/15/0/0/0)
-total   :  42
-valid   :  27 ( 64%)
-invalid :  15 ( 36%)
-unknown :   0 (  0%)
-timeout :   0 (  0%)
+why/CA-1999-14-nxtsimp-ok_why.why: ........?????????...............??...........??................###...#.###..#.##......................... (82/0/13/10/0)
+total   : 105
+valid   :  82 ( 78%)
+invalid :   0 (  0%)
+unknown :  13 ( 12%)
+timeout :  10 ( 10%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.err.oracle b/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.err.oracle
index 6fde581b466df9580948bd80c6d01ab3b7850a57..4d1ca47701978c3b4c4c25d2a4e356a997b87131 100644
--- a/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. CVE-1999-0047-arroneno-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-1999-0047-arroneno-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,4 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.res.oracle b/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.res.oracle
index 3865bc382959d2e33e6e0c283f1cc7483e0d5ab3..5e96dbb5d0ebf5e70bd0556a2d8562eab86d15e6 100644
--- a/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-1999-0047-arroneno-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-1999-0047-arroneno-bad_why.why: ..**.* (3/3/0/0/0)
-total   :   6
-valid   :   3 ( 50%)
-invalid :   3 ( 50%)
-unknown :   0 (  0%)
+why/CVE-1999-0047-arroneno-bad_why.why: .??..?...?. (7/0/4/0/0)
+total   :  11
+valid   :   7 ( 64%)
+invalid :   0 (  0%)
+unknown :   4 ( 36%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.err.oracle b/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.err.oracle
index 40a6705458fe1c428b9fea2065d260097cf454ab..84c80c242d1aa5bc62bf44c1e01ef08adc1984a1 100644
--- a/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. CVE-1999-0047-arroneno-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-1999-0047-arroneno-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,4 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.res.oracle b/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.res.oracle
index 7a542388e4f0c379278ef9969491bb715c2b72bf..426afac1d38b058b05dc3969dce1e77f0168ec98 100644
--- a/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-1999-0047-arroneno-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-1999-0047-arroneno-ok_why.why: ..**.* (3/3/0/0/0)
-total   :   6
-valid   :   3 ( 50%)
-invalid :   3 ( 50%)
-unknown :   0 (  0%)
+why/CVE-1999-0047-arroneno-ok_why.why: .??.......... (11/0/2/0/0)
+total   :  13
+valid   :  11 ( 85%)
+invalid :   0 (  0%)
+unknown :   2 ( 15%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-1999-0368-simple-bad.err.oracle b/tests/jessie/oracle/CVE-1999-0368-simple-bad.err.oracle
index 480fa8f6068c422d8ac256ea19d6b066ed15573d..10d8b7063ecf3826fae8613965a72b95a6ab0b5f 100644
--- a/tests/jessie/oracle/CVE-1999-0368-simple-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-1999-0368-simple-bad.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. CVE-1999-0368-simple-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-1999-0368-simple-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strcpy
+FIXME: Warning: ignoring second declaration of function realpath
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +16,4 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function r_strcpy
 FIXME: Warning: ignoring second declaration of function realpath
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-1999-0368-simple-bad.res.oracle b/tests/jessie/oracle/CVE-1999-0368-simple-bad.res.oracle
index ec2c8a075a39dd1eb0e6a6665d3300f3f7610b45..c8f0e9beb2c7ac4d717399b8533cf39d364d1a79 100644
--- a/tests/jessie/oracle/CVE-1999-0368-simple-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-1999-0368-simple-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-1999-0368-simple-bad_why.why: ......**....****....!!!!!!!! (14/6/0/0/8)
-total   :  28
-valid   :  14 ( 50%)
-invalid :   6 ( 21%)
-unknown :   0 (  0%)
+why/CVE-1999-0368-simple-bad_why.why: .......?.?..??...????? (13/0/9/0/0)
+total   :  22
+valid   :  13 ( 59%)
+invalid :   0 (  0%)
+unknown :   9 ( 41%)
 timeout :   0 (  0%)
-failure :   8 ( 29%)
+failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-1999-0368-simple-ok.err.oracle b/tests/jessie/oracle/CVE-1999-0368-simple-ok.err.oracle
index 62f3718aa2b33d4bb330f91330230470f718a5b4..c599a56e6aff316293697ac52e60fbcb66a4fa64 100644
--- a/tests/jessie/oracle/CVE-1999-0368-simple-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-1999-0368-simple-ok.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. CVE-1999-0368-simple-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-1999-0368-simple-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strncpy
+FIXME: Warning: ignoring second declaration of function realpath
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +16,4 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function r_strncpy
 FIXME: Warning: ignoring second declaration of function realpath
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-1999-0368-simple-ok.res.oracle b/tests/jessie/oracle/CVE-1999-0368-simple-ok.res.oracle
index 218ea8f8c2e729682e7f15f447dfaa2563a8c5a2..194f74f5d6f295705648f887be6cf529d45541ac 100644
--- a/tests/jessie/oracle/CVE-1999-0368-simple-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-1999-0368-simple-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-1999-0368-simple-ok_why.why: ......**....****....!!!!!!!! (14/6/0/0/8)
-total   :  28
-valid   :  14 ( 50%)
-invalid :   6 ( 21%)
-unknown :   0 (  0%)
+why/CVE-1999-0368-simple-ok_why.why: ...??........................???????? (27/0/10/0/0)
+total   :  37
+valid   :  27 ( 73%)
+invalid :   0 (  0%)
+unknown :  10 ( 27%)
 timeout :   0 (  0%)
-failure :   8 ( 29%)
+failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.err.oracle b/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.err.oracle
index 9d4f2262eb7368fe8aa3b2a00c7fc89666b9e9e6..a7ccd6a761e925a034e5ecbb607163233c67ab92 100644
--- a/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.err.oracle
@@ -1,4 +1,15 @@
-[preprocessing] running gcc -C -E -I. CVE-2004-0940-1Longarr-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2004-0940-1Longarr-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_char
+FIXME: Warning: ignoring second declaration of function ap_isspace
+FIXME: Warning: ignoring second declaration of function ap_tolower
+FIXME: Warning: ignoring second declaration of function ap_cpystrn
+FIXME: Warning: ignoring second declaration of function get_tag
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -11,3 +22,12 @@ FIXME: Warning: ignoring second declaration of function ap_tolower
 FIXME: Warning: ignoring second declaration of function ap_cpystrn
 FIXME: Warning: ignoring second declaration of function get_tag
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2004-0940-1Longarr-bad.why", line 195, characters 10-14:
+warning: mutable __string_done is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.res.oracle b/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.res.oracle
index 5196c1012610562011a81f44ede6d2fbae90032b..ec32b6069ca99830df167c789f3190dfe68f5a95 100644
--- a/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2004-0940-1Longarr-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2004-0940-1Longarr-bad_why.why: ..****..****.*..****************..*. (10/26/0/0/0)
-total   :  36
-valid   :  10 ( 28%)
-invalid :  26 ( 72%)
-unknown :   0 (  0%)
+why/CVE-2004-0940-1Longarr-bad_why.why: .............??.......?................................?.............?......?...........................?.?........?.????????. (109/0/17/0/0)
+total   : 126
+valid   : 109 ( 87%)
+invalid :   0 (  0%)
+unknown :  17 ( 13%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.err.oracle b/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.err.oracle
index 0c531d9cd025037c73cd4888e3a6073f54cb1363..f3cfeb790a6e724a95fcaabeed5a6992c4cd4256 100644
--- a/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.err.oracle
@@ -1,4 +1,15 @@
-[preprocessing] running gcc -C -E -I. CVE-2004-0940-1Longarr-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2004-0940-1Longarr-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_char
+FIXME: Warning: ignoring second declaration of function ap_isspace
+FIXME: Warning: ignoring second declaration of function ap_tolower
+FIXME: Warning: ignoring second declaration of function ap_cpystrn
+FIXME: Warning: ignoring second declaration of function get_tag
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -11,3 +22,12 @@ FIXME: Warning: ignoring second declaration of function ap_tolower
 FIXME: Warning: ignoring second declaration of function ap_cpystrn
 FIXME: Warning: ignoring second declaration of function get_tag
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2004-0940-1Longarr-ok.why", line 195, characters 10-14:
+warning: mutable __string_done is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.res.oracle b/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.res.oracle
index 66e6860d1cb05b8aae1138d7df9f31f0a2a1d814..5992c591e7708d0e247782c6e20cc19905905594 100644
--- a/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2004-0940-1Longarr-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2004-0940-1Longarr-ok_why.why: ..****..****.*..***********.******..*. (11/27/0/0/0)
-total   :  38
-valid   :  11 ( 29%)
-invalid :  27 ( 71%)
-unknown :   0 (  0%)
+why/CVE-2004-0940-1Longarr-ok_why.why: .............??.......?................................?.............?......?......................?...?.......?.????????. (105/0/17/0/0)
+total   : 122
+valid   : 105 ( 86%)
+invalid :   0 (  0%)
+unknown :  17 ( 14%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.err.oracle b/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.err.oracle
index 6291c34796ff23ff9a3c79d78e96bb99b9626361..ce7d3fcd67d67317467f39eaf069e84cd6c14c3a 100644
--- a/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6332-nosprintf-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6332-nosprintf-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function memcpy
+FIXME: Warning: ignoring second declaration of function encode_ie
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +16,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function memcpy
 FIXME: Warning: ignoring second declaration of function encode_ie
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.res.oracle b/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.res.oracle
index 2057e0f80747d46b1267ab2cb82e8e342b22b582..5ab6afa82c343e2409cdccb37fa58d053460d4ba 100644
--- a/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6332-nosprintf-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6332-nosprintf-bad_why.why: ....***.**......*.....**** (16/10/0/0/0)
-total   :  26
-valid   :  16 ( 62%)
-invalid :  10 ( 38%)
-unknown :   0 (  0%)
+why/CVE-2006-6332-nosprintf-bad_why.why: ?........................??..???............. (39/0/6/0/0)
+total   :  45
+valid   :  39 ( 87%)
+invalid :   0 (  0%)
+unknown :   6 ( 13%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.err.oracle b/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.err.oracle
index 21846e7f65ef4adef50cf8ea114d8c5a47867c92..9f1bde36a3a928b6117574347429b388da0993a9 100644
--- a/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6332-nosprintf-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6332-nosprintf-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function memcpy
+FIXME: Warning: ignoring second declaration of function encode_ie
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +16,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function memcpy
 FIXME: Warning: ignoring second declaration of function encode_ie
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.res.oracle b/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.res.oracle
index 5d070af8630100bf6e9e6e8b07d3ff3486b41066..a40e8c15b84a2f7c0c17c337c409f86e79838c0b 100644
--- a/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6332-nosprintf-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6332-nosprintf-ok_why.why: ....***.**......*.....**** (16/10/0/0/0)
-total   :  26
-valid   :  16 ( 62%)
-invalid :  10 ( 38%)
-unknown :   0 (  0%)
+why/CVE-2006-6332-nosprintf-ok_why.why: ?..........................??.................. (44/0/3/0/0)
+total   :  47
+valid   :  44 ( 94%)
+invalid :   0 (  0%)
+unknown :   3 (  6%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6749-perandom-bad.err.oracle b/tests/jessie/oracle/CVE-2006-6749-perandom-bad.err.oracle
index 805e528805204188eaa0585e0e4b0593347b1480..63798147037cc04cbfbe76de97dfc9850fb59c2c 100644
--- a/tests/jessie/oracle/CVE-2006-6749-perandom-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6749-perandom-bad.err.oracle
@@ -1,4 +1,14 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6749-perandom-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6749-perandom-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strcpy
+FIXME: Warning: ignoring second declaration of function strncpy
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function parse_expression
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -10,3 +20,5 @@ FIXME: Warning: ignoring second declaration of function strncpy
 FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function parse_expression
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2006-6749-perandom-bad.res.oracle b/tests/jessie/oracle/CVE-2006-6749-perandom-bad.res.oracle
index af49005ad5b411d39bd4ef8452f756fac72c2eff..af0e47256b01a99f3b73d64fe5306488ed5cbc0f 100644
--- a/tests/jessie/oracle/CVE-2006-6749-perandom-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6749-perandom-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6749-perandom-bad_why.why: .......*...*..****..****.. (16/10/0/0/0)
-total   :  26
-valid   :  16 ( 62%)
-invalid :  10 ( 38%)
-unknown :   0 (  0%)
+why/CVE-2006-6749-perandom-bad_why.why: .???.....??..?.....?.?..??............??.... (32/0/12/0/0)
+total   :  44
+valid   :  32 ( 73%)
+invalid :   0 (  0%)
+unknown :  12 ( 27%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6749-perandom-ok.err.oracle b/tests/jessie/oracle/CVE-2006-6749-perandom-ok.err.oracle
index 0ade9df8dbebfc5b375d0647b086916d6807bb9b..4ab4e94e315079f5e7d0a7622c93bda27ed0b473 100644
--- a/tests/jessie/oracle/CVE-2006-6749-perandom-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6749-perandom-ok.err.oracle
@@ -1,4 +1,14 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6749-perandom-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6749-perandom-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strcpy
+FIXME: Warning: ignoring second declaration of function strncpy
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function parse_expression
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -10,3 +20,5 @@ FIXME: Warning: ignoring second declaration of function strncpy
 FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function parse_expression
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2006-6749-perandom-ok.res.oracle b/tests/jessie/oracle/CVE-2006-6749-perandom-ok.res.oracle
index 566cce8223a83d0ea85f0a93d6c96e7b1daa51fa..7a32db2d36fd075530b73543bc773258bc6adc80 100644
--- a/tests/jessie/oracle/CVE-2006-6749-perandom-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6749-perandom-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6749-perandom-ok_why.why: .......*...*..****..****.. (16/10/0/0/0)
-total   :  26
-valid   :  16 ( 62%)
-invalid :  10 ( 38%)
-unknown :   0 (  0%)
+why/CVE-2006-6749-perandom-ok_why.why: .???.....??..?.....?.?..??............??.... (32/0/12/0/0)
+total   :  44
+valid   :  32 ( 73%)
+invalid :   0 (  0%)
+unknown :  12 ( 27%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6909-strchr-bad.err.oracle b/tests/jessie/oracle/CVE-2006-6909-strchr-bad.err.oracle
index a0b191f31e0f839b87daf64f6b852654778d61f8..fa1ce234604780660498adee63526603beb2d044 100644
--- a/tests/jessie/oracle/CVE-2006-6909-strchr-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6909-strchr-bad.err.oracle
@@ -1,4 +1,13 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6909-strchr-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6909-strchr-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strcpy
+FIXME: Warning: ignoring second declaration of function strchr
+FIXME: Warning: ignoring second declaration of function ftpls
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +18,8 @@ FIXME: Warning: ignoring second declaration of function r_strcpy
 FIXME: Warning: ignoring second declaration of function strchr
 FIXME: Warning: ignoring second declaration of function ftpls
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2006-6909-strchr-bad.why", line 125, characters 10-14:
+warning: mutable __string_ is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2006-6909-strchr-bad.res.oracle b/tests/jessie/oracle/CVE-2006-6909-strchr-bad.res.oracle
index d075cbb231f6ba4dcbf2035bd760484c0ee1abae..bc5132be4f993723a7651cf48b2bf89550ed7860 100644
--- a/tests/jessie/oracle/CVE-2006-6909-strchr-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6909-strchr-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6909-strchr-bad_why.why: ....***...*...*....*.****..**..***. (20/15/0/0/0)
-total   :  35
-valid   :  20 ( 57%)
-invalid :  15 ( 43%)
-unknown :   0 (  0%)
+why/CVE-2006-6909-strchr-bad_why.why: ..??....???..............??....?.?..??....???... (34/0/14/0/0)
+total   :  48
+valid   :  34 ( 71%)
+invalid :   0 (  0%)
+unknown :  14 ( 29%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2006-6909-strchr-ok.err.oracle b/tests/jessie/oracle/CVE-2006-6909-strchr-ok.err.oracle
index 103e34a3fcedcc52ee074ea77f78e0f11cbed3fa..b6f53f066d9f57312e37b2d6b992ac760fdaa512 100644
--- a/tests/jessie/oracle/CVE-2006-6909-strchr-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2006-6909-strchr-ok.err.oracle
@@ -1,4 +1,13 @@
-[preprocessing] running gcc -C -E -I. CVE-2006-6909-strchr-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2006-6909-strchr-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strncpy
+FIXME: Warning: ignoring second declaration of function strchr
+FIXME: Warning: ignoring second declaration of function ftpls
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +18,8 @@ FIXME: Warning: ignoring second declaration of function r_strncpy
 FIXME: Warning: ignoring second declaration of function strchr
 FIXME: Warning: ignoring second declaration of function ftpls
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2006-6909-strchr-ok.why", line 125, characters 10-14:
+warning: mutable __string_ is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2006-6909-strchr-ok.res.oracle b/tests/jessie/oracle/CVE-2006-6909-strchr-ok.res.oracle
index c936a9f5a2e2ad110a7ab60739b1581d0eb6b4c7..e5e455527f0ddef5a779140a9527381ae1f2704b 100644
--- a/tests/jessie/oracle/CVE-2006-6909-strchr-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2006-6909-strchr-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2006-6909-strchr-ok_why.why: ....***...*...*....*.****..**..***. (20/15/0/0/0)
-total   :  35
-valid   :  20 ( 57%)
-invalid :  15 ( 43%)
-unknown :   0 (  0%)
+why/CVE-2006-6909-strchr-ok_why.why: ..??....???...........?....??...........??......???... (41/0/13/0/0)
+total   :  54
+valid   :  41 ( 76%)
+invalid :   0 (  0%)
+unknown :  13 ( 24%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0406-simp-bad.err.oracle b/tests/jessie/oracle/CVE-2007-0406-simp-bad.err.oracle
index 5ce983e8c3771a579b4e1ff82682124e127dcb53..4eecac661c2d30216e9d4d8af393a615f6e1d903 100644
--- a/tests/jessie/oracle/CVE-2007-0406-simp-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0406-simp-bad.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0406-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0406-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strcpy
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,12 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function r_strcpy
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2007-0406-simp-bad.why", line 127, characters 10-31:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-bad.why", line 127, characters 10-31:
+warning: mutable sockaddr_un_sun_path_0 is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-bad.why", line 137, characters 10-27:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-bad.why", line 137, characters 10-27:
+warning: mutable sockaddr_un_sun_path_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2007-0406-simp-bad.res.oracle b/tests/jessie/oracle/CVE-2007-0406-simp-bad.res.oracle
index f42188f8be8a71a8c7c95c0c7c5536f015b15d3e..972aac11153aaed4a88476346167c0185a772f69 100644
--- a/tests/jessie/oracle/CVE-2007-0406-simp-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0406-simp-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0406-simp-bad_why.why: ....*...****.. (9/5/0/0/0)
-total   :  14
-valid   :   9 ( 64%)
-invalid :   5 ( 36%)
-unknown :   0 (  0%)
+why/CVE-2007-0406-simp-bad_why.why: .???....?.?..??.. (10/0/7/0/0)
+total   :  17
+valid   :  10 ( 59%)
+invalid :   0 (  0%)
+unknown :   7 ( 41%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0406-simp-ok.err.oracle b/tests/jessie/oracle/CVE-2007-0406-simp-ok.err.oracle
index 2e6f4af8c2d841a01cc0df704536569edd02283d..8dc9a375cc0a1f049608aeb915928c085fbad02d 100644
--- a/tests/jessie/oracle/CVE-2007-0406-simp-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0406-simp-ok.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0406-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0406-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strncpy
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,12 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function r_strncpy
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+File "why/CVE-2007-0406-simp-ok.why", line 127, characters 10-31:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-ok.why", line 127, characters 10-31:
+warning: mutable sockaddr_un_sun_path_0 is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-ok.why", line 137, characters 10-27:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/CVE-2007-0406-simp-ok.why", line 137, characters 10-27:
+warning: mutable sockaddr_un_sun_path_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/CVE-2007-0406-simp-ok.res.oracle b/tests/jessie/oracle/CVE-2007-0406-simp-ok.res.oracle
index c03bc1da6208024b3d98434b59e60099357fea70..618510fb98a93bae90e023f6bd62d9ca462454b4 100644
--- a/tests/jessie/oracle/CVE-2007-0406-simp-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0406-simp-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0406-simp-ok_why.why: ....*...****.. (9/5/0/0/0)
-total   :  14
-valid   :   9 ( 64%)
-invalid :   5 ( 36%)
-unknown :   0 (  0%)
+why/CVE-2007-0406-simp-ok_why.why: .?????...........??.... (16/0/7/0/0)
+total   :  23
+valid   :  16 ( 70%)
+invalid :   0 (  0%)
+unknown :   7 ( 30%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0453-simp-bad.err.oracle b/tests/jessie/oracle/CVE-2007-0453-simp-bad.err.oracle
index 1a4658703de71d51581db79c68adc7ec1d36aa3e..d75a87eea0e791537fdcee1e8421125c734a7708 100644
--- a/tests/jessie/oracle/CVE-2007-0453-simp-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0453-simp-bad.err.oracle
@@ -1,4 +1,13 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0453-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0453-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strncpy
+FIXME: Warning: ignoring second declaration of function strlen
+FIXME: Warning: ignoring second declaration of function _nss_winbind_ipnodes_getbyname
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +18,5 @@ FIXME: Warning: ignoring second declaration of function r_strncpy
 FIXME: Warning: ignoring second declaration of function strlen
 FIXME: Warning: ignoring second declaration of function _nss_winbind_ipnodes_getbyname
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2007-0453-simp-bad.res.oracle b/tests/jessie/oracle/CVE-2007-0453-simp-bad.res.oracle
index eb3d586bd89770bb3495ab8b5bd057abe9bc722e..ac64078be18964a0f12f29004fb912d77a9d6fb0 100644
--- a/tests/jessie/oracle/CVE-2007-0453-simp-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0453-simp-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0453-simp-bad_why.why: ..*.........****..** (13/7/0/0/0)
-total   :  20
-valid   :  13 ( 65%)
-invalid :   7 ( 35%)
-unknown :   0 (  0%)
+why/CVE-2007-0453-simp-bad_why.why: ..??.??..?...........??......???.. (24/0/10/0/0)
+total   :  34
+valid   :  24 ( 71%)
+invalid :   0 (  0%)
+unknown :  10 ( 29%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0453-simp-ok.err.oracle b/tests/jessie/oracle/CVE-2007-0453-simp-ok.err.oracle
index d6e2a9759ea5b8234ab951c0e23f1d53ad9a8602..7330fc326fac5a87f789314833caf344f136ac2a 100644
--- a/tests/jessie/oracle/CVE-2007-0453-simp-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0453-simp-ok.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0453-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0453-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function r_strncpy
+FIXME: Warning: ignoring second declaration of function _nss_winbind_ipnodes_getbyname
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +16,4 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function r_strncpy
 FIXME: Warning: ignoring second declaration of function _nss_winbind_ipnodes_getbyname
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2007-0453-simp-ok.res.oracle b/tests/jessie/oracle/CVE-2007-0453-simp-ok.res.oracle
index 23627e255853c78b3b8bb20de16885c96017063b..e8ebe6bd4ec143aaf14395ec95526b92d704185c 100644
--- a/tests/jessie/oracle/CVE-2007-0453-simp-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0453-simp-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0453-simp-ok_why.why: ...*......****.. (11/5/0/0/0)
-total   :  16
-valid   :  11 ( 69%)
-invalid :   5 ( 31%)
-unknown :   0 (  0%)
+why/CVE-2007-0453-simp-ok_why.why: ....??..??...........??.... (21/0/6/0/0)
+total   :  27
+valid   :  21 ( 78%)
+invalid :   0 (  0%)
+unknown :   6 ( 22%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0455-simp-bad.err.oracle b/tests/jessie/oracle/CVE-2007-0455-simp-bad.err.oracle
index 09a163cd6856a156f2c80f7d7da34c31393914dd..8c52b5810b4e51fc677ecc322ea95527eacb5f7c 100644
--- a/tests/jessie/oracle/CVE-2007-0455-simp-bad.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0455-simp-bad.err.oracle
@@ -1,4 +1,13 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0455-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0455-simp-bad.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function gdTcl_UtfToUniChar
+FIXME: Warning: ignoring second declaration of function gdImageStringFTEx
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +18,4 @@ FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function gdTcl_UtfToUniChar
 FIXME: Warning: ignoring second declaration of function gdImageStringFTEx
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2007-0455-simp-bad.res.oracle b/tests/jessie/oracle/CVE-2007-0455-simp-bad.res.oracle
index 3b8bd1093158cb0d113ea4589325d2ca4fa0b591..eb511a7d422498c7f32912d3b9faa0795cab4153 100644
--- a/tests/jessie/oracle/CVE-2007-0455-simp-bad.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0455-simp-bad.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0455-simp-bad_why.why: ..**..*........*...... (18/4/0/0/0)
-total   :  22
-valid   :  18 ( 82%)
-invalid :   4 ( 18%)
-unknown :   0 (  0%)
+why/CVE-2007-0455-simp-bad_why.why: ......???...................?. (26/0/4/0/0)
+total   :  30
+valid   :  26 ( 87%)
+invalid :   0 (  0%)
+unknown :   4 ( 13%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/CVE-2007-0455-simp-ok.err.oracle b/tests/jessie/oracle/CVE-2007-0455-simp-ok.err.oracle
index 77566fb556920c8d336369bd17f2902a4b759e4c..0373a04346d63358b9e62fd26a62cb31304b4d6b 100644
--- a/tests/jessie/oracle/CVE-2007-0455-simp-ok.err.oracle
+++ b/tests/jessie/oracle/CVE-2007-0455-simp-ok.err.oracle
@@ -1,4 +1,13 @@
-[preprocessing] running gcc -C -E -I. CVE-2007-0455-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h CVE-2007-0455-simp-ok.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function nondet_int
+FIXME: Warning: ignoring second declaration of function gdTcl_UtfToUniChar
+FIXME: Warning: ignoring second declaration of function gdImageStringFTEx
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +18,4 @@ FIXME: Warning: ignoring second declaration of function nondet_int
 FIXME: Warning: ignoring second declaration of function gdTcl_UtfToUniChar
 FIXME: Warning: ignoring second declaration of function gdImageStringFTEx
 FIXME: Warning: ignoring second declaration of function main
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/CVE-2007-0455-simp-ok.res.oracle b/tests/jessie/oracle/CVE-2007-0455-simp-ok.res.oracle
index 71f9733e15ffa6fcd48f0b335e4511b2faace4ad..8b72af6aa2c5bb32e9a449262a136638409495cd 100644
--- a/tests/jessie/oracle/CVE-2007-0455-simp-ok.res.oracle
+++ b/tests/jessie/oracle/CVE-2007-0455-simp-ok.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/CVE-2007-0455-simp-ok_why.why: ..**..*......*...*...... (19/5/0/0/0)
-total   :  24
-valid   :  19 ( 79%)
-invalid :   5 ( 21%)
-unknown :   0 (  0%)
+why/CVE-2007-0455-simp-ok_why.why: ......???.....?.................?. (29/0/5/0/0)
+total   :  34
+valid   :  29 ( 85%)
+invalid :   0 (  0%)
+unknown :   5 ( 15%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/abs.err.oracle b/tests/jessie/oracle/abs.err.oracle
index b27818b4b77dbb464d52d49644fd890a2508682f..60699bf27f984afb7d5580b89a24445ae29361cf 100644
--- a/tests/jessie/oracle/abs.err.oracle
+++ b/tests/jessie/oracle/abs.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. abs.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h abs.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function abs1
 FIXME: Warning: ignoring second declaration of function abs2
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function abs1
+FIXME: Warning: ignoring second declaration of function abs2
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/abs.res.oracle b/tests/jessie/oracle/abs.res.oracle
index 02c162229850a07c3da1d2bedab6c5f476ba8fdc..50cbafcefb8ad1917e67a519baebc4f90ebfe062 100644
--- a/tests/jessie/oracle/abs.res.oracle
+++ b/tests/jessie/oracle/abs.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/abs_why.why               : .**........... (12/2/0/0/0)
-total   :  14
-valid   :  12 ( 86%)
-invalid :   2 ( 14%)
+why/abs_why.why               : ........... (11/0/0/0/0)
+total   :  11
+valid   :  11 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/addrof_field.err.oracle b/tests/jessie/oracle/addrof_field.err.oracle
index c57377ca128e0b89ded424861c9fd3be6661bdfa..4e158c00375797b47ba797b852bc6498ebdb08f8 100644
--- a/tests/jessie/oracle/addrof_field.err.oracle
+++ b/tests/jessie/oracle/addrof_field.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. addrof_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h addrof_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,22 @@ FIXME: Warning: ignoring second declaration of function fs
 FIXME: Warning: ignoring second declaration of function gps
 FIXME: Warning: ignoring second declaration of function fps
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function gs
+FIXME: Warning: ignoring second declaration of function fs
+FIXME: Warning: ignoring second declaration of function gps
+FIXME: Warning: ignoring second declaration of function fps
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/addrof_field.why", line 141, characters 10-17:
+warning: mutable S_i_0 is not declared in effect; added as read
+File "why/addrof_field.why", line 141, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/addrof_field.why", line 172, characters 10-21:
+warning: mutable S_i_0 is not declared in effect; added as read
+File "why/addrof_field.why", line 172, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/addrof_field.why", line 234, characters 10-13:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/addrof_field.why", line 259, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/addrof_field.res.oracle b/tests/jessie/oracle/addrof_field.res.oracle
index e8b2f0bb9b4c1852ffb452e2171ee86897e9c24f..4b7141aec52647203174a3e72ccd1fc2b3ce299c 100644
--- a/tests/jessie/oracle/addrof_field.res.oracle
+++ b/tests/jessie/oracle/addrof_field.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/addrof_field_why.why      : ....*............*.........*.......*.............**.....** (50/8/0/0/0)
-total   :  58
-valid   :  50 ( 86%)
-invalid :   8 ( 14%)
-unknown :   0 (  0%)
+why/addrof_field_why.why      : ....??.....??...??...??................... (34/0/8/0/0)
+total   :  42
+valid   :  34 ( 81%)
+invalid :   0 (  0%)
+unknown :   8 ( 19%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/addrof_global.err.oracle b/tests/jessie/oracle/addrof_global.err.oracle
index 974ab14d7e4d5fcf703ece389bc7e8c6b4697f8a..58496ea5825f0494bedeb9300de43c3e39b59dd1 100644
--- a/tests/jessie/oracle/addrof_global.err.oracle
+++ b/tests/jessie/oracle/addrof_global.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. addrof_global.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h addrof_global.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,16 @@ FIXME: Warning: ignoring second declaration of function fi
 FIXME: Warning: ignoring second declaration of function gp
 FIXME: Warning: ignoring second declaration of function fp
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function gi
+FIXME: Warning: ignoring second declaration of function fi
+FIXME: Warning: ignoring second declaration of function gp
+FIXME: Warning: ignoring second declaration of function fp
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/addrof_global.why", line 184, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/addrof_global.why", line 193, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/addrof_global.why", line 193, characters 10-12:
+warning: mutable p_intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/addrof_global.res.oracle b/tests/jessie/oracle/addrof_global.res.oracle
index 871323c3cae42eb119ff4829d26c25abc6c0619e..c9da0bca809a1e84b4658a8ba340836c37ba4a36 100644
--- a/tests/jessie/oracle/addrof_global.res.oracle
+++ b/tests/jessie/oracle/addrof_global.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/addrof_global_why.why     : .....*.****.****..*******.**..*******................... (31/25/0/0/0)
-total   :  56
-valid   :  31 ( 55%)
-invalid :  25 ( 45%)
-unknown :   0 (  0%)
+why/addrof_global_why.why     : ..?........??.......??................. (34/0/5/0/0)
+total   :  39
+valid   :  34 ( 87%)
+invalid :   0 (  0%)
+unknown :   5 ( 13%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/addrof_local.err.oracle b/tests/jessie/oracle/addrof_local.err.oracle
index 6ed08e2ff72cb512561a4d64e5774b57a11ac144..3facdd07c1871f089577418f8c28d65ef6c60784 100644
--- a/tests/jessie/oracle/addrof_local.err.oracle
+++ b/tests/jessie/oracle/addrof_local.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. addrof_local.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h addrof_local.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,10 @@ FIXME: Warning: ignoring second declaration of function fi
 FIXME: Warning: ignoring second declaration of function gp
 FIXME: Warning: ignoring second declaration of function fp
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function gi
+FIXME: Warning: ignoring second declaration of function fi
+FIXME: Warning: ignoring second declaration of function gp
+FIXME: Warning: ignoring second declaration of function fp
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/addrof_local.res.oracle b/tests/jessie/oracle/addrof_local.res.oracle
index be1fd4b0bb46eeefaa701b3e275501e335275831..cf317ca226150121ee022ff16514f8074a8e01d9 100644
--- a/tests/jessie/oracle/addrof_local.res.oracle
+++ b/tests/jessie/oracle/addrof_local.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/addrof_local_why.why      : ................................................................. (65/0/0/0/0)
-total   :  65
-valid   :  65 (100%)
+why/addrof_local_why.why      : ............?........?.................. (38/0/2/0/0)
+total   :  40
+valid   :  38 ( 95%)
 invalid :   0 (  0%)
-unknown :   0 (  0%)
+unknown :   2 (  5%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/addrof_param.err.oracle b/tests/jessie/oracle/addrof_param.err.oracle
index 100fc4245bb3ce8e8ea3f4f6e98fc25ee1b9b6e6..b50c730f5a9e7f49d83cea1ffb39866c904e712e 100644
--- a/tests/jessie/oracle/addrof_param.err.oracle
+++ b/tests/jessie/oracle/addrof_param.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. addrof_param.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h addrof_param.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,10 @@ FIXME: Warning: ignoring second declaration of function fi
 FIXME: Warning: ignoring second declaration of function gp
 FIXME: Warning: ignoring second declaration of function fp
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function gi
+FIXME: Warning: ignoring second declaration of function fi
+FIXME: Warning: ignoring second declaration of function gp
+FIXME: Warning: ignoring second declaration of function fp
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/addrof_param.res.oracle b/tests/jessie/oracle/addrof_param.res.oracle
index 99eb6ac5c79c70193facf2aab44c8c1771470530..be7144c26db9efcbf15bcc0e2a9aaf14d5f68ae5 100644
--- a/tests/jessie/oracle/addrof_param.res.oracle
+++ b/tests/jessie/oracle/addrof_param.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/addrof_param_why.why      : .....................*****.........*****................... (49/10/0/0/0)
-total   :  59
-valid   :  49 ( 83%)
-invalid :  10 ( 17%)
-unknown :   0 (  0%)
+why/addrof_param_why.why      : ...........?.......?................. (35/0/2/0/0)
+total   :  37
+valid   :  35 ( 95%)
+invalid :   0 (  0%)
+unknown :   2 (  5%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/alias.err.oracle b/tests/jessie/oracle/alias.err.oracle
index 179d03b84ab6f10c46e9eeb2f986f8972d595cd0..c34f6f65c8ddc5810bac674e21b823f455e664f3 100644
--- a/tests/jessie/oracle/alias.err.oracle
+++ b/tests/jessie/oracle/alias.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. alias.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h alias.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,10 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/alias.why", line 155, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/alias.res.oracle b/tests/jessie/oracle/alias.res.oracle
index bfa927424ba84a737850758c2fa7ee4075cca8b2..facd027a0a7622eb793dfd44dea9d03059708ed2 100644
--- a/tests/jessie/oracle/alias.res.oracle
+++ b/tests/jessie/oracle/alias.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/alias_why.why             : ..*......*..**** (10/6/0/0/0)
-total   :  16
-valid   :  10 ( 62%)
-invalid :   6 ( 38%)
-unknown :   0 (  0%)
+why/alias_why.why             : ?......?....?. (11/0/3/0/0)
+total   :  14
+valid   :  11 ( 79%)
+invalid :   0 (  0%)
+unknown :   3 ( 21%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/all.err.oracle b/tests/jessie/oracle/all.err.oracle
index 0153c073d2280a48cf489b619196e5eac616e235..7b70fad5595324acc40a25eb5aa843fd39ead65b 100644
--- a/tests/jessie/oracle/all.err.oracle
+++ b/tests/jessie/oracle/all.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. all.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h all.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -16,15 +17,26 @@ FIXME: Warning: ignoring second declaration of function t2
 FIXME: Warning: ignoring second declaration of function t3
 FIXME: Warning: ignoring second declaration of function t4
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/all.why", line 50, characters 10-13:
-warning: mutable x is not declared in effect; added as read
-File "why/all.why", line 53, characters 10-13:
-warning: mutable x is not declared in effect; added as read
-File "why/all.why", line 64, characters 10-12:
-warning: mutable t is not declared in effect; added as read
-File "why/all.why", line 69, characters 10-12:
-warning: mutable t is not declared in effect; added as read
-File "why/all.why", line 74, characters 10-12:
-warning: mutable t is not declared in effect; added as read
-File "why/all.why", line 79, characters 10-12:
-warning: mutable t is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function f4
+FIXME: Warning: ignoring second declaration of function f5
+FIXME: Warning: ignoring second declaration of function f6
+FIXME: Warning: ignoring second declaration of function f7a
+FIXME: Warning: ignoring second declaration of function f7b
+FIXME: Warning: ignoring second declaration of function t1
+FIXME: Warning: ignoring second declaration of function t2
+FIXME: Warning: ignoring second declaration of function t3
+FIXME: Warning: ignoring second declaration of function t4
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/all.why", line 189, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/all.why", line 198, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/all.why", line 207, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/all.why", line 216, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/all.res.oracle b/tests/jessie/oracle/all.res.oracle
index d9a687f3a39a31a416b56c9d1b385c184e509119..9e7eaa7ef030b9a7a9333039eaf3baff8d0c2dc3 100644
--- a/tests/jessie/oracle/all.res.oracle
+++ b/tests/jessie/oracle/all.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/all_why.why               : ....................*.*.. (23/2/0/0/0)
-total   :  25
-valid   :  23 ( 92%)
-invalid :   2 (  8%)
-unknown :   0 (  0%)
+why/all_why.why               : .................................?.?... (37/0/2/0/0)
+total   :  39
+valid   :  37 ( 95%)
+invalid :   0 (  0%)
+unknown :   2 (  5%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/all_zeros.err.oracle b/tests/jessie/oracle/all_zeros.err.oracle
index 6af17328268746ef0766b1a3d921a56208917831..11bf8cbc870795aca175d53280c42d13641e1d64 100644
--- a/tests/jessie/oracle/all_zeros.err.oracle
+++ b/tests/jessie/oracle/all_zeros.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. all_zeros.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h all_zeros.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,7 +7,12 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function all_zeros
 FIXME: Warning: ignoring second declaration of function all_zeros_0
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/all_zeros.why", line 30, characters 10-19:
-warning: mutable intP_intM is not declared in effect; added as read
-File "why/all_zeros.why", line 44, characters 10-21:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function all_zeros
+FIXME: Warning: ignoring second declaration of function all_zeros_0
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/all_zeros.res.oracle b/tests/jessie/oracle/all_zeros.res.oracle
index cd840780c932d4c9bc3f439ba4cdc5679b0bd3f1..4626e4a89139aafc02555967142c50e5ffa57fb6 100644
--- a/tests/jessie/oracle/all_zeros.res.oracle
+++ b/tests/jessie/oracle/all_zeros.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/all_zeros_why.why         : .*.......*...................... (30/2/0/0/0)
-total   :  32
-valid   :  30 ( 94%)
-invalid :   2 (  6%)
-unknown :   0 (  0%)
+why/all_zeros_why.why         : .?...........?..........!!..........?...........!!.. (45/0/3/0/4)
+total   :  52
+valid   :  45 ( 87%)
+invalid :   0 (  0%)
+unknown :   3 (  6%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   4 (  8%)
diff --git a/tests/jessie/oracle/alloc.err.oracle b/tests/jessie/oracle/alloc.err.oracle
index d8cdaae1a445ed3f24085e0dddbddda69c2c78dc..0caafe01f5576e6411ae64774586f3275d58731d 100644
--- a/tests/jessie/oracle/alloc.err.oracle
+++ b/tests/jessie/oracle/alloc.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. alloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h alloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function alloc
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function alloc
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/alloc.res.oracle b/tests/jessie/oracle/alloc.res.oracle
index 32463b34f9a12e62320629b53c0a62b2e2b98b99..906773474edc236d7700bfe9b0d3b15937b26a49 100644
--- a/tests/jessie/oracle/alloc.res.oracle
+++ b/tests/jessie/oracle/alloc.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/alloc_why.why             : ***** (0/5/0/0/0)
-total   :   5
+why/alloc_why.why             : ? (0/0/1/0/0)
+total   :   1
 valid   :   0 (  0%)
-invalid :   5 (100%)
-unknown :   0 (  0%)
+invalid :   0 (  0%)
+unknown :   1 (100%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/alloca.err.oracle b/tests/jessie/oracle/alloca.err.oracle
index 0adb338a1744b8662f45f3728bad610fa9ce30be..70fc549b8c1b6611486f6e327182e7fbbcbbba8f 100644
--- a/tests/jessie/oracle/alloca.err.oracle
+++ b/tests/jessie/oracle/alloca.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. alloca.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h alloca.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,5 +10,11 @@ FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function two_local_arrays
 FIXME: Warning: ignoring second declaration of function two_local_arrays_not_alias
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/alloca.why", line 34, characters 10-11:
-warning: mutable u is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function two_local_arrays
+FIXME: Warning: ignoring second declaration of function two_local_arrays_not_alias
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/alloca.res.oracle b/tests/jessie/oracle/alloca.res.oracle
index a55c3161c2e8cf097851bcc95faf4935d948f8a6..9c148e143cd34dd89fb5ac022a533e507e2c1bb2 100644
--- a/tests/jessie/oracle/alloca.res.oracle
+++ b/tests/jessie/oracle/alloca.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/alloca_why.why            : ..............*......*....*........ (32/3/0/0/0)
-total   :  35
-valid   :  32 ( 91%)
-invalid :   3 (  9%)
-unknown :   0 (  0%)
+why/alloca_why.why            : ..........?.?..?..?..?.. (19/0/5/0/0)
+total   :  24
+valid   :  19 ( 79%)
+invalid :   0 (  0%)
+unknown :   5 ( 21%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/arith.err.oracle b/tests/jessie/oracle/arith.err.oracle
index 084d3e003d5da0a09565c69a33e7c941c10bf5e6..a6216c336e0ee740df81720cd78ab0504a21bf84 100644
--- a/tests/jessie/oracle/arith.err.oracle
+++ b/tests/jessie/oracle/arith.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. arith.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h arith.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function test
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function test
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/array.err.oracle b/tests/jessie/oracle/array.err.oracle
index 5fdf16b8e33cbef4f3255d609befc1ee381d4662..041fb3b7941bc425d9279d5f66f0d208ae9b207e 100644
--- a/tests/jessie/oracle/array.err.oracle
+++ b/tests/jessie/oracle/array.err.oracle
@@ -1,9 +1,12 @@
-[preprocessing] running gcc -C -E -I. array.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function getcell
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array.why", line 26, characters 10-17:
-warning: mutable t is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function getcell
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/array.res.oracle b/tests/jessie/oracle/array.res.oracle
index 51c361f7da5865b4495a44faa00eb0e64078994f..7db7c18938e994da05023f347cca016d99b1e08a 100644
--- a/tests/jessie/oracle/array.res.oracle
+++ b/tests/jessie/oracle/array.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_why.why             : ...................... (22/0/0/0/0)
-total   :  22
-valid   :  22 (100%)
+why/array_why.why             : ....................... (23/0/0/0/0)
+total   :  23
+valid   :  23 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/array_addr.err.oracle b/tests/jessie/oracle/array_addr.err.oracle
index 75c9f5f9bbf616f9e007fb87cfa1af46d191fbec..89e2af6e2cd5dc71622295ca8e977fc05c10b7bf 100644
--- a/tests/jessie/oracle/array_addr.err.oracle
+++ b/tests/jessie/oracle/array_addr.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_addr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_addr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,9 +9,10 @@ FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function m
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_addr.why", line 30, characters 10-11:
-warning: mutable t is not declared in effect; added as read
-File "why/array_addr.why", line 37, characters 10-11:
-warning: mutable t is not declared in effect; added as read
-File "why/array_addr.why", line 56, characters 10-11:
-warning: mutable t2 is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function m
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/array_addr.res.oracle b/tests/jessie/oracle/array_addr.res.oracle
index f96e2d8a92c91d8216ac166bc4f86deb95fbcc75..1f70598ad51d259cef8a8c5559ac12ff4826d8dc 100644
--- a/tests/jessie/oracle/array_addr.res.oracle
+++ b/tests/jessie/oracle/array_addr.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_addr_why.why        : ........................................*.*..*..*. (46/4/0/0/0)
-total   :  50
-valid   :  46 ( 92%)
-invalid :   4 (  8%)
-unknown :   0 (  0%)
+why/array_addr_why.why        : ......................................?. (39/0/1/0/0)
+total   :  40
+valid   :  39 ( 98%)
+invalid :   0 (  0%)
+unknown :   1 (  2%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/array_and_field.err.oracle b/tests/jessie/oracle/array_and_field.err.oracle
index 60b59c341f471a0736d023b6ea897c6b7ebb0677..d86b41174771043a430329155776641762caf817 100644
--- a/tests/jessie/oracle/array_and_field.err.oracle
+++ b/tests/jessie/oracle/array_and_field.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_and_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_and_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,5 +7,24 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function fg
 FIXME: Warning: ignoring second declaration of function fl
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_and_field.why", line 44, characters 10-12:
-warning: mutable sg is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fg
+FIXME: Warning: ignoring second declaration of function fl
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_and_field.why", line 147, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_and_field.why", line 147, characters 10-17:
+warning: mutable T_ai_0 is not declared in effect; added as read
+File "why/array_and_field.why", line 147, characters 10-17:
+warning: mutable T_aj_0 is not declared in effect; added as read
+File "why/array_and_field.why", line 176, characters 10-21:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_and_field.why", line 176, characters 10-21:
+warning: mutable T_ai_0 is not declared in effect; added as read
+File "why/array_and_field.why", line 176, characters 10-21:
+warning: mutable T_aj_0 is not declared in effect; added as read
+File "why/array_and_field.why", line 194, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_and_field.why", line 194, characters 10-12:
+warning: mutable T_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_and_field.res.oracle b/tests/jessie/oracle/array_and_field.res.oracle
index 77bc7a8b1ba00cef309b86c844255c5d4b005ce4..559c003ae8583217ff54ab9fed56175d66e2fab9 100644
--- a/tests/jessie/oracle/array_and_field.res.oracle
+++ b/tests/jessie/oracle/array_and_field.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_and_field_why.why   : ..*...*. (6/2/0/0/0)
-total   :   8
-valid   :   6 ( 75%)
-invalid :   2 ( 25%)
-unknown :   0 (  0%)
+why/array_and_field_why.why   : ?.?. (2/0/2/0/0)
+total   :   4
+valid   :   2 ( 50%)
+invalid :   0 (  0%)
+unknown :   2 ( 50%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/array_basic.err.oracle b/tests/jessie/oracle/array_basic.err.oracle
index 48424ef9b82b78780ef249fc468da89066203548..d26362bb4ea788f1d2e19d85630c231c7f7ab47c 100644
--- a/tests/jessie/oracle/array_basic.err.oracle
+++ b/tests/jessie/oracle/array_basic.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,9 +8,21 @@ FIXME: Warning: ignoring second declaration of function fg
 FIXME: Warning: ignoring second declaration of function testg
 FIXME: Warning: ignoring second declaration of function lg
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_basic.why", line 28, characters 10-12:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fg
+FIXME: Warning: ignoring second declaration of function testg
+FIXME: Warning: ignoring second declaration of function lg
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_basic.why", line 147, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_basic.why", line 172, characters 10-15:
 warning: mutable ga1 is not declared in effect; added as read
-File "why/array_basic.why", line 28, characters 10-12:
+File "why/array_basic.why", line 172, characters 10-15:
 warning: mutable ga2 is not declared in effect; added as read
-File "why/array_basic.why", line 28, characters 10-12:
+File "why/array_basic.why", line 172, characters 10-15:
 warning: mutable ga3 is not declared in effect; added as read
+File "why/array_basic.why", line 172, characters 10-15:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_basic.why", line 172, characters 10-15:
+warning: mutable intP_intM_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_basic.res.oracle b/tests/jessie/oracle/array_basic.res.oracle
index 6599af22ce846c7e52a042e7450a136d3eeafd6d..3682fd2c9f0d38d7ae328c603d84723567ef9579 100644
--- a/tests/jessie/oracle/array_basic.res.oracle
+++ b/tests/jessie/oracle/array_basic.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_basic_why.why       : ..................... (21/0/0/0/0)
-total   :  21
-valid   :  21 (100%)
+why/array_basic_why.why       : ................... (19/0/0/0/0)
+total   :  19
+valid   :  19 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/array_field.err.oracle b/tests/jessie/oracle/array_field.err.oracle
index 857d894b26c4c4dd7bcd2e6f98cd6ca35fa4b726..f659872e2bab2adc78a01e12056724c6531fb478 100644
--- a/tests/jessie/oracle/array_field.err.oracle
+++ b/tests/jessie/oracle/array_field.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_field.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,5 +7,24 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function fg
 FIXME: Warning: ignoring second declaration of function fl
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_field.why", line 34, characters 10-12:
-warning: mutable sg is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fg
+FIXME: Warning: ignoring second declaration of function fl
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_field.why", line 135, characters 10-17:
+warning: mutable S_ai_0 is not declared in effect; added as read
+File "why/array_field.why", line 135, characters 10-17:
+warning: mutable S_aj_0 is not declared in effect; added as read
+File "why/array_field.why", line 135, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_field.why", line 166, characters 10-21:
+warning: mutable S_ai_0 is not declared in effect; added as read
+File "why/array_field.why", line 166, characters 10-21:
+warning: mutable S_aj_0 is not declared in effect; added as read
+File "why/array_field.why", line 166, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_field.why", line 192, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_field.why", line 192, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_field.res.oracle b/tests/jessie/oracle/array_field.res.oracle
index c0a134b978b819bae933833642d989db7005b223..c51cb935ffb2e6bf8a86f992f02b453d7849d18b 100644
--- a/tests/jessie/oracle/array_field.res.oracle
+++ b/tests/jessie/oracle/array_field.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_field_why.why       : ..**..*. (5/3/0/0/0)
-total   :   8
-valid   :   5 ( 62%)
-invalid :   3 ( 38%)
-unknown :   0 (  0%)
+why/array_field_why.why       : ???. (1/0/3/0/0)
+total   :   4
+valid   :   1 ( 25%)
+invalid :   0 (  0%)
+unknown :   3 ( 75%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/array_field_addr.err.oracle b/tests/jessie/oracle/array_field_addr.err.oracle
index 7ac05be32b02e74349e203bd42679e2711e7ae96..3f5a55b9c48f5d00e98b5f7c89a0846946edbccf 100644
--- a/tests/jessie/oracle/array_field_addr.err.oracle
+++ b/tests/jessie/oracle/array_field_addr.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_field_addr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_field_addr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,18 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_field_addr.why", line 161, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_field_addr.why", line 161, characters 10-21:
+warning: mutable t_tab_0 is not declared in effect; added as read
+File "why/array_field_addr.why", line 169, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_field_addr.why", line 169, characters 10-17:
+warning: mutable t_tab_0 is not declared in effect; added as read
+File "why/array_field_addr.why", line 182, characters 10-11:
+warning: mutable intP_intM_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_field_addr.res.oracle b/tests/jessie/oracle/array_field_addr.res.oracle
index 959203a8bb94ea3d9066a048554d2b4349d3a719..406949583e60e429875a6373b9a66a37b3aa0340 100644
--- a/tests/jessie/oracle/array_field_addr.res.oracle
+++ b/tests/jessie/oracle/array_field_addr.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_field_addr_why.why  : ..*....... (9/1/0/0/0)
-total   :  10
-valid   :   9 ( 90%)
-invalid :   1 ( 10%)
+why/array_field_addr_why.why  : ....... (7/0/0/0/0)
+total   :   7
+valid   :   7 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/array_multi.err.oracle b/tests/jessie/oracle/array_multi.err.oracle
index 66b58406880b197e2f2a139f72c53dfb294ca084..ca2a89c3ede5cd702f553cb91e29ad4f92941210 100644
--- a/tests/jessie/oracle/array_multi.err.oracle
+++ b/tests/jessie/oracle/array_multi.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_multi.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_multi.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,9 +8,21 @@ FIXME: Warning: ignoring second declaration of function fg
 FIXME: Warning: ignoring second declaration of function testg
 FIXME: Warning: ignoring second declaration of function lg
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_multi.why", line 28, characters 10-12:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fg
+FIXME: Warning: ignoring second declaration of function testg
+FIXME: Warning: ignoring second declaration of function lg
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_multi.why", line 147, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_multi.why", line 172, characters 10-15:
 warning: mutable ga1 is not declared in effect; added as read
-File "why/array_multi.why", line 28, characters 10-12:
+File "why/array_multi.why", line 172, characters 10-15:
 warning: mutable ga2 is not declared in effect; added as read
-File "why/array_multi.why", line 28, characters 10-12:
+File "why/array_multi.why", line 172, characters 10-15:
 warning: mutable ga3 is not declared in effect; added as read
+File "why/array_multi.why", line 172, characters 10-15:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_multi.why", line 172, characters 10-15:
+warning: mutable intP_intM_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_multi.res.oracle b/tests/jessie/oracle/array_multi.res.oracle
index 6353d544eedbcb859744f5ca4da4b5d9ff33b96c..259f044033876bc9a4e97b1c7856d9f61b08247e 100644
--- a/tests/jessie/oracle/array_multi.res.oracle
+++ b/tests/jessie/oracle/array_multi.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_multi_why.why       : ............................................................................... (79/0/0/0/0)
-total   :  79
-valid   :  79 (100%)
+why/array_multi_why.why       : ............................................................................. (77/0/0/0/0)
+total   :  77
+valid   :  77 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/array_ptr.err.oracle b/tests/jessie/oracle/array_ptr.err.oracle
index 2790689e77b30d812cb9c6a7c12f05d0f312dfb8..9fe91606b9386b03de2565b5c113f26c913ae03a 100644
--- a/tests/jessie/oracle/array_ptr.err.oracle
+++ b/tests/jessie/oracle/array_ptr.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_ptr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_ptr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,15 +8,19 @@ FIXME: Warning: ignoring second declaration of function init
 FIXME: Warning: ignoring second declaration of function initp
 FIXME: Warning: ignoring second declaration of function initparith
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_ptr.why", line 30, characters 10-14:
-warning: mutable ga is not declared in effect; added as read
-File "why/array_ptr.why", line 30, characters 10-14:
-warning: mutable intP_intM is not declared in effect; added as read
-File "why/array_ptr.why", line 38, characters 10-15:
-warning: mutable ga is not declared in effect; added as read
-File "why/array_ptr.why", line 38, characters 10-15:
-warning: mutable intP_intM is not declared in effect; added as read
-File "why/array_ptr.why", line 46, characters 10-20:
-warning: mutable ga is not declared in effect; added as read
-File "why/array_ptr.why", line 46, characters 10-20:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function init
+FIXME: Warning: ignoring second declaration of function initp
+FIXME: Warning: ignoring second declaration of function initparith
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/array_ptr.why", line 149, characters 10-14:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/array_ptr.why", line 161, characters 10-15:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_ptr.res.oracle b/tests/jessie/oracle/array_ptr.res.oracle
index c91ee1e842b1966aa71336c940baabe8a9a5cfc4..2efcdc747ca1538a6dbe0d19854a551a9ba41041 100644
--- a/tests/jessie/oracle/array_ptr.res.oracle
+++ b/tests/jessie/oracle/array_ptr.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_ptr_why.why         : ..**.************ (3/14/0/0/0)
-total   :  17
-valid   :   3 ( 18%)
-invalid :  14 ( 82%)
-unknown :   0 (  0%)
+why/array_ptr_why.why         : .....?..............?..............?..??.. (37/0/5/0/0)
+total   :  42
+valid   :  37 ( 88%)
+invalid :   0 (  0%)
+unknown :   5 ( 12%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/array_struct.err.oracle b/tests/jessie/oracle/array_struct.err.oracle
index e1ede9e411663cd1a176225e248f6e9e797677b2..8150f7ffcc456d53db0dc11b3a13722d7ed15f5f 100644
--- a/tests/jessie/oracle/array_struct.err.oracle
+++ b/tests/jessie/oracle/array_struct.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. array_struct.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h array_struct.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,9 +8,21 @@ FIXME: Warning: ignoring second declaration of function fg
 FIXME: Warning: ignoring second declaration of function testg
 FIXME: Warning: ignoring second declaration of function lg
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/array_struct.why", line 34, characters 10-12:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fg
+FIXME: Warning: ignoring second declaration of function testg
+FIXME: Warning: ignoring second declaration of function lg
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/array_struct.why", line 149, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_struct.why", line 174, characters 10-15:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/array_struct.why", line 174, characters 10-15:
+warning: mutable S_ii_0 is not declared in effect; added as read
+File "why/array_struct.why", line 174, characters 10-15:
 warning: mutable ga1 is not declared in effect; added as read
-File "why/array_struct.why", line 34, characters 10-12:
+File "why/array_struct.why", line 174, characters 10-15:
 warning: mutable ga2 is not declared in effect; added as read
-File "why/array_struct.why", line 34, characters 10-12:
+File "why/array_struct.why", line 174, characters 10-15:
 warning: mutable ga3 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/array_struct.res.oracle b/tests/jessie/oracle/array_struct.res.oracle
index 86de0647ffd807f4806ab1e160ee2d0da54d0c84..a5034b902f4ed4d9170df4f98d573893f3499386 100644
--- a/tests/jessie/oracle/array_struct.res.oracle
+++ b/tests/jessie/oracle/array_struct.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/array_struct_why.why      : ..................... (21/0/0/0/0)
-total   :  21
-valid   :  21 (100%)
+why/array_struct_why.why      : ................... (19/0/0/0/0)
+total   :  19
+valid   :  19 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/assert.err.oracle b/tests/jessie/oracle/assert.err.oracle
index 092f6854fd9457ccb5081d513912d4fca9959e80..474455104349327c29615bf99b20aa0e410ff399 100644
--- a/tests/jessie/oracle/assert.err.oracle
+++ b/tests/jessie/oracle/assert.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. assert.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h assert.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/assert.res.oracle b/tests/jessie/oracle/assert.res.oracle
index 045b9e57c9ad21868822ef08eb86489b302a5748..07ca03c9197c6e66986e66f3c590044f1a1d9a9c 100644
--- a/tests/jessie/oracle/assert.res.oracle
+++ b/tests/jessie/oracle/assert.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/assert_why.why            : ... (3/0/0/0/0)
-total   :   3
-valid   :   3 (100%)
+why/assert_why.why            : .... (4/0/0/0/0)
+total   :   4
+valid   :   4 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/assigns_range.err.oracle b/tests/jessie/oracle/assigns_range.err.oracle
index 9b9971103136528e4272c35af513574f0587b5a4..5fbaea4199bf5d3d9b19ad3aee171a63cc89ffc2 100644
--- a/tests/jessie/oracle/assigns_range.err.oracle
+++ b/tests/jessie/oracle/assigns_range.err.oracle
@@ -1,11 +1,14 @@
-[preprocessing] running gcc -C -E -I. assigns_range.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h assigns_range.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/assigns_range.why", line 24, characters 10-11:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/assigns_range.why", line 143, characters 10-11:
 warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/assigns_range.why", line 24, characters 10-11:
-warning: mutable t is not declared in effect; added as read
diff --git a/tests/jessie/oracle/assigns_range_right.err.oracle b/tests/jessie/oracle/assigns_range_right.err.oracle
index 3e73428946de53b1bdfc448e3d9896bca0896864..b41754cb5025fe74d4f360dc6a84710fa7d16fd9 100644
--- a/tests/jessie/oracle/assigns_range_right.err.oracle
+++ b/tests/jessie/oracle/assigns_range_right.err.oracle
@@ -1,15 +1,16 @@
-[preprocessing] running gcc -C -E -I. assigns_range_right.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h assigns_range_right.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/assigns_range_right.why", line 28, characters 10-11:
-warning: mutable k is not declared in effect; added as read
-File "why/assigns_range_right.why", line 28, characters 10-11:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/assigns_range_right.why", line 147, characters 10-11:
 warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/assigns_range_right.why", line 28, characters 10-11:
-warning: mutable intP_intM is not declared in effect; added as read
-File "why/assigns_range_right.why", line 28, characters 10-11:
-warning: mutable t is not declared in effect; added as read
diff --git a/tests/jessie/oracle/assigns_range_right.res.oracle b/tests/jessie/oracle/assigns_range_right.res.oracle
index 73287ad6a7ce0d591e92ed1a1d38a8b3a9faff87..e108064276c48c3ab23243afb41eadd62cd31331 100644
--- a/tests/jessie/oracle/assigns_range_right.res.oracle
+++ b/tests/jessie/oracle/assigns_range_right.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/assigns_range_right_why.why: .....*.... (9/1/0/0/0)
-total   :  10
-valid   :   9 ( 90%)
-invalid :   1 ( 10%)
-unknown :   0 (  0%)
+why/assigns_range_right_why.why: ...............?................. (32/0/1/0/0)
+total   :  33
+valid   :  32 ( 97%)
+invalid :   0 (  0%)
+unknown :   1 (  3%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/band.err.oracle b/tests/jessie/oracle/band.err.oracle
index 162f1f9243f6bfa9d76ce63b104e7570e76c6207..c825054dde16cf805276f453f8efa952c4dd4e12 100644
--- a/tests/jessie/oracle/band.err.oracle
+++ b/tests/jessie/oracle/band.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. band.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h band.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +8,9 @@ FIXME: Warning: ignoring second declaration of function test1
 FIXME: Warning: ignoring second declaration of function test2
 FIXME: Warning: ignoring second declaration of function test3
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function test1
+FIXME: Warning: ignoring second declaration of function test2
+FIXME: Warning: ignoring second declaration of function test3
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/band.res.oracle b/tests/jessie/oracle/band.res.oracle
index 4262f805f46b6154927774542314e8ddde0627a9..a666753e78eda3f832ce9d2fef52fb17ead2f8a1 100644
--- a/tests/jessie/oracle/band.res.oracle
+++ b/tests/jessie/oracle/band.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/band_why.why              : *.* (1/2/0/0/0)
-total   :   3
-valid   :   1 ( 33%)
-invalid :   2 ( 67%)
-unknown :   0 (  0%)
+why/band_why.why              : ?.....?. (6/0/2/0/0)
+total   :   8
+valid   :   6 ( 75%)
+invalid :   0 (  0%)
+unknown :   2 ( 25%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/basic.err.oracle b/tests/jessie/oracle/basic.err.oracle
index e7f0aee8837d85d8661e36f3fa706b10871aec67..39420cb7b837cfb1a59766c38b1c5e555d6e4e9b 100644
--- a/tests/jessie/oracle/basic.err.oracle
+++ b/tests/jessie/oracle/basic.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +8,9 @@ FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function max
 FIXME: Warning: ignoring second declaration of function abs1
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function max
+FIXME: Warning: ignoring second declaration of function abs1
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/basic.res.oracle b/tests/jessie/oracle/basic.res.oracle
index efd8001a1fad2b4d9fe0de6eefb3fb4bde62a028..cf98e89963edf875f0a465b807e7679966a45d7e 100644
--- a/tests/jessie/oracle/basic.res.oracle
+++ b/tests/jessie/oracle/basic.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/basic_why.why             : .**........ (9/2/0/0/0)
-total   :  11
-valid   :   9 ( 82%)
-invalid :   2 ( 18%)
+why/basic_why.why             : ............ (12/0/0/0/0)
+total   :  12
+valid   :  12 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/binary_search.err.oracle b/tests/jessie/oracle/binary_search.err.oracle
index 0bb163b1c87a9eac9687f68274131d5eb6c0c9fa..c8821c96cf143481c86da9bb1dd9e7d905c734fc 100644
--- a/tests/jessie/oracle/binary_search.err.oracle
+++ b/tests/jessie/oracle/binary_search.err.oracle
@@ -1,9 +1,14 @@
-[preprocessing] running gcc -C -E -I. binary_search.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h binary_search.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function binary_search
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/binary_search.why", line 24, characters 10-23:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function binary_search
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/binary_search.res.oracle b/tests/jessie/oracle/binary_search.res.oracle
index 062cc75db616a801773752cdeac0c5e25db420f6..ccce9eb600c28ffae3ce274b4acfef14551e6f7f 100644
--- a/tests/jessie/oracle/binary_search.res.oracle
+++ b/tests/jessie/oracle/binary_search.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/binary_search_why.why     : ......................................... (41/0/0/0/0)
-total   :  41
-valid   :  41 (100%)
+why/binary_search_why.why     : ..............!!!!!!!!!!!!!!!!..............!!!!!!!!!!!!!!!!!!!!!! (28/0/0/0/38)
+total   :  66
+valid   :  28 ( 42%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :  38 ( 58%)
diff --git a/tests/jessie/oracle/binary_search_overflows.err.oracle b/tests/jessie/oracle/binary_search_overflows.err.oracle
index c212c49b96c87b9698eaa7698f887db184cf124a..ea7e5e964c9fcd93e60c50b3c09f162118a6f6ed 100644
--- a/tests/jessie/oracle/binary_search_overflows.err.oracle
+++ b/tests/jessie/oracle/binary_search_overflows.err.oracle
@@ -1,9 +1,14 @@
-[preprocessing] running gcc -C -E -I. binary_search_overflows.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h binary_search_overflows.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function binary_search
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/binary_search_overflows.why", line 24, characters 10-23:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function binary_search
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/binary_search_overflows.res.oracle b/tests/jessie/oracle/binary_search_overflows.res.oracle
index 8d76c05b187e5e999c2fde17fccda9872efcba14..ef18bc54e79967873a336293ee6663ea444fc9fc 100644
--- a/tests/jessie/oracle/binary_search_overflows.res.oracle
+++ b/tests/jessie/oracle/binary_search_overflows.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/binary_search_overflows_why.why: ......................................... (41/0/0/0/0)
-total   :  41
-valid   :  41 (100%)
+why/binary_search_overflows_why.why: ..............!!!!!!!!!!!!!!!!..............!!!!!!!!!!!!!!!!!!!!!! (28/0/0/0/38)
+total   :  66
+valid   :  28 ( 42%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :  38 ( 58%)
diff --git a/tests/jessie/oracle/break.err.oracle b/tests/jessie/oracle/break.err.oracle
index b7f1f2d4fcff29f8495f4be03330887d43b3d27b..00bfa80fbfc04ea85e55d6a23cdec9d70fe8601c 100644
--- a/tests/jessie/oracle/break.err.oracle
+++ b/tests/jessie/oracle/break.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. break.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h break.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,18 @@ FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function f3
 FIXME: Warning: ignoring second declaration of function f4
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function f4
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/break.res.oracle b/tests/jessie/oracle/break.res.oracle
index ba0ae8241033b965f028a83530ced06e4478211e..15db2cc540094af22cd4082da709b218e3deefdf 100644
--- a/tests/jessie/oracle/break.res.oracle
+++ b/tests/jessie/oracle/break.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/break_why.why             : ..................... (21/0/0/0/0)
-total   :  21
-valid   :  21 (100%)
+why/break_why.why             : ...............!!..............!!...............!!.. (46/0/0/0/6)
+total   :  52
+valid   :  46 ( 88%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   6 ( 12%)
diff --git a/tests/jessie/oracle/bug184.err.oracle b/tests/jessie/oracle/bug184.err.oracle
index 0b7765957d4fbf5c3b413312bc1bb4a3065326d5..73ccc5dba9336d2a804a440ddaf42eced2f0b8e0 100644
--- a/tests/jessie/oracle/bug184.err.oracle
+++ b/tests/jessie/oracle/bug184.err.oracle
@@ -1,4 +1,10 @@
-[preprocessing] running gcc -C -E -I. bug184.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h bug184.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
diff --git a/tests/jessie/oracle/call.err.oracle b/tests/jessie/oracle/call.err.oracle
index fdb6a8f97bcfa1b92f36eca24ae53f6317848554..2a7d5cafdb6dba723e8d96c4667d50d88d752081 100644
--- a/tests/jessie/oracle/call.err.oracle
+++ b/tests/jessie/oracle/call.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. call.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h call.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
diff --git a/tests/jessie/oracle/clash_alloc.err.oracle b/tests/jessie/oracle/clash_alloc.err.oracle
index 46f58061364c5dc601cf2a1db16c153144533ecd..26e6fe41b1309bf61ea040dc183e0b4e8b070695 100644
--- a/tests/jessie/oracle/clash_alloc.err.oracle
+++ b/tests/jessie/oracle/clash_alloc.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. clash_alloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h clash_alloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/clash_alloc.res.oracle b/tests/jessie/oracle/clash_alloc.res.oracle
index 4ca4525b06641c86bc8ba801faaa02c40149c980..9078a4c247bbf925c31a2cd7e242f119d2b4428e 100644
--- a/tests/jessie/oracle/clash_alloc.res.oracle
+++ b/tests/jessie/oracle/clash_alloc.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/clash_alloc_why.why       : .. (2/0/0/0/0)
-total   :   2
-valid   :   2 (100%)
+why/clash_alloc_why.why       : . (1/0/0/0/0)
+total   :   1
+valid   :   1 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/compound_global.err.oracle b/tests/jessie/oracle/compound_global.err.oracle
index effb0091208b0f069684a1e4cdaad2adffe9ba93..914288524859ca883b69a30cdad93374002cce3d 100644
--- a/tests/jessie/oracle/compound_global.err.oracle
+++ b/tests/jessie/oracle/compound_global.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. compound_global.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h compound_global.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function fc
 FIXME: Warning: ignoring second declaration of function fcp
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fc
+FIXME: Warning: ignoring second declaration of function fcp
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/compound_global.res.oracle b/tests/jessie/oracle/compound_global.res.oracle
index 7158e5424ebe24976a81d9dc6a11e9952c54e48a..fcbf6439a0982bc9ac88543eeb32cb8b6920729e 100644
--- a/tests/jessie/oracle/compound_global.res.oracle
+++ b/tests/jessie/oracle/compound_global.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/compound_global_why.why   : ....**....***..*.. (12/6/0/0/0)
-total   :  18
-valid   :  12 ( 67%)
-invalid :   6 ( 33%)
-unknown :   0 (  0%)
+why/compound_global_why.why   : ??....??.... (8/0/4/0/0)
+total   :  12
+valid   :   8 ( 67%)
+invalid :   0 (  0%)
+unknown :   4 ( 33%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/compound_local.err.oracle b/tests/jessie/oracle/compound_local.err.oracle
index c5f97c97391149476351403ce1e985d13c2b8993..9e9bbb39a58e32c83e8bea7a5083540f06f13454 100644
--- a/tests/jessie/oracle/compound_local.err.oracle
+++ b/tests/jessie/oracle/compound_local.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. compound_local.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h compound_local.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,16 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function fc
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function fc
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/compound_local.why", line 149, characters 10-17:
+warning: mutable S_i_0 is not declared in effect; added as read
+File "why/compound_local.why", line 149, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/compound_local.why", line 188, characters 10-21:
+warning: mutable S_i_0 is not declared in effect; added as read
+File "why/compound_local.why", line 188, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/compound_local.res.oracle b/tests/jessie/oracle/compound_local.res.oracle
index f32b0077cedd8e7a2ef5b6d6c149b4e33db9c753..566417dabc7aab800637a7f58d202bd7a117080e 100644
--- a/tests/jessie/oracle/compound_local.res.oracle
+++ b/tests/jessie/oracle/compound_local.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/compound_local_why.why    : **..*..*..*........**...............**.. (31/9/0/0/0)
-total   :  40
-valid   :  31 ( 78%)
-invalid :   9 ( 22%)
-unknown :   0 (  0%)
+why/compound_local_why.why    : .?............................ (29/0/1/0/0)
+total   :  30
+valid   :  29 ( 97%)
+invalid :   0 (  0%)
+unknown :   1 (  3%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/conflict.err.oracle b/tests/jessie/oracle/conflict.err.oracle
index 56c52d83a99ac939262dd6d69c96fabe50e7cb13..d5ada9cb1e4a6a1596011c6dd0b2f5e0910e0a3c 100644
--- a/tests/jessie/oracle/conflict.err.oracle
+++ b/tests/jessie/oracle/conflict.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. conflict.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h conflict.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/conflict.res.oracle b/tests/jessie/oracle/conflict.res.oracle
index 86d28b285f745ef8540969a3c040fc7c390a04ca..7e6f234884c8ec69f3a2ee28b949134d62529be7 100644
--- a/tests/jessie/oracle/conflict.res.oracle
+++ b/tests/jessie/oracle/conflict.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/conflict_why.why          : . (1/0/0/0/0)
-total   :   1
-valid   :   1 (100%)
+why/conflict_why.why          : .. (2/0/0/0/0)
+total   :   2
+valid   :   2 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/consts.err.oracle b/tests/jessie/oracle/consts.err.oracle
index fbf41686d7dbac4fb73c8c2ca2e028bb375537b8..5990fa31600053da69da9dcd6d35e426596ed8be 100644
--- a/tests/jessie/oracle/consts.err.oracle
+++ b/tests/jessie/oracle/consts.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. consts.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h consts.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f1
 FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/consts.res.oracle b/tests/jessie/oracle/consts.res.oracle
index 7eb8a78585ec9db1ef764f2376d68a0e2b31e5c0..8594a1eaf1d039f32ab145ddbe5f1c1d4d017630 100644
--- a/tests/jessie/oracle/consts.res.oracle
+++ b/tests/jessie/oracle/consts.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/consts_why.why            : . (1/0/0/0/0)
-total   :   1
-valid   :   1 (100%)
+why/consts_why.why            : ... (3/0/0/0/0)
+total   :   3
+valid   :   3 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/continue.err.oracle b/tests/jessie/oracle/continue.err.oracle
index d41ff92ad21be23e7093ab64c9c8a1a8efa1f461..10736a50d76969879a2b12d51cd7150c70fda6d5 100644
--- a/tests/jessie/oracle/continue.err.oracle
+++ b/tests/jessie/oracle/continue.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. continue.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h continue.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +8,15 @@ FIXME: Warning: ignoring second declaration of function f1
 FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function f3
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/continue.res.oracle b/tests/jessie/oracle/continue.res.oracle
index 69a84bb8ff3cd914881d555ae2e256531bd50bfa..9b8c7a287b83586ebd9c3fee116881a27490b942 100644
--- a/tests/jessie/oracle/continue.res.oracle
+++ b/tests/jessie/oracle/continue.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/continue_why.why          : ........................ (24/0/0/0/0)
-total   :  24
-valid   :  24 (100%)
+why/continue_why.why          : .............!!..............!!..................!!.. (47/0/0/0/6)
+total   :  53
+valid   :  47 ( 89%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   6 ( 11%)
diff --git a/tests/jessie/oracle/coord.err.oracle b/tests/jessie/oracle/coord.err.oracle
index edeea81cb1e0ad40a4d1a9dec3e9bc678fdcd806..eba9a27ef5fbf69f39167055d5b800df39a820eb 100644
--- a/tests/jessie/oracle/coord.err.oracle
+++ b/tests/jessie/oracle/coord.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. coord.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h coord.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,10 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/coord.why", line 148, characters 10-11:
+warning: mutable coord_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/coord.res.oracle b/tests/jessie/oracle/coord.res.oracle
index 34a2c57076713c6448f4c9b98946039ec12a2b6f..ce0f71e35fc5c8cadbe4681ccfb347ae1bb65518 100644
--- a/tests/jessie/oracle/coord.res.oracle
+++ b/tests/jessie/oracle/coord.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/coord_why.why             : .... (4/0/0/0/0)
-total   :   4
-valid   :   4 (100%)
+why/coord_why.why             : ..... (5/0/0/0/0)
+total   :   5
+valid   :   5 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/copy.err.oracle b/tests/jessie/oracle/copy.err.oracle
index e7fe2845bf42dbabae7f9f0e6e0d88e1dbe2c0c2..80a40830cdd880bac7b8e31ebd4b5e1816322f00 100644
--- a/tests/jessie/oracle/copy.err.oracle
+++ b/tests/jessie/oracle/copy.err.oracle
@@ -1,9 +1,14 @@
-[preprocessing] running gcc -C -E -I. copy.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h copy.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function copy
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/copy.why", line 23, characters 10-14:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function copy
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/copy.res.oracle b/tests/jessie/oracle/copy.res.oracle
index e76fa7cdfb018d2ccef033a5e2baa4c9b4a927d9..513a1e512eeae715e000c2af705e09d2d3ff0266 100644
--- a/tests/jessie/oracle/copy.res.oracle
+++ b/tests/jessie/oracle/copy.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/copy_why.why              : ...*........*.. (13/2/0/0/0)
-total   :  15
-valid   :  13 ( 87%)
-invalid :   2 ( 13%)
-unknown :   0 (  0%)
+why/copy_why.why              : ??......?.....???..........?.....!! (26/0/7/0/2)
+total   :  35
+valid   :  26 ( 74%)
+invalid :   0 (  0%)
+unknown :   7 ( 20%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 (  6%)
diff --git a/tests/jessie/oracle/copy_struct.err.oracle b/tests/jessie/oracle/copy_struct.err.oracle
index d300181241ea2fd1b4623666752cd93708405447..5e630f739e8892140c723be1eec5b7107d642849 100644
--- a/tests/jessie/oracle/copy_struct.err.oracle
+++ b/tests/jessie/oracle/copy_struct.err.oracle
@@ -1,6 +1,5 @@
-[preprocessing] running gcc -C -E -I. copy_struct.c
-Error characters 33-42 during typing of logic formula: PLdot: expected a left valuecopy_struct.c:24: Warning: ignoring logic specification of function id
-Error characters 57-66 during typing of logic formula: PLdot: expected a left valuecopy_struct.c:32: Warning: ignoring logic specification of function idp
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h copy_struct.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -10,3 +9,30 @@ FIXME: Warning: ignoring second declaration of function id
 FIXME: Warning: ignoring second declaration of function idp
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function id
+FIXME: Warning: ignoring second declaration of function idp
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/copy_struct.why", line 143, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/copy_struct.why", line 143, characters 10-17:
+warning: mutable T_a_0 is not declared in effect; added as read
+File "why/copy_struct.why", line 143, characters 10-17:
+warning: mutable T_b_0 is not declared in effect; added as read
+File "why/copy_struct.why", line 172, characters 10-21:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/copy_struct.why", line 172, characters 10-21:
+warning: mutable T_a_0 is not declared in effect; added as read
+File "why/copy_struct.why", line 172, characters 10-21:
+warning: mutable T_b_0 is not declared in effect; added as read
+File "why/copy_struct.why", line 190, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/copy_struct.why", line 217, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/copy_struct.why", line 231, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/copy_struct.why", line 258, characters 10-13:
+warning: mutable S_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/copy_struct.res.oracle b/tests/jessie/oracle/copy_struct.res.oracle
index 5b2de03ab6e454e348de22951ec648312ecbf12f..20a9b81f15da69d5acec45b4bf6b6e1b1312e9d7 100644
--- a/tests/jessie/oracle/copy_struct.res.oracle
+++ b/tests/jessie/oracle/copy_struct.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/copy_struct_why.why       : **..............................***.**.*****..***.....**....... (46/17/0/0/0)
-total   :  63
-valid   :  46 ( 73%)
-invalid :  17 ( 27%)
-unknown :   0 (  0%)
+why/copy_struct_why.why       : ??..........................?......??....????..?????......??.............. (58/0/16/0/0)
+total   :  74
+valid   :  58 ( 78%)
+invalid :   0 (  0%)
+unknown :  16 ( 22%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/count_bits.err.oracle b/tests/jessie/oracle/count_bits.err.oracle
index ea6fa10673de011f5dc28d9cd2fc533924bc7047..01169c127dc58265b215b887a36ef0191ad05154 100644
--- a/tests/jessie/oracle/count_bits.err.oracle
+++ b/tests/jessie/oracle/count_bits.err.oracle
@@ -1,11 +1,18 @@
-[preprocessing] running gcc -C -E -I. count_bits.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h count_bits.c
 Error characters 26-27 during typing of logic formula: incompatible types
 count_bits.c:10: Warning: ignoring logic global annotation
 Error characters 78-90 during typing of logic formula: incompatible types
 count_bits.c:31: Warning: ignoring logic global annotation
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function count_bits
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function count_bits
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/count_bits.res.oracle b/tests/jessie/oracle/count_bits.res.oracle
index 52d37ed683df8d5ea16382d17ace0ebb2aa88b61..5b78b493a976b56d275e9912391f99c15b7adbdd 100644
--- a/tests/jessie/oracle/count_bits.res.oracle
+++ b/tests/jessie/oracle/count_bits.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/count_bits_why.why        : .**.*.* (3/4/0/0/0)
-total   :   7
-valid   :   3 ( 43%)
-invalid :   4 ( 57%)
-unknown :   0 (  0%)
+why/count_bits_why.why        : ..?.?..?.!!. (7/0/3/0/2)
+total   :  12
+valid   :   7 ( 58%)
+invalid :   0 (  0%)
+unknown :   3 ( 25%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 ( 17%)
diff --git a/tests/jessie/oracle/dassault_1.err.oracle b/tests/jessie/oracle/dassault_1.err.oracle
index 8e64854b982b35598d772c54449974dd4b212bdb..6f599095e184c9cf580684856afa326986fb8d87 100644
--- a/tests/jessie/oracle/dassault_1.err.oracle
+++ b/tests/jessie/oracle/dassault_1.err.oracle
@@ -1,7 +1,68 @@
-[preprocessing] running gcc -C -E -I. dassault_1.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h dassault_1.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las1_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las1_d_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las2_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 204, characters 10-19:
+warning: mutable las_a_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 215, characters 10-20:
+warning: mutable las1_d_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 215, characters 10-20:
+warning: mutable las2_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 215, characters 10-20:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 215, characters 10-20:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 224, characters 10-20:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 224, characters 10-20:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las1_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las1_d_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las2_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 251, characters 10-23:
+warning: mutable las_a_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 260, characters 10-24:
+warning: mutable las1_d_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 260, characters 10-24:
+warning: mutable las2_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 260, characters 10-24:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 260, characters 10-24:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 269, characters 10-24:
+warning: mutable las2_b_0 is not declared in effect; added as read
+File "why/dassault_1.why", line 269, characters 10-24:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 287, characters 10-11:
+warning: mutable las1_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 287, characters 10-11:
+warning: mutable las2_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 287, characters 10-11:
+warning: mutable las3_alloc_table is not declared in effect; added as read
+File "why/dassault_1.why", line 287, characters 10-11:
+warning: mutable las_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/dassault_1.res.oracle b/tests/jessie/oracle/dassault_1.res.oracle
index 2a8cb7122ae294429fb21e32c9cbabb5279636af..8922b0a21a7fd64852e6a7cb8626d6fba43baa4c 100644
--- a/tests/jessie/oracle/dassault_1.res.oracle
+++ b/tests/jessie/oracle/dassault_1.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/dassault_1_why.why        : .... (4/0/0/0/0)
-total   :   4
-valid   :   4 (100%)
+why/dassault_1_why.why        : . (1/0/0/0/0)
+total   :   1
+valid   :   1 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/dassault_2.err.oracle b/tests/jessie/oracle/dassault_2.err.oracle
index 779f95d30bba7f0c9bfab49e4369504b575ba771..0a86a70bc4060a6f8943576d891e882538e1b4b3 100644
--- a/tests/jessie/oracle/dassault_2.err.oracle
+++ b/tests/jessie/oracle/dassault_2.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. dassault_2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h dassault_2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/discr_union.err.oracle b/tests/jessie/oracle/discr_union.err.oracle
index 355fd63f3d3e46a23c4ed4cc6b397d566afe96e4..3570c28ec95e4a26162c29ea64ac4fb112586413 100644
--- a/tests/jessie/oracle/discr_union.err.oracle
+++ b/tests/jessie/oracle/discr_union.err.oracle
@@ -1,13 +1,22 @@
-[preprocessing] running gcc -C -E -I. discr_union.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h discr_union.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function get
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/discr_union.why", line 81, characters 10-13:
-warning: mutable __anonunion_uni_1_tag_table is not declared in effect; added as read
-File "why/discr_union.why", line 81, characters 10-13:
-warning: mutable packet_discr_0 is not declared in effect; added as read
-File "why/discr_union.why", line 81, characters 10-13:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function get
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/discr_union.why", line 383, characters 10-26:
+warning: mutable __anonunion_uni_1_alloc_table is not declared in effect; added as read
+File "why/discr_union.why", line 383, characters 10-26:
+warning: mutable packet_uni_0 is not declared in effect; added as read
+File "why/discr_union.why", line 416, characters 10-22:
+warning: mutable __anonunion_uni_1_alloc_table is not declared in effect; added as read
+File "why/discr_union.why", line 416, characters 10-22:
 warning: mutable packet_uni_0 is not declared in effect; added as read
+File "why/discr_union.why", line 465, characters 10-13:
+warning: mutable __anonunion_uni_1_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/discr_union.res.oracle b/tests/jessie/oracle/discr_union.res.oracle
index 7ec0dcc0af51ecda81d66e85c791a83db750fe13..495df73cf11323ce3b4f610dc078cca1452c2af6 100644
--- a/tests/jessie/oracle/discr_union.res.oracle
+++ b/tests/jessie/oracle/discr_union.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/discr_union_why.why       : ................ (16/0/0/0/0)
-total   :  16
-valid   :  16 (100%)
+why/discr_union_why.why       : ....?....?.. (10/0/2/0/0)
+total   :  12
+valid   :  10 ( 83%)
 invalid :   0 (  0%)
-unknown :   0 (  0%)
+unknown :   2 ( 17%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/division.err.oracle b/tests/jessie/oracle/division.err.oracle
index ead8aa02dffc04a3cec35fa176a342bc32f595cc..6812f8ec5fa609294c98e0a93a6d673a377d043a 100644
--- a/tests/jessie/oracle/division.err.oracle
+++ b/tests/jessie/oracle/division.err.oracle
@@ -1,7 +1,14 @@
-[preprocessing] running gcc -C -E -I. division.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h division.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function division
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function division
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/division.res.oracle b/tests/jessie/oracle/division.res.oracle
index e9bd06b6e8dac8548d78b2d0d9c5e74e13fe3050..93e012b7d96436c75c42130ef8e17206d56be3e9 100644
--- a/tests/jessie/oracle/division.res.oracle
+++ b/tests/jessie/oracle/division.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/division_why.why          : *....*.... (8/2/0/0/0)
-total   :  10
-valid   :   8 ( 80%)
-invalid :   2 ( 20%)
+why/division_why.why          : ##....#.....!##....#.....!!! (18/0/0/6/4)
+total   :  28
+valid   :  18 ( 64%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
-timeout :   0 (  0%)
-failure :   0 (  0%)
+timeout :   6 ( 21%)
+failure :   4 ( 14%)
diff --git a/tests/jessie/oracle/dowhile.err.oracle b/tests/jessie/oracle/dowhile.err.oracle
index c43540404b5db9a659d6981ac047390b5a6a3bb3..6ff952a28ed6167d9dc827094ba9fd7bea4371d9 100644
--- a/tests/jessie/oracle/dowhile.err.oracle
+++ b/tests/jessie/oracle/dowhile.err.oracle
@@ -1,4 +1,10 @@
-[preprocessing] running gcc -C -E -I. dowhile.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h dowhile.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,5 +12,5 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function main
-File "why/dowhile.why", line 20, characters 10-14:
-warning: mutable x is not declared in effect; added as read
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/dowhile.res.oracle b/tests/jessie/oracle/dowhile.res.oracle
index af4ebc3e43b46517c03be911da30bb8db2ffcdc4..5be5bea383f173df33cdfebe3befc3a4a67d560a 100644
--- a/tests/jessie/oracle/dowhile.res.oracle
+++ b/tests/jessie/oracle/dowhile.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/dowhile_why.why           : ............... (15/0/0/0/0)
-total   :  15
-valid   :  15 (100%)
+why/dowhile_why.why           : .........................!!.. (27/0/0/0/2)
+total   :  29
+valid   :  27 ( 93%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 (  7%)
diff --git a/tests/jessie/oracle/enum.err.oracle b/tests/jessie/oracle/enum.err.oracle
index 2c9c5dcdbc84ad79992b05f024664e0aee68f458..63ebc1ac2cce780525df078fa2c6a4ff70f5790a 100644
--- a/tests/jessie/oracle/enum.err.oracle
+++ b/tests/jessie/oracle/enum.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. enum.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h enum.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,10 @@ FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function enum_as_array_index
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function enum_as_array_index
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/enum.res.oracle b/tests/jessie/oracle/enum.res.oracle
index 96bf8ec69ed523060ee670d87169749ce603fb81..fdc329215bfda5296955ee0d27c0b167b8400914 100644
--- a/tests/jessie/oracle/enum.res.oracle
+++ b/tests/jessie/oracle/enum.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/enum_why.why              : .......... (10/0/0/0/0)
-total   :  10
-valid   :  10 (100%)
+why/enum_why.why              : ......... (9/0/0/0/0)
+total   :   9
+valid   :   9 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/extern.err.oracle b/tests/jessie/oracle/extern.err.oracle
index eebc4529ab12bc1740ad7ef9490258e0a31592a4..78eb320c36c20d59959e28865029b2785ab8e4a5 100644
--- a/tests/jessie/oracle/extern.err.oracle
+++ b/tests/jessie/oracle/extern.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. extern.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h extern.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/extern.res.oracle b/tests/jessie/oracle/extern.res.oracle
index f3c33c4e3b68b66cf6f534706d2456040bf8bc87..e83221f686fe1bb8231a859688b59c6066fa2c94 100644
--- a/tests/jessie/oracle/extern.res.oracle
+++ b/tests/jessie/oracle/extern.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/extern_why.why            : * (0/1/0/0/0)
-total   :   1
-valid   :   0 (  0%)
-invalid :   1 (100%)
-unknown :   0 (  0%)
+why/extern_why.why            : ?. (1/0/1/0/0)
+total   :   2
+valid   :   1 ( 50%)
+invalid :   0 (  0%)
+unknown :   1 ( 50%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/fact.err.oracle b/tests/jessie/oracle/fact.err.oracle
index 72a531b58addc5015fc1e7e7f845cf078647f7f3..0c7486061fea951f7a595c0901803427d9d91a6b 100644
--- a/tests/jessie/oracle/fact.err.oracle
+++ b/tests/jessie/oracle/fact.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. fact.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h fact.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function fact
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function fact
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/false.err.oracle b/tests/jessie/oracle/false.err.oracle
index 1762a65de6ba1525f055c3be251a7eeec94c3d31..38e63bbced9b3b4ae2a53295fc997b156a1f8b59 100644
--- a/tests/jessie/oracle/false.err.oracle
+++ b/tests/jessie/oracle/false.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. false.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h false.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,34 @@ FIXME: Warning: ignoring second declaration of function false1
 FIXME: Warning: ignoring second declaration of function false2
 FIXME: Warning: ignoring second declaration of function false3
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function false0
+FIXME: Warning: ignoring second declaration of function false1
+FIXME: Warning: ignoring second declaration of function false2
+FIXME: Warning: ignoring second declaration of function false3
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/false.why", line 210, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/false.why", line 210, characters 10-21:
+warning: mutable u_alloc_table is not declared in effect; added as read
+File "why/false.why", line 210, characters 10-21:
+warning: mutable v_xx_0 is not declared in effect; added as read
+File "why/false.why", line 210, characters 10-21:
+warning: mutable v_yy_0 is not declared in effect; added as read
+File "why/false.why", line 227, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/false.why", line 227, characters 10-17:
+warning: mutable u_alloc_table is not declared in effect; added as read
+File "why/false.why", line 227, characters 10-17:
+warning: mutable v_xx_0 is not declared in effect; added as read
+File "why/false.why", line 227, characters 10-17:
+warning: mutable v_yy_0 is not declared in effect; added as read
+File "why/false.why", line 240, characters 10-16:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/false.why", line 240, characters 10-16:
+warning: mutable v_alloc_table is not declared in effect; added as read
+File "why/false.why", line 249, characters 10-16:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/false.why", line 256, characters 10-16:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/false.res.oracle b/tests/jessie/oracle/false.res.oracle
index 62c99d0a0a60e0774d94f442ea45c41ae2cdafae..904dca910662b1bb0e5d189d8536727b24b82816 100644
--- a/tests/jessie/oracle/false.res.oracle
+++ b/tests/jessie/oracle/false.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/false_why.why             : ......***..**.* (9/6/0/0/0)
-total   :  15
-valid   :   9 ( 60%)
-invalid :   6 ( 40%)
-unknown :   0 (  0%)
+why/false_why.why             : ..?....??.? (7/0/4/0/0)
+total   :  11
+valid   :   7 ( 64%)
+invalid :   0 (  0%)
+unknown :   4 ( 36%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/false2.err.oracle b/tests/jessie/oracle/false2.err.oracle
index e92fe1136ed062371eaaf9ca3e136c1317a0c651..6ab1c88e3302734dc2024233ba6d33be42baa47c 100644
--- a/tests/jessie/oracle/false2.err.oracle
+++ b/tests/jessie/oracle/false2.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. false2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h false2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
diff --git a/tests/jessie/oracle/false2.res.oracle b/tests/jessie/oracle/false2.res.oracle
index 216935dcc414c51da7516b1249817057f29a9098..e6257dea0dd114b94802157d103d6f53a3e043f0 100644
--- a/tests/jessie/oracle/false2.res.oracle
+++ b/tests/jessie/oracle/false2.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/false2_why.why            : * (0/1/0/0/0)
-total   :   1
-valid   :   0 (  0%)
-invalid :   1 (100%)
-unknown :   0 (  0%)
+why/false2_why.why            : ?.? (1/0/2/0/0)
+total   :   3
+valid   :   1 ( 33%)
+invalid :   0 (  0%)
+unknown :   2 ( 67%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/ghost2.err.oracle b/tests/jessie/oracle/ghost2.err.oracle
index 5b5cc8c662edb110517d4c7ddf305f2243c0a28d..6eace056fe4ab0a835a447cc7881dcfcf4595698 100644
--- a/tests/jessie/oracle/ghost2.err.oracle
+++ b/tests/jessie/oracle/ghost2.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. ghost2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h ghost2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,10 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/ghost2.res.oracle b/tests/jessie/oracle/ghost2.res.oracle
index 7e307bb189ea95808ac0687eaf8432ab9fec03c2..63ca9ce8c18b1d1f7b7b425c15c0e6cbbbf8784d 100644
--- a/tests/jessie/oracle/ghost2.res.oracle
+++ b/tests/jessie/oracle/ghost2.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/ghost2_why.why            : .................. (18/0/0/0/0)
-total   :  18
-valid   :  18 (100%)
+why/ghost2_why.why            : ............?...............?...!!..... (35/0/2/0/2)
+total   :  39
+valid   :  35 ( 90%)
 invalid :   0 (  0%)
-unknown :   0 (  0%)
+unknown :   2 (  5%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 (  5%)
diff --git a/tests/jessie/oracle/goto.err.oracle b/tests/jessie/oracle/goto.err.oracle
index a2dff000bce4ead18d228185fbe639c08e45acbf..3757e8fba35ffc46cb552be2730433a138345240 100644
--- a/tests/jessie/oracle/goto.err.oracle
+++ b/tests/jessie/oracle/goto.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. goto.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h goto.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,10 @@ FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function f3
 FIXME: Warning: ignoring second declaration of function f4
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function f4
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/goto.res.oracle b/tests/jessie/oracle/goto.res.oracle
index 8373c5055ce4215d26a61c260cda1a5d8e0cbf59..b36760c46af16aa8884d28cc0b01dbafd3d19819 100644
--- a/tests/jessie/oracle/goto.res.oracle
+++ b/tests/jessie/oracle/goto.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/goto_why.why              : ..... (5/0/0/0/0)
-total   :   5
-valid   :   5 (100%)
+why/goto_why.why              : .......... (10/0/0/0/0)
+total   :  10
+valid   :  10 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/incr.err.oracle b/tests/jessie/oracle/incr.err.oracle
index 00eaf048b3a52e11fe3f2b692d74229f848e0956..71df91c490b45af2914ce7a6f90012e3797be98e 100644
--- a/tests/jessie/oracle/incr.err.oracle
+++ b/tests/jessie/oracle/incr.err.oracle
@@ -1,7 +1,14 @@
-[preprocessing] running gcc -C -E -I. incr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h incr.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/incr.why", line 145, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/init.err.oracle b/tests/jessie/oracle/init.err.oracle
index d8a4fafc70f9ef5a5d548eeba703118a418573e6..cfba27a0acac900bdd61735dd68508f427774808 100644
--- a/tests/jessie/oracle/init.err.oracle
+++ b/tests/jessie/oracle/init.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. init.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h init.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +8,21 @@ FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/init.why", line 138, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/init.why", line 138, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/init.why", line 167, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/init.why", line 167, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/init.why", line 193, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/init.why", line 193, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/init.res.oracle b/tests/jessie/oracle/init.res.oracle
index b7ce5c6318288d8f0d290cc7eef48d79f6c8452a..c93b6f907b42cbdbc953695b44b294f03cf0b9ef 100644
--- a/tests/jessie/oracle/init.res.oracle
+++ b/tests/jessie/oracle/init.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/init_why.why              : ....*..*....*.. (12/3/0/0/0)
-total   :  15
-valid   :  12 ( 80%)
-invalid :   3 ( 20%)
-unknown :   0 (  0%)
+why/init_why.why              : .?.?..?. (5/0/3/0/0)
+total   :   8
+valid   :   5 ( 62%)
+invalid :   0 (  0%)
+unknown :   3 ( 38%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/init2.err.oracle b/tests/jessie/oracle/init2.err.oracle
index b934a88b7a4719e39314600e3624966555417f65..f0b2b9954945f1611f6f0833e36a9c7b2604f02d 100644
--- a/tests/jessie/oracle/init2.err.oracle
+++ b/tests/jessie/oracle/init2.err.oracle
@@ -1,15 +1,20 @@
-[preprocessing] running gcc -C -E -I. init2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h init2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/init2.why", line 83, characters 10-11:
-warning: mutable laconstante is not declared in effect; added as read
-File "why/init2.why", line 83, characters 10-11:
-warning: mutable le is not declared in effect; added as read
-File "why/init2.why", line 83, characters 10-11:
-warning: mutable ls is not declared in effect; added as read
-File "why/init2.why", line 83, characters 10-11:
-warning: mutable varglo is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/init2.why", line 187, characters 10-40:
+warning: mutable __anonstruct_lastruct1_1_alloc_table is not declared in effect; added as read
+File "why/init2.why", line 187, characters 10-40:
+warning: mutable __anonstruct_lastruct2_2_c_0 is not declared in effect; added as read
+File "why/init2.why", line 224, characters 10-44:
+warning: mutable __anonstruct_lastruct1_1_alloc_table is not declared in effect; added as read
+File "why/init2.why", line 224, characters 10-44:
+warning: mutable __anonstruct_lastruct2_2_c_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/init2.res.oracle b/tests/jessie/oracle/init2.res.oracle
index 9dbf208c4b3a0c737d7ff5394185511b5561ed33..4066d2cc607575e3788bfb4821f1b0f4d75b5411 100644
--- a/tests/jessie/oracle/init2.res.oracle
+++ b/tests/jessie/oracle/init2.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/init2_why.why             : ....**.** (5/4/0/0/0)
-total   :   9
-valid   :   5 ( 56%)
-invalid :   4 ( 44%)
-unknown :   0 (  0%)
+why/init2_why.why             : ..??.??. (4/0/4/0/0)
+total   :   8
+valid   :   4 ( 50%)
+invalid :   0 (  0%)
+unknown :   4 ( 50%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/inv_perm_minimal.err.oracle b/tests/jessie/oracle/inv_perm_minimal.err.oracle
index b4fdbf7243f0ea9e555110441872af7c7f7e6453..3dfe19fb78db2bc64139e3964ea8720729311fd2 100644
--- a/tests/jessie/oracle/inv_perm_minimal.err.oracle
+++ b/tests/jessie/oracle/inv_perm_minimal.err.oracle
@@ -1,9 +1,14 @@
-[preprocessing] running gcc -C -E -I. inv_perm_minimal.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h inv_perm_minimal.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function safety
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/inv_perm_minimal.why", line 32, characters 10-16:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function safety
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/inv_perm_minimal.res.oracle b/tests/jessie/oracle/inv_perm_minimal.res.oracle
index 743ceb5a23288d95d9d14873e4e2749b7997a00a..6f7fb7433d2a143660a66e12cd8d8020d490a33f 100644
--- a/tests/jessie/oracle/inv_perm_minimal.res.oracle
+++ b/tests/jessie/oracle/inv_perm_minimal.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/inv_perm_minimal_why.why  : ............................... (31/0/0/0/0)
-total   :  31
-valid   :  31 (100%)
+why/inv_perm_minimal_why.why  : .................................................... (52/0/0/0/0)
+total   :  52
+valid   :  52 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/invariant.err.oracle b/tests/jessie/oracle/invariant.err.oracle
index d0427adc9c0c5d845bd61ae5a5e3b9287c7934fb..d7eb859d23f3fe86480c1e19484e94b0e76a730d 100644
--- a/tests/jessie/oracle/invariant.err.oracle
+++ b/tests/jessie/oracle/invariant.err.oracle
@@ -1,6 +1,14 @@
-[preprocessing] running gcc -C -E -I. invariant.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h invariant.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function sum
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function sum
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/invariant.why", line 156, characters 10-13:
+warning: mutable __anonstruct_s_1_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/invariant.res.oracle b/tests/jessie/oracle/invariant.res.oracle
index 5420b2989d9159aebab1736667b069c71c5606bc..63c219ce47fcd92f3f9d9047ffbb1e21cdc9a571 100644
--- a/tests/jessie/oracle/invariant.res.oracle
+++ b/tests/jessie/oracle/invariant.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/invariant_why.why         : .. (2/0/0/0/0)
-total   :   2
-valid   :   2 (100%)
+why/invariant_why.why         : . (1/0/0/0/0)
+total   :   1
+valid   :   1 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/invariants.err.oracle b/tests/jessie/oracle/invariants.err.oracle
index 91a56ebdbefbd1736e1dc31be73a3817df564e05..163d6612e81db00636c4d5e650261924c96fe69d 100644
--- a/tests/jessie/oracle/invariants.err.oracle
+++ b/tests/jessie/oracle/invariants.err.oracle
@@ -1,8 +1,17 @@
-[preprocessing] running gcc -C -E -I. invariants.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h invariants.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 Warning: recursive definition of s in generated file
+File "why/invariants.why", line 186, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/invariants.why", line 186, characters 10-11:
+warning: mutable s_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/invariants.res.oracle b/tests/jessie/oracle/invariants.res.oracle
index d5be7b2c21e321f497b4e07b5974408202e23039..bad73f231616c5f0cd627bb8714b21ba78dce930 100644
--- a/tests/jessie/oracle/invariants.res.oracle
+++ b/tests/jessie/oracle/invariants.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/invariants_why.why        : .... (4/0/0/0/0)
-total   :   4
-valid   :   4 (100%)
+why/invariants_why.why        : . (1/0/0/0/0)
+total   :   1
+valid   :   1 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/loop_inv.err.oracle b/tests/jessie/oracle/loop_inv.err.oracle
index 633dc4fcfb6d25dd50cff21555e46d83c5caf7df..74c8b157e365d425194f419034cf23602af993aa 100644
--- a/tests/jessie/oracle/loop_inv.err.oracle
+++ b/tests/jessie/oracle/loop_inv.err.oracle
@@ -1,11 +1,14 @@
-[preprocessing] running gcc -C -E -I. loop_inv.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h loop_inv.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/loop_inv.why", line 18, characters 10-11:
-warning: mutable c is not declared in effect; added as read
-File "why/loop_inv.why", line 18, characters 10-11:
-warning: mutable i is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/loop_inv.res.oracle b/tests/jessie/oracle/loop_inv.res.oracle
index 6325f205eb0d001383533c8c4bd463dfbf046c3a..f9b07873cd62c80b51ef92994b33477c959fc186 100644
--- a/tests/jessie/oracle/loop_inv.res.oracle
+++ b/tests/jessie/oracle/loop_inv.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/loop_inv_why.why          : ..... (5/0/0/0/0)
-total   :   5
-valid   :   5 (100%)
+why/loop_inv_why.why          : .........!!.. (11/0/0/0/2)
+total   :  13
+valid   :  11 ( 85%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 ( 15%)
diff --git a/tests/jessie/oracle/malloc.err.oracle b/tests/jessie/oracle/malloc.err.oracle
index 35f57327450b3cb1fbd1417638e7be160d585e97..8683770ab729c7ac06feebc7a94068d41fe627d8 100644
--- a/tests/jessie/oracle/malloc.err.oracle
+++ b/tests/jessie/oracle/malloc.err.oracle
@@ -1,4 +1,12 @@
-[preprocessing] running gcc -C -E -I. malloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h malloc.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function malloc
+FIXME: Warning: ignoring second declaration of function test
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,9 +16,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function malloc
 FIXME: Warning: ignoring second declaration of function test
 FIXME: Warning: ignoring second declaration of function main
-File "why/malloc.why", line 48, characters 10-14:
-warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/malloc.why", line 48, characters 10-14:
-warning: mutable p_intP_alloc_table is not declared in effect; added as read
-File "why/malloc.why", line 48, characters 10-14:
-warning: mutable p_intP_p_intM_0 is not declared in effect; added as read
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/malloc.res.oracle b/tests/jessie/oracle/malloc.res.oracle
index 0f90b555267b7f00f533340a4118e75e7276ddba..514269411316a2a704623b48f1f7573b087c6d77 100644
--- a/tests/jessie/oracle/malloc.res.oracle
+++ b/tests/jessie/oracle/malloc.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/malloc_why.why            : .*..*....................**.................**. (41/6/0/0/0)
-total   :  47
-valid   :  41 ( 87%)
-invalid :   6 ( 13%)
-unknown :   0 (  0%)
+why/malloc_why.why            : ...................??.??..................??.??............. (52/0/8/0/0)
+total   :  60
+valid   :  52 ( 87%)
+invalid :   0 (  0%)
+unknown :   8 ( 13%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/mean.err.oracle b/tests/jessie/oracle/mean.err.oracle
index 8c7069d2497f063c8cfb18d8337ccf007eaaff84..b1db07f3d42c60b49ef498aa33be6eca657a4604 100644
--- a/tests/jessie/oracle/mean.err.oracle
+++ b/tests/jessie/oracle/mean.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. mean.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h mean.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +10,11 @@ FIXME: Warning: ignoring second declaration of function min_int
 FIXME: Warning: ignoring second declaration of function max_int
 FIXME: Warning: ignoring second declaration of function mean2
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function mean
+FIXME: Warning: ignoring second declaration of function umean
+FIXME: Warning: ignoring second declaration of function min_int
+FIXME: Warning: ignoring second declaration of function max_int
+FIXME: Warning: ignoring second declaration of function mean2
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/mean.res.oracle b/tests/jessie/oracle/mean.res.oracle
index eaab1c3e7d8547662bdaa1b3ab3d3118ad082aae..2506a33a8d5a544090252854272739daec58d18c 100644
--- a/tests/jessie/oracle/mean.res.oracle
+++ b/tests/jessie/oracle/mean.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/mean_why.why              : ..... (5/0/0/0/0)
-total   :   5
-valid   :   5 (100%)
+why/mean_why.why              : ..!!!! (2/0/0/0/4)
+total   :   6
+valid   :   2 ( 33%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   4 ( 67%)
diff --git a/tests/jessie/oracle/minix3_memchr.err.oracle b/tests/jessie/oracle/minix3_memchr.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_memchr.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_memchr.res.oracle b/tests/jessie/oracle/minix3_memchr.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_memcmp.err.oracle b/tests/jessie/oracle/minix3_memcmp.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_memcmp.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_memcmp.res.oracle b/tests/jessie/oracle/minix3_memcmp.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_memcpy.err.oracle b/tests/jessie/oracle/minix3_memcpy.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_memcpy.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_memcpy.res.oracle b/tests/jessie/oracle/minix3_memcpy.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_memmove.err.oracle b/tests/jessie/oracle/minix3_memmove.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_memmove.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_memmove.res.oracle b/tests/jessie/oracle/minix3_memmove.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_memset.err.oracle b/tests/jessie/oracle/minix3_memset.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_memset.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_memset.res.oracle b/tests/jessie/oracle/minix3_memset.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strcat.err.oracle b/tests/jessie/oracle/minix3_strcat.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strcat.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strcat.res.oracle b/tests/jessie/oracle/minix3_strcat.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strchr.err.oracle b/tests/jessie/oracle/minix3_strchr.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strchr.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strchr.res.oracle b/tests/jessie/oracle/minix3_strchr.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strcmp.err.oracle b/tests/jessie/oracle/minix3_strcmp.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strcmp.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strcmp.res.oracle b/tests/jessie/oracle/minix3_strcmp.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strcoll.err.oracle b/tests/jessie/oracle/minix3_strcoll.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strcoll.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strcoll.res.oracle b/tests/jessie/oracle/minix3_strcoll.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strcpy.err.oracle b/tests/jessie/oracle/minix3_strcpy.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strcpy.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strcpy.res.oracle b/tests/jessie/oracle/minix3_strcpy.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strcspn.err.oracle b/tests/jessie/oracle/minix3_strcspn.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strcspn.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strcspn.res.oracle b/tests/jessie/oracle/minix3_strcspn.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strerror.err.oracle b/tests/jessie/oracle/minix3_strerror.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strerror.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strerror.res.oracle b/tests/jessie/oracle/minix3_strerror.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strftime.err.oracle b/tests/jessie/oracle/minix3_strftime.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strftime.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strftime.res.oracle b/tests/jessie/oracle/minix3_strftime.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strlen.err.oracle b/tests/jessie/oracle/minix3_strlen.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strlen.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strlen.res.oracle b/tests/jessie/oracle/minix3_strlen.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strncat.err.oracle b/tests/jessie/oracle/minix3_strncat.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strncat.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strncat.res.oracle b/tests/jessie/oracle/minix3_strncat.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strncmp.err.oracle b/tests/jessie/oracle/minix3_strncmp.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strncmp.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strncmp.res.oracle b/tests/jessie/oracle/minix3_strncmp.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strncpy.err.oracle b/tests/jessie/oracle/minix3_strncpy.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strncpy.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strncpy.res.oracle b/tests/jessie/oracle/minix3_strncpy.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strpbrk.err.oracle b/tests/jessie/oracle/minix3_strpbrk.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strpbrk.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strpbrk.res.oracle b/tests/jessie/oracle/minix3_strpbrk.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strrchr.err.oracle b/tests/jessie/oracle/minix3_strrchr.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strrchr.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strrchr.res.oracle b/tests/jessie/oracle/minix3_strrchr.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strspn.err.oracle b/tests/jessie/oracle/minix3_strspn.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strspn.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strspn.res.oracle b/tests/jessie/oracle/minix3_strspn.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strstr.err.oracle b/tests/jessie/oracle/minix3_strstr.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strstr.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strstr.res.oracle b/tests/jessie/oracle/minix3_strstr.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strtok.err.oracle b/tests/jessie/oracle/minix3_strtok.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strtok.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strtok.res.oracle b/tests/jessie/oracle/minix3_strtok.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strtol.err.oracle b/tests/jessie/oracle/minix3_strtol.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strtol.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strtol.res.oracle b/tests/jessie/oracle/minix3_strtol.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minix3_strxfrm.err.oracle b/tests/jessie/oracle/minix3_strxfrm.err.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..6b9a448202aae9290f050b61a3f6277f42b8a8c1
--- /dev/null
+++ b/tests/jessie/oracle/minix3_strxfrm.err.oracle
@@ -0,0 +1 @@
+export: 13: -cpp-command: bad variable name
diff --git a/tests/jessie/oracle/minix3_strxfrm.res.oracle b/tests/jessie/oracle/minix3_strxfrm.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/jessie/oracle/minusminus.err.oracle b/tests/jessie/oracle/minusminus.err.oracle
index a6852abbb4063c8d619ec7d85dafdaee87dc8a98..e5f9806835eb3dfc7ab1cdd0238f776348af244d 100644
--- a/tests/jessie/oracle/minusminus.err.oracle
+++ b/tests/jessie/oracle/minusminus.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. minusminus.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h minusminus.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/minusminus.res.oracle b/tests/jessie/oracle/minusminus.res.oracle
index bda130f559c8bdb93da997056ad033573fbe04dd..10bd2dea36b975cf59a80462f7bf89ce2901746f 100644
--- a/tests/jessie/oracle/minusminus.res.oracle
+++ b/tests/jessie/oracle/minusminus.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/minusminus_why.why        : * (0/1/0/0/0)
+why/minusminus_why.why        : . (1/0/0/0/0)
 total   :   1
-valid   :   0 (  0%)
-invalid :   1 (100%)
+valid   :   1 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/negate.err.oracle b/tests/jessie/oracle/negate.err.oracle
index be172ec5d239cd57b7bf52884b88468e6f15cde1..9f3d351d7b0ccc15c1d9789dafedd0f369e393d9 100644
--- a/tests/jessie/oracle/negate.err.oracle
+++ b/tests/jessie/oracle/negate.err.oracle
@@ -1,9 +1,14 @@
-[preprocessing] running gcc -C -E -I. negate.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h negate.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function negate
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/negate.why", line 27, characters 10-16:
-warning: mutable intP_intM is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function negate
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/negate.res.oracle b/tests/jessie/oracle/negate.res.oracle
index dd73e3b50cd33da163858ff17e5f167cac543331..87f7b7c659b7a67610949a6241a2e5192076fa49 100644
--- a/tests/jessie/oracle/negate.res.oracle
+++ b/tests/jessie/oracle/negate.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/negate_why.why            : .....*.*.........*.. (17/3/0/0/0)
-total   :  20
-valid   :  17 ( 85%)
-invalid :   3 ( 15%)
-unknown :   0 (  0%)
+why/negate_why.why            : .........?.....?.............?....!! (31/0/3/0/2)
+total   :  36
+valid   :  31 ( 86%)
+invalid :   0 (  0%)
+unknown :   3 (  8%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 (  6%)
diff --git a/tests/jessie/oracle/null.err.oracle b/tests/jessie/oracle/null.err.oracle
index 3e8307d70fdbdbc69043a8f7f9ab18219cfa0d15..1265343b04f58e40b4e7eea6797811cbba109f40 100644
--- a/tests/jessie/oracle/null.err.oracle
+++ b/tests/jessie/oracle/null.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. null.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h null.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/null.res.oracle b/tests/jessie/oracle/null.res.oracle
index 4eb23f61879b718cefd32888cbdb9fd3cad1e144..e36e61e299566ecdd1910ab1d6ae94b70a51a185 100644
--- a/tests/jessie/oracle/null.res.oracle
+++ b/tests/jessie/oracle/null.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/null_why.why              : *.**.* (2/4/0/0/0)
-total   :   6
-valid   :   2 ( 33%)
-invalid :   4 ( 67%)
+why/null_why.why              : .. (2/0/0/0/0)
+total   :   2
+valid   :   2 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/overflow.err.oracle b/tests/jessie/oracle/overflow.err.oracle
index e942acc96bea13a2b5305711bf82206b47dd0070..6145eddd775591a0d8282c1a65d84257838f6d68 100644
--- a/tests/jessie/oracle/overflow.err.oracle
+++ b/tests/jessie/oracle/overflow.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. overflow.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h overflow.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,7 +9,10 @@ FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function hh
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/overflow.why", line 60, characters 10-11:
-warning: mutable e2 is not declared in effect; added as read
-File "why/overflow.why", line 63, characters 10-11:
-warning: mutable s is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function hh
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/overflow.res.oracle b/tests/jessie/oracle/overflow.res.oracle
index 089658c341d34f46472f4984f7f58111bceb04e5..fbc8573cbcd92f6598aa091724862d8f35ad72f7 100644
--- a/tests/jessie/oracle/overflow.res.oracle
+++ b/tests/jessie/oracle/overflow.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/overflow_why.why          : ...... (6/0/0/0/0)
-total   :   6
-valid   :   6 (100%)
+why/overflow_why.why          : ................... (19/0/0/0/0)
+total   :  19
+valid   :  19 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/param.err.oracle b/tests/jessie/oracle/param.err.oracle
index cd18262f741696f2564528a2011bb497994b865e..7e8066088d3d5835b23456e7fb7f8a636cd64ee8 100644
--- a/tests/jessie/oracle/param.err.oracle
+++ b/tests/jessie/oracle/param.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. param.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h param.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/passing.err.oracle b/tests/jessie/oracle/passing.err.oracle
index 1df410c160b7091b394e0aae27a16cb4052739c8..d77bd1b0e572ec1cde957b8007ff7bedb796741d 100644
--- a/tests/jessie/oracle/passing.err.oracle
+++ b/tests/jessie/oracle/passing.err.oracle
@@ -1,4 +1,11 @@
-[preprocessing] running gcc -C -E -I. passing.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h passing.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +14,5 @@ FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function main
+File "why/passing.why", line 158, characters 10-14:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/passing.res.oracle b/tests/jessie/oracle/passing.res.oracle
index ed3900ff1f90733f88a867f6fdc805fcff349b30..8771509c3d395b2bb45ebcffe63976185ca0aab9 100644
--- a/tests/jessie/oracle/passing.res.oracle
+++ b/tests/jessie/oracle/passing.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/passing_why.why           : ......*.**.*.** (9/6/0/0/0)
-total   :  15
-valid   :   9 ( 60%)
-invalid :   6 ( 40%)
-unknown :   0 (  0%)
+why/passing_why.why           : ....??.?? (5/0/4/0/0)
+total   :   9
+valid   :   5 ( 56%)
+invalid :   0 (  0%)
+unknown :   4 ( 44%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/pointer.err.oracle b/tests/jessie/oracle/pointer.err.oracle
index 84dcd1b337e8b24525be2524b5f70c9730084ce0..91bbb761976b706272c183556f25411893f0a535 100644
--- a/tests/jessie/oracle/pointer.err.oracle
+++ b/tests/jessie/oracle/pointer.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. pointer.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h pointer.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -12,7 +13,26 @@ FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function array1
 FIXME: Warning: ignoring second declaration of function struct1
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/pointer.why", line 43, characters 10-16:
-warning: mutable t is not declared in effect; added as read
-File "why/pointer.why", line 73, characters 10-11:
-warning: mutable r is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function malloc
+FIXME: Warning: ignoring second declaration of function g2
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function array1
+FIXME: Warning: ignoring second declaration of function struct1
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/pointer.why", line 138, characters 10-17:
+warning: mutable S_x_0 is not declared in effect; added as read
+File "why/pointer.why", line 138, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/pointer.why", line 167, characters 10-21:
+warning: mutable S_x_0 is not declared in effect; added as read
+File "why/pointer.why", line 167, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/pointer.why", line 261, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/pointer.why", line 261, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/pointer.res.oracle b/tests/jessie/oracle/pointer.res.oracle
index 29d761f8171c9ed0150d4106ccf91c37219628f9..ea3eff12c8c591226c755cc507621d2ba5fb0e59 100644
--- a/tests/jessie/oracle/pointer.res.oracle
+++ b/tests/jessie/oracle/pointer.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/pointer_why.why           : ....*.*.*.*......................................*....*................*.***.. (68/10/0/0/0)
-total   :  78
-valid   :  68 ( 87%)
-invalid :  10 ( 13%)
-unknown :   0 (  0%)
+why/pointer_why.why           : .....................................?...... (43/0/1/0/0)
+total   :  44
+valid   :  43 ( 98%)
+invalid :   0 (  0%)
+unknown :   1 (  2%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/queue.err.oracle b/tests/jessie/oracle/queue.err.oracle
index b3f0cd2dee1b05af80964a4c6eb47776cb2da109..bd37aa0204ae71eaf483979c7d8263442a8c22da 100644
--- a/tests/jessie/oracle/queue.err.oracle
+++ b/tests/jessie/oracle/queue.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. queue.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h queue.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,15 +8,23 @@ FIXME: Warning: ignoring second declaration of function push
 FIXME: Warning: ignoring second declaration of function pop
 FIXME: Warning: ignoring second declaration of function test
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/queue.why", line 51, characters 10-13:
-warning: mutable q is not declared in effect; added as read
-File "why/queue.why", line 51, characters 10-13:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function push
+FIXME: Warning: ignoring second declaration of function pop
+FIXME: Warning: ignoring second declaration of function test
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/queue.why", line 158, characters 10-13:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/queue.why", line 158, characters 10-13:
 warning: mutable queue_alloc_table is not declared in effect; added as read
-File "why/queue.why", line 68, characters 10-14:
-warning: mutable q is not declared in effect; added as read
-File "why/queue.why", line 68, characters 10-14:
+File "why/queue.why", line 186, characters 10-14:
 warning: mutable charP_alloc_table is not declared in effect; added as read
-File "why/queue.why", line 68, characters 10-14:
+File "why/queue.why", line 186, characters 10-14:
 warning: mutable queue_alloc_table is not declared in effect; added as read
-File "why/queue.why", line 93, characters 10-14:
-warning: mutable q is not declared in effect; added as read
+File "why/queue.why", line 218, characters 10-14:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/queue.why", line 218, characters 10-14:
+warning: mutable queue_contents_0 is not declared in effect; added as read
+File "why/queue.why", line 218, characters 10-14:
+warning: mutable queue_first_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/queue.res.oracle b/tests/jessie/oracle/queue.res.oracle
index 67588038ef215ee926ad420684dbfbe95547bf6b..c54ffa0b27dba7b38cef3eae7d46b5d16d286a88 100644
--- a/tests/jessie/oracle/queue.res.oracle
+++ b/tests/jessie/oracle/queue.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/queue_why.why             : ..........**......**.*... (20/5/0/0/0)
-total   :  25
-valid   :  20 ( 80%)
-invalid :   5 ( 20%)
-unknown :   0 (  0%)
-timeout :   0 (  0%)
+why/queue_why.why             : ..........#.........?...... (25/0/1/1/0)
+total   :  27
+valid   :  25 ( 93%)
+invalid :   0 (  0%)
+unknown :   1 (  4%)
+timeout :   1 (  4%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/rec.err.oracle b/tests/jessie/oracle/rec.err.oracle
index 50c8218b265fe501a3ea27d7c764452a35128aa7..9b9dddb5c1203e7c8badd46e737831f575970ad7 100644
--- a/tests/jessie/oracle/rec.err.oracle
+++ b/tests/jessie/oracle/rec.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. rec.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h rec.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/rec2.err.oracle b/tests/jessie/oracle/rec2.err.oracle
index e5c3d1732938a5950b285b479d9763f744509659..478608540f2d04573402723811e240a2a2a38928 100644
--- a/tests/jessie/oracle/rec2.err.oracle
+++ b/tests/jessie/oracle/rec2.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. rec2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h rec2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/ref.err.oracle b/tests/jessie/oracle/ref.err.oracle
index 58d674bc075975f03205c234f3fcfd606ad8c7e2..050e72096b03ce635f6cb9981f72c45856827469 100644
--- a/tests/jessie/oracle/ref.err.oracle
+++ b/tests/jessie/oracle/ref.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. ref.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h ref.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/ref.res.oracle b/tests/jessie/oracle/ref.res.oracle
index 42b26583c04d0ab6363b57e98d21812ced655613..c3254a02de3e22193caaae93a0952fee922dd3d3 100644
--- a/tests/jessie/oracle/ref.res.oracle
+++ b/tests/jessie/oracle/ref.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/ref_why.why               : .......*.......... (17/1/0/0/0)
-total   :  18
-valid   :  17 ( 94%)
-invalid :   1 (  6%)
+why/ref_why.why               : ........ (8/0/0/0/0)
+total   :   8
+valid   :   8 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/ref_glob.err.oracle b/tests/jessie/oracle/ref_glob.err.oracle
index 8130a5aa6f2b42e16823d703ff214beac780e01a..e700c618927632d7495e3082197f21ea25611ac2 100644
--- a/tests/jessie/oracle/ref_glob.err.oracle
+++ b/tests/jessie/oracle/ref_glob.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. ref_glob.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h ref_glob.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,11 +10,29 @@ FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function f4
 FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/ref_glob.why", line 49, characters 10-12:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f4
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/ref_glob.why", line 165, characters 10-34:
+warning: mutable __anonstruct_las_1_c1_0 is not declared in effect; added as read
+File "why/ref_glob.why", line 165, characters 10-34:
+warning: mutable __anonstruct_las_1_c2_0 is not declared in effect; added as read
+File "why/ref_glob.why", line 165, characters 10-34:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/ref_glob.why", line 198, characters 10-38:
+warning: mutable __anonstruct_las_1_c1_0 is not declared in effect; added as read
+File "why/ref_glob.why", line 198, characters 10-38:
+warning: mutable __anonstruct_las_1_c2_0 is not declared in effect; added as read
+File "why/ref_glob.why", line 198, characters 10-38:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/ref_glob.why", line 248, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/ref_glob.why", line 261, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/ref_glob.why", line 273, characters 10-12:
 warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/ref_glob.why", line 49, characters 10-12:
-warning: mutable x is not declared in effect; added as read
-File "why/ref_glob.why", line 56, characters 10-12:
-warning: mutable x is not declared in effect; added as read
-File "why/ref_glob.why", line 64, characters 10-12:
-warning: mutable plas is not declared in effect; added as read
diff --git a/tests/jessie/oracle/ref_glob.res.oracle b/tests/jessie/oracle/ref_glob.res.oracle
index 0e5bce6875e8f922d2d00be19849c2363bcc0e9e..f77b0b513c0616fc2c521b4e3be2eefe965639fe 100644
--- a/tests/jessie/oracle/ref_glob.res.oracle
+++ b/tests/jessie/oracle/ref_glob.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/ref_glob_why.why          : ......*.**..*.***.***.**......*.**.*.**............ (33/18/0/0/0)
-total   :  51
-valid   :  33 ( 65%)
-invalid :  18 ( 35%)
+why/ref_glob_why.why          : ..................................... (37/0/0/0/0)
+total   :  37
+valid   :  37 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/return.err.oracle b/tests/jessie/oracle/return.err.oracle
index 29acea82dcdcd4c76a11ef105b0f29db12e743d6..5ca99c9a3dd3ef00378cb663d46470a155f25e88 100644
--- a/tests/jessie/oracle/return.err.oracle
+++ b/tests/jessie/oracle/return.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. return.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h return.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,10 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function cast_null
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function cast_null
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/return.why", line 146, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/return.res.oracle b/tests/jessie/oracle/return.res.oracle
index e6134edaa70d181ddca070a4ce7c3ff61aafb67e..2f95b717d29c4bb76a00107405d945338e751901 100644
--- a/tests/jessie/oracle/return.res.oracle
+++ b/tests/jessie/oracle/return.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/return_why.why            : ***. (1/3/0/0/0)
-total   :   4
-valid   :   1 ( 25%)
-invalid :   3 ( 75%)
+why/return_why.why            : .. (2/0/0/0/0)
+total   :   2
+valid   :   2 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/see.err.oracle b/tests/jessie/oracle/see.err.oracle
index 7a578f7e9aaa9716c07dc50bff89aba024280fe3..d92578577794765cd4714348e0665a08e2af7d95 100644
--- a/tests/jessie/oracle/see.err.oracle
+++ b/tests/jessie/oracle/see.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. see.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h see.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,8 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function k
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function k
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/see.res.oracle b/tests/jessie/oracle/see.res.oracle
index 2e94587053be099ffe952015c1f1dcfc11db8911..50c1e3974de4f7d9f995f77e0ed738095d0572d1 100644
--- a/tests/jessie/oracle/see.res.oracle
+++ b/tests/jessie/oracle/see.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/see_why.why               : ... (3/0/0/0/0)
-total   :   3
-valid   :   3 (100%)
+why/see_why.why               : ....?. (5/0/1/0/0)
+total   :   6
+valid   :   5 ( 83%)
 invalid :   0 (  0%)
-unknown :   0 (  0%)
+unknown :   1 ( 17%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/separation3.err.oracle b/tests/jessie/oracle/separation3.err.oracle
index 7943662c4a96f44559294e9c64ccc4a1c02a31a0..e268c526a842959e3de91e0e970a1ba14662ea5b 100644
--- a/tests/jessie/oracle/separation3.err.oracle
+++ b/tests/jessie/oracle/separation3.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. separation3.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h separation3.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,3 +8,59 @@ FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function f2
 FIXME: Warning: ignoring second declaration of function f3
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable L_q_0 is not declared in effect; added as read
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable L_r_0 is not declared in effect; added as read
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/separation3.why", line 180, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 189, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation3.why", line 189, characters 10-17:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/separation3.why", line 189, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable L_q_0 is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable L_r_0 is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/separation3.why", line 220, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 229, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation3.why", line 229, characters 10-21:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/separation3.why", line 229, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 255, characters 10-11:
+warning: mutable L_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 255, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 267, characters 10-12:
+warning: mutable L_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 267, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 267, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 279, characters 10-12:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation3.why", line 279, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/separation3.res.oracle b/tests/jessie/oracle/separation3.res.oracle
index 3300ebf28dd99576b753481594a110f1d01fd1b3..ed061a0b626492c87a3cd98ff51c97f4a8f242e7 100644
--- a/tests/jessie/oracle/separation3.res.oracle
+++ b/tests/jessie/oracle/separation3.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/separation3_why.why       : ....*.***** (5/6/0/0/0)
-total   :  11
-valid   :   5 ( 45%)
-invalid :   6 ( 55%)
-unknown :   0 (  0%)
+why/separation3_why.why       : ....???? (4/0/4/0/0)
+total   :   8
+valid   :   4 ( 50%)
+invalid :   0 (  0%)
+unknown :   4 ( 50%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/separation4.err.oracle b/tests/jessie/oracle/separation4.err.oracle
index e82731b2adcf0d3abc0fc39b913bccebef672466..16e86f43a9e0fc9f61be1e99f3f3e89c12aa99de 100644
--- a/tests/jessie/oracle/separation4.err.oracle
+++ b/tests/jessie/oracle/separation4.err.oracle
@@ -1,9 +1,24 @@
-[preprocessing] running gcc -C -E -I. separation4.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h separation4.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/separation4.why", line 41, characters 10-11:
-warning: mutable x is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/separation4.why", line 162, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation4.why", line 162, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation4.why", line 193, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/separation4.why", line 193, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/separation4.why", line 219, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/separation4.why", line 219, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/separation4.res.oracle b/tests/jessie/oracle/separation4.res.oracle
index fe8a4973f528d4228ddd99156b61e4f7dc5a3804..00ca8e6de432b256985dcad7fb645fbf7a8fd5a0 100644
--- a/tests/jessie/oracle/separation4.res.oracle
+++ b/tests/jessie/oracle/separation4.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/separation4_why.why       : .... (4/0/0/0/0)
-total   :   4
-valid   :   4 (100%)
+why/separation4_why.why       : . (1/0/0/0/0)
+total   :   1
+valid   :   1 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/shift.err.oracle b/tests/jessie/oracle/shift.err.oracle
index 33c597fe210f0e61f8ce90115aa7e499817c3a47..64ab0f07503ff106cb06425ede88188dcdcf969e 100644
--- a/tests/jessie/oracle/shift.err.oracle
+++ b/tests/jessie/oracle/shift.err.oracle
@@ -1,7 +1,12 @@
-[preprocessing] running gcc -C -E -I. shift.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h shift.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
diff --git a/tests/jessie/oracle/shift.res.oracle b/tests/jessie/oracle/shift.res.oracle
index 96fb7f8645e133aa49040bf4e4a4d31d5ff4b68e..fdf0ecc9e21aa664b482be1f33098e02cc44bb19 100644
--- a/tests/jessie/oracle/shift.res.oracle
+++ b/tests/jessie/oracle/shift.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/shift_why.why             : * (0/1/0/0/0)
+why/shift_why.why             : ! (0/0/0/0/1)
 total   :   1
 valid   :   0 (  0%)
-invalid :   1 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   1 (100%)
diff --git a/tests/jessie/oracle/string_basic.err.oracle b/tests/jessie/oracle/string_basic.err.oracle
index 2ead4227cadf2f0dd8bf0341b7044654c0b64272..f59c76c4b8efa3ce63bd8e18f3fe06e650f62bf6 100644
--- a/tests/jessie/oracle/string_basic.err.oracle
+++ b/tests/jessie/oracle/string_basic.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. string_basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h string_basic.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -9,3 +10,17 @@ FIXME: Warning: ignoring second declaration of function test2
 FIXME: Warning: ignoring second declaration of function test1ptr
 FIXME: Warning: ignoring second declaration of function test2ptr
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function endsat
+FIXME: Warning: ignoring second declaration of function test1
+FIXME: Warning: ignoring second declaration of function test2
+FIXME: Warning: ignoring second declaration of function test1ptr
+FIXME: Warning: ignoring second declaration of function test2ptr
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/string_basic.why", line 126, characters 10-15:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/string_basic.why", line 133, characters 10-18:
+warning: mutable charP_alloc_table is not declared in effect; added as read
+File "why/string_basic.why", line 145, characters 10-18:
+warning: mutable charP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/string_basic.res.oracle b/tests/jessie/oracle/string_basic.res.oracle
index 7a741d8a6ba79f2c7842377e2c6c0a5fa6caa4e0..c611fe61e4deed858d3e29ab61b20f549ffedadf 100644
--- a/tests/jessie/oracle/string_basic.res.oracle
+++ b/tests/jessie/oracle/string_basic.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/string_basic_why.why      : ....*....*.****.***.......*..*** (19/13/0/0/0)
-total   :  32
-valid   :  19 ( 59%)
-invalid :  13 ( 41%)
-unknown :   0 (  0%)
+why/string_basic_why.why      : ..??.??..??.......??.... (16/0/8/0/0)
+total   :  24
+valid   :  16 ( 67%)
+invalid :   0 (  0%)
+unknown :   8 ( 33%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/struct.err.oracle b/tests/jessie/oracle/struct.err.oracle
index efb4c9df3986fa9ec24ab91621c5eb2a70953951..8c11ed26648634eaee6b3a4b7b1443c9ef15869c 100644
--- a/tests/jessie/oracle/struct.err.oracle
+++ b/tests/jessie/oracle/struct.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. struct.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h struct.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,20 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/struct.why", line 162, characters 10-17:
+warning: mutable S_t_0 is not declared in effect; added as read
+File "why/struct.why", line 162, characters 10-17:
+warning: mutable T_alloc_table is not declared in effect; added as read
+File "why/struct.why", line 190, characters 10-21:
+warning: mutable S_t_0 is not declared in effect; added as read
+File "why/struct.why", line 190, characters 10-21:
+warning: mutable T_alloc_table is not declared in effect; added as read
+File "why/struct.why", line 248, characters 10-11:
+warning: mutable T_alloc_table is not declared in effect; added as read
+File "why/struct.why", line 248, characters 10-11:
+warning: mutable p_s_SP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/struct.res.oracle b/tests/jessie/oracle/struct.res.oracle
index 8c7010f19979b7bacd355b724b15627f9b3ba27d..179cc624016cb07be7f3092927b28d9d8d6ba992 100644
--- a/tests/jessie/oracle/struct.res.oracle
+++ b/tests/jessie/oracle/struct.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/struct_why.why            : .................*.*.*.***.. (22/6/0/0/0)
-total   :  28
-valid   :  22 ( 79%)
-invalid :   6 ( 21%)
+why/struct_why.why            : ................ (16/0/0/0/0)
+total   :  16
+valid   :  16 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/struct2.err.oracle b/tests/jessie/oracle/struct2.err.oracle
index 00123f15814b87300b49d7ce6cd69bee56ce986f..c3cc5ca65c8e74636d2fca80802b8411aa432fc6 100644
--- a/tests/jessie/oracle/struct2.err.oracle
+++ b/tests/jessie/oracle/struct2.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. struct2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h struct2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,42 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/struct2.why", line 167, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/struct2.why", line 167, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 176, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 176, characters 10-17:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/struct2.why", line 176, characters 10-17:
+warning: mutable U_d_0 is not declared in effect; added as read
+File "why/struct2.why", line 176, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 207, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/struct2.why", line 207, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 215, characters 10-21:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 215, characters 10-21:
+warning: mutable S_b_0 is not declared in effect; added as read
+File "why/struct2.why", line 215, characters 10-21:
+warning: mutable U_d_0 is not declared in effect; added as read
+File "why/struct2.why", line 215, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 242, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 242, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 253, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 253, characters 10-11:
+warning: mutable U_alloc_table is not declared in effect; added as read
+File "why/struct2.why", line 253, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/struct2.res.oracle b/tests/jessie/oracle/struct2.res.oracle
index dbf1eecc409bd5734d142bc81940a7e336776bef..9b998e5f919a6288389497d7229bb3edf8cce750 100644
--- a/tests/jessie/oracle/struct2.res.oracle
+++ b/tests/jessie/oracle/struct2.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/struct2_why.why           : .... (4/0/0/0/0)
-total   :   4
-valid   :   4 (100%)
+why/struct2_why.why           : .. (2/0/0/0/0)
+total   :   2
+valid   :   2 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/struct3.err.oracle b/tests/jessie/oracle/struct3.err.oracle
index 05028b5f24815a495f2612c808dd23e7ae8cc61c..ee53964b52627ae7ad6a0a842f73e6552fd3db56 100644
--- a/tests/jessie/oracle/struct3.err.oracle
+++ b/tests/jessie/oracle/struct3.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. struct3.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h struct3.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,3 +7,16 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/struct3.why", line 138, characters 10-17:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct3.why", line 138, characters 10-17:
+warning: mutable U_s_0 is not declared in effect; added as read
+File "why/struct3.why", line 166, characters 10-21:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/struct3.why", line 166, characters 10-21:
+warning: mutable U_s_0 is not declared in effect; added as read
diff --git a/tests/jessie/oracle/struct3.res.oracle b/tests/jessie/oracle/struct3.res.oracle
index 93bcfbcee430c1d69127e67cc71c5f8f31c35190..fc10e2ce5bbeffab1d231a3a6d1d382f3a08711b 100644
--- a/tests/jessie/oracle/struct3.res.oracle
+++ b/tests/jessie/oracle/struct3.res.oracle
@@ -1,7 +1,7 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/struct3_why.why           : .......... (10/0/0/0/0)
-total   :  10
-valid   :  10 (100%)
+why/struct3_why.why           : .... (4/0/0/0/0)
+total   :   4
+valid   :   4 (100%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
diff --git a/tests/jessie/oracle/struct4.err.oracle b/tests/jessie/oracle/struct4.err.oracle
index e55c7085a55280307f1aa824f10c6143f6f73f14..5df8d9c2c758cbb0b1073ff5babea0f3037c4b55 100644
--- a/tests/jessie/oracle/struct4.err.oracle
+++ b/tests/jessie/oracle/struct4.err.oracle
@@ -1,7 +1,26 @@
-[preprocessing] running gcc -C -E -I. struct4.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h struct4.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/struct4.why", line 151, characters 10-17:
+warning: mutable A_alloc_table is not declared in effect; added as read
+File "why/struct4.why", line 151, characters 10-17:
+warning: mutable S_a_0 is not declared in effect; added as read
+File "why/struct4.why", line 151, characters 10-17:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/struct4.why", line 180, characters 10-21:
+warning: mutable A_alloc_table is not declared in effect; added as read
+File "why/struct4.why", line 180, characters 10-21:
+warning: mutable S_a_0 is not declared in effect; added as read
+File "why/struct4.why", line 180, characters 10-21:
+warning: mutable S_c_0 is not declared in effect; added as read
+File "why/struct4.why", line 198, characters 10-11:
+warning: mutable A_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/struct4.res.oracle b/tests/jessie/oracle/struct4.res.oracle
index 453db1f3282a810b3b70e7b025df13dfd849c9b0..30cd20e1d3b36bd3ed3e8315164ad0e2b12bbf4e 100644
--- a/tests/jessie/oracle/struct4.res.oracle
+++ b/tests/jessie/oracle/struct4.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/struct4_why.why           : ....****.. (6/4/0/0/0)
-total   :  10
-valid   :   6 ( 60%)
-invalid :   4 ( 40%)
+why/struct4_why.why           : .... (4/0/0/0/0)
+total   :   4
+valid   :   4 (100%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/struct_hack.err.oracle b/tests/jessie/oracle/struct_hack.err.oracle
index 813083735cca585103e429616dd5f06dca50b644..60b6c70915e1b9125704c05c204ca4bc67f3cd74 100644
--- a/tests/jessie/oracle/struct_hack.err.oracle
+++ b/tests/jessie/oracle/struct_hack.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. struct_hack.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h struct_hack.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -7,21 +8,20 @@ FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function f0
 FIXME: Warning: ignoring second declaration of function f1
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/struct_hack.why", line 64, characters 10-11:
-warning: mutable S_a_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 64, characters 10-11:
-warning: mutable S_i_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 64, characters 10-11:
-warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/struct_hack.why", line 76, characters 10-12:
-warning: mutable S0_a0_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 76, characters 10-12:
-warning: mutable S0_i0_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 76, characters 10-12:
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function f0
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
+File "why/struct_hack.why", line 195, characters 10-18:
+warning: mutable S1_a1_0 is not declared in effect; added as read
+File "why/struct_hack.why", line 195, characters 10-18:
 warning: mutable intP_alloc_table is not declared in effect; added as read
-File "why/struct_hack.why", line 88, characters 10-12:
+File "why/struct_hack.why", line 242, characters 10-22:
 warning: mutable S1_a1_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 88, characters 10-12:
-warning: mutable S1_i1_0 is not declared in effect; added as read
-File "why/struct_hack.why", line 88, characters 10-12:
+File "why/struct_hack.why", line 242, characters 10-22:
 warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/struct_hack.res.oracle b/tests/jessie/oracle/struct_hack.res.oracle
index 1934816aee317b6007b6b5f00e58510c60651c23..45f9e4fe54976705a7b9f1c0ec21acacd22b3056 100644
--- a/tests/jessie/oracle/struct_hack.res.oracle
+++ b/tests/jessie/oracle/struct_hack.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/struct_hack_why.why       : ...***..*...***..*...***..* (15/12/0/0/0)
-total   :  27
-valid   :  15 ( 56%)
-invalid :  12 ( 44%)
+why/struct_hack_why.why       : ..........................!!........................!!...........................!!. (78/0/0/0/6)
+total   :  84
+valid   :  78 ( 93%)
+invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   6 (  7%)
diff --git a/tests/jessie/oracle/sum1.err.oracle b/tests/jessie/oracle/sum1.err.oracle
index e546e467b8cf77ee508e56927a936cfcefd0b3dc..04e3d8c35bf6630f935ba39dd611ecd2b935db34 100644
--- a/tests/jessie/oracle/sum1.err.oracle
+++ b/tests/jessie/oracle/sum1.err.oracle
@@ -1,4 +1,10 @@
-[preprocessing] running gcc -C -E -I. sum1.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h sum1.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function main
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,5 +12,5 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function main
-File "why/sum1.why", line 18, characters 10-14:
-warning: mutable x is not declared in effect; added as read
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/sum1.res.oracle b/tests/jessie/oracle/sum1.res.oracle
index 4620a4f1aec63c2340bf80861f6e8293ccf8cad0..986fca4df42e2029fef51b851be7f8cd98ce1464 100644
--- a/tests/jessie/oracle/sum1.res.oracle
+++ b/tests/jessie/oracle/sum1.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/sum1_why.why              : *....*..... (9/2/0/0/0)
-total   :  11
-valid   :   9 ( 82%)
-invalid :   2 ( 18%)
-unknown :   0 (  0%)
+why/sum1_why.why              : ?.?........?.?.......!!. (18/0/4/0/2)
+total   :  24
+valid   :  18 ( 75%)
+invalid :   0 (  0%)
+unknown :   4 ( 17%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   2 (  8%)
diff --git a/tests/jessie/oracle/switch.err.oracle b/tests/jessie/oracle/switch.err.oracle
index 314bf2d9def38fb4fc088e4eefd32ec72db80793..9097e8855c59ae557f0cd2c716bc9598a3a5b931 100644
--- a/tests/jessie/oracle/switch.err.oracle
+++ b/tests/jessie/oracle/switch.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. switch.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h switch.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -12,3 +13,16 @@ FIXME: Warning: ignoring second declaration of function f5
 FIXME: Warning: ignoring second declaration of function f6
 FIXME: Warning: ignoring second declaration of function f7
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f1
+FIXME: Warning: ignoring second declaration of function f1a
+FIXME: Warning: ignoring second declaration of function f2
+FIXME: Warning: ignoring second declaration of function f3
+FIXME: Warning: ignoring second declaration of function f4
+FIXME: Warning: ignoring second declaration of function f5
+FIXME: Warning: ignoring second declaration of function f6
+FIXME: Warning: ignoring second declaration of function f7
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+Warning: exception Loop_exit cannot be thrown
+Warning: exception Loop_exit cannot be thrown
diff --git a/tests/jessie/oracle/switch.res.oracle b/tests/jessie/oracle/switch.res.oracle
index 7550cefe1fa637fa6c817aeb2d873babe1e48fd2..40dd67cf1d109f1fb4c1ed09ab28e94f98fae52d 100644
--- a/tests/jessie/oracle/switch.res.oracle
+++ b/tests/jessie/oracle/switch.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/switch_why.why            : ........ (8/0/0/0/0)
-total   :   8
-valid   :   8 (100%)
+why/switch_why.why            : .!!.!!....!............. (19/0/0/0/5)
+total   :  24
+valid   :  19 ( 79%)
 invalid :   0 (  0%)
 unknown :   0 (  0%)
 timeout :   0 (  0%)
-failure :   0 (  0%)
+failure :   5 ( 21%)
diff --git a/tests/jessie/oracle/unsafe.err.oracle b/tests/jessie/oracle/unsafe.err.oracle
index 38d7b08498024316242d0e3a6cc5a9bfd259e2de..35cc9c85b14c861ee085cd53f15c9d358d99ec20 100644
--- a/tests/jessie/oracle/unsafe.err.oracle
+++ b/tests/jessie/oracle/unsafe.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. unsafe.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h unsafe.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -8,3 +9,18 @@ FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function h
 FIXME: Warning: ignoring second declaration of function h2
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function h
+FIXME: Warning: ignoring second declaration of function h2
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/unsafe.why", line 143, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/unsafe.why", line 150, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/unsafe.why", line 157, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/unsafe.why", line 164, characters 10-12:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/unsafe.res.oracle b/tests/jessie/oracle/unsafe.res.oracle
index 43e5a1153b34e7b5a07bc515e93a25fd697250ea..4d97b1d5515623c431ef6f4db38692fcb6d7c392 100644
--- a/tests/jessie/oracle/unsafe.res.oracle
+++ b/tests/jessie/oracle/unsafe.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/unsafe_why.why            : ....*** (4/3/0/0/0)
-total   :   7
-valid   :   4 ( 57%)
-invalid :   3 ( 43%)
-unknown :   0 (  0%)
+why/unsafe_why.why            : ...??? (3/0/3/0/0)
+total   :   6
+valid   :   3 ( 50%)
+invalid :   0 (  0%)
+unknown :   3 ( 50%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/zones.err.oracle b/tests/jessie/oracle/zones.err.oracle
index 90b5dcd1a3a490e2e73af0c2fbf8c0fb81165124..d2b9015940eb056aa11de78c8b48ddaffcf03006 100644
--- a/tests/jessie/oracle/zones.err.oracle
+++ b/tests/jessie/oracle/zones.err.oracle
@@ -1,7 +1,16 @@
-[preprocessing] running gcc -C -E -I. zones.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h zones.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
 FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/zones.why", line 183, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/zones.why", line 183, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/zones.res.oracle b/tests/jessie/oracle/zones.res.oracle
index 55d726db7d9cf7547904ae5dc0a87cca5e8bd28b..c133941db8c9152e64167d235041a9c107891c8f 100644
--- a/tests/jessie/oracle/zones.res.oracle
+++ b/tests/jessie/oracle/zones.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/zones_why.why             : *****..** (2/7/0/0/0)
-total   :   9
-valid   :   2 ( 22%)
-invalid :   7 ( 78%)
-unknown :   0 (  0%)
+why/zones_why.why             : ..??...... (8/0/2/0/0)
+total   :  10
+valid   :   8 ( 80%)
+invalid :   0 (  0%)
+unknown :   2 ( 20%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/oracle/zones2.err.oracle b/tests/jessie/oracle/zones2.err.oracle
index 0566795a8ae70459728798286c1c9f0d84f6ff51..8f10b449db9526bfc219638700e2f59a40fd8afc 100644
--- a/tests/jessie/oracle/zones2.err.oracle
+++ b/tests/jessie/oracle/zones2.err.oracle
@@ -1,4 +1,5 @@
-[preprocessing] running gcc -C -E -I. zones2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h zones2.c
+[preprocessing] running gcc -C -E -I. -I minix3_include -include /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.h /home/yfam7513/ppc/tests/jessie/../../src/jessie/prolog.c
 
 Warning: Cannot find main to add global initializer __globinit_whole_program
 FIXME: Warning: ignoring second declaration of function integer_of_real
@@ -6,5 +7,30 @@ FIXME: Warning: ignoring second declaration of function real_of_integer
 FIXME: Warning: ignoring second declaration of function f
 FIXME: Warning: ignoring second declaration of function g
 FIXME: Warning: ignoring second declaration of function __globinit_whole_program
-File "why/zones2.why", line 50, characters 10-11:
-warning: mutable s is not declared in effect; added as read
+FIXME: Warning: ignoring second declaration of function integer_of_real
+FIXME: Warning: ignoring second declaration of function real_of_integer
+FIXME: Warning: ignoring second declaration of function f
+FIXME: Warning: ignoring second declaration of function g
+FIXME: Warning: ignoring second declaration of function __globinit_whole_program
+File "why/zones2.why", line 161, characters 10-17:
+warning: mutable S_x_0 is not declared in effect; added as read
+File "why/zones2.why", line 161, characters 10-17:
+warning: mutable S_y_0 is not declared in effect; added as read
+File "why/zones2.why", line 161, characters 10-17:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 200, characters 10-21:
+warning: mutable S_x_0 is not declared in effect; added as read
+File "why/zones2.why", line 200, characters 10-21:
+warning: mutable S_y_0 is not declared in effect; added as read
+File "why/zones2.why", line 200, characters 10-21:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 234, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 234, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 247, characters 10-11:
+warning: mutable S_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 247, characters 10-11:
+warning: mutable T_alloc_table is not declared in effect; added as read
+File "why/zones2.why", line 247, characters 10-11:
+warning: mutable intP_alloc_table is not declared in effect; added as read
diff --git a/tests/jessie/oracle/zones2.res.oracle b/tests/jessie/oracle/zones2.res.oracle
index b8d71804cacf6d9b149c631e8b9f515f83760658..30736fc7fed5dd6300f90d7ca054f3ef4fc5d1f4 100644
--- a/tests/jessie/oracle/zones2.res.oracle
+++ b/tests/jessie/oracle/zones2.res.oracle
@@ -1,8 +1,8 @@
 (. = valid * = invalid ? = unknown # = timeout ! = failure)
-why/zones2_why.why            : ..********* (2/9/0/0/0)
-total   :  11
-valid   :   2 ( 18%)
-invalid :   9 ( 82%)
-unknown :   0 (  0%)
+why/zones2_why.why            : ?........ (8/0/1/0/0)
+total   :   9
+valid   :   8 ( 89%)
+invalid :   0 (  0%)
+unknown :   1 ( 11%)
 timeout :   0 (  0%)
 failure :   0 (  0%)
diff --git a/tests/jessie/separation4.c b/tests/jessie/separation4.c
index a5ac2474cbe86dad1f1a66a9f7f95b327494fa19..b1a39b3600c14fb0a278296e870f7704997bd224 100644
--- a/tests/jessie/separation4.c
+++ b/tests/jessie/separation4.c
@@ -34,7 +34,9 @@ S x,y;
 
 /*@ predicate p(S a) { a.b[0] >= 0 } */
 
-/*@ requires p(x); */
+/*@ requires p(x);
+  @ ensures p(x);
+  @ */
 void f() {
   x.b[0] = 0;
   y.b[1] = 1;
diff --git a/tests/jessie/struct2.c b/tests/jessie/struct2.c
index ed3b8e27b735a560d02cdc74ccb09b1b238a8e28..2404497d7bd488c89a47a59c44b929ac50f906e2 100644
--- a/tests/jessie/struct2.c
+++ b/tests/jessie/struct2.c
@@ -26,7 +26,7 @@ struct S { int a; int b[5]; int c; };
 
 struct S s0;
 
-//@ ensures \true;
+//@ ensures s0.b[2] == 1;
 void f() {
   s0.b[2] = 1;
 }
@@ -36,7 +36,7 @@ struct U { struct S d; int e; };
 
 struct U u;
 
-//@ ensures \true;
+//@ ensures u.d.b[2] == 1;
 void g() {
   u.d.b[2] = 1;
 }