From patchwork Fri Aug 8 12:18:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 35118 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 97C5C21457 for ; Fri, 8 Aug 2014 12:23:42 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf17556990yha.3 for ; Fri, 08 Aug 2014 05:23:42 -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:cc: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=gfgrc3gQ3ZE4FF4lZt86mV2d0SbbLbjP3HA03RyoJYI=; b=mW4mpJwx8bucn2/unEmADn1AwlCEJYeCcqAILxBgtKiBydqcx8Q82X7ApklB7DrPgZ p+AKWL0MIgnI0H0o7uoFII/MMBwQPsnD1NswuXHKaSxrhR4Gbr0EW+atdKudS5EKZSWw o4UkWAMN5nKxvPSjABmtdZO3nBeLiZXowUr18GJHvzTu6ld+Ir9Fb/t3Iz7cuOTMILY4 ejgXY3ek1bRE3R8p5VWCyJfD6SHrQ9U30VlZjSQt25Ask8SOK8WPF/ylVUk4qEDGCOp1 2CzwblQDkFmDUXauEDFNWzgxDMb7jIhwEzv1DqwYUi32aqvg6L7zseRKyC7BACS/4yOg Ab/g== X-Gm-Message-State: ALoCoQlv3Gao2fYXS3a4bBb7GKWz4gED7+WTdv9WESr5GL5SU5oedPkKN5s7HtZWymCv5a7Gj0wQ X-Received: by 10.236.63.67 with SMTP id z43mr4693676yhc.11.1407500622443; Fri, 08 Aug 2014 05:23:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.148 with SMTP id p20ls504051qgp.50.gmail; Fri, 08 Aug 2014 05:23:42 -0700 (PDT) X-Received: by 10.52.28.231 with SMTP id e7mr485531vdh.55.1407500622320; Fri, 08 Aug 2014 05:23:42 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id ls1si2817072vcb.99.2014.08.08.05.23.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Aug 2014 05:23:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so8302774vcb.27 for ; Fri, 08 Aug 2014 05:23:42 -0700 (PDT) X-Received: by 10.220.144.10 with SMTP id x10mr1382186vcu.42.1407500622258; Fri, 08 Aug 2014 05:23:42 -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 tc5csp118357vcb; Fri, 8 Aug 2014 05:23:41 -0700 (PDT) X-Received: by 10.224.51.15 with SMTP id b15mr38119129qag.19.1407500621789; Fri, 08 Aug 2014 05:23:41 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x8si4704361qam.87.2014.08.08.05.23.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Aug 2014 05:23:41 -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]:50856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFjCv-00011b-C3 for patch@linaro.org; Fri, 08 Aug 2014 08:23:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFj7v-0001Os-6d for qemu-devel@nongnu.org; Fri, 08 Aug 2014 08:18:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFj7m-0007GH-Cm for qemu-devel@nongnu.org; Fri, 08 Aug 2014 08:18:31 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFj7m-0007Fb-6W for qemu-devel@nongnu.org; Fri, 08 Aug 2014 08:18:22 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XFj7f-0002pk-1w; Fri, 08 Aug 2014 13:18:15 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 8 Aug 2014 13:18:14 +0100 Message-Id: <1407500294-10804-12-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407500294-10804-1-git-send-email-peter.maydell@linaro.org> References: <1407500294-10804-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: David Long Subject: [Qemu-devel] [PATCH 11/11] 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.182 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 --- 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,