Updated expected output following %eflags.ac simulation fix.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4334

diff --git a/3_0_BUGSTATUS.txt b/3_0_BUGSTATUS.txt
index 1067b75f88eb76f191d7ef21d741a10b62fb3604..f35d359f4cc280334e1c6093bebc08dbb1887010 100644 (file)
--- a/3_0_BUGSTATUS.txt
+++ b/3_0_BUGSTATUS.txt
@@ -21,7 +21,7 @@ x86 INT/INT3
 109345 ppc32 ptrace patch available    should be applied
 
 CrispinF %eflags.ac problem            yes             fixed-r1319       TODO:merge
-
+                                                       & r4334
 
 
 

diff --git a/memcheck/tests/x86/pushfpopf.stderr.exp b/memcheck/tests/x86/pushfpopf.stderr.exp
index 2d2d623e44c101ceaf164ef692bf2cde2112b8c7..eecd21c12230d46a3c09345fee67e5e0579adf9d 100644 (file)
--- a/memcheck/tests/x86/pushfpopf.stderr.exp
+++ b/memcheck/tests/x86/pushfpopf.stderr.exp
@@ -1,3 +1,7 @@
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: fooble (...)
    by 0x........: main (pushfpopf_c.c:12)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: fooble (...)
+   by 0x........: main (pushfpopf_c.c:12)

diff --git a/memcheck/tests/x86/pushfpopf_s.s b/memcheck/tests/x86/pushfpopf_s.s
index f1409950b46629f3b5230b92deaa190ae2916779..23e297fe9596e4b138f3951afee0ae6bfd6a499e 100644 (file)
--- a/memcheck/tests/x86/pushfpopf_s.s
+++ b/memcheck/tests/x86/pushfpopf_s.s
@@ -22,9 +22,12 @@ fooble:
        popfl
        # resulting flag definedness depends on outcome of sub above
        # should override that created by 0 + 0 above
+       # because Vex does an emulation-warning check on the popfl,
+       # an error should be reported for the popfl
        
        # now use the condition codes to generate a value
        # in a way which will cause undefinedness to get reported
+       # (a second time)
        jz      labelz
        movl    $22, %eax
        jmp     theend