From nobody Wed Apr 16 17:15:41 2025 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=1676863523; cv=none; d=zohomail.com; s=zohoarc; b=j+MYQqIy16ShZPs2DNPHjqC0bainkpOh3zB2HsCmpXq9dYaYruKcjy1ZB8jykvTJlmkRnMJDuskazmacDSdz68bs6VrBfrVoiB8jThP9tH5wAGWA67wdsNtckI4wos9aIGCIDefBRd2PVAl5rvSNAu8Cmm9iOV4FSYTDSGJIjA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676863523; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DlJuyAHzYrazSg4WxydLb3Ck/tzkX7PaZRHPA6NtOV4=; b=IMrClEB5YOpORIhIRUPAnOpIwxhH/kmvbZls9rkYHi38yEJYUwtCuqT/q9pEGO9PlkRddRwtfnCQDqVJgbn7/FEMShXv17tUzmh3qN/uZ+EBJUErIxnj1woLuI/nktgJjgVTFjrSn7eI+jGRzF5xIV1PaV6cvUKfnF/9FdMVN58= 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 1676863523366947.6919508020276; Sun, 19 Feb 2023 19:25:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTwmY-0001Gr-9E; Sun, 19 Feb 2023 22:24:02 -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 1pTwmV-0001Bf-RJ for qemu-devel@nongnu.org; Sun, 19 Feb 2023 22:23:59 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTwmT-0005sN-KW for qemu-devel@nongnu.org; Sun, 19 Feb 2023 22:23:59 -0500 Received: by mail-pl1-x634.google.com with SMTP id f14so1959159plr.0 for ; Sun, 19 Feb 2023 19:23:57 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id l11-20020a170902d34b00b00198e1bc9d83sm6621302plk.266.2023.02.19.19.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 19:23:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=DlJuyAHzYrazSg4WxydLb3Ck/tzkX7PaZRHPA6NtOV4=; b=ZWtwqL6w1fJ/cAIIg+0BMlNZWQLMsrhC6tAv0Xvy4NzyXEp2WnZAsWMd64ixazZ7cg PPi7ySvhKuEfoumnlrnKdDOHAH135cOXntXn/b+S/xdNajIsUrr1SHZwn6njPfo1tAya 31xwd3KeZSGRmkYxY8CpXyj8+3r+BOvk38VSxPBvmZsvxo2RZVVNwrS2i8ZQbaaS5/1M EA5e0JEI7qpxNaoOuFIOVTZ0myHEL+cwya/GSLgL1UZb1coBrGc6MO9QqX/krp4mOxlh yy6nE3n/vx2wLvw/sfJt9CK5BekNexrJM0ukSnICgrAIT04vSBUxQZHiLEDKHdJ3DYvV 992Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=DlJuyAHzYrazSg4WxydLb3Ck/tzkX7PaZRHPA6NtOV4=; b=FycpptBnRDkETulfH46JplhZEmB6xiPFcUVQFjT1KBtzrqKCqaJWb/pxdujrMakzWT BypoY2VzO2APIQnMwVKn0h3wzIknguBNYT5h2o9j2iKZdAb/pwcHWCQhH8wjwRGTSk8F x4j/rN3bEjrtc0D5GRZVpCtayUhCzKtPMhKQy7GTN+lUGtczrsHeHlVMvscmN39K9MSM onyF95ypLc6XjUcteYctR9bTOHdolDH8YD0PXlB+6RiY0blvnONDQutOZie3VCc/u66s JiaSk/aW1ojPrXnYBck5ox1A9tkOWlqRRLFxuI157tcXXVbxbs6PQH6KiiVmGQCCHpXd VAzw== X-Gm-Message-State: AO0yUKWgTQObkuwBkbedisbeOiLMQT4hEC3FOYiuUB6Wf9ZMeimmG77d i648mmIM6M7cBGg7NNZQtmqY6o7tB6H7IgCSqGY= X-Google-Smtp-Source: AK7set/RWtvlYJviDJ7h7q4dZFO9exUym709SnfNXJmfE5N4P/I7fqzJRs/xAj3SEKNzHr/pRdrvPQ== X-Received: by 2002:a17:903:11d0:b0:19a:b683:e11b with SMTP id q16-20020a17090311d000b0019ab683e11bmr2813388plh.23.1676863436223; Sun, 19 Feb 2023 19:23:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Edgar E . Iglesias" Subject: [PULL 7/7] target/microblaze: Add gdbstub xml Date: Sun, 19 Feb 2023 17:23:38 -1000 Message-Id: <20230220032338.5619-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220032338.5619-1-richard.henderson@linaro.org> References: <20230220032338.5619-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676863523902100003 Content-Type: text/plain; charset="utf-8" Mirroring the upstream gdb xml files, the two stack boundary registers are separated out. Reviewed-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- configs/targets/microblaze-linux-user.mak | 1 + configs/targets/microblaze-softmmu.mak | 1 + configs/targets/microblazeel-linux-user.mak | 1 + configs/targets/microblazeel-softmmu.mak | 1 + target/microblaze/cpu.h | 2 + target/microblaze/cpu.c | 7 ++- target/microblaze/gdbstub.c | 51 +++++++++++----- gdb-xml/microblaze-core.xml | 67 +++++++++++++++++++++ gdb-xml/microblaze-stack-protect.xml | 12 ++++ 9 files changed, 128 insertions(+), 15 deletions(-) create mode 100644 gdb-xml/microblaze-core.xml create mode 100644 gdb-xml/microblaze-stack-protect.xml diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/mi= croblaze-linux-user.mak index 4249a37f65..0a2322c249 100644 --- a/configs/targets/microblaze-linux-user.mak +++ b/configs/targets/microblaze-linux-user.mak @@ -3,3 +3,4 @@ TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_BIG_ENDIAN=3Dy TARGET_HAS_BFLT=3Dy +TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/micro= blaze-softmmu.mak index 8385e2d333..e84c0cc728 100644 --- a/configs/targets/microblaze-softmmu.mak +++ b/configs/targets/microblaze-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=3Dmicroblaze TARGET_BIG_ENDIAN=3Dy TARGET_SUPPORTS_MTTCG=3Dy TARGET_NEED_FDT=3Dy +TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml diff --git a/configs/targets/microblazeel-linux-user.mak b/configs/targets/= microblazeel-linux-user.mak index d0e775d840..270743156a 100644 --- a/configs/targets/microblazeel-linux-user.mak +++ b/configs/targets/microblazeel-linux-user.mak @@ -2,3 +2,4 @@ TARGET_ARCH=3Dmicroblaze TARGET_SYSTBL_ABI=3Dcommon TARGET_SYSTBL=3Dsyscall.tbl TARGET_HAS_BFLT=3Dy +TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/mic= roblazeel-softmmu.mak index af40391f2f..9b688036bd 100644 --- a/configs/targets/microblazeel-softmmu.mak +++ b/configs/targets/microblazeel-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=3Dmicroblaze TARGET_SUPPORTS_MTTCG=3Dy TARGET_NEED_FDT=3Dy +TARGET_XML_FILES=3Dgdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-pr= otect.xml diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 1e84dd8f47..e541fbb0b3 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -367,6 +367,8 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cpu, = vaddr addr, MemTxAttrs *attrs); int mb_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); +int mb_cpu_gdb_read_stack_protect(CPUArchState *cpu, GByteArray *buf, int = reg); +int mb_cpu_gdb_write_stack_protect(CPUArchState *cpu, uint8_t *buf, int re= g); =20 static inline uint32_t mb_cpu_read_msr(const CPUMBState *env) { diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 817681f9b2..a2d2f5c340 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/qdev-properties.h" #include "exec/exec-all.h" +#include "exec/gdbstub.h" #include "fpu/softfloat-helpers.h" =20 static const struct { @@ -294,6 +295,9 @@ static void mb_cpu_initfn(Object *obj) CPUMBState *env =3D &cpu->env; =20 cpu_set_cpustate_pointers(cpu); + gdb_register_coprocessor(CPU(cpu), mb_cpu_gdb_read_stack_protect, + mb_cpu_gdb_write_stack_protect, 2, + "microblaze-stack-protect.xml", 0); =20 set_float_rounding_mode(float_round_nearest_even, &env->fp_status); =20 @@ -422,7 +426,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) cc->sysemu_ops =3D &mb_sysemu_ops; #endif device_class_set_props(dc, mb_properties); - cc->gdb_num_core_regs =3D 32 + 27; + cc->gdb_num_core_regs =3D 32 + 25; + cc->gdb_core_xml_file =3D "microblaze-core.xml"; =20 cc->disas_set_info =3D mb_disas_set_info; cc->tcg_ops =3D &mb_tcg_ops; diff --git a/target/microblaze/gdbstub.c b/target/microblaze/gdbstub.c index 2e6e070051..8143fcae88 100644 --- a/target/microblaze/gdbstub.c +++ b/target/microblaze/gdbstub.c @@ -39,8 +39,11 @@ enum { GDB_PVR0 =3D 32 + 6, GDB_PVR11 =3D 32 + 17, GDB_EDR =3D 32 + 18, - GDB_SLR =3D 32 + 25, - GDB_SHR =3D 32 + 26, +}; + +enum { + GDB_SP_SHL, + GDB_SP_SHR, }; =20 int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) @@ -83,12 +86,6 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *m= em_buf, int n) case GDB_EDR: val =3D env->edr; break; - case GDB_SLR: - val =3D env->slr; - break; - case GDB_SHR: - val =3D env->shr; - break; default: /* Other SRegs aren't modeled, so report a value of 0 */ val =3D 0; @@ -97,6 +94,23 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *m= em_buf, int n) return gdb_get_reg32(mem_buf, val); } =20 +int mb_cpu_gdb_read_stack_protect(CPUMBState *env, GByteArray *mem_buf, in= t n) +{ + uint32_t val; + + switch (n) { + case GDB_SP_SHL: + val =3D env->slr; + break; + case GDB_SP_SHR: + val =3D env->shr; + break; + default: + return 0; + } + return gdb_get_reg32(mem_buf, val); +} + int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) { MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); @@ -135,12 +149,21 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *= mem_buf, int n) case GDB_EDR: env->edr =3D tmp; break; - case GDB_SLR: - env->slr =3D tmp; - break; - case GDB_SHR: - env->shr =3D tmp; - break; + } + return 4; +} + +int mb_cpu_gdb_write_stack_protect(CPUMBState *env, uint8_t *mem_buf, int = n) +{ + switch (n) { + case GDB_SP_SHL: + env->slr =3D ldl_p(mem_buf); + break; + case GDB_SP_SHR: + env->shr =3D ldl_p(mem_buf); + break; + default: + return 0; } return 4; } diff --git a/gdb-xml/microblaze-core.xml b/gdb-xml/microblaze-core.xml new file mode 100644 index 0000000000..becf77c89c --- /dev/null +++ b/gdb-xml/microblaze-core.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gdb-xml/microblaze-stack-protect.xml b/gdb-xml/microblaze-stac= k-protect.xml new file mode 100644 index 0000000000..997301e8a2 --- /dev/null +++ b/gdb-xml/microblaze-stack-protect.xml @@ -0,0 +1,12 @@ + + + + + + + + --=20 2.34.1