Merge branches/OTRACK_BY_INSTRUMENTATION into the trunk.  This adds
support to Memcheck for tracking the origin of uninitialised values,
if you use the --track-origins=yes flag.

This currently causes some Memcheck regression tests to fail, because
they now print an extra line of advisory text in their output.  This
will be fixed.

The core-tool interface is slightly changed.  The version number for
the interface needs to be incremented.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7982 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/docs/internals/xml-output.txt b/docs/internals/xml-output.txt
index 7b5d502..2ad21c3 100644
--- a/docs/internals/xml-output.txt
+++ b/docs/internals/xml-output.txt
@@ -107,12 +107,13 @@
   </valgrindoutput>
 
 Valgrind versions 3.0.0 and 3.0.1 emit protocol version 1.  Versions
-3.1.X and 3.2.X emit protocol version 2.
+3.1.X and 3.2.X emit protocol version 2.  3.4.X emits protocol version
+3.
 
 
 PROTOCOL for version 3
 ----------------------
-Changes in 3.3.X (tentative): (jrs, 1 March 2008)
+Changes in 3.4.X (tentative): (jrs, 1 March 2008)
 
 * There may be more than one <logfilequalifier> clause, depending on
   how this pans out.  (AshleyP perhaps to investigate)
@@ -120,6 +121,10 @@
 * Some errors may have two <auxwhat> blocks, rather than just one
   (resulting from merge of the DATASYMS branch)
 
+* Some errors may have an ORIGIN component, indicating the origins of
+  uninitialised values.  This results from the merge of the
+  OTRACK_BY_INSTRUMENTATION branch.
+
 
 PROTOCOL for version 2
 ----------------------
@@ -231,6 +236,7 @@
 
      optionally: <auxwhat>TEXT</auxwhat>
      optionally: STACK
+     optionally: ORIGIN
 
   </error>
 
@@ -376,6 +382,19 @@
 * line: gives the line number in the source file
 
 
+ORIGIN
+------
+ORIGIN shows the origin of uninitialised data in errors that involve
+uninitialised data.  STACK shows the origin of the uninitialised
+value.  TEXT gives a human-understandable hint as to the meaning of
+the information in STACK.
+
+   <origin>
+      <what>TEXT<what>
+      STACK
+   </origin>
+
+
 ERRORCOUNTS
 -----------
 This specifies, for each error that has been so far presented,