From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrmqx-0000mT-C5 for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrmqs-0004qr-La for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:34 -0400 Received: from mail.uni-paderborn.de ([131.234.142.9]:55736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrmqs-0004q7-Eq for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:30 -0400 From: Bastian Koppelmann Date: Mon, 11 May 2015 14:30:15 +0200 Message-Id: <1431347416-32365-5-git-send-email-kbastian@mail.uni-paderborn.de> In-Reply-To: <1431347416-32365-1-git-send-email-kbastian@mail.uni-paderborn.de> References: <1431347416-32365-1-git-send-email-kbastian@mail.uni-paderborn.de> Subject: [Qemu-devel] [PULL 4/5] target-tricore: fix rslcx restoring the upper context instead of the lower List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Bastian Koppelmann --- Note here, that I swaped the attributes here as compared to the patch on the list, since this was wrong. target-tricore/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c index 9907e07..1dc25c2 100644 --- a/target-tricore/op_helper.c +++ b/target-tricore/op_helper.c @@ -2581,7 +2581,7 @@ void helper_rslcx(CPUTriCoreState *env) ((env->PCXI & MASK_PCXI_PCXO) << 6); /* {new_PCXI, A[11], A[10], A[11], D[8], D[9], D[10], D[11], A[12], A[13], A[14], A[15], D[12], D[13], D[14], D[15]} = M(EA, 16 * word); */ - restore_context_upper(env, ea, &new_PCXI, &env->gpr_a[11]); + restore_context_lower(env, ea, &env->gpr_a[11], &new_PCXI); /* M(EA, word) = FCX; */ cpu_stl_data(env, ea, env->FCX); /* M(EA, word) = FCX; */ -- 2.4.0