Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iFfxc-0004bj-Md for mharc-qemu-riscv@gnu.org; Wed, 02 Oct 2019 10:50:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFfxX-0004aT-Qg for qemu-riscv@nongnu.org; Wed, 02 Oct 2019 10:50:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFfxV-0007DO-Rb for qemu-riscv@nongnu.org; Wed, 02 Oct 2019 10:50:31 -0400 Received: from rs224.mailgun.us ([209.61.151.224]:35944) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFfxV-00072S-CH for qemu-riscv@nongnu.org; Wed, 02 Oct 2019 10:50:29 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=fintelia.io; q=dns/txt; s=pic; t=1570027828; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: Cc: To: From: Sender; bh=EHhfHLVDFb0Ou/NSqI45n9804z/nKay+LpZFpt/Dpv0=; b=vLpa6xVoCSdtGilil8XtzKYkPlrDghl5Qtl21XnCq9keEJ9nSeXeSxGEfWM98pgOV4PV8p2k QeBVWlp+0g97yI3AkMLNB+C+y6bH5kydblPG26OOi2X9PofULf05MF4Rdrhr0PocrOpkovQv /JZgCfvTkpPBtJz6WBI+yfztBqD9LZELUI2kMCMJWf99H72tTL3NLucePKQ5WJkguds5xgdb CGvLQjzI1cdnhh661mwu2myQIOAzBKg7RCAqXEGLKPDkYFPRY0bsCmXzpDXtnMfGxU0r7krs unAaION4rTQGYwb4z5MOKmmHsZ9zwwu9vFcT4JkQzzLMPFHsboKV9Q== X-Mailgun-Sending-Ip: 209.61.151.224 X-Mailgun-Sid: WyJkNjk0ZSIsICJxZW11LXJpc2N2QG5vbmdudS5vcmciLCAiOWI0ZTc2Il0= Sender: jonathan@fintelia.io Received: from jonathan-ThinkPad-X1-Carbon.csail.mit.edu (30-10-182.wireless.csail.mit.edu [128.30.10.182]) by mxa.mailgun.org with ESMTP id 5d94b926.7f3c59b89e90-smtp-out-n04; Wed, 02 Oct 2019 14:50:14 -0000 (UTC) From: Jonathan Behrens To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Jonathan Behrens , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , Bastian Koppelmann Subject: [PATCH] target/riscv: Expose "priv" register for GDB Date: Wed, 2 Oct 2019 10:48:59 -0400 Message-Id: <20191002144859.18208-1-jonathan@fintelia.io> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.61.151.224 X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 14:50:33 -0000 This patch enables a debugger to read and write the current privilege level via a special "priv" register. When compiled with CONFIG_USER_ONLY the register is still visible but is hardwired to zero. Signed-off-by: Jonathan Behrens --- gdb-xml/riscv-32bit-cpu.xml | 1 + gdb-xml/riscv-64bit-cpu.xml | 1 + target/riscv/cpu.c | 2 +- target/riscv/gdbstub.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb-xml/riscv-32bit-cpu.xml b/gdb-xml/riscv-32bit-cpu.xml index 0d07aaec85..d6d76aafd8 100644 --- a/gdb-xml/riscv-32bit-cpu.xml +++ b/gdb-xml/riscv-32bit-cpu.xml @@ -44,4 +44,5 @@ + diff --git a/gdb-xml/riscv-64bit-cpu.xml b/gdb-xml/riscv-64bit-cpu.xml index b8aa424ae4..0758d1b5fe 100644 --- a/gdb-xml/riscv-64bit-cpu.xml +++ b/gdb-xml/riscv-64bit-cpu.xml @@ -44,4 +44,5 @@ + diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f13e298a36..347989858f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -475,7 +475,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->synchronize_from_tb = riscv_cpu_synchronize_from_tb; cc->gdb_read_register = riscv_cpu_gdb_read_register; cc->gdb_write_register = riscv_cpu_gdb_write_register; - cc->gdb_num_core_regs = 33; + cc->gdb_num_core_regs = 34; #if defined(TARGET_RISCV32) cc->gdb_core_xml_file = "riscv-32bit-cpu.xml"; #elif defined(TARGET_RISCV64) diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index ded140e8d8..dc8cb4d26c 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -278,6 +278,12 @@ int riscv_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) return gdb_get_regl(mem_buf, env->gpr[n]); } else if (n == 32) { return gdb_get_regl(mem_buf, env->pc); + } else if (n == 33) { +#ifdef CONFIG_USER_ONLY + return gdb_get_regl(mem_buf, 0); +#else + return gdb_get_regl(mem_buf, env->priv); +#endif } return 0; } @@ -296,6 +302,14 @@ int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) } else if (n == 32) { env->pc = ldtul_p(mem_buf); return sizeof(target_ulong); + } else if (n == 33) { +#ifndef CONFIG_USER_ONLY + env->priv = ldtul_p(mem_buf) & 0x3; + if (env->priv == 2) { + env->priv = 1; + } +#endif + return sizeof(target_ulong); } return 0; } -- 2.23.0