From nobody Fri Mar 27 04:03:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771528994; cv=none; d=zohomail.com; s=zohoarc; b=asfJvaOK/ApQPSYWoRlV6O2bJN+3HxtCHbcmFTY+Qvz0xv4iuU/sCM/mXna9cgsiY2Vba5wSe5KXyADIRlQrGVtjXy4gWJ9R+gyZmpF82gMXpNCeiubbJdWCBtfhlIcOFz45NoP86HE88N6BwLdo/gNpk7MfnZoVnTIrI3/rZWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771528994; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LIKlp8+QB5QCeuqk3PWtJARa4Zczs3ttig3+XtmneFk=; b=DIpUV7ONJUVoZC5pfIb9v4bWHpa+bMkj+1d0RrU/SxxmStGp713UAj0Q+XL2nTix6IXU5yeoD/2E/OoMpmTf5c8QRYZs6HnqgBXlDVqlnFRVJJusKCz6uiGr9ovn/wnC4z4D+2dis8iugpsgXue5WSg3Bqk6qnKer6cfZ1X7TW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1771528993999479.9639055218656; Thu, 19 Feb 2026 11:23:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vt9aX-0001NG-GG; Thu, 19 Feb 2026 14:21:25 -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 1vt9aV-0001M6-QZ for qemu-devel@nongnu.org; Thu, 19 Feb 2026 14:21:23 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vt9aR-0007yr-Vn for qemu-devel@nongnu.org; Thu, 19 Feb 2026 14:21:23 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-4376c0bffc1so1048995f8f.0 for ; Thu, 19 Feb 2026 11:21:19 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796ac8075sm48226941f8f.29.2026.02.19.11.21.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Feb 2026 11:21:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771528878; x=1772133678; darn=nongnu.org; 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=LIKlp8+QB5QCeuqk3PWtJARa4Zczs3ttig3+XtmneFk=; b=m60eqvKZUTml3w78vuEXVdcJGyh3M13+6OkMmLwAMIR2eUJjiXKgieHj0M0ZXl4Dr9 Zz7dM86Xc80Ad47F0SrjUQ3LKUS7+5fywTaUKgJiEvrU1wY+Z06TEo13y9i2BXTZinSd nuhzd868P+l4wdqer4EqoDf46CJaQeAD7K7l5cZ+lN4C6uZGG7gNr5C0LWB79xnB+YQV CpcKFPEbFXS7Ko10WLwZOvufCzoV4jBED/rT3JXamrhbI+SZLTdhgeLhH2lHgeItPSzi ShThtAPxI/qjmHPUke+//IuoK9Pw8KshiJWTgCVF4btx0B9hK8uG0CjjrQjvkrgkE90E X29A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771528878; x=1772133678; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LIKlp8+QB5QCeuqk3PWtJARa4Zczs3ttig3+XtmneFk=; b=W6kgO1mlJYN8RrQ2rzISTE1qxIp4pGZxhHKBb3g4OjsEO+mcX9LXUFbw4nbMhxBvk5 MzwqzVM/u8n6j3/8sTl8CIU/X2nmaVg76Q5YYE62XB0bACH3/uRzsM+HdleGjr+0tqt7 If80+JYA51lT2g8XQ1yfbz1JRDpmR0KHe8zGOL45Td67E8/PZumlnH7yAVbqPf30hH9P qdaTvfIPunj6MvQ09W48qD9he8RNRgysT2vFaIVIQaIKmw4D1mNAiANNchervVZbYiSB 9Fa5BXzqsduEhaYdIHGdCiZTJOcOYRnhGS5uMRhws+V3eNTxJuCzJ9kEgbNdNIc31mr3 65aw== X-Gm-Message-State: AOJu0YzjHc/A08NfKAbYKEEQ3GRZkTGVomo7GjjA4Zr0iY8hpNbW2q7j pbttQO965UiCyLMkQNGXDGQWub5as/Uh9w9hi5QReNM0+glbjVwIWIL8iZTvUXSq3uGMZ3gGoQN fvxIz58qgTw== X-Gm-Gg: AZuq6aLUgzn4mlc3yG/EAgrJfusbBEvtPRsywl84Scv00FwK+ACptZxq0DMn3b0yx5D 7bp+DC4lC4sWB6oTfa10cY8S+m982sOYSuRrJXbsGmZbvN8TXZPA9FAz5q2LxkbTuv1Ezru0RRZ bfhDocX9dMOEY6k16St1eidELEtwjC67A2fqD6WFpIDw+VtaV5uSpSJZ2h7pxSGSd+ADgyejBOG A00NRimqDll3yAvd78cENdCrdyLR5RFApHGpC1oXirCd5JbyuvygjERUH/huBWIl4ezFNIRDpJ2 llA3XpPkx8KE+z6rcjV6cGuNl59d/LYwXv9mK4vKxNdUed7UoFpiGtV9kvN3zeZq3EkNUhkCQKo IOuO6FYCwUq8QjDweUzBc61VFv1QnurpRwl6RuOGWeOI+cCUTfGCw3Pg4Yj+XBE8U/DLGGrQMEe n34UFgu9VGeun7biCJ8CyHt/yQ0X5iyb5Vr4anQq0HBz42IkxiSZXkrQaVmhrFGUMq8OVmKpaD9 k+xROm8oz8= X-Received: by 2002:a05:6000:26cc:b0:435:97b4:b699 with SMTP id ffacd0b85a97d-4395fd5c362mr6721737f8f.51.1771528877893; Thu, 19 Feb 2026 11:21:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Richard Henderson , qemu-s390x@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v2 11/50] target/sparc: Restore 'gdb-xml/sparc64-cp0.xml' Date: Thu, 19 Feb 2026 20:19:13 +0100 Message-ID: <20260219191955.83815-12-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260219191955.83815-1-philmd@linaro.org> References: <20260219191955.83815-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1771528995461158500 Restore gdb-xml/sparc64-cp0.xml from mainstream binutils, tag 'binutils-2_46', found in the gdb/features/sparc/folder [*]. Extract sparc_cp0_gdb_write_register() out of sparc_cpu_gdb_read_register() and sparc_cp0_gdb_write_register() out of sparc_cpu_gdb_write_register(), taking care to update the register indexes in the switch cases. Register these helpers with a call to gdb_register_coprocessor() in sparc_cpu_register_gdb_regs(). [*] https://sourceware.org/git/?p=3Dbinutils-gdb.git;a=3Dtree;f=3Dgdb/featu= res/sparc;hb=3Drefs/tags/binutils-2_46 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- configs/targets/sparc64-linux-user.mak | 2 +- configs/targets/sparc64-softmmu.mak | 2 +- target/sparc/gdbstub.c | 193 ++++++++++++++----------- gdb-xml/sparc64-core.xml | 7 - gdb-xml/sparc64-cp0.xml | 16 ++ 5 files changed, 130 insertions(+), 90 deletions(-) create mode 100644 gdb-xml/sparc64-cp0.xml diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc= 64-linux-user.mak index 3bbd8495210..930f7e13ab9 100644 --- a/configs/targets/sparc64-linux-user.mak +++ b/configs/targets/sparc64-linux-user.mak @@ -4,6 +4,6 @@ TARGET_ABI_DIR=3Dsparc TARGET_SYSTBL_ABI=3Dcommon,64 TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc64-core.xml +TARGET_XML_FILES=3Dgdb-xml/sparc64-core.xml gdb-xml/sparc64-cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-= softmmu.mak index 8a0290c2093..22e7f3c94a7 100644 --- a/configs/targets/sparc64-softmmu.mak +++ b/configs/targets/sparc64-softmmu.mak @@ -1,7 +1,7 @@ TARGET_ARCH=3Dsparc64 TARGET_BASE_ARCH=3Dsparc TARGET_BIG_ENDIAN=3Dy -TARGET_XML_FILES=3Dgdb-xml/sparc64-core.xml +TARGET_XML_FILES=3Dgdb-xml/sparc64-core.xml gdb-xml/sparc64-cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy diff --git a/target/sparc/gdbstub.c b/target/sparc/gdbstub.c index 79d661fbc10..bdd759dd0a9 100644 --- a/target/sparc/gdbstub.c +++ b/target/sparc/gdbstub.c @@ -18,6 +18,7 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" +#include "exec/gdbstub.h" #include "cpu.h" #include "gdbstub/helpers.h" =20 @@ -48,27 +49,6 @@ int sparc_cpu_gdb_read_register(CPUState *cs, GByteArray= *mem_buf, int n) return gdb_get_reg32(mem_buf, env->fpr[(n - 32) / 2].l.upper); } } - /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ - switch (n) { - case 64: - return gdb_get_rega(mem_buf, env->y); - case 65: - return gdb_get_rega(mem_buf, cpu_get_psr(env)); - case 66: - return gdb_get_rega(mem_buf, env->wim); - case 67: - return gdb_get_rega(mem_buf, env->tbr); - case 68: - return gdb_get_rega(mem_buf, env->pc); - case 69: - return gdb_get_rega(mem_buf, env->npc); - case 70: - return gdb_get_rega(mem_buf, cpu_get_fsr(env)); - case 71: - return gdb_get_rega(mem_buf, 0); /* csr */ - default: - return gdb_get_rega(mem_buf, 0); - } #else if (n < 64) { /* f0-f31 */ @@ -87,21 +67,51 @@ int sparc_cpu_gdb_read_register(CPUState *cs, GByteArra= y *mem_buf, int n) */ return gdb_get_reg64(mem_buf, env->fpr[(n - 64) + 16].ll); } +#endif + return 0; +} + +__attribute__((unused)) +static int sparc_cp0_gdb_read_register(CPUState *cs, GByteArray *mem_buf, = int n) +{ + CPUSPARCState *env =3D cpu_env(cs); + +#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64) + /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ switch (n) { - case 80: + case 0: + return gdb_get_rega(mem_buf, env->y); + case 1: + return gdb_get_rega(mem_buf, cpu_get_psr(env)); + case 2: + return gdb_get_rega(mem_buf, env->wim); + case 3: + return gdb_get_rega(mem_buf, env->tbr); + case 4: + return gdb_get_rega(mem_buf, env->pc); + case 5: + return gdb_get_rega(mem_buf, env->npc); + case 6: + return gdb_get_rega(mem_buf, cpu_get_fsr(env)); + case 7: + return gdb_get_rega(mem_buf, 0); /* csr */ + } +#else + switch (n) { + case 0: return gdb_get_regl(mem_buf, env->pc); - case 81: + case 1: return gdb_get_regl(mem_buf, env->npc); - case 82: + case 2: return gdb_get_regl(mem_buf, (cpu_get_ccr(env) << 32) | ((env->asi & 0xff) << 24) | ((env->pstate & 0xfff) << 8) | cpu_get_cwp64(env)); - case 83: + case 3: return gdb_get_regl(mem_buf, cpu_get_fsr(env)); - case 84: + case 4: return gdb_get_regl(mem_buf, env->fprs); - case 85: + case 5: return gdb_get_regl(mem_buf, env->y); } #endif @@ -138,33 +148,6 @@ int sparc_cpu_gdb_write_register(CPUState *cs, uint8_t= *mem_buf, int n) } else { env->fpr[(n - 32) / 2].l.upper =3D tmp; } - } else { - /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ - switch (n) { - case 64: - env->y =3D tmp; - break; - case 65: - cpu_put_psr(env, tmp); - break; - case 66: - env->wim =3D tmp; - break; - case 67: - env->tbr =3D tmp; - break; - case 68: - env->pc =3D tmp; - break; - case 69: - env->npc =3D tmp; - break; - case 70: - cpu_put_fsr(env, tmp); - break; - default: - return 0; - } } return 4; #else @@ -185,32 +168,77 @@ int sparc_cpu_gdb_write_register(CPUState *cs, uint8_= t *mem_buf, int n) * n =3D=3D 79: f62 : env->fpr[31] */ env->fpr[(n - 64) + 16].ll =3D tmp; - } else { - switch (n) { - case 80: - env->pc =3D tmp; - break; - case 81: - env->npc =3D tmp; - break; - case 82: - cpu_put_ccr(env, tmp >> 32); - env->asi =3D (tmp >> 24) & 0xff; - env->pstate =3D (tmp >> 8) & 0xfff; - cpu_put_cwp64(env, tmp & 0xff); - break; - case 83: - cpu_put_fsr(env, tmp); - break; - case 84: - env->fprs =3D tmp; - break; - case 85: - env->y =3D tmp; - break; - default: - return 0; - } + } + return 8; +#endif +} + +__attribute__((unused)) +static int sparc_cp0_gdb_write_register(CPUState *cs, uint8_t *mem_buf, in= t n) +{ + CPUSPARCState *env =3D cpu_env(cs); + +#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64) + uint32_t tmp; + + tmp =3D ldl_p(mem_buf); + + /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ + switch (n) { + case 0: + env->y =3D tmp; + break; + case 1: + cpu_put_psr(env, tmp); + break; + case 2: + env->wim =3D tmp; + break; + case 3: + env->tbr =3D tmp; + break; + case 4: + env->pc =3D tmp; + break; + case 5: + env->npc =3D tmp; + break; + case 6: + cpu_put_fsr(env, tmp); + break; + default: + return 0; + } + return 4; +#else + uint64_t tmp; + + tmp =3D ldq_p(mem_buf); + + switch (n) { + case 0: + env->pc =3D tmp; + break; + case 1: + env->npc =3D tmp; + break; + case 2: + cpu_put_ccr(env, tmp >> 32); + env->asi =3D (tmp >> 24) & 0xff; + env->pstate =3D (tmp >> 8) & 0xfff; + cpu_put_cwp64(env, tmp & 0xff); + break; + case 3: + cpu_put_fsr(env, tmp); + break; + case 4: + env->fprs =3D tmp; + break; + case 5: + env->y =3D tmp; + break; + default: + return 0; } return 8; #endif @@ -221,6 +249,9 @@ void sparc_cpu_register_gdb_regs(CPUState *cs) #if defined(TARGET_ABI32) || !defined(TARGET_SPARC64) /* Not yet supported */ #else - /* Not yet supported */ + gdb_register_coprocessor(cs, sparc_cp0_gdb_read_register, + sparc_cp0_gdb_write_register, + gdb_find_static_feature("sparc64-cp0.xml"), + 0); #endif } diff --git a/gdb-xml/sparc64-core.xml b/gdb-xml/sparc64-core.xml index 375b9bb0cc6..1c26d8c01c1 100644 --- a/gdb-xml/sparc64-core.xml +++ b/gdb-xml/sparc64-core.xml @@ -89,11 +89,4 @@ - - - - - - - diff --git a/gdb-xml/sparc64-cp0.xml b/gdb-xml/sparc64-cp0.xml new file mode 100644 index 00000000000..9b938dc7ecc --- /dev/null +++ b/gdb-xml/sparc64-cp0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + --=20 2.52.0