From patchwork Tue Aug 19 18:09:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 35651 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 584322034C for ; Tue, 19 Aug 2014 18:12:31 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id j5sf9008444qga.3 for ; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=Z+g5A0gUo1O0xRWTcen+ISz2DcMwMeYRju4n+3+0TFs=; b=fuFJTsRedIorwMMkNlKQZULEAxW6+S0DhusP6Lz74qY+Yikgw3/gdR5IDM/Vhj/KnK DZvhg8nko5t41CZxwCsJcpCXoQxhK4xa5EV7wNEhxVdCSfp2chx+U5aST1l/QwVeBvU9 idIZl7c4tgBUslaZgHmKa9n01JOSOlKV3oaPBpfc9Nj7v7mlwER0csk0xqW3v+0JKHoL kJNmfmZMdX7yHP8MW8qurxm3ai22WfRiX9SKHiAuFjtJuefOqKD5VLXXZomjoZ8b73WQ +DmOP9bnwsmI4wc4g/tp/NAN0jgdDRsvaauQLpYONSTks0uv16o7ZC0Sp1UqDAQK0FY/ bW8g== X-Gm-Message-State: ALoCoQlOEZOVesdUuEQ6ZLK7XjcczsN/4/EgwNlRRQgIB9XUzwwndGLtWXKFi/prcbxAaKS135Pw X-Received: by 10.236.124.161 with SMTP id x21mr5316704yhh.48.1408471948279; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.141 with SMTP id s13ls2817288qga.6.gmail; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) X-Received: by 10.52.165.116 with SMTP id yx20mr2885203vdb.13.1408471948120; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id na2si8480793vcb.96.2014.08.19.11.12.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Aug 2014 11:12:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so7847094vcb.38 for ; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) X-Received: by 10.221.5.137 with SMTP id og9mr31847075vcb.18.1408471948056; Tue, 19 Aug 2014 11:12:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp260156vcb; Tue, 19 Aug 2014 11:12:27 -0700 (PDT) X-Received: by 10.224.130.7 with SMTP id q7mr71067575qas.42.1408471947170; Tue, 19 Aug 2014 11:12:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m8si30126179qas.0.2014.08.19.11.12.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 Aug 2014 11:12:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:52400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJntS-0002YR-MY for patch@linaro.org; Tue, 19 Aug 2014 14:12:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJns6-00016y-Kn for qemu-devel@nongnu.org; Tue, 19 Aug 2014 14:11:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJns0-00044S-P7 for qemu-devel@nongnu.org; Tue, 19 Aug 2014 14:11:02 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:42051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJns0-0003wv-HA for qemu-devel@nongnu.org; Tue, 19 Aug 2014 14:10:56 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XJnqq-0000iC-Th for qemu-devel@nongnu.org; Tue, 19 Aug 2014 19:09:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 19 Aug 2014 19:09:37 +0100 Message-Id: <1408471784-2652-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1408471784-2652-1-git-send-email-peter.maydell@linaro.org> References: <1408471784-2652-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Subject: [Qemu-devel] [PULL 12/19] target-arm: Implement MDSCR_EL1 as having state 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Now that all the new code to support single-stepping is in place, wire up the guest-visible MDSCR_EL1, so the guest can enable single-stepping. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias --- target-arm/helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index f981569..2a77c97 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2204,7 +2204,9 @@ static const ARMCPRegInfo debug_cp_reginfo[] = { */ { .name = "MDSCR_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = 2, .opc2 = 2, - .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + .access = PL1_RW, + .fieldoffset = offsetof(CPUARMState, cp15.mdscr_el1), + .resetvalue = 0 }, /* We define a dummy WI OSLAR_EL1, because Linux writes to it. */ { .name = "OSLAR_EL1", .state = ARM_CP_STATE_BOTH, .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 1, .crm = 0, .opc2 = 4,