Fix tcg/mips barrier encoding

-----BEGIN PGP SIGNATURE-----
 
 iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAl6Tg0YdHHJpY2hhcmQu
 aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/+zggAvTqn3J5X+oTYv7yV
 OdDO27cDCGkj++z2vzSM2MXetAmAguq/clu34pxGwec2TtRgdcIBOnqM/BVzhLwX
 n2+FKk+rf1zeIzHD7cGIF/ZLXjNa74lPorTdgiAS2t2ryYt4FBvHHVYBfD646VxB
 DBqcxnDPhoQ7FnnKs0xb4W6I4QatdWgcsG0HCgMQiHGuXCJBfZLzWEU/ekAzaT1j
 PEn4gJyGn57iojUZ4V8Dw38kTvk/OZkz7SYGFkIvFPoUIT4oyghAQd5TbrYPGyBt
 2V3SyuqKXwuznKwxL5uiDq1Ur35j/U1aDIK7RLU6YCR5ksVfNFjKNKcstOQsrAI+
 0d0GKQ==
 =yIvv
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200412' into staging

Fix tcg/mips barrier encoding

# gpg: Signature made Sun 12 Apr 2020 22:08:22 BST
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-tcg-20200412:
  tcg/mips: mips sync* encode error

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-04-13 10:48:37 +01:00
commit 792cb70eb0

View File

@ -404,11 +404,11 @@ typedef enum {
/* MIPS r6 introduced names for weaker variants of SYNC. These are
backward compatible to previous architecture revisions. */
OPC_SYNC_WMB = OPC_SYNC | 0x04 << 5,
OPC_SYNC_MB = OPC_SYNC | 0x10 << 5,
OPC_SYNC_ACQUIRE = OPC_SYNC | 0x11 << 5,
OPC_SYNC_RELEASE = OPC_SYNC | 0x12 << 5,
OPC_SYNC_RMB = OPC_SYNC | 0x13 << 5,
OPC_SYNC_WMB = OPC_SYNC | 0x04 << 6,
OPC_SYNC_MB = OPC_SYNC | 0x10 << 6,
OPC_SYNC_ACQUIRE = OPC_SYNC | 0x11 << 6,
OPC_SYNC_RELEASE = OPC_SYNC | 0x12 << 6,
OPC_SYNC_RMB = OPC_SYNC | 0x13 << 6,
/* Aliases for convenience. */
ALIAS_PADD = sizeof(void *) == 4 ? OPC_ADDU : OPC_DADDU,