From patchwork Mon Oct 9 16:40:55 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: 731018 Delivered-To: patch@linaro.org Received: by 2002:a5d:574c:0:b0:31d:da82:a3b4 with SMTP id q12csp1312873wrw; Mon, 9 Oct 2023 09:47:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVTFpo3+5NIbx38oWtWh8lGvOhMheZE+kmzY9LS5gYG87GQaquNPuDRSCrCDr15t23yJSu X-Received: by 2002:a05:622a:30c:b0:417:f9e1:664f with SMTP id q12-20020a05622a030c00b00417f9e1664fmr19526989qtw.36.1696870048091; Mon, 09 Oct 2023 09:47:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696870048; cv=none; d=google.com; s=arc-20160816; b=nTpli38iVyeVm6D00NBEUusf/bVmRc6YPbJv0NNoTRgULUXQA9rpr74ZEzs0KJkeAg 1ZL2gopWyO0HoYMnVzg6evs9/UI3nG07e1fh02cnXDZSBPE1LTLr3xElh9QR/odBcLG0 ZWX/vXt2Df0cscbuqYJe2MUR3RX83So6ZgKmLqiF6h+VwZ0hiVWx44vTPRzc9pkujpc5 Mb3cxwoyXjXaG1ZWSL0++NNH22XI1lnM+IY8n7+CNMb1+EzmpM95FvY9ddXJtod6QfbT WAbN86oPGYaD+g8CaAtOeT4XyAmJe9uSW1DPNddb7NereYjo6x5i1AJsDGsdrZ+T7HEr lrKA== 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=VWYhOQMznQlDFerIuEfFly6GjEqfzxxsRGSOgMHMHjQ=; fh=FL21b9FDJBPKO4Cw1gBqBPIr8gb5CEXpVKTgM6hLIl8=; b=ZwgvnJs+bA77xcra92WosD1xh67Vi/cToYjt5lLPR9uf8YDYwK7FA82LxF1ZWSiCbO rZMZxdqXTftOEndyZ18AzxDUe9ZBaUvGVTlmPT+HlXnaqb+UJcpiSl7hPfVdhPcBZSoi FZNFYrLtsk4R7/2RrioB2yT4XL1GoXXZT2keKCYoMDSuHsRei+kw4M2Xg9OsIXaGMbNF Zx965hAkbFpIqhnbWxZlLq1HOuv6+kw5QKpskt7NQRwLI5+Z0JewXnCdDehF2triy0+9 fAUzJiELGqIbZHhbTHhnAmod4ASFC+Mwxua7TBErGfpJTUQDxqp6BvywrN15c5b1Yovl F1xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B1S01vsq; 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 a17-20020a05622a065100b00403bf9d2091si6435508qtb.363.2023.10.09.09.47.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2023 09:47:28 -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=B1S01vsq; 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 1qptPb-0005W1-Sa; Mon, 09 Oct 2023 12:47:19 -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 1qptP1-0003Dr-QV for qemu-devel@nongnu.org; Mon, 09 Oct 2023 12:46:55 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qptOk-0003Vz-3S for qemu-devel@nongnu.org; Mon, 09 Oct 2023 12:46:38 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-406619b53caso43669395e9.1 for ; Mon, 09 Oct 2023 09:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696869973; x=1697474773; 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=VWYhOQMznQlDFerIuEfFly6GjEqfzxxsRGSOgMHMHjQ=; b=B1S01vsqV3ds4VPMz0moge7l9PDi7dmPCEtIX5Mz15oqpKERvHdC/yiStZ3MCRh4wi +MWs+Wf3u5iEAZypYYi6SMxugZkNHNghLmj+xPcHeWdgt1WUAERDTgq/zxR0PbNeiFUc D9hZWBqnhNeKhPpRTN1TSMczfUlMMd1kYN8hj5sdF24ENHbT0NJE5DIJuzv5zvqpOB6k hZYPY9wuDLZat/4STwgQdxeY6l6heTj2ED9vWhvBlNbFRMe24+sbKb4X7DPpVpnwKC61 gQLysqcK65by1KD9a2uDR4vFBzkDY/rqkRfHwgmvwInN19bE6zuPkDp8tdGI7yybj9Aj MbvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696869973; x=1697474773; 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=VWYhOQMznQlDFerIuEfFly6GjEqfzxxsRGSOgMHMHjQ=; b=uOecl0fUlfxoXmWVEtLJztjX0Up3FNbm8tKAGetWI0m8lCTqS2ALa3Gr5dWsiytmgG wRr8kVqYDspHQrKJZuE2y/8bq5dFFDUCd9PcFqhpxlXo1ios1EEze7dh8G3YfoyiWfcW 8mgDyn/3fT0EkwoaQJSJCy6IDv9QS+mWY5ZJ98OmKedBQu7o4/dOJrj5JdbStvOHpacB MRvQVf2pkbRGnKFem5N9KPXQpyxOM+whAzK4QCSkFYyLKeon5/iPvnNNsH9O/8TUT+Q5 tlX5y2ehHcFCLn+7GMQL7zNMOsBl2ykCzEC3LM1RwGfCPm/J1Ya+EsHD7ga5Kr2VxaLg dtUw== X-Gm-Message-State: AOJu0Yy0lvJZouVGZUUgryTx/bYzRrdr58IcWbATrfyrHEKGwrN0ruFX Dx5MGdXfH9Pr/WSu71SRuX8F/w== X-Received: by 2002:a05:600c:231a:b0:3fe:f667:4e4c with SMTP id 26-20020a05600c231a00b003fef6674e4cmr14363217wmo.12.1696869973250; Mon, 09 Oct 2023 09:46:13 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v16-20020a1cf710000000b003fefaf299b6sm11633283wmh.38.2023.10.09.09.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 09:46:11 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DA6B1FFC8; Mon, 9 Oct 2023 17:41:07 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Xiaojuan Yang , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Bastian Koppelmann , Brad Smith , Radoslaw Biernacki , David Hildenbrand , Cleber Rosa , Ilya Leoshkevich , qemu-riscv@nongnu.org, Daniel Henrique Barboza , Alexandre Iooss , Nicholas Piggin , Bin Meng , Leif Lindholm , Paolo Bonzini , Eduardo Habkost , Alistair Francis , qemu-ppc@nongnu.org, John Snow , Liu Zhiwei , qemu-arm@nongnu.org, Wainer dos Santos Moschetta , Palmer Dabbelt , Peter Maydell , Yanan Wang , Weiwei Li , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Beraldo Leal , Yoshinori Sato , Mahmoud Mandour , Richard Henderson , Song Gao , Marcin Juszkiewicz , qemu-s390x@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH 16/25] target/arm: Remove references to gdb_has_xml Date: Mon, 9 Oct 2023 17:40:55 +0100 Message-Id: <20231009164104.369749-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231009164104.369749-1-alex.bennee@linaro.org> References: <20231009164104.369749-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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: 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 Message-Id: <20230912224107.29669-10-akihiko.odaki@daynix.com> Signed-off-by: Alex Bennée Reviewed-by: Alistair Francis --- target/arm/gdbstub.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) 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)) { /*