From patchwork Fri Feb 19 13:46:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Koppelmann X-Patchwork-Id: 8361481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB6BFC0553 for ; Fri, 19 Feb 2016 13:54:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D67E20461 for ; Fri, 19 Feb 2016 13:54:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 848CF20450 for ; Fri, 19 Feb 2016 13:54:23 +0000 (UTC) Received: from localhost ([::1]:52520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlVn-0003cr-2L for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 08:54:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlOm-0008By-9q for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWlOf-0005Xr-Ev for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:47:08 -0500 Received: from mail.uni-paderborn.de ([131.234.142.9]:56813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlOf-0005Xn-7U for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:47:01 -0500 Received: from magmaria.uni-paderborn.de ([131.234.189.24] helo=localhost.localdomain) by mail.uni-paderborn.de with esmtp (Exim 4.84 telepax) id 1aWlOe-0001En-4f for qemu-devel@nongnu.org; Fri, 19 Feb 2016 14:47:00 +0100 Received: from mail.uni-paderborn.de by magmaria with queue id 1050125-3 for qemu-devel@nongnu.org; Fri, 19 Feb 2016 13:47:00 GMT Received: from kbastian@mail.uni-paderborn.de (eduroam-73-98.uni-paderborn.de [131.234.73.98]) by mail.uni-paderborn.de with SMTP id 1aWlOe-00006L-Jr; Fri, 19 Feb 2016 13:47:00 GMT (envelope-from kbastian@mail.uni-paderborn.de) X-Envelope-From: Received: from eduroam-73-98.uni-paderborn.de ([131.234.73.98] helo=schnipp.localdomain) by mail.uni-paderborn.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84 zuban) id 1aWlOe-00006L-Jr; Fri, 19 Feb 2016 14:47:00 +0100 From: Bastian Koppelmann To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 14:46:55 +0100 Message-Id: <1455889615-3435-1-git-send-email-kbastian@mail.uni-paderborn.de> X-Mailer: git-send-email 2.7.1 X-PMX-Version: 6.2.1.2493963, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.2.19.133615 X-IMT-Spam-Score: 0.0 () X-IMT-Authenticated-Sender: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 131.234.142.9 Cc: kbastian@mail.uni-paderborn.de Subject: [Qemu-devel] [PATCH] target-tricore: fix save_context_upper using env->PSW X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the cached bits for C, V, SV, AV, or SAV were set, they would not be saved during the context save since env->PSW was stored instead of properly reading them using psw_read(). Signed-off-by: Bastian Koppelmann Reviewed-by: Richard Henderson --- 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 3aa6326..796fe67 100644 --- a/target-tricore/op_helper.c +++ b/target-tricore/op_helper.c @@ -2279,7 +2279,7 @@ static bool cdc_zero(target_ulong *psw) static void save_context_upper(CPUTriCoreState *env, int ea) { cpu_stl_data(env, ea, env->PCXI); - cpu_stl_data(env, ea+4, env->PSW); + cpu_stl_data(env, ea+4, psw_read(env)); cpu_stl_data(env, ea+8, env->gpr_a[10]); cpu_stl_data(env, ea+12, env->gpr_a[11]); cpu_stl_data(env, ea+16, env->gpr_d[8]);