From patchwork Mon Aug 17 08:49:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 1346031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=fjx6VuYB; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BVT985N6bz9sRK for ; Mon, 17 Aug 2020 19:22:52 +1000 (AEST) Received: from localhost ([::1]:59768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7bLu-00043k-F9 for incoming@patchwork.ozlabs.org; Mon, 17 Aug 2020 05:22:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7atM-00038T-Cb for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:53:20 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:53206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7atJ-0005NS-6H for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:53:19 -0400 Received: by mail-pj1-x1031.google.com with SMTP id kr4so7488846pjb.2 for ; Mon, 17 Aug 2020 01:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IIDpnVDv9+trjyRRch9JAqW8+nRxIqRgOoCbDIBNhSI=; b=fjx6VuYBV6Vy/VYoKzWMrxaq2FbJBzTVpOApLV13UNVkFoiPA5XUCdH0sK5TTpaZxX 5zPRWVh+IfeFZs5ZohzuuePadpR+vrZjKf9+mJus+B7hWCcDJqKCUaqr0zR+x81OD6b/ IMwoTBo9iDV69V3eLF5NdIydwgmrm+hikDjkAkrVVXh2LKaZkyPt25HLLk6Sw1WX5+lO +APHkcIqGsx9eIFC4mE7WwNmDaQ+PknUITeJltyQLRSuBZdf7UaKzGaREmRJ5Oi60fTV uwWo97qv4YPSG6LdIWk6fOgLbZKRRyoixIeAerNrbgGVbbd8DtdGT/gZP0NfW4ABf7a9 ExzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IIDpnVDv9+trjyRRch9JAqW8+nRxIqRgOoCbDIBNhSI=; b=N4HFB9+rpKq1lvArCRH47KJj4UfoJiXubB5CGfoKBtUxM/4s/G0EMxMZP3FNgcUCbZ N9RVz9wMrL/nNKgMXkk8VnTTuPCoWHjUsrxJlOYJi3SF7n7+Xc9r8Ms1/2onvaGLSrZO LSo9lZhXUrn4fgVI9q2fLKPOczbMH3HKqtbnmdT/iVzZAE4pk0uFYrhbMW2xJgg/RU6+ nQyhJaWN+e8DkFv6PeeharN883YidRg00bVAj7fwkcGhH7CLIDduI2LDfbt1o0OEGHC4 hBEJayJF7Na27nQo9Q+orC8aca03tdP2fVvIA7i1NUyLdf98qi9c02neeaEH1mY2fY8C qXOQ== X-Gm-Message-State: AOAM532g5r8C2lVGIhfyMqx6yuUvlF3qQVHbiUNpxvf5vWoeyCdQGMro qGd6SCLy1Ak986MVim5I0hI9V2aW/IuPVg== X-Google-Smtp-Source: ABdhPJw2HSlzcjR4EErxKvbwPYLs1L8eqSieIJ1nO1TTK8SgXodmT7mZBnw2VpHLOcZPODeiujC5EA== X-Received: by 2002:a17:902:9345:: with SMTP id g5mr10676858plp.192.1597654395549; Mon, 17 Aug 2020 01:53:15 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id d9sm16478588pgv.45.2020.08.17.01.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:53:15 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v4 68/70] target/riscv: gdb: modify gdb csr xml file to align with csr register map Date: Mon, 17 Aug 2020 16:49:53 +0800 Message-Id: <20200817084955.28793-69-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817084955.28793-1-frank.chang@sifive.com> References: <20200817084955.28793-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=frank.chang@sifive.com; helo=mail-pj1-x1031.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Frank Chang , =?utf-8?q?Alex_Benn=C3=A9e?= , Hsiangkai Wang , Palmer Dabbelt , Bastian Koppelmann , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hsiangkai Wang Signed-off-by: Hsiangkai Wang Signed-off-by: Frank Chang Acked-by: Richard Henderson --- gdb-xml/riscv-32bit-csr.xml | 11 ++++++----- gdb-xml/riscv-64bit-csr.xml | 11 ++++++----- target/riscv/gdbstub.c | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gdb-xml/riscv-32bit-csr.xml b/gdb-xml/riscv-32bit-csr.xml index da1bf19e2f4..3d2031da7dc 100644 --- a/gdb-xml/riscv-32bit-csr.xml +++ b/gdb-xml/riscv-32bit-csr.xml @@ -110,6 +110,8 @@ + + @@ -232,12 +234,11 @@ - - - - - + + + + diff --git a/gdb-xml/riscv-64bit-csr.xml b/gdb-xml/riscv-64bit-csr.xml index 6aa4bed9f50..90394562930 100644 --- a/gdb-xml/riscv-64bit-csr.xml +++ b/gdb-xml/riscv-64bit-csr.xml @@ -110,6 +110,8 @@ + + @@ -232,12 +234,11 @@ - - - - - + + + + diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index eba12a86f2e..f7c5212e274 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -418,13 +418,13 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState *cs) } #if defined(TARGET_RISCV32) gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr, - 240, "riscv-32bit-csr.xml", 0); + 241, "riscv-32bit-csr.xml", 0); gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual, 1, "riscv-32bit-virtual.xml", 0); #elif defined(TARGET_RISCV64) gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr, - 240, "riscv-64bit-csr.xml", 0); + 241, "riscv-64bit-csr.xml", 0); gdb_register_coprocessor(cs, riscv_gdb_get_virtual, riscv_gdb_set_virtual, 1, "riscv-64bit-virtual.xml", 0);