diff for duplicates of <1565166911751.16655@bt.com>

diff --git a/a/2.bin b/a/2.bin
deleted file mode 100644
index 90f38c4..0000000
--- a/a/2.bin
+++ /dev/null
@@ -1,143 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css" style="display:none"><!-- P { margin-top: 0px; margin-bottom: 0px; } .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left-width: 2px; border-left-style: solid; border-left-color: rgb(128, 0, 0); }--></style>
-</head>
-<body dir="ltr" style="font-size:12pt;color:#000000;background-color:#FFFFFF;font-family:Calibri,Arial,Helvetica,sans-serif;">
-<p></p>
-<div style="color: rgb(33, 33, 33);"><font size="2"><span style="font-size:10pt;">
-<div class="PlainText">
-<div><span style="font-size: 10pt;">Append MemTxAttrs to interfaces so we can pass along up coming Invert</span><br>
-</div>
-<div>Endian TTE bit on SPARC64.</div>
-<div><br>
-</div>
-<div>Signed-off-by: Tony Nguyen &lt;tony.nguyen@bt.com&gt;</div>
-<div>Reviewed-by: Richard Henderson &lt;richard.henderson@linaro.org&gt;</div>
-<div>---</div>
-<div>&nbsp;target/sparc/mmu_helper.c | 32 &#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;--------------</div>
-<div>&nbsp;1 file changed, 18 insertions(&#43;), 14 deletions(-)</div>
-<div><br>
-</div>
-<div>diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c</div>
-<div>index cbd1e91..826e14b 100644</div>
-<div>--- a/target/sparc/mmu_helper.c</div>
-<div>&#43;&#43;&#43; b/target/sparc/mmu_helper.c</div>
-<div>@@ -88,7 &#43;88,7 @@ static const int perm_table[2][8] = {</div>
-<div>&nbsp;};</div>
-<div>&nbsp;</div>
-<div>&nbsp;static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index, MemTxAttrs *attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong address, int rw, int mmu_idx,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong *page_size)</div>
-<div>&nbsp;{</div>
-<div>@@ -219,6 &#43;219,7 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>
-<div>&nbsp; &nbsp; &nbsp;target_ulong vaddr;</div>
-<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>
-<div>&nbsp; &nbsp; &nbsp;int error_code = 0, prot, access_index;</div>
-<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>
-<div>&nbsp;</div>
-<div>&nbsp; &nbsp; &nbsp;/*</div>
-<div>&nbsp; &nbsp; &nbsp; * TODO: If we ever need tlb_vaddr_to_host for this target,</div>
-<div>@@ -229,7 &#43;230,7 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>
-<div>&nbsp; &nbsp; &nbsp;assert(!probe);</div>
-<div>&nbsp;</div>
-<div>&nbsp; &nbsp; &nbsp;address &amp;= TARGET_PAGE_MASK;</div>
-<div>- &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index,</div>
-<div>&#43; &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index, &amp;attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;address, access_type,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>
-<div>&nbsp; &nbsp; &nbsp;vaddr = address;</div>
-<div>@@ -490,8 &#43;491,8 @@ static inline int ultrasparc_tag_match(SparcTLBEntry *tlb,</div>
-<div>&nbsp; &nbsp; &nbsp;return 0;</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>-static int get_physical_address_data(CPUSPARCState *env,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr *physical, int *prot,</div>
-<div>&#43;static int get_physical_address_data(CPUSPARCState *env, hwaddr *physical,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; int *prot, MemTxAttrs *attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; target_ulong address, int rw, int mmu_idx)</div>
-<div>&nbsp;{</div>
-<div>&nbsp; &nbsp; &nbsp;CPUState *cs = env_cpu(env);</div>
-<div>@@ -608,8 &#43;609,8 @@ static int get_physical_address_data(CPUSPARCState *env,</div>
-<div>&nbsp; &nbsp; &nbsp;return 1;</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>-static int get_physical_address_code(CPUSPARCState *env,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr *physical, int *prot,</div>
-<div>&#43;static int get_physical_address_code(CPUSPARCState *env, hwaddr *physical,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; int *prot, MemTxAttrs *attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; target_ulong address, int mmu_idx)</div>
-<div>&nbsp;{</div>
-<div>&nbsp; &nbsp; &nbsp;CPUState *cs = env_cpu(env);</div>
-<div>@@ -686,7 &#43;687,7 @@ static int get_physical_address_code(CPUSPARCState *env,</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>&nbsp;static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index, MemTxAttrs *attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong address, int rw, int mmu_idx,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong *page_size)</div>
-<div>&nbsp;{</div>
-<div>@@ -716,11 &#43;717,11 @@ static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>
-<div>&nbsp; &nbsp; &nbsp;}</div>
-<div>&nbsp;</div>
-<div>&nbsp; &nbsp; &nbsp;if (rw == 2) {</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_code(env, physical, prot, address,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_code(env, physical, prot, attrs, address,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; mmu_idx);</div>
-<div>&nbsp; &nbsp; &nbsp;} else {</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_data(env, physical, prot, address, rw,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; mmu_idx);</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_data(env, physical, prot, attrs, address,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; rw, mmu_idx);</div>
-<div>&nbsp; &nbsp; &nbsp;}</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>@@ -734,10 &#43;735,11 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>
-<div>&nbsp; &nbsp; &nbsp;target_ulong vaddr;</div>
-<div>&nbsp; &nbsp; &nbsp;hwaddr paddr;</div>
-<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>
-<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>
-<div>&nbsp; &nbsp; &nbsp;int error_code = 0, prot, access_index;</div>
-<div>&nbsp;</div>
-<div>&nbsp; &nbsp; &nbsp;address &amp;= TARGET_PAGE_MASK;</div>
-<div>- &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index,</div>
-<div>&#43; &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index, &amp;attrs,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;address, access_type,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>
-<div>&nbsp; &nbsp; &nbsp;if (likely(error_code == 0)) {</div>
-<div>@@ -747,7 &#43;749,8 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; env-&gt;dmmu.mmu_primary_context,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; env-&gt;dmmu.mmu_secondary_context);</div>
-<div>&nbsp;</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp;tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, page_size);</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;tlb_set_page_with_attrs(cs, vaddr, paddr, attrs, prot, mmu_idx,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;page_size);</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true;</div>
-<div>&nbsp; &nbsp; &nbsp;}</div>
-<div>&nbsp; &nbsp; &nbsp;if (probe) {</div>
-<div>@@ -849,9 &#43;852,10 @@ static int cpu_sparc_get_phys_page(CPUSPARCState *env, hwaddr *phys,</div>
-<div>&nbsp;{</div>
-<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>
-<div>&nbsp; &nbsp; &nbsp;int prot, access_index;</div>
-<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>
-<div>&nbsp;</div>
-<div>- &nbsp; &nbsp;return get_physical_address(env, phys, &amp;prot, &amp;access_index, addr, rw,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>
-<div>&#43; &nbsp; &nbsp;return get_physical_address(env, phys, &amp;prot, &amp;access_index, &amp;attrs, addr,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;rw, mmu_idx, &amp;page_size);</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>&nbsp;#if defined(TARGET_SPARC64)</div>
-<div>--&nbsp;</div>
-<div>1.8.3.1</div>
-<div><br>
-&#8203;<br>
-</div>
-<br>
-</div>
-</span></font></div>
-</body>
-</html>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index e54d0ae..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/html; charset="iso-8859-1"
-Content-Transfer-Encoding: quoted-printable
diff --git a/a/content_digest b/N1/content_digest
index 8014e8a..57860cb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,92 +1,92 @@
  "ref\045ec4924e0b34a3d9124e2db06af75b4@tpw09926dag18e.domain1.systemhost.net\0"
  "From\0<tony.nguyen@bt.com>\0"
- "Subject\0[Qemu-riscv] [Qemu-devel] [PATCH v6 25/26] target/sparc: Add TLB entry with attributes\0"
+ "Subject\0[Qemu-devel] [PATCH v6 25/26] target/sparc: Add TLB entry with attributes\0"
  "Date\0Wed, 7 Aug 2019 08:35:12 +0000\0"
  "To\0<qemu-devel@nongnu.org>\0"
- "Cc\0<frederic.konrad@adacore.com>"
-  <berto@igalia.com>
-  <qemu-block@nongnu.org>
-  <arikalo@wavecomp.com>
-  <pasic@linux.ibm.com>
-  <hpoussin@reactos.org>
-  <anthony.perard@citrix.com>
-  <xen-devel@lists.xenproject.org>
-  <lersek@redhat.com>
-  <jasowang@redhat.com>
-  <jiri@resnulli.us>
-  <ehabkost@redhat.com>
-  <b.galvani@gmail.com>
-  <eric.auger@redhat.com>
-  <alex.williamson@redhat.com>
-  <stefanha@redhat.com>
-  <jsnow@redhat.com>
-  <rth@twiddle.net>
-  <kwolf@redhat.com>
-  <andrew@aj.id.au>
-  <crwulff@gmail.com>
-  <laurent@vivier.eu>
-  <sundeep.lkml@gmail.com>
-  <michael@walle.cc>
-  <qemu-ppc@nongnu.org>
-  <kbastian@mail.uni-paderborn.de>
-  <imammedo@redhat.com>
-  <fam@euphon.net>
-  <peter.maydell@linaro.org>
-  <david@redhat.com>
-  <palmer@sifive.com>
-  <keith.busch@intel.com>
-  <jcmvbkbc@gmail.com>
-  <hare@suse.com>
-  <sstabellini@kernel.org>
-  <andrew.smirnov@gmail.com>
-  <deller@gmx.de>
-  <magnus.damm@gmail.com>
-  <atar4qemu@gmail.com>
-  <minyard@acm.org>
-  <sw@weilnetz.de>
-  <yuval.shaia@oracle.com>
-  <qemu-s390x@nongnu.org>
-  <qemu-arm@nongnu.org>
-  <jan.kiszka@web.de>
-  <clg@kaod.org>
-  <shorne@gmail.com>
-  <qemu-riscv@nongnu.org>
-  <i.mitsyanko@gmail.com>
-  <cohuck@redhat.com>
-  <philmd@redhat.com>
-  <amarkovic@wavecomp.com>
-  <peter.chubb@nicta.com.au>
-  <aurelien@aurel32.net>
-  <pburton@wavecomp.com>
-  <sagark@eecs.berkeley.edu>
-  <green@moxielogic.com>
-  <kraxel@redhat.com>
-  <edgar.iglesias@gmail.com>
-  <gxt@mprc.pku.edu.cn>
-  <robh@kernel.org>
-  <borntraeger@de.ibm.com>
-  <joel@jms.id.au>
-  <antonynpavlov@gmail.com>
-  <chouteau@adacore.com>
-  <Andrew.Baumann@microsoft.com>
-  <mreitz@redhat.com>
-  <walling@linux.ibm.com>
-  <dmitry.fleytman@gmail.com>
-  <mst@redhat.com>
-  <mark.cave-ayland@ilande.co.uk>
-  <jslaby@suse.cz>
-  <marex@denx.de>
-  <proljc@gmail.com>
-  <marcandre.lureau@redhat.com>
-  <alistair@alistair23.me>
-  <paul.durrant@citrix.com>
-  <david@gibson.dropbear.id.au>
-  <xiaoguangrong.eric@gmail.com>
-  <huth@tuxfamily.org>
-  <jcd@tribudubois.net>
-  <pbonzini@redhat.com>
- " <stefanb@linux.ibm.com>\0"
- "\01:1\0"
+ "Cc\0fam@euphon.net"
+  peter.maydell@linaro.org
+  walling@linux.ibm.com
+  cohuck@redhat.com
+  sagark@eecs.berkeley.edu
+  david@redhat.com
+  jasowang@redhat.com
+  palmer@sifive.com
+  mark.cave-ayland@ilande.co.uk
+  i.mitsyanko@gmail.com
+  keith.busch@intel.com
+  jcmvbkbc@gmail.com
+  frederic.konrad@adacore.com
+  dmitry.fleytman@gmail.com
+  kraxel@redhat.com
+  edgar.iglesias@gmail.com
+  gxt@mprc.pku.edu.cn
+  pburton@wavecomp.com
+  xiaoguangrong.eric@gmail.com
+  peter.chubb@nicta.com.au
+  philmd@redhat.com
+  robh@kernel.org
+  hare@suse.com
+  sstabellini@kernel.org
+  berto@igalia.com
+  chouteau@adacore.com
+  qemu-block@nongnu.org
+  arikalo@wavecomp.com
+  jslaby@suse.cz
+  deller@gmx.de
+  mst@redhat.com
+  magnus.damm@gmail.com
+  jcd@tribudubois.net
+  pasic@linux.ibm.com
+  borntraeger@de.ibm.com
+  mreitz@redhat.com
+  hpoussin@reactos.org
+  joel@jms.id.au
+  anthony.perard@citrix.com
+  xen-devel@lists.xenproject.org
+  david@gibson.dropbear.id.au
+  lersek@redhat.com
+  green@moxielogic.com
+  atar4qemu@gmail.com
+  antonynpavlov@gmail.com
+  marex@denx.de
+  jiri@resnulli.us
+  ehabkost@redhat.com
+  minyard@acm.org
+  qemu-s390x@nongnu.org
+  sw@weilnetz.de
+  alistair@alistair23.me
+  yuval.shaia@oracle.com
+  b.galvani@gmail.com
+  eric.auger@redhat.com
+  alex.williamson@redhat.com
+  qemu-arm@nongnu.org
+  jan.kiszka@web.de
+  clg@kaod.org
+  stefanha@redhat.com
+  marcandre.lureau@redhat.com
+  shorne@gmail.com
+  jsnow@redhat.com
+  rth@twiddle.net
+  kwolf@redhat.com
+  qemu-riscv@nongnu.org
+  proljc@gmail.com
+  pbonzini@redhat.com
+  andrew@aj.id.au
+  kbastian@mail.uni-paderborn.de
+  crwulff@gmail.com
+  laurent@vivier.eu
+  Andrew.Baumann@microsoft.com
+  sundeep.lkml@gmail.com
+  andrew.smirnov@gmail.com
+  michael@walle.cc
+  paul.durrant@citrix.com
+  qemu-ppc@nongnu.org
+  huth@tuxfamily.org
+  amarkovic@wavecomp.com
+  imammedo@redhat.com
+  aurelien@aurel32.net
+ " stefanb@linux.ibm.com\0"
+ "\00:1\0"
  "b\0"
  "Append MemTxAttrs to interfaces so we can pass along up coming Invert\n"
  "Endian TTE bit on SPARC64.\n"
@@ -213,150 +213,5 @@
  "1.8.3.1\n"
  "\n"
  ?
- "\01:2\0"
- "b\0"
- "<html>\r\n"
- "<head>\r\n"
- "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\r\n"
- "<style type=\"text/css\" style=\"display:none\"><!-- P { margin-top: 0px; margin-bottom: 0px; } .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left-width: 2px; border-left-style: solid; border-left-color: rgb(128, 0, 0); }--></style>\r\n"
- "</head>\r\n"
- "<body dir=\"ltr\" style=\"font-size:12pt;color:#000000;background-color:#FFFFFF;font-family:Calibri,Arial,Helvetica,sans-serif;\">\r\n"
- "<p></p>\r\n"
- "<div style=\"color: rgb(33, 33, 33);\"><font size=\"2\"><span style=\"font-size:10pt;\">\r\n"
- "<div class=\"PlainText\">\r\n"
- "<div><span style=\"font-size: 10pt;\">Append MemTxAttrs to interfaces so we can pass along up coming Invert</span><br>\r\n"
- "</div>\r\n"
- "<div>Endian TTE bit on SPARC64.</div>\r\n"
- "<div><br>\r\n"
- "</div>\r\n"
- "<div>Signed-off-by: Tony Nguyen &lt;tony.nguyen@bt.com&gt;</div>\r\n"
- "<div>Reviewed-by: Richard Henderson &lt;richard.henderson@linaro.org&gt;</div>\r\n"
- "<div>---</div>\r\n"
- "<div>&nbsp;target/sparc/mmu_helper.c | 32 &#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;--------------</div>\r\n"
- "<div>&nbsp;1 file changed, 18 insertions(&#43;), 14 deletions(-)</div>\r\n"
- "<div><br>\r\n"
- "</div>\r\n"
- "<div>diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c</div>\r\n"
- "<div>index cbd1e91..826e14b 100644</div>\r\n"
- "<div>--- a/target/sparc/mmu_helper.c</div>\r\n"
- "<div>&#43;&#43;&#43; b/target/sparc/mmu_helper.c</div>\r\n"
- "<div>@@ -88,7 &#43;88,7 @@ static const int perm_table[2][8] = {</div>\r\n"
- "<div>&nbsp;};</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp;static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index, MemTxAttrs *attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong address, int rw, int mmu_idx,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong *page_size)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>@@ -219,6 &#43;219,7 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;target_ulong vaddr;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;int error_code = 0, prot, access_index;</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;/*</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; * TODO: If we ever need tlb_vaddr_to_host for this target,</div>\r\n"
- "<div>@@ -229,7 &#43;230,7 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;assert(!probe);</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;address &amp;= TARGET_PAGE_MASK;</div>\r\n"
- "<div>- &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index, &amp;attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;address, access_type,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;vaddr = address;</div>\r\n"
- "<div>@@ -490,8 &#43;491,8 @@ static inline int ultrasparc_tag_match(SparcTLBEntry *tlb,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;return 0;</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>-static int get_physical_address_data(CPUSPARCState *env,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr *physical, int *prot,</div>\r\n"
- "<div>&#43;static int get_physical_address_data(CPUSPARCState *env, hwaddr *physical,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; int *prot, MemTxAttrs *attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; target_ulong address, int rw, int mmu_idx)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;CPUState *cs = env_cpu(env);</div>\r\n"
- "<div>@@ -608,8 &#43;609,8 @@ static int get_physical_address_data(CPUSPARCState *env,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;return 1;</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>-static int get_physical_address_code(CPUSPARCState *env,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr *physical, int *prot,</div>\r\n"
- "<div>&#43;static int get_physical_address_code(CPUSPARCState *env, hwaddr *physical,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; int *prot, MemTxAttrs *attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; target_ulong address, int mmu_idx)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;CPUState *cs = env_cpu(env);</div>\r\n"
- "<div>@@ -686,7 &#43;687,7 @@ static int get_physical_address_code(CPUSPARCState *env,</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp;static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int *prot, int *access_index, MemTxAttrs *attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong address, int rw, int mmu_idx,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;target_ulong *page_size)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>@@ -716,11 &#43;717,11 @@ static int get_physical_address(CPUSPARCState *env, hwaddr *physical,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;if (rw == 2) {</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_code(env, physical, prot, address,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_code(env, physical, prot, attrs, address,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; mmu_idx);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;} else {</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_data(env, physical, prot, address, rw,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; mmu_idx);</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;return get_physical_address_data(env, physical, prot, attrs, address,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; rw, mmu_idx);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;}</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>@@ -734,10 &#43;735,11 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;target_ulong vaddr;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;hwaddr paddr;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;int error_code = 0, prot, access_index;</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;address &amp;= TARGET_PAGE_MASK;</div>\r\n"
- "<div>- &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;error_code = get_physical_address(env, &amp;paddr, &amp;prot, &amp;access_index, &amp;attrs,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;address, access_type,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;if (likely(error_code == 0)) {</div>\r\n"
- "<div>@@ -747,7 &#43;749,8 @@ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; env-&gt;dmmu.mmu_primary_context,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; env-&gt;dmmu.mmu_secondary_context);</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp;tlb_set_page(cs, vaddr, paddr, prot, mmu_idx, page_size);</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp;tlb_set_page_with_attrs(cs, vaddr, paddr, attrs, prot, mmu_idx,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;page_size);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;}</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;if (probe) {</div>\r\n"
- "<div>@@ -849,9 &#43;852,10 @@ static int cpu_sparc_get_phys_page(CPUSPARCState *env, hwaddr *phys,</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;target_ulong page_size;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;int prot, access_index;</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;MemTxAttrs attrs = {};</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>- &nbsp; &nbsp;return get_physical_address(env, phys, &amp;prot, &amp;access_index, addr, rw,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;mmu_idx, &amp;page_size);</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;return get_physical_address(env, phys, &amp;prot, &amp;access_index, &amp;attrs, addr,</div>\r\n"
- "<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;rw, mmu_idx, &amp;page_size);</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp;#if defined(TARGET_SPARC64)</div>\r\n"
- "<div>--&nbsp;</div>\r\n"
- "<div>1.8.3.1</div>\r\n"
- "<div><br>\r\n"
- "&#8203;<br>\r\n"
- "</div>\r\n"
- "<br>\r\n"
- "</div>\r\n"
- "</span></font></div>\r\n"
- "</body>\r\n"
- "</html>\r\n"
 
-6cf0c15b943fe9a7011d108b8d2ab44480b76e3d1a2c014a55ece37d0767f54c
+1ed5056805f4475b02f115101f4944179811dd7f3f06aad9a838aec888390932
