From patchwork Mon Aug 21 12:59:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 715372 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp1820748wrs; Mon, 21 Aug 2023 06:01:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSpl9qf3vDmhlQhBx0Q78S1ZPvKivwz+3ObwnkZASk8bwbO2wE3R6iiUCGptnikLhnEUvP X-Received: by 2002:a05:620a:3903:b0:762:3567:a64c with SMTP id qr3-20020a05620a390300b007623567a64cmr8565282qkn.11.1692622914202; Mon, 21 Aug 2023 06:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692622914; cv=none; d=google.com; s=arc-20160816; b=Uie2xvsa8AE68d6GgYnOoLGh4pVlZHoJSqCVirIVgea8PqRoRkZIORvlgt/AN+wTtb QkDVU3x3jNymo8kLr4lz12rggjwlhn638x3zcc1caYrV1Ao+6cZa7E3r37ybeOxwFBNf J+LpW8qcrmFxTmdTNt271YgbXzGffrSvJr5EC2aJjgTefaVJeYikM1RjusRUIoC/L63n Z7Z0hm+wcg3Xr88K1ztuI+yUc//zN3KffTGR1DBJBB5GEK/Oresi9ZaIeOxFKBUDPgAZ 11e/9GaLfnvSMrCxeEUGihG3+ZbvR8zzEKvywSXHoi9Bwc5b904KmSCnsR225EiSoceU SuGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bDgVnseA0w8JiDAxdtmtFg9qt15KV6UaIIai4w2k7Xg=; fh=6ZlfjzpG5M4zTB3QdUsu1um4KG/wqA9A9dxpvstpjlg=; b=UrSlS8bi6t5HsB7L7Myo5Znf4rtWPeV1NDELwryw0Dsf9k7ssdpQSiJAUcn7Cwjiv5 9heKoA+5aXgyyQc42uWS5P5WRaD79Ct7r/FYKsdrheoEK1ozUgTkck6uYbizQooq3F2o AjnN/F90p6XqQe5D/UJeZfDEWVhKgkgngx16MhquIVPC29jTaA+o9n3HeVWmpF/Trv+r 4x1yiPMeiHryeDwAfTXGDYYFm8PTQ99Lj4ARG1KQZT/w8kqHkNnWbdVqHRacdTxlD3Ew 9heU40sqWT6xkLANbmPs4xjTKRBFPuDLaYEnewnUePjy0mPmM7utujmYc5uLZawP1Um3 EjaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FDVEh4zH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b15-20020ac85bcf000000b003fdeb6b4fd5si4769559qtb.766.2023.08.21.06.01.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Aug 2023 06:01:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FDVEh4zH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qY4XE-0000xO-AQ; Mon, 21 Aug 2023 09:01:34 -0400 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 1qY4Wg-0000bn-0V for qemu-devel@nongnu.org; Mon, 21 Aug 2023 09:01:06 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qY4Wc-0001Hh-Tm for qemu-devel@nongnu.org; Mon, 21 Aug 2023 09:00:57 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe1fc8768aso31570735e9.1 for ; Mon, 21 Aug 2023 06:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692622852; x=1693227652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bDgVnseA0w8JiDAxdtmtFg9qt15KV6UaIIai4w2k7Xg=; b=FDVEh4zH8GeP0/8eBgf5CykUO0Yp1ptm6znb1gPdw4ixd0DOaoNkX342NhyPRavrLT W3scMVfLLEo3Lkny4xjrp2rbRVz8oh37/3azi9cag4KwsYy91LDKHw/HCq+PDoFynwnS cfJVk7cELsey1WGe1/MfJBjB9/xMknlxIF+cnWT0d9AcmZ9CsjosRvlPXx2A0N64D/km FTM9Sec0yg2tW1ZpjWU/iGZha5yfSBjzsW1sLfbqTLzg1ihQdJR62pa6wso+QTGP1qsB 2g9cN/rfjBgC4kTEWCBz/jFuKiQSuoSHDpb8h3O+VHOfmvnXsrP38l5uNBeNRQn3VSJm 20+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692622852; x=1693227652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bDgVnseA0w8JiDAxdtmtFg9qt15KV6UaIIai4w2k7Xg=; b=f1VI4ClqaYTJj881sgdSDfxQoiGEaufkTk/s5UVT1yx42vlDdZVGeycw7vpeLb3NuJ e5l0potJW8emzwnGATU3sAMWh/MeFYvo0I72f+VagpjBAjzGwVVsp9TodN2yco4v6jr3 V0O2w+hqmQcBOlEw6C9spL4a5rTqfxb8pKZwR/jVFRz1AndI1XsEqtzBKBh0yiPyzpCu PewT5cbqEWN5UxqwMyBVKbc9P93YcQPJ2WsYIrEPcNWo69PUvzW6fVrIEfwt1bCQiTD8 yKqiyV2i2ytKCE7GumK4LeftjsJaHcLjeK6k3h30zMBQ3QoyyJg6MD9qW5nsfld67aZK o/mg== X-Gm-Message-State: AOJu0Yz8f2tnDH+aaOWvl5kqhl2IYFSNJUy5bTJOerK3VHdd8BnUbVKH imNqHyxX4Evn6qskGK2yBdHZ+MGx+y2Hdbd2yig= X-Received: by 2002:a5d:6a02:0:b0:31a:e612:ae04 with SMTP id m2-20020a5d6a02000000b0031ae612ae04mr4847076wru.31.1692622851813; Mon, 21 Aug 2023 06:00:51 -0700 (PDT) Received: from m1x-phil.lan (static-176-182-122-208.ncc.abo.bbox.fr. [176.182.122.208]) by smtp.gmail.com with ESMTPSA id x9-20020adfffc9000000b00319756d5b80sm12575680wrs.29.2023.08.21.06.00.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 21 Aug 2023 06:00:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Song Gao , Jiajie Chen , Xiaojuan Yang , Huacai Chen , Richard Henderson Subject: [PATCH v3 8/8] target/loongarch: Add GDB support for loongarch32 mode Date: Mon, 21 Aug 2023 14:59:59 +0200 Message-ID: <20230821125959.28666-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230821125959.28666-1-philmd@linaro.org> References: <20230821125959.28666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Jiajie Chen GPRs and PC are 32-bit wide in loongarch32 mode. Signed-off-by: Jiajie Chen Reviewed-by: Richard Henderson Signed-off-by: Song Gao Message-ID: <20230817093121.1053890-4-gaosong@loongson.cn> [PMD: Rebased, set gdb_num_core_regs] Signed-off-by: Philippe Mathieu-Daudé --- configs/targets/loongarch64-softmmu.mak | 2 +- target/loongarch/cpu.c | 10 ++++++ target/loongarch/gdbstub.c | 32 ++++++++++++++---- gdb-xml/loongarch-base32.xml | 45 +++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 gdb-xml/loongarch-base32.xml diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loongarch64-softmmu.mak index 9abc99056f..f23780fdd8 100644 --- a/configs/targets/loongarch64-softmmu.mak +++ b/configs/targets/loongarch64-softmmu.mak @@ -1,5 +1,5 @@ TARGET_ARCH=loongarch64 TARGET_BASE_ARCH=loongarch TARGET_SUPPORTS_MTTCG=y -TARGET_XML_FILES= gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml +TARGET_XML_FILES= gdb-xml/loongarch-base32.xml gdb-xml/loongarch-base64.xml gdb-xml/loongarch-fpu.xml TARGET_NEED_FDT=y diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 556419f159..822f2a72e5 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -726,8 +726,18 @@ static void loongarch_cpu_class_init(ObjectClass *c, void *data) #endif } +static gchar *loongarch32_gdb_arch_name(CPUState *cs) +{ + return g_strdup("loongarch32"); +} + static void loongarch32_cpu_class_init(ObjectClass *c, void *data) { + CPUClass *cc = CPU_CLASS(c); + + cc->gdb_num_core_regs = 35; + cc->gdb_core_xml_file = "loongarch-base32.xml"; + cc->gdb_arch_name = loongarch32_gdb_arch_name; } static gchar *loongarch64_gdb_arch_name(CPUState *cs) diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c index 0752fff924..a462e25737 100644 --- a/target/loongarch/gdbstub.c +++ b/target/loongarch/gdbstub.c @@ -34,16 +34,25 @@ int loongarch_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) { LoongArchCPU *cpu = LOONGARCH_CPU(cs); CPULoongArchState *env = &cpu->env; + uint64_t val; if (0 <= n && n < 32) { - return gdb_get_regl(mem_buf, env->gpr[n]); + val = env->gpr[n]; } else if (n == 32) { /* orig_a0 */ - return gdb_get_regl(mem_buf, 0); + val = 0; } else if (n == 33) { - return gdb_get_regl(mem_buf, env->pc); + val = env->pc; } else if (n == 34) { - return gdb_get_regl(mem_buf, env->CSR_BADV); + val = env->CSR_BADV; + } + + if (0 <= n && n <= 34) { + if (is_la64(env)) { + return gdb_get_reg64(mem_buf, val); + } else { + return gdb_get_reg32(mem_buf, val); + } } return 0; } @@ -52,15 +61,24 @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) { LoongArchCPU *cpu = LOONGARCH_CPU(cs); CPULoongArchState *env = &cpu->env; - target_ulong tmp = ldtul_p(mem_buf); + target_ulong tmp; + int read_length; int length = 0; + if (is_la64(env)) { + tmp = ldq_p(mem_buf); + read_length = 8; + } else { + tmp = ldl_p(mem_buf); + read_length = 4; + } + if (0 <= n && n < 32) { env->gpr[n] = tmp; - length = sizeof(target_ulong); + length = read_length; } else if (n == 33) { env->pc = tmp; - length = sizeof(target_ulong); + length = read_length; } return length; } diff --git a/gdb-xml/loongarch-base32.xml b/gdb-xml/loongarch-base32.xml new file mode 100644 index 0000000000..af47bbd3da --- /dev/null +++ b/gdb-xml/loongarch-base32.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +