From 94fe3e61347da78f8dc833523c5f69400d6f9c36 Mon Sep 17 00:00:00 2001
From: Yannick Moy <yannick.moy@lri.fr>
Date: Fri, 30 Nov 2007 13:04:10 +0000
Subject: [PATCH] Adding Minix 3 tests
---
tests/jessie/CA-1999-14-nxtsimp-ok.c | 8 +-
tests/jessie/CVE-1999-0368-simple-ok.c | 2 +-
tests/jessie/Makefile | 2 +-
tests/jessie/copy_struct.c | 4 +-
tests/jessie/dassault_1.c | 2 +
tests/jessie/invariant.c | 5 +
tests/jessie/minix3_memchr.c | 32 ++++
tests/jessie/minix3_memcmp.c | 31 +++
tests/jessie/minix3_memcpy.c | 32 ++++
tests/jessie/minix3_memmove.c | 41 ++++
tests/jessie/minix3_memset.c | 30 +++
tests/jessie/minix3_strcat.c | 30 +++
tests/jessie/minix3_strchr.c | 27 +++
tests/jessie/minix3_strcmp.c | 29 +++
tests/jessie/minix3_strcoll.c | 28 +++
tests/jessie/minix3_strcpy.c | 27 +++
tests/jessie/minix3_strcspn.c | 30 +++
tests/jessie/minix3_strerror.c | 31 +++
tests/jessie/minix3_strftime.c | 181 ++++++++++++++++++
tests/jessie/minix3_strlen.c | 27 +++
tests/jessie/minix3_strncat.c | 34 ++++
tests/jessie/minix3_strncmp.c | 35 ++++
tests/jessie/minix3_strncpy.c | 33 ++++
tests/jessie/minix3_strpbrk.c | 31 +++
tests/jessie/minix3_strrchr.c | 31 +++
tests/jessie/minix3_strspn.c | 30 +++
tests/jessie/minix3_strstr.c | 58 ++++++
tests/jessie/minix3_strtok.c | 69 +++++++
tests/jessie/minix3_strtol.c | 110 +++++++++++
tests/jessie/minix3_strxfrm.c | 33 ++++
tests/jessie/minusminus.c | 3 +
.../oracle/BID-6679-loop-bad.err.oracle | 11 +-
.../oracle/BID-6679-loop-bad.res.oracle | 10 +-
.../jessie/oracle/BID-6679-loop-ok.err.oracle | 11 +-
.../jessie/oracle/BID-6679-loop-ok.res.oracle | 10 +-
.../oracle/CA-1999-14-nxtsimp-bad.err.oracle | 18 +-
.../oracle/CA-1999-14-nxtsimp-bad.res.oracle | 10 +-
.../oracle/CA-1999-14-nxtsimp-ok.err.oracle | 18 +-
.../oracle/CA-1999-14-nxtsimp-ok.res.oracle | 12 +-
.../CVE-1999-0047-arroneno-bad.err.oracle | 10 +-
.../CVE-1999-0047-arroneno-bad.res.oracle | 10 +-
.../CVE-1999-0047-arroneno-ok.err.oracle | 10 +-
.../CVE-1999-0047-arroneno-ok.res.oracle | 10 +-
.../CVE-1999-0368-simple-bad.err.oracle | 11 +-
.../CVE-1999-0368-simple-bad.res.oracle | 12 +-
.../oracle/CVE-1999-0368-simple-ok.err.oracle | 11 +-
.../oracle/CVE-1999-0368-simple-ok.res.oracle | 12 +-
.../CVE-2004-0940-1Longarr-bad.err.oracle | 22 ++-
.../CVE-2004-0940-1Longarr-bad.res.oracle | 10 +-
.../CVE-2004-0940-1Longarr-ok.err.oracle | 22 ++-
.../CVE-2004-0940-1Longarr-ok.res.oracle | 10 +-
.../CVE-2006-6332-nosprintf-bad.err.oracle | 12 +-
.../CVE-2006-6332-nosprintf-bad.res.oracle | 10 +-
.../CVE-2006-6332-nosprintf-ok.err.oracle | 12 +-
.../CVE-2006-6332-nosprintf-ok.res.oracle | 10 +-
.../CVE-2006-6749-perandom-bad.err.oracle | 14 +-
.../CVE-2006-6749-perandom-bad.res.oracle | 10 +-
.../CVE-2006-6749-perandom-ok.err.oracle | 14 +-
.../CVE-2006-6749-perandom-ok.res.oracle | 10 +-
.../CVE-2006-6909-strchr-bad.err.oracle | 16 +-
.../CVE-2006-6909-strchr-bad.res.oracle | 10 +-
.../oracle/CVE-2006-6909-strchr-ok.err.oracle | 16 +-
.../oracle/CVE-2006-6909-strchr-ok.res.oracle | 10 +-
.../oracle/CVE-2007-0406-simp-bad.err.oracle | 18 +-
.../oracle/CVE-2007-0406-simp-bad.res.oracle | 10 +-
.../oracle/CVE-2007-0406-simp-ok.err.oracle | 18 +-
.../oracle/CVE-2007-0406-simp-ok.res.oracle | 10 +-
.../oracle/CVE-2007-0453-simp-bad.err.oracle | 13 +-
.../oracle/CVE-2007-0453-simp-bad.res.oracle | 10 +-
.../oracle/CVE-2007-0453-simp-ok.err.oracle | 11 +-
.../oracle/CVE-2007-0453-simp-ok.res.oracle | 10 +-
.../oracle/CVE-2007-0455-simp-bad.err.oracle | 12 +-
.../oracle/CVE-2007-0455-simp-bad.res.oracle | 10 +-
.../oracle/CVE-2007-0455-simp-ok.err.oracle | 12 +-
.../oracle/CVE-2007-0455-simp-ok.res.oracle | 10 +-
tests/jessie/oracle/abs.err.oracle | 8 +-
tests/jessie/oracle/abs.res.oracle | 8 +-
tests/jessie/oracle/addrof_field.err.oracle | 22 ++-
tests/jessie/oracle/addrof_field.res.oracle | 10 +-
tests/jessie/oracle/addrof_global.err.oracle | 16 +-
tests/jessie/oracle/addrof_global.res.oracle | 10 +-
tests/jessie/oracle/addrof_local.err.oracle | 10 +-
tests/jessie/oracle/addrof_local.res.oracle | 8 +-
tests/jessie/oracle/addrof_param.err.oracle | 10 +-
tests/jessie/oracle/addrof_param.res.oracle | 10 +-
tests/jessie/oracle/alias.err.oracle | 10 +-
tests/jessie/oracle/alias.res.oracle | 10 +-
tests/jessie/oracle/all.err.oracle | 38 ++--
tests/jessie/oracle/all.res.oracle | 10 +-
tests/jessie/oracle/all_zeros.err.oracle | 16 +-
tests/jessie/oracle/all_zeros.res.oracle | 12 +-
tests/jessie/oracle/alloc.err.oracle | 8 +-
tests/jessie/oracle/alloc.res.oracle | 8 +-
tests/jessie/oracle/alloca.err.oracle | 13 +-
tests/jessie/oracle/alloca.res.oracle | 10 +-
tests/jessie/oracle/arith.err.oracle | 7 +-
tests/jessie/oracle/array.err.oracle | 9 +-
tests/jessie/oracle/array.res.oracle | 6 +-
tests/jessie/oracle/array_addr.err.oracle | 16 +-
tests/jessie/oracle/array_addr.res.oracle | 10 +-
.../jessie/oracle/array_and_field.err.oracle | 26 ++-
.../jessie/oracle/array_and_field.res.oracle | 10 +-
tests/jessie/oracle/array_basic.err.oracle | 21 +-
tests/jessie/oracle/array_basic.res.oracle | 6 +-
tests/jessie/oracle/array_field.err.oracle | 26 ++-
tests/jessie/oracle/array_field.res.oracle | 10 +-
.../jessie/oracle/array_field_addr.err.oracle | 18 +-
.../jessie/oracle/array_field_addr.res.oracle | 8 +-
tests/jessie/oracle/array_multi.err.oracle | 21 +-
tests/jessie/oracle/array_multi.res.oracle | 6 +-
tests/jessie/oracle/array_ptr.err.oracle | 31 +--
tests/jessie/oracle/array_ptr.res.oracle | 10 +-
tests/jessie/oracle/array_struct.err.oracle | 21 +-
tests/jessie/oracle/array_struct.res.oracle | 6 +-
tests/jessie/oracle/assert.err.oracle | 8 +-
tests/jessie/oracle/assert.res.oracle | 6 +-
tests/jessie/oracle/assigns_range.err.oracle | 11 +-
.../oracle/assigns_range_right.err.oracle | 17 +-
.../oracle/assigns_range_right.res.oracle | 10 +-
tests/jessie/oracle/band.err.oracle | 9 +-
tests/jessie/oracle/band.res.oracle | 10 +-
tests/jessie/oracle/basic.err.oracle | 9 +-
tests/jessie/oracle/basic.res.oracle | 8 +-
tests/jessie/oracle/binary_search.err.oracle | 11 +-
tests/jessie/oracle/binary_search.res.oracle | 8 +-
.../oracle/binary_search_overflows.err.oracle | 11 +-
.../oracle/binary_search_overflows.res.oracle | 8 +-
tests/jessie/oracle/break.err.oracle | 18 +-
tests/jessie/oracle/break.res.oracle | 8 +-
tests/jessie/oracle/bug184.err.oracle | 8 +-
tests/jessie/oracle/call.err.oracle | 9 +-
tests/jessie/oracle/clash_alloc.err.oracle | 7 +-
tests/jessie/oracle/clash_alloc.res.oracle | 6 +-
.../jessie/oracle/compound_global.err.oracle | 8 +-
.../jessie/oracle/compound_global.res.oracle | 10 +-
tests/jessie/oracle/compound_local.err.oracle | 16 +-
tests/jessie/oracle/compound_local.res.oracle | 10 +-
tests/jessie/oracle/conflict.err.oracle | 7 +-
tests/jessie/oracle/conflict.res.oracle | 6 +-
tests/jessie/oracle/consts.err.oracle | 8 +-
tests/jessie/oracle/consts.res.oracle | 6 +-
tests/jessie/oracle/continue.err.oracle | 15 +-
tests/jessie/oracle/continue.res.oracle | 8 +-
tests/jessie/oracle/coord.err.oracle | 10 +-
tests/jessie/oracle/coord.res.oracle | 6 +-
tests/jessie/oracle/copy.err.oracle | 11 +-
tests/jessie/oracle/copy.res.oracle | 12 +-
tests/jessie/oracle/copy_struct.err.oracle | 32 +++-
tests/jessie/oracle/copy_struct.res.oracle | 10 +-
tests/jessie/oracle/count_bits.err.oracle | 9 +-
tests/jessie/oracle/count_bits.res.oracle | 12 +-
tests/jessie/oracle/dassault_1.err.oracle | 63 +++++-
tests/jessie/oracle/dassault_1.res.oracle | 6 +-
tests/jessie/oracle/dassault_2.err.oracle | 7 +-
tests/jessie/oracle/discr_union.err.oracle | 21 +-
tests/jessie/oracle/discr_union.res.oracle | 8 +-
tests/jessie/oracle/division.err.oracle | 9 +-
tests/jessie/oracle/division.res.oracle | 12 +-
tests/jessie/oracle/dowhile.err.oracle | 12 +-
tests/jessie/oracle/dowhile.res.oracle | 8 +-
tests/jessie/oracle/enum.err.oracle | 10 +-
tests/jessie/oracle/enum.res.oracle | 6 +-
tests/jessie/oracle/extern.err.oracle | 7 +-
tests/jessie/oracle/extern.res.oracle | 10 +-
tests/jessie/oracle/fact.err.oracle | 7 +-
tests/jessie/oracle/false.err.oracle | 34 +++-
tests/jessie/oracle/false.res.oracle | 10 +-
tests/jessie/oracle/false2.err.oracle | 9 +-
tests/jessie/oracle/false2.res.oracle | 10 +-
tests/jessie/oracle/ghost2.err.oracle | 10 +-
tests/jessie/oracle/ghost2.res.oracle | 10 +-
tests/jessie/oracle/goto.err.oracle | 10 +-
tests/jessie/oracle/goto.res.oracle | 6 +-
tests/jessie/oracle/incr.err.oracle | 9 +-
tests/jessie/oracle/init.err.oracle | 21 +-
tests/jessie/oracle/init.res.oracle | 10 +-
tests/jessie/oracle/init2.err.oracle | 23 ++-
tests/jessie/oracle/init2.res.oracle | 10 +-
.../jessie/oracle/inv_perm_minimal.err.oracle | 11 +-
.../jessie/oracle/inv_perm_minimal.res.oracle | 6 +-
tests/jessie/oracle/invariant.err.oracle | 10 +-
tests/jessie/oracle/invariant.res.oracle | 6 +-
tests/jessie/oracle/invariants.err.oracle | 11 +-
tests/jessie/oracle/invariants.res.oracle | 6 +-
tests/jessie/oracle/loop_inv.err.oracle | 13 +-
tests/jessie/oracle/loop_inv.res.oracle | 8 +-
tests/jessie/oracle/malloc.err.oracle | 18 +-
tests/jessie/oracle/malloc.res.oracle | 10 +-
tests/jessie/oracle/mean.err.oracle | 11 +-
tests/jessie/oracle/mean.res.oracle | 8 +-
tests/jessie/oracle/minix3_memchr.err.oracle | 1 +
tests/jessie/oracle/minix3_memchr.res.oracle | 0
tests/jessie/oracle/minix3_memcmp.err.oracle | 1 +
tests/jessie/oracle/minix3_memcmp.res.oracle | 0
tests/jessie/oracle/minix3_memcpy.err.oracle | 1 +
tests/jessie/oracle/minix3_memcpy.res.oracle | 0
tests/jessie/oracle/minix3_memmove.err.oracle | 1 +
tests/jessie/oracle/minix3_memmove.res.oracle | 0
tests/jessie/oracle/minix3_memset.err.oracle | 1 +
tests/jessie/oracle/minix3_memset.res.oracle | 0
tests/jessie/oracle/minix3_strcat.err.oracle | 1 +
tests/jessie/oracle/minix3_strcat.res.oracle | 0
tests/jessie/oracle/minix3_strchr.err.oracle | 1 +
tests/jessie/oracle/minix3_strchr.res.oracle | 0
tests/jessie/oracle/minix3_strcmp.err.oracle | 1 +
tests/jessie/oracle/minix3_strcmp.res.oracle | 0
tests/jessie/oracle/minix3_strcoll.err.oracle | 1 +
tests/jessie/oracle/minix3_strcoll.res.oracle | 0
tests/jessie/oracle/minix3_strcpy.err.oracle | 1 +
tests/jessie/oracle/minix3_strcpy.res.oracle | 0
tests/jessie/oracle/minix3_strcspn.err.oracle | 1 +
tests/jessie/oracle/minix3_strcspn.res.oracle | 0
.../jessie/oracle/minix3_strerror.err.oracle | 1 +
.../jessie/oracle/minix3_strerror.res.oracle | 0
.../jessie/oracle/minix3_strftime.err.oracle | 1 +
.../jessie/oracle/minix3_strftime.res.oracle | 0
tests/jessie/oracle/minix3_strlen.err.oracle | 1 +
tests/jessie/oracle/minix3_strlen.res.oracle | 0
tests/jessie/oracle/minix3_strncat.err.oracle | 1 +
tests/jessie/oracle/minix3_strncat.res.oracle | 0
tests/jessie/oracle/minix3_strncmp.err.oracle | 1 +
tests/jessie/oracle/minix3_strncmp.res.oracle | 0
tests/jessie/oracle/minix3_strncpy.err.oracle | 1 +
tests/jessie/oracle/minix3_strncpy.res.oracle | 0
tests/jessie/oracle/minix3_strpbrk.err.oracle | 1 +
tests/jessie/oracle/minix3_strpbrk.res.oracle | 0
tests/jessie/oracle/minix3_strrchr.err.oracle | 1 +
tests/jessie/oracle/minix3_strrchr.res.oracle | 0
tests/jessie/oracle/minix3_strspn.err.oracle | 1 +
tests/jessie/oracle/minix3_strspn.res.oracle | 0
tests/jessie/oracle/minix3_strstr.err.oracle | 1 +
tests/jessie/oracle/minix3_strstr.res.oracle | 0
tests/jessie/oracle/minix3_strtok.err.oracle | 1 +
tests/jessie/oracle/minix3_strtok.res.oracle | 0
tests/jessie/oracle/minix3_strtol.err.oracle | 1 +
tests/jessie/oracle/minix3_strtol.res.oracle | 0
tests/jessie/oracle/minix3_strxfrm.err.oracle | 1 +
tests/jessie/oracle/minix3_strxfrm.res.oracle | 0
tests/jessie/oracle/minusminus.err.oracle | 7 +-
tests/jessie/oracle/minusminus.res.oracle | 6 +-
tests/jessie/oracle/negate.err.oracle | 11 +-
tests/jessie/oracle/negate.res.oracle | 12 +-
tests/jessie/oracle/null.err.oracle | 8 +-
tests/jessie/oracle/null.res.oracle | 8 +-
tests/jessie/oracle/overflow.err.oracle | 14 +-
tests/jessie/oracle/overflow.res.oracle | 6 +-
tests/jessie/oracle/param.err.oracle | 7 +-
tests/jessie/oracle/passing.err.oracle | 11 +-
tests/jessie/oracle/passing.res.oracle | 10 +-
tests/jessie/oracle/pointer.err.oracle | 30 ++-
tests/jessie/oracle/pointer.res.oracle | 10 +-
tests/jessie/oracle/queue.err.oracle | 29 ++-
tests/jessie/oracle/queue.res.oracle | 12 +-
tests/jessie/oracle/rec.err.oracle | 7 +-
tests/jessie/oracle/rec2.err.oracle | 7 +-
tests/jessie/oracle/ref.err.oracle | 8 +-
tests/jessie/oracle/ref.res.oracle | 8 +-
tests/jessie/oracle/ref_glob.err.oracle | 35 +++-
tests/jessie/oracle/ref_glob.res.oracle | 8 +-
tests/jessie/oracle/return.err.oracle | 10 +-
tests/jessie/oracle/return.res.oracle | 8 +-
tests/jessie/oracle/see.err.oracle | 8 +-
tests/jessie/oracle/see.res.oracle | 8 +-
tests/jessie/oracle/separation3.err.oracle | 59 +++++-
tests/jessie/oracle/separation3.res.oracle | 10 +-
tests/jessie/oracle/separation4.err.oracle | 21 +-
tests/jessie/oracle/separation4.res.oracle | 6 +-
tests/jessie/oracle/shift.err.oracle | 7 +-
tests/jessie/oracle/shift.res.oracle | 6 +-
tests/jessie/oracle/string_basic.err.oracle | 17 +-
tests/jessie/oracle/string_basic.res.oracle | 10 +-
tests/jessie/oracle/struct.err.oracle | 20 +-
tests/jessie/oracle/struct.res.oracle | 8 +-
tests/jessie/oracle/struct2.err.oracle | 42 +++-
tests/jessie/oracle/struct2.res.oracle | 6 +-
tests/jessie/oracle/struct3.err.oracle | 16 +-
tests/jessie/oracle/struct3.res.oracle | 6 +-
tests/jessie/oracle/struct4.err.oracle | 21 +-
tests/jessie/oracle/struct4.res.oracle | 8 +-
tests/jessie/oracle/struct_hack.err.oracle | 32 ++--
tests/jessie/oracle/struct_hack.res.oracle | 10 +-
tests/jessie/oracle/sum1.err.oracle | 12 +-
tests/jessie/oracle/sum1.res.oracle | 12 +-
tests/jessie/oracle/switch.err.oracle | 16 +-
tests/jessie/oracle/switch.res.oracle | 8 +-
tests/jessie/oracle/unsafe.err.oracle | 18 +-
tests/jessie/oracle/unsafe.res.oracle | 10 +-
tests/jessie/oracle/zones.err.oracle | 11 +-
tests/jessie/oracle/zones.res.oracle | 10 +-
tests/jessie/oracle/zones2.err.oracle | 32 +++-
tests/jessie/oracle/zones2.res.oracle | 10 +-
tests/jessie/separation4.c | 4 +-
tests/jessie/struct2.c | 4 +-
293 files changed, 3020 insertions(+), 717 deletions(-)
create mode 100644 tests/jessie/minix3_memchr.c
create mode 100644 tests/jessie/minix3_memcmp.c
create mode 100644 tests/jessie/minix3_memcpy.c
create mode 100644 tests/jessie/minix3_memmove.c
create mode 100644 tests/jessie/minix3_memset.c
create mode 100644 tests/jessie/minix3_strcat.c
create mode 100644 tests/jessie/minix3_strchr.c
create mode 100644 tests/jessie/minix3_strcmp.c
create mode 100644 tests/jessie/minix3_strcoll.c
create mode 100644 tests/jessie/minix3_strcpy.c
create mode 100644 tests/jessie/minix3_strcspn.c
create mode 100644 tests/jessie/minix3_strerror.c
create mode 100644 tests/jessie/minix3_strftime.c
create mode 100644 tests/jessie/minix3_strlen.c
create mode 100644 tests/jessie/minix3_strncat.c
create mode 100644 tests/jessie/minix3_strncmp.c
create mode 100644 tests/jessie/minix3_strncpy.c
create mode 100644 tests/jessie/minix3_strpbrk.c
create mode 100644 tests/jessie/minix3_strrchr.c
create mode 100644 tests/jessie/minix3_strspn.c
create mode 100644 tests/jessie/minix3_strstr.c
create mode 100644 tests/jessie/minix3_strtok.c
create mode 100644 tests/jessie/minix3_strtol.c
create mode 100644 tests/jessie/minix3_strxfrm.c
create mode 100644 tests/jessie/oracle/minix3_memchr.err.oracle
create mode 100644 tests/jessie/oracle/minix3_memchr.res.oracle
create mode 100644 tests/jessie/oracle/minix3_memcmp.err.oracle
create mode 100644 tests/jessie/oracle/minix3_memcmp.res.oracle
create mode 100644 tests/jessie/oracle/minix3_memcpy.err.oracle
create mode 100644 tests/jessie/oracle/minix3_memcpy.res.oracle
create mode 100644 tests/jessie/oracle/minix3_memmove.err.oracle
create mode 100644 tests/jessie/oracle/minix3_memmove.res.oracle
create mode 100644 tests/jessie/oracle/minix3_memset.err.oracle
create mode 100644 tests/jessie/oracle/minix3_memset.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strcat.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strcat.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strchr.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strchr.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strcmp.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strcmp.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strcoll.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strcoll.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strcpy.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strcpy.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strcspn.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strcspn.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strerror.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strerror.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strftime.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strftime.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strlen.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strlen.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strncat.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strncat.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strncmp.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strncmp.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strncpy.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strncpy.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strpbrk.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strpbrk.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strrchr.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strrchr.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strspn.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strspn.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strstr.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strstr.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strtok.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strtok.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strtol.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strtol.res.oracle
create mode 100644 tests/jessie/oracle/minix3_strxfrm.err.oracle
create mode 100644 tests/jessie/oracle/minix3_strxfrm.res.oracle
diff --git a/tests/jessie/CA-1999-14-nxtsimp-ok.c b/tests/jessie/CA-1999-14-nxtsimp-ok.c
index aa898fb57f7..fabdb0d5fba 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 2b6ee051a52..c1d2359359a 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 be6b95f6d77..fa3fc8e56ee 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 d75a0212b33..bf109be4d3e 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 43f6a352d45..70d9c244d56 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 6dd93e36146..8b49a96a570 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 00000000000..1ba7156ac0d
--- /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 00000000000..898c357a559
--- /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 00000000000..c6742e59a6f
--- /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 00000000000..472369665ab
--- /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 00000000000..0b4f32eb8e4
--- /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 00000000000..28564fc8d93
--- /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 00000000000..4831e404c62
--- /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 00000000000..a342fbcd135
--- /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 00000000000..b02d9622234
--- /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 00000000000..ccc60985d2f
--- /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 00000000000..0bce37699d4
--- /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 00000000000..a2a37276c23
--- /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 00000000000..988b279dfe5
--- /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 00000000000..3c182a1e68d
--- /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 00000000000..249de8515da
--- /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 00000000000..ae6e63237e4
--- /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 00000000000..9bfce705323
--- /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 00000000000..e67eadc9555
--- /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 00000000000..d7b29a7fe62
--- /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 00000000000..9bdc11e0361
--- /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 00000000000..7ef5e81608a
--- /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 00000000000..5973deb5a27
--- /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 00000000000..991d219b10e
--- /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 00000000000..a1f8a3ac38c
--- /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 11b811c710b..3e0c25aa65c 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 0956d79eba3..ef6b976f52e 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 fc2e11107ee..b3ed01a6af1 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 f55a6a32129..58d2576a96f 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 14a187afce5..a9c88222f64 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 d650677b09b..f5e1c1f15b1 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 c65a93e534c..baa44cee3d3 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 0aced465952..f7eb8ec9cf8 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 87c5d5177ca..64ae55eca5c 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 6fde581b466..4d1ca477019 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 3865bc38295..5e96dbb5d0e 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 40a6705458f..84c80c242d1 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 7a542388e4f..426afac1d38 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 480fa8f6068..10d8b7063ec 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 ec2c8a075a3..c8f0e9beb2c 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 62f3718aa2b..c599a56e6af 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 218ea8f8c2e..194f74f5d6f 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 9d4f2262eb7..a7ccd6a761e 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 5196c101261..ec32b6069ca 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 0c531d9cd02..f3cfeb790a6 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 66e6860d1cb..5992c591e77 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 6291c34796f..ce7d3fcd67d 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 2057e0f8074..5ab6afa82c3 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 21846e7f65e..9f1bde36a3a 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 5d070af8630..a40e8c15b84 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 805e5288052..63798147037 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 af49005ad5b..af0e47256b0 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 0ade9df8dbe..4ab4e94e315 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 566cce8223a..7a32db2d36f 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 a0b191f31e0..fa1ce234604 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 d075cbb231f..bc5132be4f9 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 103e34a3fce..b6f53f066d9 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 c936a9f5a2e..e5e455527f0 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 5ce983e8c37..4eecac661c2 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 f42188f8be8..972aac11153 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 2e6f4af8c2d..8dc9a375cc0 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 c03bc1da620..618510fb98a 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 1a4658703de..d75a87eea0e 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 eb3d586bd89..ac64078be18 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 d6e2a9759ea..7330fc326fa 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 23627e25585..e8ebe6bd4ec 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 09a163cd685..8c52b5810b4 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 3b8bd109315..eb511a7d422 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 77566fb5569..0373a04346d 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 71f9733e15f..8b72af6aa2c 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 b27818b4b77..60699bf27f9 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 02c16222985..50cbafcefb8 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 c57377ca128..4e158c00375 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 e8b2f0bb9b4..4b7141aec52 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 974ab14d7e4..58496ea5825 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 871323c3cae..c9da0bca809 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 6ed08e2ff72..3facdd07c18 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 be1fd4b0bb4..cf317ca2261 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 100fc4245bb..b50c730f5a9 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 99eb6ac5c79..be7144c26db 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 179d03b84ab..c34f6f65c8d 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 bfa927424ba..facd027a0a7 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 0153c073d22..7b70fad5595 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 d9a687f3a39..9e7eaa7ef03 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 6af17328268..11bf8cbc870 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 cd840780c93..4626e4a8913 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 d8cdaae1a44..0caafe01f55 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 32463b34f9a..906773474ed 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 0adb338a174..70fc549b8c1 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 a55c3161c2e..9c148e143cd 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 084d3e003d5..a6216c336e0 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 5fdf16b8e33..041fb3b7941 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 51c361f7da5..7db7c18938e 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 75c9f5f9bbf..89e2af6e2cd 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 f96e2d8a92c..1f70598ad51 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 60b59c341f4..d86b4117477 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 77bc7a8b1ba..559c003ae85 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 48424ef9b82..d26362bb4ea 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 6599af22ce8..3682fd2c9f0 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 857d894b26c..f659872e2ba 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 c0a134b978b..c51cb935ffb 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 7ac05be32b0..3f5a55b9c48 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 959203a8bb9..406949583e6 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 66b58406880..ca2a89c3ede 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 6353d544eed..259f0440338 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 2790689e77b..9fe91606b93 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 c91ee1e842b..2efcdc747ca 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 e1ede9e4116..8150f7ffcc4 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 86de0647ffd..a5034b902f4 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 092f6854fd9..47445510434 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 045b9e57c9a..07ca03c9197 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 9b997110313..5fbaea4199b 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 3e73428946d..b41754cb502 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 73287ad6a7c..e108064276c 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 162f1f9243f..c825054dde1 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 4262f805f46..a666753e78e 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 e7f0aee8837..39420cb7b83 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 efd8001a1fa..cf98e89963e 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 0bb163b1c87..c8821c96cf1 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 062cc75db61..ccce9eb600c 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 c212c49b96c..ea7e5e964c9 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 8d76c05b187..ef18bc54e79 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 b7f1f2d4fcf..00bfa80fbfc 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 ba0ae824103..15db2cc5400 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 0b7765957d4..73ccc5dba93 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 fdb6a8f97bc..2a7d5cafdb6 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 46f58061364..26e6fe41b13 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 4ca4525b066..9078a4c247b 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 effb0091208..91428852485 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 7158e5424eb..fcbf6439a09 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 c5f97c97391..9e9bbb39a58 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 f32b0077ced..566417dabc7 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 56c52d83a99..d5ada9cb1e4 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 86d28b285f7..7e6f234884c 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 fbf41686d7d..5990fa31600 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 7eb8a78585e..8594a1eaf1d 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 d41ff92ad21..10736a50d76 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 69a84bb8ff3..9b8c7a287b8 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 edeea81cb1e..eba9a27ef5f 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 34a2c570767..ce0f71e35fc 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 e7fe2845bf4..80a40830cdd 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 e76fa7cdfb0..513a1e512ee 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 d300181241e..5e630f739e8 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 5b2de03ab6e..20a9b81f15d 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 ea6fa10673d..01169c127dc 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 52d37ed683d..5b78b493a97 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 8e64854b982..6f599095e18 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 2a8cb7122ae..8922b0a21a7 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 779f95d30bb..0a86a70bc40 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 355fd63f3d3..3570c28ec95 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 7ec0dcc0af5..495df73cf11 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 ead8aa02dff..6812f8ec5fa 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 e9bd06b6e8d..93e012b7d96 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 c43540404b5..6ff952a28ed 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 af4ebc3e43b..5be5bea383f 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 2c9c5dcdbc8..63ebc1ac2cc 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 96bf8ec69ed..fdc329215bf 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 eebc4529ab1..78eb320c36c 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 f3c33c4e3b6..e83221f686f 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 72a531b58ad..0c7486061fe 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 1762a65de6b..38e63bbced9 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 62c99d0a0a6..904dca91066 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 e92fe1136ed..6ab1c88e330 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 216935dcc41..e6257dea0dd 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 5b5cc8c662e..6eace056fe4 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 7e307bb189e..63ca9ce8c18 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 a2dff000bce..3757e8fba35 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 8373c5055ce..b36760c46af 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 00eaf048b3a..71df91c490b 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 d8a4fafc70f..cfba27a0aca 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 b7ce5c63182..c93b6f907b4 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 b934a88b7a4..f0b2b995494 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 9dbf208c4b3..4066d2cc607 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 b4fdbf7243f..3dfe19fb78d 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 743ceb5a232..6f7fb7433d2 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 d0427adc9c0..d7eb859d23f 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 5420b2989d9..63c219ce47f 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 91a56ebdbef..163d6612e81 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 d5be7b2c21e..bad73f23161 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 633dc4fcfb6..74c8b157e36 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 6325f205eb0..f9b07873cd6 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 35f57327450..8683770ab72 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 0f90b555267..51426941131 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 8c7069d2497..b1db07f3d42 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 eaab1c3e7d8..2506a33a8d5 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 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_memcmp.err.oracle b/tests/jessie/oracle/minix3_memcmp.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_memcpy.err.oracle b/tests/jessie/oracle/minix3_memcpy.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_memmove.err.oracle b/tests/jessie/oracle/minix3_memmove.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_memset.err.oracle b/tests/jessie/oracle/minix3_memset.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strcat.err.oracle b/tests/jessie/oracle/minix3_strcat.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strchr.err.oracle b/tests/jessie/oracle/minix3_strchr.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strcmp.err.oracle b/tests/jessie/oracle/minix3_strcmp.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strcoll.err.oracle b/tests/jessie/oracle/minix3_strcoll.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strcpy.err.oracle b/tests/jessie/oracle/minix3_strcpy.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strcspn.err.oracle b/tests/jessie/oracle/minix3_strcspn.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strerror.err.oracle b/tests/jessie/oracle/minix3_strerror.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strftime.err.oracle b/tests/jessie/oracle/minix3_strftime.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strlen.err.oracle b/tests/jessie/oracle/minix3_strlen.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strncat.err.oracle b/tests/jessie/oracle/minix3_strncat.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strncmp.err.oracle b/tests/jessie/oracle/minix3_strncmp.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strncpy.err.oracle b/tests/jessie/oracle/minix3_strncpy.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strpbrk.err.oracle b/tests/jessie/oracle/minix3_strpbrk.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strrchr.err.oracle b/tests/jessie/oracle/minix3_strrchr.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strspn.err.oracle b/tests/jessie/oracle/minix3_strspn.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strstr.err.oracle b/tests/jessie/oracle/minix3_strstr.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strtok.err.oracle b/tests/jessie/oracle/minix3_strtok.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strtol.err.oracle b/tests/jessie/oracle/minix3_strtol.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minix3_strxfrm.err.oracle b/tests/jessie/oracle/minix3_strxfrm.err.oracle
new file mode 100644
index 00000000000..6b9a448202a
--- /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 00000000000..e69de29bb2d
diff --git a/tests/jessie/oracle/minusminus.err.oracle b/tests/jessie/oracle/minusminus.err.oracle
index a6852abbb40..e5f9806835e 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 bda130f559c..10bd2dea36b 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 be172ec5d23..9f3d351d7b0 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 dd73e3b50cd..87f7b7c659b 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 3e8307d70fd..1265343b04f 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 4eb23f61879..e36e61e2995 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 e942acc96be..6145eddd775 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 089658c341d..fbc8573cbcd 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 cd18262f741..7e8066088d3 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 1df410c160b..d77bd1b0e57 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 ed3900ff1f9..8771509c3d3 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 84dcd1b337e..91bbb761976 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 29d761f8171..ea3eff12c8c 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 b3f0cd2dee1..bd37aa0204a 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 67588038ef2..c54ffa0b27d 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 50c8218b265..9b9dddb5c12 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 e5c3d173293..478608540f2 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 58d674bc075..050e72096b0 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 42b26583c04..c3254a02de3 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 8130a5aa6f2..e700c618927 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 0e5bce6875e..f77b0b513c0 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 29acea82dcd..5ca99c9a3dd 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 e6134edaa70..2f95b717d29 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 7a578f7e9aa..d9257857779 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 2e94587053b..50c1e3974de 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 7943662c4a9..e268c526a84 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 3300ebf28dd..ed061a0b626 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 e82731b2adc..16e86f43a9e 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 fe8a4973f52..00ca8e6de43 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 33c597fe210..64ab0f07503 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 96fb7f8645e..fdf0ecc9e21 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 2ead4227cad..f59c76c4b8e 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 7a741d8a6ba..c611fe61e4d 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 efb4c9df398..8c11ed26648 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 8c7010f1997..179cc624016 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 00123f15814..c3cc5ca65c8 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 dbf1eecc409..9b998e5f919 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 05028b5f248..ee53964b526 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 93bcfbcee43..fc10e2ce5bb 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 e55c7085a55..5df8d9c2c75 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 453db1f3282..30cd20e1d3b 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 813083735cc..60b6c70915e 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 1934816aee3..45f9e4fe549 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 e546e467b8c..04e3d8c35bf 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 4620a4f1aec..986fca4df42 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 314bf2d9def..9097e8855c5 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 7550cefe1fa..40dd67cf1d1 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 38d7b084980..35cc9c85b14 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 43e5a1153b3..4d97b1d5515 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 90b5dcd1a3a..d2b9015940e 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 55d726db7d9..c133941db8c 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 0566795a8ae..8f10b449db9 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 b8d71804cac..30736fc7fed 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 a5ac2474cbe..b1a39b3600c 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 ed3b8e27b73..2404497d7bd 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;
}
--
GitLab