From 5ee529edd3ddd6c478c9cbafa82f9409edf0353b Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 14 Feb 2018 17:00:19 -0500 Subject: [PATCH] target-mips: fix ASID synchronisation for MIPS MT When syncing the task ASID with EntryHi, correctly or the value instead of assigning it. Backports commit 6a973e6b6584221bed89a01e755b88e58b496652 from qemu --- qemu/target-mips/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target-mips/op_helper.c b/qemu/target-mips/op_helper.c index 5ffc212d..26dd624b 100644 --- a/qemu/target-mips/op_helper.c +++ b/qemu/target-mips/op_helper.c @@ -660,7 +660,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); }