From patchwork Wed Dec 20 16:25:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "nicolas.eder@lauterbach.com" X-Patchwork-Id: 1878652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SwJt92dTBz20LV for ; Thu, 21 Dec 2023 03:29:21 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFzPG-0000WE-PG; Wed, 20 Dec 2023 11:26:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFzPD-0000Uq-NV for qemu-devel@nongnu.org; Wed, 20 Dec 2023 11:26:47 -0500 Received: from smtp1.lauterbach.com ([62.154.241.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFzPB-0004ns-9l for qemu-devel@nongnu.org; Wed, 20 Dec 2023 11:26:47 -0500 Received: (qmail 15586 invoked by uid 484); 20 Dec 2023 16:26:33 -0000 X-Qmail-Scanner-Diagnostics: from nedpc1.intern.lauterbach.com by smtp1.lauterbach.com (envelope-from , uid 484) with qmail-scanner-2.11 (mhr: 1.0. clamdscan: 0.99/21437. spamassassin: 3.4.0. Clear:RC:1(10.2.11.92):. Processed in 0.072786 secs); 20 Dec 2023 16:26:33 -0000 Received: from nedpc1.intern.lauterbach.com (Authenticated_SSL:neder@[10.2.11.92]) (envelope-sender ) by smtp1.lauterbach.com (qmail-ldap-1.03) with TLS_AES_256_GCM_SHA384 encrypted SMTP for ; 20 Dec 2023 16:26:32 -0000 From: Nicolas Eder To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , "Christian Boenig" , "Nicolas Eder" Subject: [PATCH v5 16/18] mcdstub: register access added Date: Wed, 20 Dec 2023 17:25:53 +0100 Message-Id: <20231220162555.19545-17-nicolas.eder@lauterbach.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220162555.19545-1-nicolas.eder@lauterbach.com> References: <20231220162555.19545-1-nicolas.eder@lauterbach.com> MIME-Version: 1.0 X-Qmail-Scanner-2.11: added fake Content-Type header Received-SPF: pass client-ip=62.154.241.196; envelope-from=nicolas.eder@lauterbach.com; helo=smtp1.lauterbach.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 --- debug/mcdstub/mcdstub.c | 161 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/debug/mcdstub/mcdstub.c b/debug/mcdstub/mcdstub.c index df97eca65b..df98453558 100644 --- a/debug/mcdstub/mcdstub.c +++ b/debug/mcdstub/mcdstub.c @@ -857,6 +857,146 @@ static void handle_reset(GArray *params, void *user_ctx) */ } +/** + * mcd_memtohex() - Converts a byte array into a hex string. + * + * @mem: Pointer to byte array. + * @buf: Pointer to hex string. + * @len: Number of bytes. + */ +static void mcd_memtohex(GString *buf, const uint8_t *mem, int len) +{ + int i, c; + for (i = 0; i < len; i++) { + c = mem[i]; + g_string_append_c(buf, nibble_to_hexchar(c >> 4)); + g_string_append_c(buf, nibble_to_hexchar(c & 0xf)); + } + g_string_append_c(buf, '\0'); +} + +/** + * mcd_hextomem() - Converts a hex string into a byte array. + * + * @mem: Pointer to byte array. + * @buf: Pointer to hex string. + * @len: Number of bytes. + */ +static void mcd_hextomem(GByteArray *mem, const char *buf, int len) +{ + int i; + + for (i = 0; i < len; i++) { + guint8 byte = hexchar_to_nibble(buf[0]) << 4 | + hexchar_to_nibble(buf[1]); + g_byte_array_append(mem, &byte, 1); + buf += 2; + } +} + +/** + * mcd_read_register() - Reads a registers data and stores it into the buf. + * + * This function collects the register type and internal ID + * (depending on the XML file). Then it calls the architecture specific + * read function. For ARM this is :c:func:`arm_mcd_read_register`. + * @cpu: CPU to which the register belongs. + * @buf: Byte array with register data. + * @reg: General ID of the register. + */ +static int mcd_read_register(CPUState *cpu, GByteArray *buf, int reg) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + CPUArchState *env = cpu_env(cpu); + GDBRegisterState *r; + + if (reg < cc->gdb_num_core_regs) { + return cc->gdb_read_register(cpu, buf, reg); + } + + for (guint i = 0; i < cpu->gdb_regs->len; i++) { + r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + return r->get_reg(env, buf, reg - r->base_reg); + } + } + return 0; +} + +/** + * mcd_write_register() - Writes data from the buf to a register. + * + * This function collects the register type and internal ID + * (depending on the XML file). Then it calls the architecture specific + * write function. For ARM this is :c:func:`arm_mcd_write_register`. + * @cpu: CPU to which the register belongs. + * @mem_buf: Byte array with register data. + * @reg: General ID of the register. + */ +static int mcd_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + CPUArchState *env = cpu_env(cpu); + GDBRegisterState *r; + + if (reg < cc->gdb_num_core_regs) { + return cc->gdb_write_register(cpu, mem_buf, reg); + } + + for (guint i = 0; i < cpu->gdb_regs->len; i++) { + r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); + if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + return r->set_reg(env, mem_buf, reg - r->base_reg); + } + } + return 0; +} + +/** + * handle_read_register() - Handler for reading a register. + * + * This function calls :c:func:`mcd_read_register` to read a register. The + * register data gets stored in the mem_buf byte array. The data then gets + * converted into a hex string with :c:func:`mcd_memtohex` and then send. + * @params: GArray with all TCP packet parameters. + */ +static void handle_read_register(GArray *params, void *user_ctx) +{ + uint32_t cpu_id = get_param(params, 0)->cpu_id; + uint64_t reg_num = get_param(params, 1)->data_uint64_t; + int reg_size; + + CPUState *cpu = mcd_get_cpu(cpu_id); + reg_size = mcd_read_register(cpu, mcdserver_state.mem_buf, reg_num); + mcd_memtohex(mcdserver_state.str_buf, + mcdserver_state.mem_buf->data, reg_size); + mcd_put_strbuf(); +} + +/** + * handle_write_register() - Handler for writing a register. + * + * This function converts the incoming hex string data into a byte array with + * :c:func:`mcd_hextomem`. Then it calls :c:func:`mcd_write_register` to write + * to the register. + * @params: GArray with all TCP packet parameters. + */ +static void handle_write_register(GArray *params, void *user_ctx) +{ + uint32_t cpu_id = get_param(params, 0)->cpu_id; + uint64_t reg_num = get_param(params, 1)->data_uint64_t; + uint32_t reg_size = get_param(params, 2)->data_uint32_t; + + CPUState *cpu = mcd_get_cpu(cpu_id); + mcd_hextomem(mcdserver_state.mem_buf, + mcdserver_state.str_buf->str, reg_size); + if (mcd_write_register(cpu, mcdserver_state.mem_buf->data, reg_num) == 0) { + mcd_put_packet(TCP_EXECUTION_ERROR); + } else { + mcd_put_packet(TCP_EXECUTION_SUCCESS); + } +} + /** * mcd_handle_packet() - Evaluates the type of received packet and chooses the * correct handler. @@ -967,6 +1107,27 @@ static int mcd_handle_packet(const char *line_buf) cmd_parser = &reset_cmd_desc; } break; + case TCP_CHAR_READ_REGISTER: + { + static MCDCmdParseEntry read_reg_cmd_desc = { + .handler = handle_read_register, + .cmd = {TCP_CHAR_READ_REGISTER, '\0'}, + .schema = {ARG_SCHEMA_CORENUM, ARG_SCHEMA_UINT64_T, '\0'}, + }; + cmd_parser = &read_reg_cmd_desc; + } + break; + case TCP_CHAR_WRITE_REGISTER: + { + static MCDCmdParseEntry write_reg_cmd_desc = { + .handler = handle_write_register, + .cmd = {TCP_CHAR_WRITE_REGISTER, '\0'}, + .schema = {ARG_SCHEMA_CORENUM, ARG_SCHEMA_UINT64_T, + ARG_SCHEMA_INT, ARG_SCHEMA_HEXDATA, '\0'}, + }; + cmd_parser = &write_reg_cmd_desc; + } + break; default: /* command not supported */ mcd_put_packet("");