From patchwork Fri Apr 25 15:28:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 884376 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4026086wrs; Fri, 25 Apr 2025 08:32:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4QCYNf+CZSkEHlZzkvmpByzKjVmsx8lDyjbrZLvOUjcEcd6s3DEgRStCC/nEs0t3aZl0U8g==@linaro.org X-Google-Smtp-Source: AGHT+IFDGs1Zs8oI0vJDD70z32Ph/BgmInwctC5JlGEjSDWR9md6D2ValHG+au4qACkvIaY4IOP+ X-Received: by 2002:ad4:5d4d:0:b0:6e8:9e9c:d20f with SMTP id 6a1803df08f44-6f4cb9eb666mr47666376d6.21.1745595150564; Fri, 25 Apr 2025 08:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745595150; cv=none; d=google.com; s=arc-20240605; b=kVJbzq0MYuRSgiNvACt5nUISIhzAKRJeM4HA59JswxvVceft+kAtGYgUTQa8Z6rHnr zGTrIpxwTN4SStdtakMrxkJYYtbCGVJm+yRFsuBUQXxcvmyogPeBeDHXHObabV5VeazA Q+DlM3XHumGbDrkP+ZYaZ09zkKsQKQ4fuFmu0eMbKKZ5kYN5Vxwz8stwumv6BnEg2xpq z3EXUR3IqftDELGmNmdFYzKr8CnmuqDmwaKjur4ljPMChdRT1cNlPpn1WdquRjUmTtME +7WAucb5AgBVYog7EBTI5iAXD6RJFX2gfA62sa/cda+Zjr6pGUnCx9cLWtzZ8Qt+CUxm rHBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=mlzJ4A4jALjtU+0r3cIdS3NAsSdBaVqAytVllxW1gkI=; fh=alZCUczDNtN4yFLy44SM1yTUliPrh8AgZa0GP8izqo4=; b=eHXoPDij6LHWrmC8L/mqS3vwdeamO3iJJR7IWuJy7B+k9Gs0g6p7zFn+BRYlIcJ9f0 1lX06G7ie71/K7fU3lkOkSMEJLWAhMNMekpuz4B+KQZB6jge67hXMIYyGhqpyI9+EFax ImO0yJLwQHDZwywAuXgrIqCOnK9eEcQYQuA8i1sh3KodUuQOnjh+1il/k61OhVPteE8+ xBQCjJPfy3G9dKK5iT0faOm8UMsMp9+hjG3OIlZGLxzkEIHDzD+RxDhbDh4/x4jC5Yq7 QQhkkaVTgovkJePDo597SXuJIrNULvjwavwDuJK7A6fVFy3e1YDmJxG5cq+Kx7mru1j+ X6vw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=haGZqoR2; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c0b213b2si38773866d6.495.2025.04.25.08.32.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 08:32:30 -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=haGZqoR2; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8L15-00022X-0z; Fri, 25 Apr 2025 11:31:03 -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 1u8L0l-0001bB-Gg for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:30:48 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8L0j-0003wz-NU for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:30:43 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39bf44be22fso1640024f8f.0 for ; Fri, 25 Apr 2025 08:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745595040; x=1746199840; 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=mlzJ4A4jALjtU+0r3cIdS3NAsSdBaVqAytVllxW1gkI=; b=haGZqoR2i4Vhw6wPRnh1bR67hwwjr+/k4QiBvGriqC7t4qRCenYQhYCfV42hLf9iT/ XGfeCKelQISSOxUwa0OdPMXDcobEkKXEnOOmHAkO8WXGdF96AbAhplgg6nuvAkfur21l u8LwnIxf+AwIXWhGofAJfBSKCOI3rn6I9dEJ4/BNnqeAlMnBAPzqOcEP1eXyoRC93aPr YIjUfyIfPHjwkNUg/dIbDaf4AFs8EWMf+px5BgapGHzMA1xmLfeLEfTGza6QcGT36BIt UwYEnZZykpbPB910Nk86SD2MU0xynyNWatlvw0doPmctJwJ00uu5r/EBR8REkGgYjlzz KovQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745595040; x=1746199840; 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=mlzJ4A4jALjtU+0r3cIdS3NAsSdBaVqAytVllxW1gkI=; b=Sg03h0jtdw6SYB/Oy9O1SGYFRqRIOVwvL99NJBwmhh8dDR4JL0TKsJelWkSUg4HaOe EhKD8jIqF7Mnw+oGYRHU+jrzRBTPYC0uut6zeh861mIK/HyylWkNj4S3dHbA2bun6kUk r8yeu88+iq3EbkmRhET6rqsCYzqlTdVhzJ2+c9zo7LC88UyEy0+gogW4Ocys5Eb2kepc BoXORj1VccN/zZE+2XN2lFgqO42GKn7xiTNc5isstL+tID+8AXrqGn0gQyfnsHIGPci4 OyAJcailSngeyZqBbJeBCsyoXTmueugT8pyIBriUmyn0rrBBcDtbLv0JA7ve5G6yI0Ln yjyA== X-Gm-Message-State: AOJu0YwmzvRNKtareqr0X3p+SY1iISRX4QoKWJxu5Vq9SW6MhcGJG/wF NkFh5C8XDiGWnUoaIt7ue6KXy9OkkBPtA2iHs18/aH0hh4Wzl9isRIjz5QmIKETBvKf/BP34ShP b X-Gm-Gg: ASbGncsW0AONYzN5KVFZ7fVEwHrY1sYMxiwVlpi/BRjY78jVPyRNJlacDZk/ETGPvZV kuiLFOUvN70es8ZIx+n2WESUG6yTMeM2A55XwzT/ay2DzFeCjPsAHdiup/s3n1qGn/jYF0y/x0b Mr/X6J7+d1VH9f0yrfgF2YdY6h3rAh+0qH+9S0QSpZva8nU3rHXqOvg8KQ+IAUimJfYIZpeq5uU whfvSD20cITnd1ceCyzeLGmfMbjiTGIbOdW3YN/6SxCxEOLS3pfRgJLRiQm56hNhD1kLuSojmvd iBPnReHrhO6xlrWq/73p/hKLyZ6pntHd/6suYZV7EhkU95yqCcFHhNOJPqth9kWJ6c69AgeKVn3 3s9lkwDJ6LUYF59w= X-Received: by 2002:a05:6000:4212:b0:39e:f9d8:e016 with SMTP id ffacd0b85a97d-3a074f0dbc6mr2163346f8f.44.1745595039908; Fri, 25 Apr 2025 08:30:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e5e198sm2704997f8f.97.2025.04.25.08.30.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 25 Apr 2025 08:30:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PULL 23/58] target/arm: Handle AArch64 gdb read/write regs in TYPE_ARM_CPU Date: Fri, 25 Apr 2025 17:28:07 +0200 Message-ID: <20250425152843.69638-24-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250425152843.69638-1-philmd@linaro.org> References: <20250425152843.69638-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: Peter Maydell Instead of having the TYPE_AARCH64_CPU subclass set CPUClass::gdb_read_register and ::gdb_write_register to different methods from those of the TYPE_ARM_CPU parent class, have the TYPE_ARM_CPU methods handle either AArch32 or AArch64 at runtime. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250317142819.900029-6-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- target/arm/cpu64.c | 5 ----- target/arm/gdbstub.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 5135ef63cb2..00629a5d1d1 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -815,11 +815,6 @@ static void aarch64_cpu_finalizefn(Object *obj) static void aarch64_cpu_class_init(ObjectClass *oc, const void *data) { - CPUClass *cc = CPU_CLASS(oc); - - cc->gdb_read_register = aarch64_cpu_gdb_read_register; - cc->gdb_write_register = aarch64_cpu_gdb_write_register; - object_class_property_add_bool(oc, "aarch64", aarch64_cpu_get_aarch64, aarch64_cpu_set_aarch64); object_class_property_set_description(oc, "aarch64", diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 30068c22627..ce4497ad7c3 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -44,6 +44,12 @@ int arm_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; +#ifdef TARGET_AARCH64 + if (arm_gdbstub_is_aarch64(cpu)) { + return aarch64_cpu_gdb_read_register(cs, mem_buf, n); + } +#endif + if (n < 16) { /* Core integer register. */ return gdb_get_reg32(mem_buf, env->regs[n]); @@ -66,6 +72,12 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) CPUARMState *env = &cpu->env; uint32_t tmp; +#ifdef TARGET_AARCH64 + if (arm_gdbstub_is_aarch64(cpu)) { + return aarch64_cpu_gdb_write_register(cs, mem_buf, n); + } +#endif + tmp = ldl_p(mem_buf); /*