From patchwork Wed Oct 11 10:33:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 731952 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp329657wrv; Wed, 11 Oct 2023 03:44:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+0GoV2+IRfgqdWgXcazbYFeLKasJrhx2q5Z65Jfki8wpJNG96w9WvqKR46y87XY2ShkkV X-Received: by 2002:a0c:de0a:0:b0:66d:d3d:aa66 with SMTP id t10-20020a0cde0a000000b0066d0d3daa66mr375865qvk.58.1697021071703; Wed, 11 Oct 2023 03:44:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697021071; cv=none; d=google.com; s=arc-20160816; b=jDh14LNClDV04Zz35JvHKiSbn8TG9MXKN4crHOV3bQ8n8wrkLF8xr2L2nne2GJsJow 2wLM6Qz1k0s7CJdH2ys8/QramkWdBESo0nNxPyh3EF22Ew9RANQX/dfNOEZEfbp4+2xB uTw8epIOca6wW5wZBMzuhFEmtnp8c6uQ9/rlR+/I8qxm0VBWsMrNA1764K3dEENqUg7l N1n0ujIlEF1MYGKlhRSC8CbLrU6G6ysw7XU1g7+FXpjMWrHYyDZ4BJkFeSNc3ldpW9HU Dr8+sMUTXxNUovXZO9nWsJArKJKIGAvx/3LuGpfsyInAuVIUxiSx5J0C4xE1fWuc46D1 HHLA== 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=GPaasftMrVbbA875970yr+KsXKzf7HZNoY4yrQwF8Og=; fh=14Et6+aoIqq9hTmjkJ3aRzbOpUTckSmem5lrycrk3AM=; b=anYKXbhUNeCeh8g1Njmx38RXlIy6BdQaAybd/rOG7iB+evMdU2S53DtojdEvBeDv6z c6oCgeuHQZPHIrQ62loj75uulRQHThNqf5Cxatfp5DfFynW5zv+own3tY26cLW7cOzjN nvhgfJIETgN0afK60WX2txNEmjZJmOB2ZKXkJVHY4m2qy6Nh4q8TRYM8kGv3pBUWew59 IM/XFM2M2UWZmGsLpJtfDu7KlcqLaz/hy/JID0E6dW0LzxkaP9mIScSUiS4SYpRg4h4g G2AItBjQS+hikoqUmd/+ei0Ldwc28tF1xq+mwnQH1XrfVDRehrhrlxAzgZoNwAYVsrZi mJ2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ay3YH6wv; 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 t15-20020a0cb38f000000b0065af551572bsi8802669qve.495.2023.10.11.03.44.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 03:44:31 -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=Ay3YH6wv; 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 1qqWgl-0008D2-SG; Wed, 11 Oct 2023 06:43:39 -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 1qqWgj-0008At-PG for qemu-devel@nongnu.org; Wed, 11 Oct 2023 06:43:37 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqWgh-0007fB-3b for qemu-devel@nongnu.org; Wed, 11 Oct 2023 06:43:37 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-406650da82bso61643145e9.3 for ; Wed, 11 Oct 2023 03:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697021012; x=1697625812; 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=GPaasftMrVbbA875970yr+KsXKzf7HZNoY4yrQwF8Og=; b=Ay3YH6wvFeInz/4JZVMAYNkuLzH6bzNgOd+eBH9rmyPGqoJGhVjp9jXsEMJUwBUmW8 LKJm0Se4cY96r3YrHeDRZ4uWnf3nzBjNhbN9yBbgutjdqoozCoi/JsFoUwrbDU0dHr6A iYaPM+WWNutqLdebVQCAUWSMcCKUwZNJksssGfbFlNQo6AaRXUeuryrOvUQ0VwE0cIHq S2Pfde4D0tUDzeGANEpCtE0tStmkT/PwWbilDEE00f5pHbS2wmaJnFITFGsP8HthR9UW NLQPgG8s438ELw6S1foamXnCpR5xj2pNmFk4l7CL3gJvlAYDOwAZkzv7ga3vexmWt2ZT /n5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697021012; x=1697625812; 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=GPaasftMrVbbA875970yr+KsXKzf7HZNoY4yrQwF8Og=; b=wG5KPtv0z471zAdeCfZVlOnExIxvKQLcdLg2U0k/Tjl1mlFxZ5Cr5caZa17tHsZ/dD y+FheStELMBJIr1ojIzK4/aYlFwGdPmG/it5lUTgp9oZocoDIv2mYTfBV6+BkwttbnhV asHme11OtCAC2KngahlFCoRAqQb0NSMirobXMeYE08jcaCkgdWXvbpJLNV/NwLkg/wi+ JJeXv7qkV4oWmjqPnk2SNie1juMQ22MYTUCEC+8KurPwlWuQrzfjcjiODDzpIFz52wYl 6fD2z/6jHDDcnI5GaZtLSTn4Z+ruNjnNZQO5TLR5E7SC0RUP3wqbfmxXfdSYS1bC+nX/ W8rw== X-Gm-Message-State: AOJu0Yxvy6KbDuHXwwgSTqKNe0k6nReQohs/FnBLsAPX4t9a3p5C5c6z kYlv3csMkie3radBHWOlBybf1Q== X-Received: by 2002:a1c:ed02:0:b0:401:38dc:891c with SMTP id l2-20020a1ced02000000b0040138dc891cmr17641553wmh.5.1697021012597; Wed, 11 Oct 2023 03:43:32 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p5-20020a1c7405000000b004064e3b94afsm18852827wmc.4.2023.10.11.03.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 03:43:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EAFFC1FFC8; Wed, 11 Oct 2023 11:33:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Alex_Benn=C3=A9e?= , Alistair Francis , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 16/25] target/arm: Remove references to gdb_has_xml Date: Wed, 11 Oct 2023 11:33:20 +0100 Message-Id: <20231011103329.670525-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231011103329.670525-1-alex.bennee@linaro.org> References: <20231011103329.670525-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: Akihiko Odaki GDB has XML support since 6.7 which was released in 2007. It's time to remove support for old GDB versions without XML support. Signed-off-by: Akihiko Odaki Acked-by: Alex Bennée Reviewed-by: Alistair Francis Message-Id: <20230912224107.29669-10-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20231009164104.369749-17-alex.bennee@linaro.org> diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 8fc8351df7..b7ace24bfc 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -46,21 +46,7 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) /* Core integer register. */ return gdb_get_reg32(mem_buf, env->regs[n]); } - if (n < 24) { - /* FPA registers. */ - if (gdb_has_xml()) { - return 0; - } - return gdb_get_zeroes(mem_buf, 12); - } - switch (n) { - case 24: - /* FPA status register. */ - if (gdb_has_xml()) { - return 0; - } - return gdb_get_reg32(mem_buf, 0); - case 25: + if (n == 25) { /* CPSR, or XPSR for M-profile */ if (arm_feature(env, ARM_FEATURE_M)) { return gdb_get_reg32(mem_buf, xpsr_read(env)); @@ -100,21 +86,7 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) env->regs[n] = tmp; return 4; } - if (n < 24) { /* 16-23 */ - /* FPA registers (ignored). */ - if (gdb_has_xml()) { - return 0; - } - return 12; - } - switch (n) { - case 24: - /* FPA status register (ignored). */ - if (gdb_has_xml()) { - return 0; - } - return 4; - case 25: + if (n == 25) { /* CPSR, or XPSR for M-profile */ if (arm_feature(env, ARM_FEATURE_M)) { /*