From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 1 Jul 2015 13:59:13 +0000 (+0200)
Subject: target-mips: fix ASID synchronisation for MIPS MT
X-Git-Tag: v2.4.0-rc1~3^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a973e6b6584221bed89a01e755b88e58b496652;p=thirdparty%2Fqemu.git

target-mips: fix ASID synchronisation for MIPS MT

When syncing the task ASID with EntryHi, correctly or the value instead
of assigning it.

Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 2a9ddff70fe..d457a29f3e7 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -661,7 +661,7 @@ static void sync_c0_tcstatus(CPUMIPSState *cpu, int tc,
 
     /* Sync the TASID with EntryHi.  */
     cpu->CP0_EntryHi &= ~0xff;
-    cpu->CP0_EntryHi = tasid;
+    cpu->CP0_EntryHi |= tasid;
 
     compute_hflags(cpu);
 }