From patchwork Sun Jan 27 13:31:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 215998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B3D7F2C0080 for ; Mon, 28 Jan 2013 01:43:25 +1100 (EST) Received: from localhost ([::1]:44531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSNG-0000yK-Do for incoming@patchwork.ozlabs.org; Sun, 27 Jan 2013 08:34:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSMM-0007nw-LX for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TzSML-0003F1-LH for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:22 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48489 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TzSML-0002vh-FK for qemu-devel@nongnu.org; Sun, 27 Jan 2013 08:33:21 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 76024A520A; Sun, 27 Jan 2013 14:32:40 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2013 14:31:59 +0100 Message-Id: <1359293537-8251-2-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359293537-8251-1-git-send-email-afaerber@suse.de> References: <1359293537-8251-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH RESEND for-1.4 01/19] target-cris: Build fix for debug output 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Around r3361 (81fdc5f8d2d681da8d255baf0713144f8656bac9) env->debug1 used to contain the address of an MMU fault. This is now written into env->pregs[PR_EDA] instead. Signed-off-by: Andreas Färber --- target-cris/op_helper.c | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c index 0f6a1ee..b580513 100644 --- a/target-cris/op_helper.c +++ b/target-cris/op_helper.c @@ -60,7 +60,7 @@ void tlb_fill(CPUCRISState *env, target_ulong addr, int is_write, int mmu_idx, int ret; D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__, - env->pc, env->debug1, (void *)retaddr); + env->pc, env->pregs[PR_EDA], (void *)retaddr); ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) {