From: lixinyu Date: Sat, 11 Apr 2020 12:46:12 +0000 (+0800) Subject: tcg/mips: mips sync* encode error X-Git-Tag: v4.2.1~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27f56b9aa2687a346484aa2108bbb2f70bc2d373;p=thirdparty%2Fqemu.git tcg/mips: mips sync* encode error OPC_SYNC_WMB, OPC_SYNC_MB, OPC_SYNC_ACQUIRE, OPC_SYNC_RELEASE and OPC_SYNC_RMB have wrong encode. According to the mips manual, their encode should be 'OPC_SYNC | 0x?? << 6' rather than 'OPC_SYNC | 0x?? << 5'. Wrong encode can lead illegal instruction errors. These instructions often appear with multi-threaded simulation. Fixes: 6f0b99104a3 ("tcg/mips: Add support for fence") Reviewed-by: Richard Henderson Reviewed-by: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: lixinyu Message-Id: <20200411124612.12560-1-precinct@mail.ustc.edu.cn> Signed-off-by: Richard Henderson (cherry picked from commit a4e57084c16d5b0eff3651693fba04f26b30b551) Signed-off-by: Michael Roth --- diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index 54421670452..006835348fe 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -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,