From patchwork Mon Mar 6 15:34:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659253 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1909128wrb; Mon, 6 Mar 2023 08:34:13 -0800 (PST) X-Google-Smtp-Source: AK7set8mL61Qxg7lLPxieS1YV4Z+5aSmDSEcLT8gidEg9kVB9iDA8xUjMBJDPAw/obXJ+SGrP5IH X-Received: by 2002:ad4:4eaf:0:b0:56f:52ba:ccea with SMTP id ed15-20020ad44eaf000000b0056f52bacceamr19269342qvb.20.1678120453018; Mon, 06 Mar 2023 08:34:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678120453; cv=none; d=google.com; s=arc-20160816; b=A9+W0kq7dCCTXqCjGBS6b/bWC2RlKFBEmThvBUOcC3v125t8iiUZWZte4ScM+3hscb 4a28kEheCCV2D3lo2+0ftLioWzi36Uk5UVsyBKGzEoMoCpc6UlqFTq3F0HGMnHqha5jx 5pvIX6spvNxpjcCSWbk3dDw37nq9rvuUVQ1ME3IDAmvQnp7ncsm0cbvelSaYZEyOZVOL iiIMG0LF4FdpZS1HCavCV9k2XkeFEdG4m1dnGM9OFvmuzxMGveYnqVlqce0ceWIPEjOf OZ4axGSI3YmfgtDuAlV4fPLGC5BrO54s57mT9CPs9yusIlxt/l+tDFkbanIWdtUamAUD axLw== 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:to:from :dkim-signature; bh=QtnPnkI6JE32KFQWMPapGJT07TBBs4s4tJxaXGLRcDU=; b=cqC49h0xn3TEXcvhHmwVWQQc5RDT+0G04Wr4HKdCV5jdVEtHl8aMfvx8lsHAZr+IL/ ajpp8QycDQZMFM69KQBZX263SALv2HqKmpJKykGMfKp8Q6tGusTTfKNjW56RkQgqMtAI 6nQuTLq3mQR0yzSobnJqir95eRYvqy62MRJGYjp5sr/n7TuIxszTVZwNPHPdIK/ezulb szJp2R8ikROj0JmpMJ//AUyJmHweBd5zMU/IBOhmrovtOfzIqSCalKUNUaFmmHpAKmoB WkRQ/bxkl9SK7z4czOgHKIvn6BQ2lhHHPbQq31ZE0C58t8RMdCBFFGLOoSM5JPDYuGf/ mPGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pOWJX9VV; 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 g8-20020a0ce4c8000000b0056bef93ab3esi7025512qvm.425.2023.03.06.08.34.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:34:12 -0800 (PST) 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=pOWJX9VV; 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 1pZCrM-0003zO-No; Mon, 06 Mar 2023 10:34:45 -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 1pZCrJ-0003yS-P7 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:41 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCrH-00027u-Qf for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:41 -0500 Received: by mail-wm1-x329.google.com with SMTP id fm20-20020a05600c0c1400b003ead37e6588so8464475wmb.5 for ; Mon, 06 Mar 2023 07:34:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678116878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QtnPnkI6JE32KFQWMPapGJT07TBBs4s4tJxaXGLRcDU=; b=pOWJX9VVpK0P+zxEZLty06XBiWsbP9i7kHlMDtDABGAZlPCe5E4Tgt5WgwTx+okZqv BlshPaWjS3Cx/0PGMe0KJmTYVdvAWZhOLXe8Igix6JqnbczjVLvjIEAnCTevzh6j8Gug /GDMRNYlXAeMmjzSipQRPlIWypodpo7qeWm7ags+8splIBFI9eMzBemj+aJwTELFkm/K X3lEk2mCWI6CEy0UCcL8FyCSTSVG+mM+jKZY9UjENBpSpN77zdAYS3budCHhqzDObcwz SDFcfbgsW/8WReIngxbhREBYL9EqNzFnPmCsP8tnBAJmB6/oBvCgOHnrPMuJEL8bE+wG /9VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678116878; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QtnPnkI6JE32KFQWMPapGJT07TBBs4s4tJxaXGLRcDU=; b=FewK8OvmJjh4s8d3um0exMSaVuqe/SVpX0Jx+M3Vuqf3iWYsEjgYCY2DIFfZjGxXbi NLDAaNK8vih77Iyqg1SFasDobl/IdLwYYXfDnAgyjBNbn+qv5XTBaibtYFbCXxj36bEW DkhXoiZ0sH3VhcJe+EZdnrduzMZCD9NeF6P4I5GunTD1Jxz0pU6EzRLjoMBRLag5CclY gTz+kNquInIQH0ilznQmlKWX8JtzfSJD4mPpbHfUR/uW82AMS0XeMbWkikePBbbF3a99 C4YNPFW4pSTWBlzMISE2UnLakQomUjpKc3DAG8AizSLqRbB4jBxWiahEfEN1B7zIfBxD B1JQ== X-Gm-Message-State: AO0yUKW5LTpbLyl/pPjMREuLuCGPh2D+w60POZvs53cEGa2x1+fVFppd 6uAxMWFoYnW1EPFUonZJC70MHi29Flqz8lKzsCo= X-Received: by 2002:a05:600c:19cf:b0:3e7:772d:22de with SMTP id u15-20020a05600c19cf00b003e7772d22demr9494889wmq.30.1678116878561; Mon, 06 Mar 2023 07:34:38 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm15287432wmn.27.2023.03.06.07.34.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:34:38 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/21] target/arm: Normalize aarch64 gdbstub get/set function names Date: Mon, 6 Mar 2023 15:34:15 +0000 Message-Id: <20230306153435.490894-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org> References: <20230306153435.490894-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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: Richard Henderson Make the form of the function names between fp and sve the same: - arm_gdb_*_svereg -> aarch64_gdb_*_sve_reg. - aarch64_fpu_gdb_*_reg -> aarch64_gdb_*_fpu_reg. Reviewed-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-id: 20230227213329.793795-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 8 ++++---- target/arm/gdbstub.c | 9 +++++---- target/arm/gdbstub64.c | 8 ++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 3c7341e7741..f99d0d98413 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1344,10 +1344,10 @@ static inline uint64_t pmu_counter_mask(CPUARMState *env) } #ifdef TARGET_AARCH64 -int arm_gdb_get_svereg(CPUARMState *env, GByteArray *buf, int reg); -int arm_gdb_set_svereg(CPUARMState *env, uint8_t *buf, int reg); -int aarch64_fpu_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg); -int aarch64_fpu_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg); +int aarch64_gdb_get_sve_reg(CPUARMState *env, GByteArray *buf, int reg); +int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg); +int aarch64_gdb_get_fpu_reg(CPUARMState *env, GByteArray *buf, int reg); +int aarch64_gdb_set_fpu_reg(CPUARMState *env, uint8_t *buf, int reg); void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp); void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp); void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp); diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 2f806512d0a..cf1c01e3cf5 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -466,12 +466,13 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) */ #ifdef TARGET_AARCH64 if (isar_feature_aa64_sve(&cpu->isar)) { - gdb_register_coprocessor(cs, arm_gdb_get_svereg, arm_gdb_set_svereg, - arm_gen_dynamic_svereg_xml(cs, cs->gdb_num_regs), + int nreg = arm_gen_dynamic_svereg_xml(cs, cs->gdb_num_regs); + gdb_register_coprocessor(cs, aarch64_gdb_get_sve_reg, + aarch64_gdb_set_sve_reg, nreg, "sve-registers.xml", 0); } else { - gdb_register_coprocessor(cs, aarch64_fpu_gdb_get_reg, - aarch64_fpu_gdb_set_reg, + gdb_register_coprocessor(cs, aarch64_gdb_get_fpu_reg, + aarch64_gdb_set_fpu_reg, 34, "aarch64-fpu.xml", 0); } #endif diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 07a6746944d..c598cb03759 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -72,7 +72,7 @@ int aarch64_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) return 0; } -int aarch64_fpu_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg) +int aarch64_gdb_get_fpu_reg(CPUARMState *env, GByteArray *buf, int reg) { switch (reg) { case 0 ... 31: @@ -92,7 +92,7 @@ int aarch64_fpu_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg) } } -int aarch64_fpu_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg) +int aarch64_gdb_set_fpu_reg(CPUARMState *env, uint8_t *buf, int reg) { switch (reg) { case 0 ... 31: @@ -116,7 +116,7 @@ int aarch64_fpu_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg) } } -int arm_gdb_get_svereg(CPUARMState *env, GByteArray *buf, int reg) +int aarch64_gdb_get_sve_reg(CPUARMState *env, GByteArray *buf, int reg) { ARMCPU *cpu = env_archcpu(env); @@ -164,7 +164,7 @@ int arm_gdb_get_svereg(CPUARMState *env, GByteArray *buf, int reg) return 0; } -int arm_gdb_set_svereg(CPUARMState *env, uint8_t *buf, int reg) +int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg) { ARMCPU *cpu = env_archcpu(env);