diff for duplicates of <1565166587275.42474@bt.com>

diff --git a/a/2.bin b/a/2.bin
deleted file mode 100644
index d75b436..0000000
--- a/a/2.bin
+++ /dev/null
@@ -1,144 +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;">Convert memory_region_dispatch_{read|write} operand &quot;unsigned size&quot;</span><br>
-</div>
-<div>into a &quot;MemOp op&quot;.</div>
-<div><br>
-</div>
-<div>Signed-off-by: Tony Nguyen &lt;tony.nguyen@bt.com&gt;</div>
-<div>---</div>
-<div>&nbsp;include/exec/memop.h &nbsp;| 18 &#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;-----</div>
-<div>&nbsp;include/exec/memory.h | &nbsp;9 &#43;&#43;&#43;&#43;&#43;----</div>
-<div>&nbsp;memory.c &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;| &nbsp;7 &#43;&#43;&#43;&#43;&#43;--</div>
-<div>&nbsp;3 files changed, 23 insertions(&#43;), 11 deletions(-)</div>
-<div><br>
-</div>
-<div>diff --git a/include/exec/memop.h b/include/exec/memop.h</div>
-<div>index 5c5769e..4a4212d 100644</div>
-<div>--- a/include/exec/memop.h</div>
-<div>&#43;&#43;&#43; b/include/exec/memop.h</div>
-<div>@@ -12,6 &#43;12,8 @@</div>
-<div>&nbsp;#ifndef MEMOP_H</div>
-<div>&nbsp;#define MEMOP_H</div>
-<div>&nbsp;</div>
-<div>&#43;#include &quot;qemu/host-utils.h&quot;</div>
-<div>&#43;</div>
-<div>&nbsp;typedef enum MemOp {</div>
-<div>&nbsp; &nbsp; &nbsp;MO_8 &nbsp; &nbsp; = 0,</div>
-<div>&nbsp; &nbsp; &nbsp;MO_16 &nbsp; &nbsp;= 1,</div>
-<div>@@ -107,14 &#43;109,20 @@ typedef enum MemOp {</div>
-<div>&nbsp; &nbsp; &nbsp;MO_SSIZE = MO_SIZE | MO_SIGN,</div>
-<div>&nbsp;} MemOp;</div>
-<div>&nbsp;</div>
-<div>&#43;/* MemOp to size in bytes. &nbsp;*/</div>
-<div>&#43;static inline unsigned memop_size(MemOp op)</div>
-<div>&#43;{</div>
-<div>&#43; &nbsp; &nbsp;return 1 &lt;&lt; ((op) &amp; MO_SIZE);</div>
-<div>&#43;}</div>
-<div>&#43;</div>
-<div>&nbsp;/* Size in bytes to MemOp. &nbsp;*/</div>
-<div>&nbsp;static inline MemOp size_memop(unsigned size)</div>
-<div>&nbsp;{</div>
-<div>- &nbsp; &nbsp;/*</div>
-<div>- &nbsp; &nbsp; * FIXME: No-op to aid conversion of memory_region_dispatch_{read|write}</div>
-<div>- &nbsp; &nbsp; * &quot;unsigned size&quot; operand into a &quot;MemOp op&quot;.</div>
-<div>- &nbsp; &nbsp; */</div>
-<div>- &nbsp; &nbsp;return size;</div>
-<div>&#43;#ifdef CONFIG_DEBUG_TCG</div>
-<div>&#43; &nbsp; &nbsp;/* Power of 2 up to 8. &nbsp;*/</div>
-<div>&#43; &nbsp; &nbsp;assert((size &amp; (size - 1)) == 0 &amp;&amp; size &gt;= 1 &amp;&amp; size &lt;= 8);</div>
-<div>&#43;#endif</div>
-<div>&#43; &nbsp; &nbsp;return ctz32(size);</div>
-<div>&nbsp;}</div>
-<div>&nbsp;</div>
-<div>&nbsp;#endif</div>
-<div>diff --git a/include/exec/memory.h b/include/exec/memory.h</div>
-<div>index bb0961d..975b86a 100644</div>
-<div>--- a/include/exec/memory.h</div>
-<div>&#43;&#43;&#43; b/include/exec/memory.h</div>
-<div>@@ -19,6 &#43;19,7 @@</div>
-<div>&nbsp;#include &quot;exec/cpu-common.h&quot;</div>
-<div>&nbsp;#include &quot;exec/hwaddr.h&quot;</div>
-<div>&nbsp;#include &quot;exec/memattrs.h&quot;</div>
-<div>&#43;#include &quot;exec/memop.h&quot;</div>
-<div>&nbsp;#include &quot;exec/ramlist.h&quot;</div>
-<div>&nbsp;#include &quot;qemu/queue.h&quot;</div>
-<div>&nbsp;#include &quot;qemu/int128.h&quot;</div>
-<div>@@ -1731,13 &#43;1732,13 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner);</div>
-<div>&nbsp; * @mr: #MemoryRegion to access</div>
-<div>&nbsp; * @addr: address within that region</div>
-<div>&nbsp; * @pval: pointer to uint64_t which the data is written to</div>
-<div>- * @size: size of the access in bytes</div>
-<div>&#43; * @op: size, sign, and endianness of the memory operation</div>
-<div>&nbsp; * @attrs: memory transaction attributes to use for the access</div>
-<div>&nbsp; */</div>
-<div>&nbsp;MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;hwaddr addr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uint64_t *pval,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unsigned size,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;MemOp op,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;MemTxAttrs attrs);</div>
-<div>&nbsp;/**</div>
-<div>&nbsp; * memory_region_dispatch_write: perform a write directly to the specified</div>
-<div>@@ -1746,13 &#43;1747,13 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</div>
-<div>&nbsp; * @mr: #MemoryRegion to access</div>
-<div>&nbsp; * @addr: address within that region</div>
-<div>&nbsp; * @data: data to write</div>
-<div>- * @size: size of the access in bytes</div>
-<div>&#43; * @op: size, sign, and endianness of the memory operation</div>
-<div>&nbsp; * @attrs: memory transaction attributes to use for the access</div>
-<div>&nbsp; */</div>
-<div>&nbsp;MemTxResult memory_region_dispatch_write(MemoryRegion *mr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr addr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; uint64_t data,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; unsigned size,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; MemOp op,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; MemTxAttrs attrs);</div>
-<div>&nbsp;</div>
-<div>&nbsp;/**</div>
-<div>diff --git a/memory.c b/memory.c</div>
-<div>index 5d8c9a9..89ea4fb 100644</div>
-<div>--- a/memory.c</div>
-<div>&#43;&#43;&#43; b/memory.c</div>
-<div>@@ -1439,9 &#43;1439,10 @@ static MemTxResult memory_region_dispatch_read1(MemoryRegion *mr,</div>
-<div>&nbsp;MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;hwaddr addr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uint64_t *pval,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unsigned size,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;MemOp op,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;MemTxAttrs attrs)</div>
-<div>&nbsp;{</div>
-<div>&#43; &nbsp; &nbsp;unsigned size = memop_size(op);</div>
-<div>&nbsp; &nbsp; &nbsp;MemTxResult r;</div>
-<div>&nbsp;</div>
-<div>&nbsp; &nbsp; &nbsp;if (!memory_region_access_valid(mr, addr, size, false, attrs)) {</div>
-<div>@@ -1483,9 &#43;1484,11 @@ static bool memory_region_dispatch_write_eventfds(MemoryRegion *mr,</div>
-<div>&nbsp;MemTxResult memory_region_dispatch_write(MemoryRegion *mr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; hwaddr addr,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; uint64_t data,</div>
-<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; unsigned size,</div>
-<div>&#43; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; MemOp op,</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; MemTxAttrs attrs)</div>
-<div>&nbsp;{</div>
-<div>&#43; &nbsp; &nbsp;unsigned size = memop_size(op);</div>
-<div>&#43;</div>
-<div>&nbsp; &nbsp; &nbsp;if (!memory_region_access_valid(mr, addr, size, true, attrs)) {</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unassigned_mem_write(mr, addr, data, size);</div>
-<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return MEMTX_DECODE_ERROR;</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 2e2b51e..9bf6019 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 11/26] memory: Access MemoryRegion with MemOp\0"
+ "Subject\0[Qemu-devel] [PATCH v6 11/26] memory: Access MemoryRegion with MemOp\0"
  "Date\0Wed, 7 Aug 2019 08:29:47 +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"
  "Convert memory_region_dispatch_{read|write} operand \"unsigned size\"\n"
  "into a \"MemOp op\".\n"
@@ -214,151 +214,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;\">Convert memory_region_dispatch_{read|write} operand &quot;unsigned size&quot;</span><br>\r\n"
- "</div>\r\n"
- "<div>into a &quot;MemOp op&quot;.</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>---</div>\r\n"
- "<div>&nbsp;include/exec/memop.h &nbsp;| 18 &#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;&#43;-----</div>\r\n"
- "<div>&nbsp;include/exec/memory.h | &nbsp;9 &#43;&#43;&#43;&#43;&#43;----</div>\r\n"
- "<div>&nbsp;memory.c &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;| &nbsp;7 &#43;&#43;&#43;&#43;&#43;--</div>\r\n"
- "<div>&nbsp;3 files changed, 23 insertions(&#43;), 11 deletions(-)</div>\r\n"
- "<div><br>\r\n"
- "</div>\r\n"
- "<div>diff --git a/include/exec/memop.h b/include/exec/memop.h</div>\r\n"
- "<div>index 5c5769e..4a4212d 100644</div>\r\n"
- "<div>--- a/include/exec/memop.h</div>\r\n"
- "<div>&#43;&#43;&#43; b/include/exec/memop.h</div>\r\n"
- "<div>@@ -12,6 &#43;12,8 @@</div>\r\n"
- "<div>&nbsp;#ifndef MEMOP_H</div>\r\n"
- "<div>&nbsp;#define MEMOP_H</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&#43;#include &quot;qemu/host-utils.h&quot;</div>\r\n"
- "<div>&#43;</div>\r\n"
- "<div>&nbsp;typedef enum MemOp {</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;MO_8 &nbsp; &nbsp; = 0,</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;MO_16 &nbsp; &nbsp;= 1,</div>\r\n"
- "<div>@@ -107,14 &#43;109,20 @@ typedef enum MemOp {</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;MO_SSIZE = MO_SIZE | MO_SIGN,</div>\r\n"
- "<div>&nbsp;} MemOp;</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&#43;/* MemOp to size in bytes. &nbsp;*/</div>\r\n"
- "<div>&#43;static inline unsigned memop_size(MemOp op)</div>\r\n"
- "<div>&#43;{</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;return 1 &lt;&lt; ((op) &amp; MO_SIZE);</div>\r\n"
- "<div>&#43;}</div>\r\n"
- "<div>&#43;</div>\r\n"
- "<div>&nbsp;/* Size in bytes to MemOp. &nbsp;*/</div>\r\n"
- "<div>&nbsp;static inline MemOp size_memop(unsigned size)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>- &nbsp; &nbsp;/*</div>\r\n"
- "<div>- &nbsp; &nbsp; * FIXME: No-op to aid conversion of memory_region_dispatch_{read|write}</div>\r\n"
- "<div>- &nbsp; &nbsp; * &quot;unsigned size&quot; operand into a &quot;MemOp op&quot;.</div>\r\n"
- "<div>- &nbsp; &nbsp; */</div>\r\n"
- "<div>- &nbsp; &nbsp;return size;</div>\r\n"
- "<div>&#43;#ifdef CONFIG_DEBUG_TCG</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;/* Power of 2 up to 8. &nbsp;*/</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;assert((size &amp; (size - 1)) == 0 &amp;&amp; size &gt;= 1 &amp;&amp; size &lt;= 8);</div>\r\n"
- "<div>&#43;#endif</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;return ctz32(size);</div>\r\n"
- "<div>&nbsp;}</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp;#endif</div>\r\n"
- "<div>diff --git a/include/exec/memory.h b/include/exec/memory.h</div>\r\n"
- "<div>index bb0961d..975b86a 100644</div>\r\n"
- "<div>--- a/include/exec/memory.h</div>\r\n"
- "<div>&#43;&#43;&#43; b/include/exec/memory.h</div>\r\n"
- "<div>@@ -19,6 &#43;19,7 @@</div>\r\n"
- "<div>&nbsp;#include &quot;exec/cpu-common.h&quot;</div>\r\n"
- "<div>&nbsp;#include &quot;exec/hwaddr.h&quot;</div>\r\n"
- "<div>&nbsp;#include &quot;exec/memattrs.h&quot;</div>\r\n"
- "<div>&#43;#include &quot;exec/memop.h&quot;</div>\r\n"
- "<div>&nbsp;#include &quot;exec/ramlist.h&quot;</div>\r\n"
- "<div>&nbsp;#include &quot;qemu/queue.h&quot;</div>\r\n"
- "<div>&nbsp;#include &quot;qemu/int128.h&quot;</div>\r\n"
- "<div>@@ -1731,13 &#43;1732,13 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner);</div>\r\n"
- "<div>&nbsp; * @mr: #MemoryRegion to access</div>\r\n"
- "<div>&nbsp; * @addr: address within that region</div>\r\n"
- "<div>&nbsp; * @pval: pointer to uint64_t which the data is written to</div>\r\n"
- "<div>- * @size: size of the access in bytes</div>\r\n"
- "<div>&#43; * @op: size, sign, and endianness of the memory operation</div>\r\n"
- "<div>&nbsp; * @attrs: memory transaction attributes to use for the access</div>\r\n"
- "<div>&nbsp; */</div>\r\n"
- "<div>&nbsp;MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</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;hwaddr addr,</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;uint64_t *pval,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unsigned size,</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;MemOp op,</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;MemTxAttrs attrs);</div>\r\n"
- "<div>&nbsp;/**</div>\r\n"
- "<div>&nbsp; * memory_region_dispatch_write: perform a write directly to the specified</div>\r\n"
- "<div>@@ -1746,13 &#43;1747,13 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</div>\r\n"
- "<div>&nbsp; * @mr: #MemoryRegion to access</div>\r\n"
- "<div>&nbsp; * @addr: address within that region</div>\r\n"
- "<div>&nbsp; * @data: data to write</div>\r\n"
- "<div>- * @size: size of the access in bytes</div>\r\n"
- "<div>&#43; * @op: size, sign, and endianness of the memory operation</div>\r\n"
- "<div>&nbsp; * @attrs: memory transaction attributes to use for the access</div>\r\n"
- "<div>&nbsp; */</div>\r\n"
- "<div>&nbsp;MemTxResult memory_region_dispatch_write(MemoryRegion *mr,</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; hwaddr addr,</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; uint64_t data,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; unsigned size,</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; MemOp op,</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; MemTxAttrs attrs);</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp;/**</div>\r\n"
- "<div>diff --git a/memory.c b/memory.c</div>\r\n"
- "<div>index 5d8c9a9..89ea4fb 100644</div>\r\n"
- "<div>--- a/memory.c</div>\r\n"
- "<div>&#43;&#43;&#43; b/memory.c</div>\r\n"
- "<div>@@ -1439,9 &#43;1439,10 @@ static MemTxResult memory_region_dispatch_read1(MemoryRegion *mr,</div>\r\n"
- "<div>&nbsp;MemTxResult memory_region_dispatch_read(MemoryRegion *mr,</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;hwaddr addr,</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;uint64_t *pval,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unsigned size,</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;MemOp op,</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;MemTxAttrs attrs)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;unsigned size = memop_size(op);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;MemTxResult r;</div>\r\n"
- "<div>&nbsp;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;if (!memory_region_access_valid(mr, addr, size, false, attrs)) {</div>\r\n"
- "<div>@@ -1483,9 &#43;1484,11 @@ static bool memory_region_dispatch_write_eventfds(MemoryRegion *mr,</div>\r\n"
- "<div>&nbsp;MemTxResult memory_region_dispatch_write(MemoryRegion *mr,</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; hwaddr addr,</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; uint64_t data,</div>\r\n"
- "<div>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; unsigned size,</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; MemOp op,</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; MemTxAttrs attrs)</div>\r\n"
- "<div>&nbsp;{</div>\r\n"
- "<div>&#43; &nbsp; &nbsp;unsigned size = memop_size(op);</div>\r\n"
- "<div>&#43;</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp;if (!memory_region_access_valid(mr, addr, size, true, attrs)) {</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unassigned_mem_write(mr, addr, data, size);</div>\r\n"
- "<div>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return MEMTX_DECODE_ERROR;</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"
 
-2c93e4ea10fb7e9e723302c504ac2b23c1b7174b0c9e514f28e3f3f6cfe982dd
+baeef1f39049ed3d3324885bf7daecd138483a29e0802a4e1794696bec363d40
