From patchwork Thu May 15 10:24:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890183 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062089wrr; Thu, 15 May 2025 03:35:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEKJ/vd9qI7xZLkOkjiMrVr/iA8cFjcT8Ip9faX44L/NbGARYUP65SISniB9RE43YDjzaQRw==@linaro.org X-Google-Smtp-Source: AGHT+IHFQuqqYb569mMsHYRe+xesfumZ9RhQtS2XS63tu0p2SGADgtV4WbKqo8OuL8c3n4WiE9OP X-Received: by 2002:a05:620a:bd5:b0:7c5:3cf6:7838 with SMTP id af79cd13be357-7cd2885ce10mr1213875785a.49.1747305346506; Thu, 15 May 2025 03:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305346; cv=none; d=google.com; s=arc-20240605; b=atdDWTtstrqotfMEP6WrN8bl4YI57r542mYuHXi942IOdRkyEAahcmmwcKYTvowL/T L6Jj3tf9uV+2E1z75Djuz1ssyitXVQf7ez22ihQlIWuaE3m8htV6MHMYYqPY7OmNPAP9 UkNdLftto0kHTIK2rDhjIY/E/aNP7xutcD1/ML74XoFi2pOgo1LF6QQfuIW4GPtUjNGK RoK3bMMdskngUyep4kE6YJwZ7nvaBNOAXX625IO95ncEY7VjIcZE2c6HiR1EqxrdfL5q 9JE43Hi9QYaFn6B3jn1y6SuZrjT8GVKYXhvGL5kJpWhFqjxRTRfNy056ACFZRXGgdxOZ z9zQ== 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:to:from :dkim-signature; bh=DRuZri4+JHhBySzNzcQhM79/aaMB+kacQBfm+tsx07Y=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=RGID0LQh6bk25oUOJK13qK91Fhpj1utnqVvts3yQr8R/6p41STPQXCjlIKwoiUh4yM nGmLeXtk4P/qrztRICm5PJLdrODeEHYBKLDPWN/99i2ROnfB5Vi4ps3OJPtz+SaSKNWu J3Av6RGjDzj+hhZJ5bdg8ioM4OhlZ4n0acqHEnQh7JAE0XkkA9Slyj7c2Xv5Zl4G3zrO +EJiEL0A51at5j72Smvt0O2W/0K6wcWFOJk4geT6HMNvvJvc8Hye748NysWhBGglGZoQ H6RCe9nI6j9WlKL0SPp0HvmpH9Cd3rLB1yO5GDujJTWj9FSCT78YDLm6E+360BVZKpd/ IjSQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R0UL/O4M"; 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 af79cd13be357-7cd00fd5140si1553250085a.301.2025.05.15.03.35.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:46 -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="R0UL/O4M"; 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 1uFVmn-0004FJ-IB; Thu, 15 May 2025 06:25:57 -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 1uFVmm-0004D2-4T for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:56 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmi-000864-UY for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:55 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a1f5d2d91eso426734f8f.1 for ; Thu, 15 May 2025 03:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304751; x=1747909551; darn=nongnu.org; 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=DRuZri4+JHhBySzNzcQhM79/aaMB+kacQBfm+tsx07Y=; b=R0UL/O4MqkhIDNdOvIXJ1L0UBLFTOp2HCljZRbM+i/3y/SwF+z+4iqIKv1rN8YdChz v/4dq5+LkpSmJc5I1aGTQGG7SPPacsCoYyqLDW+L6oykgqvZjNTlw2bMvIDaC5B689M3 4L/r45MqyqL+W1UWy0JQU5F9xI96KfTMTHgNx6ggF/KAYBwYe2pi59orH9mW4zTEFwbU UqbRjoY8hrqyTreAAU4ZwAGL/bOJ8s+fKteXfx4ZP+QvxK57mpoLxeYZW3RA21FqVA8Q ha6yE1hI+zqgSuTZM3y4FWa2Yk+f1LFdKvlW+pcbMlFC8wh9mOiLlioiZV+lxygaJ9Wo FKUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304751; x=1747909551; 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=DRuZri4+JHhBySzNzcQhM79/aaMB+kacQBfm+tsx07Y=; b=iFYX9T+xI40slRpDBRXNMhmol0yfr8ReZa+Y2rWvxyFfgoKxTeq1VGP4h4cIl3+Fdm DkFtJFTILOoK05Mi1zGJ1ABtdWkPXbsXrx4e7JD3bUyZkWQQ8gNhTMBL/euJRfjTy1JW wB+ujqLxWTDo/A6zuTNEb4BMywptfYpjk7FknVbAZagmnA5ApWBorB/NcD1tllqj94W5 wOqK2QjmjEEwbNgDeignpDoZd7iES4hc4J/+jLymC5HDyUJ65BqPtwfmzmwz54HS1oh4 MHUGce2ND7OpfPj1d8aZJgzz9XCZ57lDAaCa2FtCc19sLGrd9vVceDNGCZ/48MtxU0uQ kBIw== X-Gm-Message-State: AOJu0Yzxi71JMgG6Fj7Fo9oOFI3XPa+iTB7XzWhFataaRrsQvIsQKcpN W56bu0aGKeWZqfCPrL74K01Hq9UNkHk9mCpxku4qkTFebnS16Fu44w7O+IS7xMdGwgJDZ/F4gdf 3PwY= X-Gm-Gg: ASbGncthLdcVAVbbAkjDqMcpnq6+t02mL25Ban6UHg75h6zDMzXLROwiYQtzMLNeP3i fqSCtKgBY7q9A5MYRpsn5DY65vhZ5sdXQ3lWZRnOtN4el83On986YJd9fx1fBN3kbYqAy6kB9VT m/kcLjWORh78Au+tUCrgKd76v/843QlI3Z91TThpB4sf8HNaBqk4ApeLMSdZV/5voniEImkGkkD NEFBWuH3qMLiXGKfH4CcFXTOsWGjvLkRfLxD8+Dlt6kGthnFR/cbo9GzZEyksSsucv/1DbEvqYm ViRZukQSCAWMFVKCajdF3x7aZbLz8gmcU3B1BplOU5NwJGGoiVQR6qxBkA== X-Received: by 2002:a05:6000:2dc7:b0:39a:c9c1:5453 with SMTP id ffacd0b85a97d-3a34994d408mr5882258f8f.49.1747304751287; Thu, 15 May 2025 03:25:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/58] target/microblaze: Use 'obj' in DEVICE() casts in mb_cpu_initfn() Date: Thu, 15 May 2025 11:24:49 +0100 Message-ID: <20250515102546.2149601-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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 We're about to make a change that removes the only other use of the 'cpu' local variable in mb_cpu_initfn(); since the DEVICE() casts work fine with the Object*, use that instead, so that we can remove the local variable when we make the following change. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Message-id: 20250429132200.605611-2-peter.maydell@linaro.org --- target/microblaze/cpu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index d069e40e70c..d895d683956 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -344,11 +344,11 @@ static void mb_cpu_initfn(Object *obj) #ifndef CONFIG_USER_ONLY /* Inbound IRQ and FIR lines */ - qdev_init_gpio_in(DEVICE(cpu), microblaze_cpu_set_irq, 2); - qdev_init_gpio_in_named(DEVICE(cpu), mb_cpu_ns_axi_dp, "ns_axi_dp", 1); - qdev_init_gpio_in_named(DEVICE(cpu), mb_cpu_ns_axi_ip, "ns_axi_ip", 1); - qdev_init_gpio_in_named(DEVICE(cpu), mb_cpu_ns_axi_dc, "ns_axi_dc", 1); - qdev_init_gpio_in_named(DEVICE(cpu), mb_cpu_ns_axi_ic, "ns_axi_ic", 1); + qdev_init_gpio_in(DEVICE(obj), microblaze_cpu_set_irq, 2); + qdev_init_gpio_in_named(DEVICE(obj), mb_cpu_ns_axi_dp, "ns_axi_dp", 1); + qdev_init_gpio_in_named(DEVICE(obj), mb_cpu_ns_axi_ip, "ns_axi_ip", 1); + qdev_init_gpio_in_named(DEVICE(obj), mb_cpu_ns_axi_dc, "ns_axi_dc", 1); + qdev_init_gpio_in_named(DEVICE(obj), mb_cpu_ns_axi_ic, "ns_axi_ic", 1); #endif /* Restricted 'endianness' property is equivalent of 'little-endian' */ From patchwork Thu May 15 10:24:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890191 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062346wrr; Thu, 15 May 2025 03:36:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZ3Vi1yPj96Ow+V9M5Y+o264Ln68nT4aUqLgOr7wn/t8/UqQhTj+oQ/ZVtUx6bnqgMz9t+kA==@linaro.org X-Google-Smtp-Source: AGHT+IGvRXhhvYdi5gHj5WhVq74ogXyvR1Sb5zUO6D37LmjIYyZROo54WjLMAeAsO27sjrg8eSy+ X-Received: by 2002:a05:6214:c29:b0:6ed:1095:e9cc with SMTP id 6a1803df08f44-6f8a31b3500mr51444526d6.8.1747305376242; Thu, 15 May 2025 03:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305376; cv=none; d=google.com; s=arc-20240605; b=Dmjy3FsVU823+gCaQOQ43bP/rqG6k5AkF4B0CI+vPk8iPBvWecTAsIFQQ07vFVX6Dr jnb0JzVA8oDHm697YM1mDhjOXv5faBMNVvKWLZU1zx+2g3/yhmCewv4Tn4z0WudtwAgs ZEpBAsfhm01VZvJIw5Sab3ODZjqdZoL6hnBcKUkbgBNRSQ5ZFWYufJMOAI5OorHdnEpA tTeD90RRSABM6QpEHGLFxO1wRyYfyVn3jKc7NjTKj5geXoVB39xMS8vTpY5DSZG/ylhS /57kwKzR1dLI4kHedvbDged53hV8SjWyIePyn3aFELZrA9PPqPoCxsy7MbOrX+iMYjm8 dZ0w== 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:to:from :dkim-signature; bh=jUxbkP+HhDnHsdXnm5ZqQIvQggnNxrTAh7W07VaYQEE=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=UzaOXFa7+I0PH26NnmeZi3QgQMFO3FqhqPq8qutWEsKxnowogi9+Gybk16LFzUTUhx c6Aifui2hIV12uUkfmxjW8Ab0fhiSScIwLWJMPhSfEAEg9eFQN1eidRUCMv324X8bnIx TWDUUEKMxU75FUlBMwf+HVzmNEJNq2TmkD493700gfMjUwhC9paao6J5iiu0Z32BLuA3 CaihYy0Zg2IsGu4/gK7N/2gkNg4AQorEgUKIQypwCR5+pBW6HRoctpl2Tvca5/Y/tkNV XNE0yh+yHfSAQNad4CoDPCSIVB2YT9DX6S9ydLdLNZSmIgNQk7aBsT8iML67JPS1qZuT A2ug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WPeadnob; 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-6f8a93e3d25si7586056d6.317.2025.05.15.03.36.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:36:16 -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=WPeadnob; 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 1uFVmp-0004GH-1W; Thu, 15 May 2025 06:25:59 -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 1uFVmm-0004D7-6M for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:56 -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 1uFVmk-00086D-6n for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:55 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-440685d6afcso8439845e9.0 for ; Thu, 15 May 2025 03:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304752; x=1747909552; darn=nongnu.org; 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=jUxbkP+HhDnHsdXnm5ZqQIvQggnNxrTAh7W07VaYQEE=; b=WPeadnobR0g7cdFCbpy1In3VyqJkhtWgTcYbTMR88FS28lljQ6poq2AaKsMqgrxjHH HHMDWmzM1a3cFrynAdq+CRzbLo5ovKc9mo16QnTafXcMWNNZxYZtMDJKBGY0DD1uVP8Q KH7zeMm83xvNAmcJQAfMHsgYeATHXZF0nBg6iRmzAOh5y3mvxRg+zrzTdusrnoe+4sd1 bp9jG4Nl85vXVSKCxfukhm91hNOJ2GzCfpP6qPd/9uFNi3kHemuuX83KLZPpNWHQwMsU NQVu9Z3hy90B6k8K3op15gNRV/KXzzZTtNS7jLBWJSPZK8t4odW/VKl9bcuA3vbldtRT S1gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304752; x=1747909552; 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=jUxbkP+HhDnHsdXnm5ZqQIvQggnNxrTAh7W07VaYQEE=; b=B4nqZzokAqgQZyjmx3aR0AZM547AOlmbi9Rbquddg3sVlhdbpQXfI7FK+ZZ457yqcC m6sAXfmYB/IOtG8xkVkuzXGtpqqDmxuoNvVcKExwrI+vi3H4TnpaAN8mG6OSEGxoiYso iqhp0jecAvzgf2PO+gEw08pWcjwdm0yhVpziz4JLSaG5Ha4aXKD4SKdK4ym6nzI6hiUa fpa1rPAz0koJGTfzQuXpuOLW21crGycQkTpihbjZO8/VpUl0AAIIPH75lTUO402pQxxi G1H7j4+NKQ2DVdfhFXyhb1EaGQMRX0CVsR+NKZdWj5xOKAYvQxOhXwIh/6rYAAYTYSjK SyQQ== X-Gm-Message-State: AOJu0YwE0+GDQcBXEBHjAMm20F6Tc5Q9bHhcpqSJPsJD8kQoRS/Oayg/ xfoN9oavvAF2a22fLKOGOLjZm8SFJzfRtbFQrpLZAUFdqZBchrLiL4eVkYJApkNRTU7GlDVCmHS 7wuk= X-Gm-Gg: ASbGncuClHjdLhAWppGuLcM1xauXsTxk2NYSzHfEmmmhI6ISIO1lI+FnEMHW8kv7j4V LoOpOGRZFLPil3yAMEY7brPEmIEC6jCd9naGIpKnCf1qN4TpJa+rW5d4zjS8pJZzmCAaApb6HVF 9y7zLibODjqhFRXZVKz0k3W5hzbqyfGx0gwmp21047mqEZlMK1erstmNNkjXiwJDc84lD4gBgJ2 RueDySqvlq7+zFKdzSry91L4DmabhBrzIavdM0e2ZD71EEwUYKzNlTqiZmyvx8P4W3PJnKZxSEM oNCquuwUo54K0hDVSPsq9uh+9ZQ7c52fBwUeVxNkExVq0oDjj2dgK2xzYw== X-Received: by 2002:a05:600c:1e02:b0:43c:ea36:9840 with SMTP id 5b1f17b1804b1-442f970a8dcmr15025815e9.22.1747304752462; Thu, 15 May 2025 03:25:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/58] target/microblaze: Delay gdb_register_coprocessor() to realize Date: Thu, 15 May 2025 11:24:50 +0100 Message-ID: <20250515102546.2149601-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@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=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 Currently the microblaze code calls gdb_register_coprocessor() in its initfn. This works, but we would like to delay setting up GDB registers until realize. All other target architectures only call gdb_register_coprocessor() in realize, after the call to cpu_exec_realizefn(). Move the microblaze gdb_register_coprocessor() use, bringing it in line with other targets. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250429132200.605611-3-peter.maydell@linaro.org --- target/microblaze/cpu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index d895d683956..615a9592005 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -263,6 +263,11 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) return; } + gdb_register_coprocessor(cs, mb_cpu_gdb_read_stack_protect, + mb_cpu_gdb_write_stack_protect, + gdb_find_static_feature("microblaze-stack-protect.xml"), + 0); + qemu_init_vcpu(cs); version = cpu->cfg.version ? cpu->cfg.version : DEFAULT_CPU_VERSION; @@ -335,13 +340,6 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) static void mb_cpu_initfn(Object *obj) { - MicroBlazeCPU *cpu = MICROBLAZE_CPU(obj); - - gdb_register_coprocessor(CPU(cpu), mb_cpu_gdb_read_stack_protect, - mb_cpu_gdb_write_stack_protect, - gdb_find_static_feature("microblaze-stack-protect.xml"), - 0); - #ifndef CONFIG_USER_ONLY /* Inbound IRQ and FIR lines */ qdev_init_gpio_in(DEVICE(obj), microblaze_cpu_set_irq, 2); From patchwork Thu May 15 10:24:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890156 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059090wrr; Thu, 15 May 2025 03:27:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWe7K7bQpyxlqUtE0v96yuztC+2T2D/Y5dMb+VAwJbeCK7dDzA7UFlpFs7FZmaHKpo5YYLmmQ==@linaro.org X-Google-Smtp-Source: AGHT+IEEpVh7M2KZrQJTMm0QYHs3s+y8A55jLFQBNxe992dKumn+jcSP1mXDB+mFR1wjy3YY64XW X-Received: by 2002:a05:6214:3009:b0:6e8:f5db:d78d with SMTP id 6a1803df08f44-6f896e35f47mr111196726d6.23.1747304876035; Thu, 15 May 2025 03:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304876; cv=none; d=google.com; s=arc-20240605; b=DLuF31PlZO7KIksda7nyHmi2AhJOW87mzSmmFBTmXrpUew5q4yCPsPTNM7EIgF0yU2 PrA4kxZ3MlFfRusKXI5vRr7oPfdlsvWBaDAMVY/bYmaagRK/lXmeTq4GLj+ZpIjSR0F2 v71CjF6HVN5D1U+JWbbeRrl7W+l/LhJc67gYCsJ6AC5VdqkomwJCMHBpiesjsPnfosGj NmTbgapWlGzfhf7G5XCxDSZE0i2P7mVJ8B4SExb05Cmu7W6DnrbzSHgZ+Ijlwg/n+bcy GtOrGg9wPys3W4i66nsOvWa6pdxrJRmaFuG32f0fBTCr7DdlFJRDZPX+GtlNHIHIwYcH 0kIw== 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:to:from :dkim-signature; bh=7QtsMbWF7VE6Px6bLjp5onVkzczQnDLHxWTCi6gF8ps=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=NvJYuSty8ZY9tGVbTG6qtBAO6OMQgb9ifdO8BJ0Iv+UVC93/pjlN3AvZ4ZLNzIv8Cg HQkqPFYqBgFCk586JiY+M/b0X8+p270JEDUNfr+egjZ4ZUCOYvEHOlE4VLq8a27Yb7BL EEGawpNr1hWvpLDNWn9v4fXcyrmHA/dHLz0vsyuS5rjICkLWEpcM0LDMgn/KG2ZPGyi4 xbK4L5jcpCnmGgcTmFAvoymOi7NxRWXeUriUPRm4+Z4BhR5a8WGPh4IL4Fyd8vGb4e9h wkKUQX/Bv8rhrHIUauT3SscXJ63NrlolNhsbUwAjWMpSg1wCfovKKx3zO+6t9tj2CQvf gBYg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vL7bC4/5"; 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-6f6e39f7a6asi165597256d6.148.2025.05.15.03.27.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:27:56 -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="vL7bC4/5"; 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 1uFVmr-0004Jk-Rn; Thu, 15 May 2025 06:26:01 -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 1uFVmo-0004GI-3j for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmm-00086Y-4s for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:57 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so8367505e9.3 for ; Thu, 15 May 2025 03:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304754; x=1747909554; darn=nongnu.org; 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=7QtsMbWF7VE6Px6bLjp5onVkzczQnDLHxWTCi6gF8ps=; b=vL7bC4/5r4i4GuqhwXZAXFaO8mc4/35wlFZbZmipaYUfnxSsRePslhPubL8L/wUmG3 mMJBlu8qF5B9K+t7YZlJArdH/z3CiGUoeWVpIpfASOOsnffVrlK+yKmJBsJKMdZrA7cM J8JOCTi1XUTDqZMq1RCHzul6DCrN7mVJZrZVvuGdsWU30cr0e8YiUqSE3dEoPIP8t8PG RlI7+n9yy4munKFjcyr9fmOvALOHG752xKShBg2eer5pW//2Gv4wRUJbJXtAMLwj7Uvk 7bdPhcQfmG4RY/uNB5sqWu0fL54idCtS4DqKi4egkgslKG/xWEZGWk8ItPn4WvqRYjAL +Bpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304754; x=1747909554; 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=7QtsMbWF7VE6Px6bLjp5onVkzczQnDLHxWTCi6gF8ps=; b=xPLS48LPGzn3Or7SGSnSZVjBu7imMkk0xOu2vh15adqecLdZc8b5z7EXsT9weCeGzF vV7bUlZmmPuyVOi0YGcGtchhp4uCRVbJ6Je0JajKSf9J/dzA8N1VMuWsmkAtog0v1NAD wBD3izE4ZA1OOfneWkgH6wq6FvFJb1ukfOgiR4c3RbNVIFhBxGAKyrdA33jT7UN6sAJY nmkhZ1t1ZOp/b/S6ZyX9GILkRpMl0954a2RfKlz4uB5Jql98/0+BNhfvToQu9sGOKb3H ihACtk4e//GHJKlG9gfn1tMu66zbeNp2hwZ3FRG1peAAMcjzkmQ+GoWYQbrzouXqVScE maZQ== X-Gm-Message-State: AOJu0YxMiaRyxd1I9qNSSfSOI3cBKo1ee0hgENqxMrngFbeRtL9FqmQs hLX8dCygNcnl/PB3WTxifpy8VMAYCiN74TcmW7GtKsgi9ynedF62FpuNO4fHKiUIpQXhDr2SWsN +iMQ= X-Gm-Gg: ASbGncskAT4iqAbY0wXxF8zH5I2CbD2ozhQKjQbSLacT/S5Aa73N2y6b2hUqFilg8pE 5LU3RJQWczEk1hOQ3Bsz/zI/vv1In7zEtoTK3klE9EaA+9tDYQisTy8QiQ0B2v2bmYxziwU2Lc+ 7v/KtVRn/9vnQ/Y6qWr2FAVG8rfpUTYan4ReRvcnOzWCXOf0gIyGXoMMqVY/V6AVKikQftYT4XE 0WpBrWPF12L+cZuDfCVgL+ooazExywrn/sHDmceubwcI558joaraR2kSzwdQW0H2uSUif7TwSWC m9kHQu3YhehgBKjw6uuCAZe+doD/uNs93zJ1vD0vyZiKWRBJtr/JTVSzcg== X-Received: by 2002:a05:600c:83c8:b0:442:f485:6fa4 with SMTP id 5b1f17b1804b1-442f971924amr21742645e9.31.1747304754143; Thu, 15 May 2025 03:25:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/58] hw/core/cpu-common: Don't init gdbstub until cpu_exec_realizefn() Date: Thu, 15 May 2025 11:24:51 +0100 Message-ID: <20250515102546.2149601-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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 Currently we call gdb_init_cpu() in cpu_common_initfn(), which is very early in the CPU object's init->realize creation sequence. In particular this happens before the architecture-specific subclass's init fn has even run. This means that gdb_init_cpu() can only do things that depend strictly on the class, not on the object, because the CPUState* that it is passed is currently half-initialized. In commit a1f728ecc90cf6c6 we accidentally broke this rule, by adding a call to the gdb_get_core_xml_file method which takes the CPUState. At the moment we get away with this because the only implementation doesn't actually look at the pointer it is passed. However the whole reason we created that method was so that we could make the "which XML file?" decision based on a property of the CPU object, and we currently can't change the Arm implementation of the method to do what we want without causing wrong behaviour or a crash. The ordering restrictions here are: * we must call gdb_init_cpu before: - any call to gdb_register_coprocessor() - any use of the gdb_num_regs field (this is only used in code that's about to call gdb_register_coprocessor() and wants to know the first register number of the set of registers it's about to add) * we must call gdb_init_cpu after CPU properties have been set, which is to say somewhere in realize The function cpu_exec_realizefn() meets both of these requirements, as it is called by the architecture-specific CPU realize function early in realize, before any calls ot gdb_register_coprocessor(). Move the gdb_init_cpu() call to there. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250429132200.605611-4-peter.maydell@linaro.org --- hw/core/cpu-common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 92c40b6bf83..39e674aca21 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -234,6 +234,8 @@ bool cpu_exec_realizefn(CPUState *cpu, Error **errp) return false; } + gdb_init_cpu(cpu); + /* Wait until cpu initialization complete before exposing cpu. */ cpu_list_add(cpu); @@ -304,7 +306,6 @@ static void cpu_common_initfn(Object *obj) /* cache the cpu class for the hotpath */ cpu->cc = CPU_GET_CLASS(cpu); - gdb_init_cpu(cpu); cpu->cpu_index = UNASSIGNED_CPU_INDEX; cpu->cluster_index = UNASSIGNED_CLUSTER_INDEX; cpu->as = NULL; From patchwork Thu May 15 10:24:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890161 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059374wrr; Thu, 15 May 2025 03:28:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgxfRSRQ7MccM+QYbrbHWPzwY3zoF2nF3uj3nCPq2Ly9Gt7fj1Qj6/61/mVBQOzKWoCMmkSw==@linaro.org X-Google-Smtp-Source: AGHT+IEiYoNV9STFX1moQ+QVNUqnZMfgdl6wDyBrdwfAgfSSSGGHKyFSxfJkuAklsBaRCjOtw9Ev X-Received: by 2002:a05:620a:f07:b0:7c5:57b1:1fd1 with SMTP id af79cd13be357-7cd3c82c5c8mr291323485a.47.1747304921613; Thu, 15 May 2025 03:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304921; cv=none; d=google.com; s=arc-20240605; b=ZZ605ctX9Oa5eohGusTpX80jmGlzYo4nQuTxyCGY/zRn/eqx0xVOtMdsr6enVwBYOZ 2wu3ILUMJNMksTaKR9O2E/7/oQYrrZHAraTdF026y+xSmnetb3EVsYGV7o2VNHnkR3cz re5zBpOro3OEbIF4sobGLJWAluPI0cD6UK0Qxc9j5Lm4UFPF7/XxLaY6O4biJ9cSh+Wd O+H7jePipTslvHjsYPjjjM79mZFTAzhkHfUrSCyZMLfuwk2ozmZmhs+6hwhilcOncByI TQhn3AACMRfXTsnPXQ27B+SjMaupw5D0kX13jtVHkQyfAQvhcIlpNkrekUMDnhRqj8xN xgbA== 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:to:from :dkim-signature; bh=bObN/GZFYIPXswmzQmBrFY+KFYsdoS+icAznneCd2Ck=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=P2mq4DLcjjt/7+3v92ivQJkdKMcxAkqPeWlXFNNLngyJkZu3vqj2Q1WM3mwBLrQ4Ci l/8sJpiepyorxxvKq80jthr0ohqiVEqOvlNlRn+C0VlNrP97rd2Kx13Ix2zRM9NEk3lC eMIZwa7rZUKZKqGzBTbmYVzhH4SfAIIGchqU5AvTY9VSscHCYNG4EuN+EWenw1rxa+lt R1K59gMARnrQldZvgTMC6lFY6INZ29gu16QgZ6rl0Svefi3UqVCMF4Mf1EXCnTZexriO Z3o7lHAL7ETUZ1Ur0Pb7u+jFF2OuhVuCg4EBdCLsj4MO+ux53fhhrqYRuNw+6kjAJ+h+ JVTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XK+ppCmR; 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 af79cd13be357-7cd00f51a75si1507136185a.25.2025.05.15.03.28.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:41 -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=XK+ppCmR; 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 1uFVmr-0004Ja-Ql; Thu, 15 May 2025 06:26:01 -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 1uFVmp-0004HJ-9w for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:59 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmn-000872-Jv for qemu-devel@nongnu.org; Thu, 15 May 2025 06:25:59 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so8367755e9.3 for ; Thu, 15 May 2025 03:25:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304756; x=1747909556; darn=nongnu.org; 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=bObN/GZFYIPXswmzQmBrFY+KFYsdoS+icAznneCd2Ck=; b=XK+ppCmRVs3Q+RVjZ7bil6PE3H2GC1u6wK3pfVA4qak0y6KX74s99DEnjEohuul1wi +l8oJs2tSC80sfMfrFs+sKL3VPj1rudrTIEuamrldFxaLMjk8406/hfIfArkQfMqcAby yFr/V3GNgZqJ6bIDJJCm60Lv8iTuz60hHE1XPpciI6XeP2omcEVweh6DUa9gKHIyqy17 Bhl7RXDED1urw6yXUyUBLx6bY3CKzzZbM1nEZPd0VeI/kucJJYtNVssD8Q8fClrYn2Zf lB7HM4QrCmaRQCtAovh6Xj9wBDtOkYU68Ol6YbJaYxbIzndQCcORhWkH0iTfZHn+AQew 0i9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304756; x=1747909556; 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=bObN/GZFYIPXswmzQmBrFY+KFYsdoS+icAznneCd2Ck=; b=J3dYYv/ENL9IBfu0KDPGiw6Tkh1U5CUhNRJ0FVjXftEDeKjYErzTlkD3oMm5i3VwMk u3ZxXg/1pNWSzYpoPrU6igQ1A+uZrYpKEPLBsisAhAqHSLLu/bMZU84QuPZwW8SNfYx4 +byqN5UFLuLdpbmC2gMjBAS5YUtVr2SUs5KJpwTrTNH5L9aWSsFEcqn/GGMWIs+WIRjI 5kugVabbZ7LHnx6GcRFjiRyfHFTtXzktS0/FXSV2w8nZBsqZRMiaIPDxH5cOp7KLk97j wUgzTWUP6bsJnXB2sscHXe9TLhX4Bw3WVxWUBZQQffQ9PWd9oSwSYtU5+vumQm8Nqnyc pa+w== X-Gm-Message-State: AOJu0YzQ1iY5RczHcLPJVR7H1idP+31/oSNrSc8ncNqDjmabxFiJu8XN uWSUMN+3IFeNNlj5RNDwEwidu/9mSK/uOLBz4uO/wOLjNhyzr2nzewhuZYvyI19PJlFkDQ9ubUp Fv7I= X-Gm-Gg: ASbGnct6kqyROTzTpaLagu2azTiHFzq3KEv33MN5ymq+pUoQeHwM68ywK5eqzYvGgzr 5wjNed8Ba+mMj7DjdzGAX6h5Vuvut6dJ5/QFW0eAGzj0c+qyv6RlyQN36dn7+VgjUzLQrn+frok JPqIPwrHoD9m/sNEFVfQmOQnyTDKlUE0M98e+QhTuWnVBya5CGVjUo1Vx+5w92Arg4pi/St+Nls aw/htTv7rdRgOZcWpznKMOXL5dlVH1yqUQucPb5n0F0TmEWtN2oj+5hR2U+oW6Jj+sV9aNwKQHy M5wy9lY+Ch1XenspBvu50GDJJEq7dKxgJRfIfP9qdK4P2jPk8CoegT4vLQ== X-Received: by 2002:a05:600c:1e02:b0:43c:ea36:9840 with SMTP id 5b1f17b1804b1-442f970a8dcmr15027585e9.22.1747304755959; Thu, 15 May 2025 03:25:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/58] target/arm: Present AArch64 gdbstub based on ARM_FEATURE_AARCH64 Date: Thu, 15 May 2025 11:24:52 +0100 Message-ID: <20250515102546.2149601-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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 Currently we provide an AArch64 gdbstub for CPUs which are TYPE_AARCH64_CPU, and an AArch32 gdbstub for those which are only TYPE_ARM_CPU. This mostly does the right thing, except in the corner case of KVM with -cpu host,aarch64=off. That produces a CPU which is TYPE_AARCH64_CPU but which has ARM_FEATURE_AARCH64 removed and which to the guest is in AArch32 mode. Now we have moved all the handling of AArch64-vs-AArch32 gdbstub behaviour into TYPE_ARM_CPU we can change the condition we use for whether to select the AArch64 gdbstub to look at ARM_FEATURE_AARCH64. This will mean that we now correctly provide an AArch32 gdbstub for aarch64=off CPUs. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429132200.605611-5-peter.maydell@linaro.org --- target/arm/internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 660d3a88e07..a396c0be3b7 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1833,7 +1833,7 @@ void aarch64_add_sme_properties(Object *obj); /* Return true if the gdbstub is presenting an AArch64 CPU */ static inline bool arm_gdbstub_is_aarch64(ARMCPU *cpu) { - return object_dynamic_cast(OBJECT(cpu), TYPE_AARCH64_CPU); + return arm_feature(&cpu->env, ARM_FEATURE_AARCH64); } /* Read the CONTROL register as the MRS instruction would. */ From patchwork Thu May 15 10:24:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890202 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3071343wrr; Thu, 15 May 2025 04:02:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFuS6E0RjGdduhIiYPMF7MuTugvr/0qyK/no2ZJw7UOrNrMJUS6Pr3/ikdKfMOGDeeCnqwKQ==@linaro.org X-Google-Smtp-Source: AGHT+IG6/U65z6Hwqg8tS+6vm9ofZqyFcszVgEtR0P81JWZkQFkXOoazpG5EXQO6STFUKBWNMDy3 X-Received: by 2002:a05:6402:3482:b0:5fb:1bd8:2f99 with SMTP id 4fb4d7f45d1cf-5ff988e788dmr5864515a12.30.1747306933132; Thu, 15 May 2025 04:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306933; cv=none; d=google.com; s=arc-20240605; b=WCySRHPzveDSRAL2TL7R7nha7RQEbNG1UjiOjptxkURHFeWnHqTQG1ZjnBYaP+R0rw pz9s3TzbMbDh+AxU5R40qfCZ4zW0gW3lu0T2Htj/70ivzppjLd7Afakygbf7AUfXEnbW daYeRs7YKky3ksm3d/hf5A3XSL02qFzG+AiddKkSAx2umBrdU3u7OYjtWOTRHW35R2t6 13EhBOPkL0EVpj+qOCnrY3lUg51XDUusfJwlAcJjdZYWRV/zrITXghyqeG4jYp+WKT8b It3DW4iMU+G/xlKW//Qjf0ZFCgqcjCLSNbLkNO+3604nIKy2rzeFoOFyg/Pr/Y2PqCR+ ismg== 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:to:from :dkim-signature; bh=V44BClu19+jvYPw+zjT/7PfwtqiqasGrnUcfMcg673Q=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=cyRfOdJ2V/hOOaaY6IP2NqR881DaWScQzMPzNtqdm3xR0X8ow07sMw5kC9qiJ2kINE kDnskYJ+FAbcdRrzfwe3IiDIFkwzsO6/433FBk6oXl6ihD5CwUbkRJ/iIenUftVfrXqe dU15fkP7tFydLMkyqWVJLbzAI25kC9FGoWm1CHs54Zpktgf0XcFAeJDmJ4RbxgLjFXLF xCwL0D01yI4g6kHzFZXNsqV8nvI19hUs6bY5a0HSsd3pz3WDd5ifZpozfTtdE61RDkrc 5dCn5EKYeHBJtjTCdcNRSBjZ9E/Qbzb6P8DsNLFjsndQ+PXwdzEzTjGCXVre0WZ1cwEU I3lw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CZS+esSn; 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 4fb4d7f45d1cf-5fc9d6f3497si10574837a12.483.2025.05.15.04.02.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:02:13 -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=CZS+esSn; 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 1uFVmu-0004NR-Ve; Thu, 15 May 2025 06:26:05 -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 1uFVmq-0004JH-Mx for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:00 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmo-00087G-NU for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:00 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-442ccf0e1b3so9263445e9.3 for ; Thu, 15 May 2025 03:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304757; x=1747909557; darn=nongnu.org; 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=V44BClu19+jvYPw+zjT/7PfwtqiqasGrnUcfMcg673Q=; b=CZS+esSn4X67hdD7niZJW2zNGW1xSZjmt9Vp6kQXA/irzEdJfQCJO9peJ7JSaaaI8W YgHcF8wzJ4ITbP5/Nf9yHxmFzneuQpaGw3tMDlx3T1tmLNtb3zxWysOrP169Cc2UFKqY sOF3so3IYCIhQ9G0bjhfmyWUetoH6tqFNjPLeJcmskXmcoxotE8TpynPMvLz0bgaCbSm ZGkIa+IQmAav/CFdKVEvWt2VYwbChGSIbM+wbBK+XeWUooP4NAcj7t9YqoxvfyT/16Qs qqL4MiTygxm/9JkA9XSL8ozoKY1ZYFcNxG5veQKHrh4esa7PCKD6luQKf5Lj/CJudCFK 3RgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304757; x=1747909557; 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=V44BClu19+jvYPw+zjT/7PfwtqiqasGrnUcfMcg673Q=; b=k12AB/syNHqeXeJ0ZAv3WKeSmnVmXOxHpuDJT1QItSIwloeTAzQIl6OT5cURWW4DCa yYa1Tq03KFnTAi1e6RdKPGAvCJSfqQaPfxV4jUbzY+clcytwt3hxywttCVQh7MYRvFiE rEM6hm71RPU4swr0segb/Kg6LzzmBynBGU/nARJxHA5ln4/aR6IBejRE1xeGRm4jI8I5 7bto8FeCDpol1kiM8mABTFEl6JJKPp9DOxbCkKIJ50OnVJdBhluaAuweQRDULg/moEmZ s9xIGkvv3qVPWYb3TeMsLKFWxe24wNhZeXVyio9iWBem96XRXFeW5MjCz0BLNTwy+5cx AEKA== X-Gm-Message-State: AOJu0YxJYEBIEDhsjsSccZMUEn8p/hzfCKp5+j6XRdccytJBJyJMgzYX eesJ8nSKX2/J/HpwttfQf6txsDsZp0jK29v3wUi+zQsjm/z7k2+XS0s0gn82K8XW/mrTVCjtcoB aMaw= X-Gm-Gg: ASbGncvrDcKvHahGWhib8nivoBSfWkSJ8kFw6ARdgrJDbyHphQFwWCoJkaE8EEpYY0g jMIdPdW+3xi7xomQLzluJMzSUWUuQ7IdT6frik+KRK2NtwErlkoVj1UJF11UMvMJzYCEhJ9q2r2 NLXu4/ULm8EcC0IyUcaBKHYeAoNH4TsUeCQjjiWiEaVJ1CcbPRR7SBljM2ySOIG/04XfUbuVRfg 2L+jmDCP9EhULv1NCUCxfh26gyQ7pnurYAa5Voo5lGFLE1PgIRhLzW3rSBABXwnhCUNBjS6LIC4 MJ7+1+LGeB116N3d2jXFvZSoRaNld5JNLMSRXSNi6leo1mkCO/05FmHBgyCjseEvju/y X-Received: by 2002:a05:600c:c09:b0:43d:82c:2b23 with SMTP id 5b1f17b1804b1-442f2168c29mr54196595e9.23.1747304756870; Thu, 15 May 2025 03:25:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/58] target/arm: Move aarch64 CPU property code to TYPE_ARM_CPU Date: Thu, 15 May 2025 11:24:53 +0100 Message-ID: <20250515102546.2149601-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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 The only thing we have left in the TYPE_AARCH64_CPU class that makes it different to TYPE_ARM_CPU is that we register the handling of the "aarch64" property there. Move the handling of this property to the base class, where we make it a property of the object rather than of the class, and add it to the CPU if it has the ARM_FEATURE_AARCH64 property present at init. This is in line with how we handle other Arm CPU properties, and should not change which CPUs it's visible for. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429132200.605611-6-peter.maydell@linaro.org --- target/arm/cpu.c | 36 ++++++++++++++++++++++++++++++++++++ target/arm/cpu64.c | 33 --------------------------------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 45cb6fd7eed..603f08d05a0 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1609,6 +1609,35 @@ static void arm_set_pmu(Object *obj, bool value, Error **errp) cpu->has_pmu = value; } +static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + + return arm_feature(&cpu->env, ARM_FEATURE_AARCH64); +} + +static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + + /* + * At this time, this property is only allowed if KVM is enabled. This + * restriction allows us to avoid fixing up functionality that assumes a + * uniform execution state like do_interrupt. + */ + if (value == false) { + if (!kvm_enabled() || !kvm_arm_aarch32_supported()) { + error_setg(errp, "'aarch64' feature cannot be disabled " + "unless KVM is enabled and 32-bit EL1 " + "is supported"); + return; + } + unset_feature(&cpu->env, ARM_FEATURE_AARCH64); + } else { + set_feature(&cpu->env, ARM_FEATURE_AARCH64); + } +} + unsigned int gt_cntfrq_period_ns(ARMCPU *cpu) { /* @@ -1736,6 +1765,13 @@ void arm_cpu_post_init(Object *obj) */ arm_cpu_propagate_feature_implications(cpu); + if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { + object_property_add_bool(obj, "aarch64", aarch64_cpu_get_aarch64, + aarch64_cpu_set_aarch64); + object_property_set_description(obj, "aarch64", + "Set on/off to enable/disable aarch64 " + "execution state "); + } if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) || arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property); diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 00629a5d1d1..e527465a3ca 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -781,45 +781,12 @@ static const ARMCPUInfo aarch64_cpus[] = { #endif }; -static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp) -{ - ARMCPU *cpu = ARM_CPU(obj); - - return arm_feature(&cpu->env, ARM_FEATURE_AARCH64); -} - -static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp) -{ - ARMCPU *cpu = ARM_CPU(obj); - - /* At this time, this property is only allowed if KVM is enabled. This - * restriction allows us to avoid fixing up functionality that assumes a - * uniform execution state like do_interrupt. - */ - if (value == false) { - if (!kvm_enabled() || !kvm_arm_aarch32_supported()) { - error_setg(errp, "'aarch64' feature cannot be disabled " - "unless KVM is enabled and 32-bit EL1 " - "is supported"); - return; - } - unset_feature(&cpu->env, ARM_FEATURE_AARCH64); - } else { - set_feature(&cpu->env, ARM_FEATURE_AARCH64); - } -} - static void aarch64_cpu_finalizefn(Object *obj) { } static void aarch64_cpu_class_init(ObjectClass *oc, const void *data) { - object_class_property_add_bool(oc, "aarch64", aarch64_cpu_get_aarch64, - aarch64_cpu_set_aarch64); - object_class_property_set_description(oc, "aarch64", - "Set on/off to enable/disable aarch64 " - "execution state "); } static void aarch64_cpu_instance_init(Object *obj) From patchwork Thu May 15 10:24:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890176 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061621wrr; Thu, 15 May 2025 03:34:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVoS/g93h/XnOb0GZmRpuyPlymTt/2JDn/Ms7/2apFF4gblHlPUzuWfVi4DcE4u4HIwziAIsg==@linaro.org X-Google-Smtp-Source: AGHT+IFX8GmD656qqZQJ64lp5/9Cm5CuJ0I9uaCb6VCrobVFjLwQcB8Z6pzj+hHaI/LF7YLRJptS X-Received: by 2002:a05:622a:a18:b0:476:964a:e338 with SMTP id d75a77b69052e-49495ca0b6amr126812821cf.28.1747305269893; Thu, 15 May 2025 03:34:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305269; cv=none; d=google.com; s=arc-20240605; b=LyuCfkJ8NMFJ7zyMIFvhXxh3FNoce26e+rHh5LYPkIib5QfiMusH+vxdx/P+wwWXE8 2++4DytmufRJ0j1OS+YTcjjIoctgwA6FzU9K03kDQqIt8hzRLKIaaCfBhNKPm3xng+M3 hD66t8fUZYiFzGBD3EAtnQ954tcV4wBlnvHxHnd0L733/k5Pa53lDRcxqk9ctSuBAZI8 g1TztjzeseKXdtDHRinpQ9/wQdzWOHc6ZQCwXi6QtTecI24spiNC3hPcwxFldZQDWcWh b3/zBZ36BB2pPrddkZozjcG2the+acugg4Ar4LZjeBZUOK9LKmuDRFKgT3IwduF1oZb9 3Rtg== 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:to:from :dkim-signature; bh=Q1yE9IE70+v4hZl3qoJgdI0L4GqLSUpkP/8flgn4noI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=SY1dXCvObKp7Fv93Not1bY0GvZrkegezh1qXgT5OR/SPGUNC8KwvZ7SelGzpXH4zVF Q9f0Kn4yeyvXvy65Jr517R4GxOIARQoyrV0t3G41kAYUMD6bu78LZWq5fiXj8V3ggVyM +d0M9biglhG+X2bbtzbcOzvhjBYre3JrkfyU5l2ytiAG3eQVzJ9ZunEcpH4CZzJPvi2f fg53w+/O2ObhnAcFHGn49U7f65lV2esouxWWxChBvZL7g0K/DJarAdpZnodz9nhulmMR w5NGsDP6vLANlWsUclcEHQmcq4VHBpVsp3oFKR93lT7F57qXJql3mVytBDClm8tU44Yw uAQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yGJVnTIn; 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 d75a77b69052e-4945247a032si156707211cf.155.2025.05.15.03.34.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:34:29 -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=yGJVnTIn; 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 1uFVmt-0004KO-HK; Thu, 15 May 2025 06:26: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 1uFVmr-0004JZ-DA for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:01 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmp-00087T-Gh for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:01 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-441ab63a415so8013265e9.3 for ; Thu, 15 May 2025 03:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304758; x=1747909558; darn=nongnu.org; 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=Q1yE9IE70+v4hZl3qoJgdI0L4GqLSUpkP/8flgn4noI=; b=yGJVnTInvsd8dIPAakjKgOBhjgBWrkHf7RrdiW3toM1YBD0w/x942Y3q3cKRKMdpFb toJfoU43/dwJrFoG/CxiCOR/diVrNfyWaT1kF7ZN+wr0NginrMjU3MEdevaolrfpxJIm wJt36fKIGZLJhWKluLUCJxFBB8AgrCVTKbda/og94uFe6OpD95xYOZsLWSHtgFfrckaY C1verJ1cyP8RQi0U+aFDS40kNqe6zpMoQBDE/p3caDBJYRmWNLemZa5/UQ63Y6f0JLOE 4byiHdg+Kg3Hkk8t81+Pzmt3u5r39mw5LMr/AAMmlO0H4ko/oJutmgJZ0Zrb6ZBXYph5 ytPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304758; x=1747909558; 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=Q1yE9IE70+v4hZl3qoJgdI0L4GqLSUpkP/8flgn4noI=; b=J+HOPqDN8qSFwWTa3rnpPWnHTqds0ALB4p5wlgUeCcj1MwrNSLR8rfGpDPOfVFrbYM Ln/emWWQ01Y0qXD/KFWPQxDAF6H61TKoe4r56x74yjw+rodJaQHiqOLKag1xtNZDrPMH ogZ/frIzAShBDJRuVv1RC61ZaitMp3coz1k0zdbDif4U3v0slsbVZ6QhpTg8WWOhHVYJ UFUzeXHaVwrXPU4uXDwOA6iTloV+RN2T7rowfOm/tf+H8QpuLFXMQvaN5pJj8xF0LwKy /KtJlSd7eaQXNvNlnf8quHvETE+MkCJqfNHCWNyDxxT6lZBnAvfg2IUQYtgHjvSUTwvU 2SJQ== X-Gm-Message-State: AOJu0YxXmknUcRLcjLCd6pYameOH7TJwSu+m8vjkG16VV9GNYvTm2gX4 FmbUm7di/zTFWRYr+Sb+6euCNhgRqmW7khsr/a1vFTburW9G39re3EPh3cQQkKvDhRmxFOrwQbA Dmh4= X-Gm-Gg: ASbGnctqAvskGJ2e4G+OqXoxF44qkR7XmF+LbEi8BVYPMTuK2ONHpmmiEUfNKhe8KIa hFUrA9btGVIfx0w2hpn0LkQcN1eOb77gOM3MM8FlASE3QsDJnR9cIj5gEDLUhwcpZq2owkNUVsI sLqd8JwOdSu0fVSxqK/ZXR4vFP8d4KYP46WrsizGY45SBA82cZiF66qWnrWw8NmVLNcVTx6vgqj hBCGTWMYM786fUPg+rgb1UePPwY+OlJgfhci7u/BK5IHxjV0Yi4AqG7sLM9V3bCopECAwAphklZ C4/luFcFuAY991ur2fV6/bpuynhw8dNAUMoT3Yib6zM8gtQBiPaX3O0OYQ== X-Received: by 2002:a05:600c:4447:b0:43c:f470:7605 with SMTP id 5b1f17b1804b1-442f20e80cbmr65442325e9.12.1747304757832; Thu, 15 May 2025 03:25:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/58] target/arm/kvm: don't check TYPE_AARCH64_CPU Date: Thu, 15 May 2025 11:24:54 +0100 Message-ID: <20250515102546.2149601-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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 We want to merge TYPE_AARCH64_CPU with TYPE_ARM_CPU, so enforcing in kvm_arch_init_vcpu() that the CPU class is a subclass of TYPE_AARCH64_CPU will no longer be possible. It's safe to just remove this test, because any purely-AArch32 CPU will fail the "kvm_target isn't set" check, because we no longer support the old AArch32-host KVM setup and so CPUs like the Cortex-A7 no longer set cpu->kvm_target. Only the 'host', 'max', and the odd special cases 'cortex-a53' and 'cortex-a57' set kvm_target. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429132200.605611-7-peter.maydell@linaro.org --- target/arm/kvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 9c62d12b233..85911e30242 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1843,8 +1843,7 @@ int kvm_arch_init_vcpu(CPUState *cs) CPUARMState *env = &cpu->env; uint64_t psciver; - if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE || - !object_dynamic_cast(OBJECT(cpu), TYPE_AARCH64_CPU)) { + if (cpu->kvm_target == QEMU_KVM_ARM_TARGET_NONE) { error_report("KVM is not supported for this guest CPU type"); return -EINVAL; } From patchwork Thu May 15 10:24:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890203 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3071369wrr; Thu, 15 May 2025 04:02:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvwJMpjzKqTcf9gdixzRRsBprKrjbWuACrM9rdl+9a2XP6+WccH8JuT8z3tO5xwea82u/FlA==@linaro.org X-Google-Smtp-Source: AGHT+IEdL6Jo+q+J3Pd+BF29Bra22VkkGyya7Y5Q7lQXHuj7A8YcTkZ1Wk4JFRVmqVl7O2aXwVoT X-Received: by 2002:a05:620a:6019:b0:7be:73f6:9e86 with SMTP id af79cd13be357-7cd39e1b140mr475784585a.20.1747306935378; Thu, 15 May 2025 04:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306935; cv=none; d=google.com; s=arc-20240605; b=bQE7fXzXJmyrBaf7ulUQsb/J9vf+jmD0UOr+idw7KvlMJeZAYAAgq1t9YtwAuR4tcm hxibdQui7uBpTBa6udU8luGoYTTAlBw1CKACCDqikHTNTqTjUv5NvLkEvIe/1/LR0Ekr smzUcJKWQPniW47y6OAf5ZaA2giA+OKCXrZYoR/BGRZnNVPMkYLlcsUaX9UuYriU4ITv L6f4FZIvLhY6ejnWXaYPzVxwfSOI0g/xS4jlM7m3m/X9Ry7qKZsfukZRiOpY8Uhb9VLD m59ge6YakBeoWEGyRbRbT3TF35GlLr6NRg6eYY2oC0UW9qndrMSsHXbkWki4eWmcleCL TTCA== 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:to:from :dkim-signature; bh=zvEbnDk7n0V5mA6cNTidl4bv1ZVHjjW3TCNPh3U2qMA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=f6d8zoLsX6Qs8ElHR5Kby0pQckRa8Sf/ISVMDX2FKSSXmjrO8pxjXyrDYClTLnvjIR brcehFESrVF40YTJN3oVsm3bfUznKYKNnX3Wsr4drTj42Zzi5IXEhzd1GTRqROlLvLpc IFlw3D3yRWKp7GPk2V8YrUcV9xGFMIdDtIx8se83f0YJOwT85P5QMdHLiXCncBok7ekN 2eGJGyXG2BpthI1imhzid4q+4Yaa1qoVcfapSSJK/BDoAuQeo8gObKmFYxebqvDoa3o9 +uF5BCXFJBtFcfmmiY8yfmgCNH3UR8vB94qkSI6qnbE77bO3xNK/d9m2Yo6BnM0yiGJi TnZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zwySI0dI; 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 a1e0cc1a2514c-87be97beaf3si14656241.45.2025.05.15.04.02.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:02:15 -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=zwySI0dI; 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 1uFVmu-0004ND-VU; Thu, 15 May 2025 06:26:05 -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 1uFVmt-0004KR-DU for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:03 -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 1uFVmr-00087s-Ac for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:03 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso5029985e9.3 for ; Thu, 15 May 2025 03:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304760; x=1747909560; darn=nongnu.org; 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=zvEbnDk7n0V5mA6cNTidl4bv1ZVHjjW3TCNPh3U2qMA=; b=zwySI0dITlL7WXBSu1w6qX41xHVbM354LJ5nL2UKcRirIQN6pQZUspNYQNdDlyxu3L bo2DpTQ/UviG1C/bXqptogfDG9DKokdCCQOJ7Ce3MT0Qoso3w3CdgJ0sHjjfa39jMqBk fRLnqNsT15tEsnizpVjaeihl28HZQR8YYULijV4sNgA9q4DD3L+Bj/n7VnGoTQhDUsLg UfGoOUpjYEMLcHMUpixb1oFlDN3zRhQGxZ+UfLipFLELE0+a72XgiET1nHDeY+0sx63l KqJcHou5KTL1fQcEtKqijGHdoTBMVYtK0i8IUlKTlN3dI4r1yOVppNf1BKxVKT+DLN81 Bgeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304760; x=1747909560; 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=zvEbnDk7n0V5mA6cNTidl4bv1ZVHjjW3TCNPh3U2qMA=; b=WuUG8K2LDL5T69cN8ayAhuQ74QKL/Nv5bO1YcLqmL5MttIpD9VEr46SuSNhanSHyUw lYazs5T7p1OHpULg6Fe0j9aN3DyWmMNkhIlnucTZmGw4+vYDXHzkp4udwCtgTsUTQIwt Syrl7mhlgtRtjVte0RgvNGuaPNqfeQ8eey3BdOMcDNGlCU/xtvk089qE95oj/V3faUno q3Vy1402kkmAFg4srXKA776fBOKF3mTHXDZ8f67bSddQmaepGlwC0uhgbc7vyLSQaOe6 h2bTbG6UbwdMDkVPXfZ+dyc3HYAs1RzQVOBfyyDXekhQ36rjxdkE7INy3vvr1PrdvRWr zeYQ== X-Gm-Message-State: AOJu0YyFafdSsVzWKigJNa0QLva4GAznaJYNT6ZSt3q6gLOLxY7VzAha RPiO9V3SCPpLMM/r7CxcSrvenrI47vYSPbiGaOuu6cmwgoJpPoZaxglW/BndFm33Y55v7V7JDnv iLy4= X-Gm-Gg: ASbGncsmiJ3s/sBL/0tyRfVgteSd0/dydUDplUffTaEhaxta+JYv1I2cRrZj+U2RzY3 W+G8ccHfEib/CzCA2AVkcjvelPFAbm6p0RZ8Adznmf4BOGexqcjA4fIEul2CDY1xwYr1h6kj6ec UGiLNIyABL+5C9pPAS6xaWmLzyf+QZJNj2v2N4D7JBrpdtELLWLYtuQiIAksl4+N4ChwZwWO7qf owXkIz16hMoTiimoc8V0Y/+mciS+Hm9zqTOYuIgE9KU8p5XVElFVTjRrkvXmwb6NI1CQSfSA8Ei FrnHSGhvqoYjs6FFQx71nQtte18pljNKrvHwW105oRJAPYXM5uUCPO8S/w== X-Received: by 2002:a05:600c:5128:b0:43c:ec4c:25b1 with SMTP id 5b1f17b1804b1-442f2169795mr45289785e9.23.1747304759650; Thu, 15 May 2025 03:25:59 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:58 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/58] target/arm: Remove TYPE_AARCH64_CPU Date: Thu, 15 May 2025 11:24:55 +0100 Message-ID: <20250515102546.2149601-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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 The TYPE_AARCH64_CPU class is an abstract type that is the parent of all the AArch64 CPUs. It now has no special behaviour of its own, so we can eliminate it and make the AArch64 CPUs directly inherit from TYPE_ARM_CPU. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429132200.605611-8-peter.maydell@linaro.org --- target/arm/cpu-qom.h | 5 ----- target/arm/cpu.h | 4 ---- target/arm/internals.h | 1 - target/arm/cpu64.c | 49 +----------------------------------------- target/arm/tcg/cpu64.c | 2 +- 5 files changed, 2 insertions(+), 59 deletions(-) diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h index b497667d61e..2fcb0e12525 100644 --- a/target/arm/cpu-qom.h +++ b/target/arm/cpu-qom.h @@ -28,11 +28,6 @@ OBJECT_DECLARE_CPU_TYPE(ARMCPU, ARMCPUClass, ARM_CPU) #define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU -#define TYPE_AARCH64_CPU "aarch64-cpu" -typedef struct AArch64CPUClass AArch64CPUClass; -DECLARE_CLASS_CHECKERS(AArch64CPUClass, AARCH64_CPU, - TYPE_AARCH64_CPU) - #define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6ed6409cb7a..302c24e2324 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1138,10 +1138,6 @@ struct ARMCPUClass { ResettablePhases parent_phases; }; -struct AArch64CPUClass { - ARMCPUClass parent_class; -}; - /* Callback functions for the generic timer's timers. */ void arm_gt_ptimer_cb(void *opaque); void arm_gt_vtimer_cb(void *opaque); diff --git a/target/arm/internals.h b/target/arm/internals.h index a396c0be3b7..702eb1a5483 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -354,7 +354,6 @@ static inline int r14_bank_number(int mode) } void arm_cpu_register(const ARMCPUInfo *info); -void aarch64_cpu_register(const ARMCPUInfo *info); void register_cp_regs_for_features(ARMCPU *cpu); void init_cpreg_list(ARMCPU *cpu); diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index e527465a3ca..200da1c489b 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -781,59 +781,12 @@ static const ARMCPUInfo aarch64_cpus[] = { #endif }; -static void aarch64_cpu_finalizefn(Object *obj) -{ -} - -static void aarch64_cpu_class_init(ObjectClass *oc, const void *data) -{ -} - -static void aarch64_cpu_instance_init(Object *obj) -{ - ARMCPUClass *acc = ARM_CPU_GET_CLASS(obj); - - acc->info->initfn(obj); - arm_cpu_post_init(obj); -} - -static void cpu_register_class_init(ObjectClass *oc, const void *data) -{ - ARMCPUClass *acc = ARM_CPU_CLASS(oc); - - acc->info = data; -} - -void aarch64_cpu_register(const ARMCPUInfo *info) -{ - TypeInfo type_info = { - .parent = TYPE_AARCH64_CPU, - .instance_init = aarch64_cpu_instance_init, - .class_init = info->class_init ?: cpu_register_class_init, - .class_data = info, - }; - - type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name); - type_register_static(&type_info); - g_free((void *)type_info.name); -} - -static const TypeInfo aarch64_cpu_type_info = { - .name = TYPE_AARCH64_CPU, - .parent = TYPE_ARM_CPU, - .instance_finalize = aarch64_cpu_finalizefn, - .abstract = true, - .class_init = aarch64_cpu_class_init, -}; - static void aarch64_cpu_register_types(void) { size_t i; - type_register_static(&aarch64_cpu_type_info); - for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) { - aarch64_cpu_register(&aarch64_cpus[i]); + arm_cpu_register(&aarch64_cpus[i]); } } diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 29ab0ac79da..5d8ed2794d3 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1316,7 +1316,7 @@ static void aarch64_cpu_register_types(void) size_t i; for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) { - aarch64_cpu_register(&aarch64_cpus[i]); + arm_cpu_register(&aarch64_cpus[i]); } } From patchwork Thu May 15 10:24:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890168 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060245wrr; Thu, 15 May 2025 03:31:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWUCXnUQPOevqw6WlSo0Yw5f7Am5lUwFxZdP9k9mEZuYOluqMGZdLDaxWnSiAbDjF90SdomPg==@linaro.org X-Google-Smtp-Source: AGHT+IGEFIWVOGP1yGkn6VJi5s3bwdq8B1bYysA1PiVpe6OsXREu2lLCN1X1F7DW4AY27sHY8TJG X-Received: by 2002:a05:6102:4a42:b0:4df:8f03:12ca with SMTP id ada2fe7eead31-4df8f031467mr2491865137.21.1747305050555; Thu, 15 May 2025 03:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305050; cv=none; d=google.com; s=arc-20240605; b=SbugUeYXDmwyx57+vhjJNxYQBYDWZTwva093466w6s+JoQj8KMyOaHZ7+g9p38vrAv 4fp40obbYYRQv6wYTznGgEGvxb+qC4IbtVUi6Ptgvh2+b80OwdFg4KADbMr/8ey9djqZ Ni5jf+ohpB2rIzL8tChO63MiVSg3MJ5RtgOThEtSrObVP0MmDuwX2Y1D84SBtuvcsABA 471AI4ez2SyS8Ujsk6RVZKkroSYs9tDKpF2SS1rfI68yqIFNNXxsHLf/JpF1aLsl2tK0 VqaAoSXoDRAsSclQNIwys/x+WeNkbE868yawYjnmqXQiu33CVedpRs19QQkSJ217wd5/ FvWA== 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:to:from :dkim-signature; bh=51BFccdTXBVY20jOsT7VzsPgWHsL1ys8mbXjW7Ru+Ls=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=CLTnRXpuE0rEiwGsN3YMnSMUFhbHjJ1IAHs/zwEackjeT3TSm+cQ3dAcJAmO8R/rri vS6Z1fg/bPafDyW0nN/LuO6b6tBVWGMmo4cyt6uvdyANRzgopRocUHsRjx87jFoTINr6 7o6+prJeALeMFIvtmG6v2+3KzRFUSJMIdkfpTarNLydQMnCXWkdwBCSyVby5MUHwQ5Pl G3JLovyQpu78IAh0ywgmp0zZv8pJrrCChzgZAK4ohVOYRzJgaw03bJ5TLv53StsSn65x fz0Uar36PXPoFVVY2khKI66j7vjpo2PrxsBHVI3ltK0PA4c8wobSnNdToN5YMonMRmlu nSPA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IAm5H0Zj; 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 ada2fe7eead31-4deb2027224si5905593137.506.2025.05.15.03.30.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:30:50 -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=IAm5H0Zj; 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 1uFVmy-0004Oj-GV; Thu, 15 May 2025 06:26:08 -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 1uFVmw-0004OH-EU for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:06 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmt-00088D-0Q for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:06 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf848528aso6413025e9.2 for ; Thu, 15 May 2025 03:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304761; x=1747909561; darn=nongnu.org; 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=51BFccdTXBVY20jOsT7VzsPgWHsL1ys8mbXjW7Ru+Ls=; b=IAm5H0ZjYnn57BryjDlo9/fZ9eqpb5ORgLIeZ8p2h+n/bVUGs9W027i7Pf7vFazbyv QtdvVhyZEE0BwzHRXb9+tTQteGjkX9+PhEsYhIOaQerw2DZo7m4RD1IRzjvkCCyvgNyJ Hu6BY6vSFgMNv2XdnfsvIftdNRX4M1bzz+L2nzlN7yjlNn5PcJivSYk5Con0n6DdtslC XSEZt7iFFB3VrZW9HMGbtHbNgHay8C+v1qDGWPAS2mfcgbLG8/FGXW0yl8Tbgc32A0Rr qWS0u5DknMzyc9xQY99DGdC8R05ZlHAWHQOj9008jy+WyJTFpMQXA5tfZV5Fv0jHmebx aWCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304761; x=1747909561; 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=51BFccdTXBVY20jOsT7VzsPgWHsL1ys8mbXjW7Ru+Ls=; b=UZ6Igclj5Zhiif0aHAGdM55xwfbOTDWfk7NVbAIodDQVnQOjbBcdNl2OijPTV+Tr80 45iAN8fAPE9Vyvk9sSpssRjsCLsgwYx0ogfYsxEux5JmUFHvPZeeePZWBsW9xsWcU5HO MUogimV66NyfMULUHxMwhhdjoaYy1C+Y/FFbmBFLDpaafM+VPWdIIKT/dek/ieSdqHp9 mSiJ2LoDqI+XwPFPTd5n7H94qDOrSd9X6RlgvAqKqfcqlwSJyV0ZY0U+JIBZCG1edC7O KE31R74VHJknR2nLxze94Gstwv4QONlIgYEljXk7UaLq8VTGoMrVIBi830Q6ORio9MtU OGkA== X-Gm-Message-State: AOJu0YzXae92zfr/B/+5zsAusUkEigi2oGiQmjAe/i5uhtnZNQkRGaDF Ujl+uOEZTNFCwgU4pckIP1PgUWFlUmnsrPI0QZ+/uLu0J5ZM6+r09LasXsy1inPDvrEvjXsGGR1 XUZk= X-Gm-Gg: ASbGncvgwFk8gvDV2pKLg998JcJYJY86vITLfcEOng4Kujy8eKoKJzHuLdnYEOabW7R i3WStMqdhF2mEYioYCKbHWNe9ZFzsPaQ85Xk4wVpY4x/fS7jglgTxICv2bHNv0oAbcIZ/gqIoq7 vEnvxhkrynGEIstjpkQbyqBh+ZnWHZlnDk9jHauJbJnLGepMjsVKWxVL7dHVqFEOlA42G4mfkQg /RRttm0dGaGoCS2XWMK5xNUSF7Xcs1oUcpSR2gOX5Ec84NCP2sqGveBil4es9O3Og/w2lcKkavW xodbdFq1swkTEDtD5zPwtAADhH9wfVwMOeVvUC9qiyU2zy82oLiypS7duA== X-Received: by 2002:a05:600c:1f14:b0:442:e147:bea6 with SMTP id 5b1f17b1804b1-442fa3fe0f5mr14525315e9.11.1747304760617; Thu, 15 May 2025 03:26:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.25.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:25:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/58] rust: pl011: Cut down amount of text quoted from PL011 TRM Date: Thu, 15 May 2025 11:24:56 +0100 Message-ID: <20250515102546.2149601-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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 Currently the comments in the Rust pl011 register.rs file include large amounts of text from the PL011 TRM. This is much more commentary than we typically quote from a device reference manual, and much of it is not relevant to QEMU. Compress and rephrase the comments so that we are not quoting such a large volume of TRM text. We add a URL for the TRM; readers who need more detail on the function of the register bits can find it there, presented in context with the overall description of the hardware. Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé --- rust/hw/char/pl011/src/registers.rs | 261 ++++++---------------------- 1 file changed, 51 insertions(+), 210 deletions(-) diff --git a/rust/hw/char/pl011/src/registers.rs b/rust/hw/char/pl011/src/registers.rs index cd92fa2c300..690feb63785 100644 --- a/rust/hw/char/pl011/src/registers.rs +++ b/rust/hw/char/pl011/src/registers.rs @@ -5,13 +5,13 @@ //! Device registers exposed as typed structs which are backed by arbitrary //! integer bitmaps. [`Data`], [`Control`], [`LineControl`], etc. +// For more detail see the PL011 Technical Reference Manual DDI0183: +// https://developer.arm.com/documentation/ddi0183/latest/ + use bilge::prelude::*; use qemu_api::impl_vmstate_bitsized; /// Offset of each register from the base memory address of the device. -/// -/// # Source -/// ARM DDI 0183G, Table 3-1 p.3-3 #[doc(alias = "offset")] #[allow(non_camel_case_types)] #[repr(u64)] @@ -87,48 +87,11 @@ pub struct Errors { _reserved_unpredictable: u4, } -// TODO: FIFO Mode has different semantics /// Data Register, `UARTDR` /// -/// The `UARTDR` register is the data register. -/// -/// For words to be transmitted: -/// -/// - if the FIFOs are enabled, data written to this location is pushed onto the -/// transmit -/// FIFO -/// - if the FIFOs are not enabled, data is stored in the transmitter holding -/// register (the -/// bottom word of the transmit FIFO). -/// -/// The write operation initiates transmission from the UART. The data is -/// prefixed with a start bit, appended with the appropriate parity bit -/// (if parity is enabled), and a stop bit. The resultant word is then -/// transmitted. -/// -/// For received words: -/// -/// - if the FIFOs are enabled, the data byte and the 4-bit status (break, -/// frame, parity, -/// and overrun) is pushed onto the 12-bit wide receive FIFO -/// - if the FIFOs are not enabled, the data byte and status are stored in the -/// receiving -/// holding register (the bottom word of the receive FIFO). -/// -/// The received data byte is read by performing reads from the `UARTDR` -/// register along with the corresponding status information. The status -/// information can also be read by a read of the `UARTRSR/UARTECR` -/// register. -/// -/// # Note -/// -/// You must disable the UART before any of the control registers are -/// reprogrammed. When the UART is disabled in the middle of -/// transmission or reception, it completes the current character before -/// stopping. -/// -/// # Source -/// ARM DDI 0183G 3.3.1 Data Register, UARTDR +/// The `UARTDR` register is the data register; write for TX and +/// read for RX. It is a 12-bit register, where bits 7..0 are the +/// character and bits 11..8 are error bits. #[bitsize(32)] #[derive(Clone, Copy, Default, DebugBits, FromBits)] #[doc(alias = "UARTDR")] @@ -144,30 +107,17 @@ impl Data { pub const BREAK: Self = Self { value: 1 << 10 }; } -// TODO: FIFO Mode has different semantics /// Receive Status Register / Error Clear Register, `UARTRSR/UARTECR` /// -/// The UARTRSR/UARTECR register is the receive status register/error clear -/// register. Receive status can also be read from the `UARTRSR` -/// register. If the status is read from this register, then the status -/// information for break, framing and parity corresponds to the -/// data character read from the [Data register](Data), `UARTDR` prior to -/// reading the UARTRSR register. The status information for overrun is -/// set immediately when an overrun condition occurs. +/// This register provides a different way to read the four receive +/// status error bits that can be found in bits 11..8 of the UARTDR +/// on a read. It gets updated when the guest reads UARTDR, and the +/// status bits correspond to that character that was just read. /// -/// -/// # Note -/// The received data character must be read first from the [Data -/// Register](Data), `UARTDR` before reading the error status associated -/// with that data character from the `UARTRSR` register. This read -/// sequence cannot be reversed, because the `UARTRSR` register is -/// updated only when a read occurs from the `UARTDR` register. However, -/// the status information can also be obtained by reading the `UARTDR` -/// register -/// -/// # Source -/// ARM DDI 0183G 3.3.2 Receive Status Register/Error Clear Register, -/// UARTRSR/UARTECR +/// The TRM confusingly describes this offset as UARTRSR for reads +/// and UARTECR for writes, but really it's a single error status +/// register where writing anything to the register clears the error +/// bits. #[bitsize(32)] #[derive(Clone, Copy, DebugBits, FromBits)] pub struct ReceiveStatusErrorClear { @@ -196,54 +146,29 @@ fn default() -> Self { #[bitsize(32)] #[derive(Clone, Copy, DebugBits, FromBits)] /// Flag Register, `UARTFR` +/// +/// This has the usual inbound RS232 modem-control signals, plus flags +/// for RX and TX FIFO fill levels and a BUSY flag. #[doc(alias = "UARTFR")] pub struct Flags { - /// CTS Clear to send. This bit is the complement of the UART clear to - /// send, `nUARTCTS`, modem status input. That is, the bit is 1 - /// when `nUARTCTS` is LOW. + /// CTS: Clear to send pub clear_to_send: bool, - /// DSR Data set ready. This bit is the complement of the UART data set - /// ready, `nUARTDSR`, modem status input. That is, the bit is 1 when - /// `nUARTDSR` is LOW. + /// DSR: Data set ready pub data_set_ready: bool, - /// DCD Data carrier detect. This bit is the complement of the UART data - /// carrier detect, `nUARTDCD`, modem status input. That is, the bit is - /// 1 when `nUARTDCD` is LOW. + /// DCD: Data carrier detect pub data_carrier_detect: bool, - /// BUSY UART busy. If this bit is set to 1, the UART is busy - /// transmitting data. This bit remains set until the complete - /// byte, including all the stop bits, has been sent from the - /// shift register. This bit is set as soon as the transmit FIFO - /// becomes non-empty, regardless of whether the UART is enabled - /// or not. + /// BUSY: UART busy. In real hardware, set while the UART is + /// busy transmitting data. QEMU's implementation never sets BUSY. pub busy: bool, - /// RXFE Receive FIFO empty. The meaning of this bit depends on the - /// state of the FEN bit in the UARTLCR_H register. If the FIFO - /// is disabled, this bit is set when the receive holding - /// register is empty. If the FIFO is enabled, the RXFE bit is - /// set when the receive FIFO is empty. + /// RXFE: Receive FIFO empty pub receive_fifo_empty: bool, - /// TXFF Transmit FIFO full. The meaning of this bit depends on the - /// state of the FEN bit in the UARTLCR_H register. If the FIFO - /// is disabled, this bit is set when the transmit holding - /// register is full. If the FIFO is enabled, the TXFF bit is - /// set when the transmit FIFO is full. + /// TXFF: Transmit FIFO full pub transmit_fifo_full: bool, - /// RXFF Receive FIFO full. The meaning of this bit depends on the state - /// of the FEN bit in the UARTLCR_H register. If the FIFO is - /// disabled, this bit is set when the receive holding register - /// is full. If the FIFO is enabled, the RXFF bit is set when - /// the receive FIFO is full. + /// RXFF: Receive FIFO full pub receive_fifo_full: bool, - /// Transmit FIFO empty. The meaning of this bit depends on the state of - /// the FEN bit in the [Line Control register](LineControl), - /// `UARTLCR_H`. If the FIFO is disabled, this bit is set when the - /// transmit holding register is empty. If the FIFO is enabled, - /// the TXFE bit is set when the transmit FIFO is empty. This - /// bit does not indicate if there is data in the transmit shift - /// register. + /// TXFE: Transmit FIFO empty pub transmit_fifo_empty: bool, - /// `RI`, is `true` when `nUARTRI` is `LOW`. + /// RI: Ring indicator pub ring_indicator: bool, _reserved_zero_no_modify: u23, } @@ -270,54 +195,23 @@ fn default() -> Self { /// Line Control Register, `UARTLCR_H` #[doc(alias = "UARTLCR_H")] pub struct LineControl { - /// BRK Send break. - /// - /// If this bit is set to `1`, a low-level is continually output on the - /// `UARTTXD` output, after completing transmission of the - /// current character. For the proper execution of the break command, - /// the software must set this bit for at least two complete - /// frames. For normal use, this bit must be cleared to `0`. + /// BRK: Send break pub send_break: bool, - /// 1 PEN Parity enable: - /// - /// - 0 = parity is disabled and no parity bit added to the data frame - /// - 1 = parity checking and generation is enabled. - /// - /// See Table 3-11 on page 3-14 for the parity truth table. + /// PEN: Parity enable pub parity_enabled: bool, - /// EPS Even parity select. Controls the type of parity the UART uses - /// during transmission and reception: - /// - 0 = odd parity. The UART generates or checks for an odd number of 1s - /// in the data and parity bits. - /// - 1 = even parity. The UART generates or checks for an even number of 1s - /// in the data and parity bits. - /// This bit has no effect when the `PEN` bit disables parity checking - /// and generation. See Table 3-11 on page 3-14 for the parity - /// truth table. + /// EPS: Even parity select pub parity: Parity, - /// 3 STP2 Two stop bits select. If this bit is set to 1, two stop bits - /// are transmitted at the end of the frame. The receive - /// logic does not check for two stop bits being received. + /// STP2: Two stop bits select pub two_stops_bits: bool, - /// FEN Enable FIFOs: - /// 0 = FIFOs are disabled (character mode) that is, the FIFOs become - /// 1-byte-deep holding registers 1 = transmit and receive FIFO - /// buffers are enabled (FIFO mode). + /// FEN: Enable FIFOs pub fifos_enabled: Mode, - /// WLEN Word length. These bits indicate the number of data bits - /// transmitted or received in a frame as follows: b11 = 8 bits + /// WLEN: Word length in bits + /// b11 = 8 bits /// b10 = 7 bits /// b01 = 6 bits /// b00 = 5 bits. pub word_length: WordLength, - /// 7 SPS Stick parity select. - /// 0 = stick parity is disabled - /// 1 = either: - /// • if the EPS bit is 0 then the parity bit is transmitted and checked - /// as a 1 • if the EPS bit is 1 then the parity bit is - /// transmitted and checked as a 0. This bit has no effect when - /// the PEN bit disables parity checking and generation. See Table 3-11 - /// on page 3-14 for the parity truth table. + /// SPS Stick parity select pub sticky_parity: bool, /// 31:8 - Reserved, do not modify, read as zero. _reserved_zero_no_modify: u24, @@ -342,11 +236,7 @@ fn default() -> Self { /// `EPS` "Even parity select", field of [Line Control /// register](LineControl). pub enum Parity { - /// - 0 = odd parity. The UART generates or checks for an odd number of 1s - /// in the data and parity bits. Odd = 0, - /// - 1 = even parity. The UART generates or checks for an even number of 1s - /// in the data and parity bits. Even = 1, } @@ -381,88 +271,39 @@ pub enum WordLength { /// Control Register, `UARTCR` /// -/// The `UARTCR` register is the control register. All the bits are cleared -/// to `0` on reset except for bits `9` and `8` that are set to `1`. -/// -/// # Source -/// ARM DDI 0183G, 3.3.8 Control Register, `UARTCR`, Table 3-12 +/// The `UARTCR` register is the control register. It contains various +/// enable bits, and the bits to write to set the usual outbound RS232 +/// modem control signals. All bits reset to 0 except TXE and RXE. #[bitsize(32)] #[doc(alias = "UARTCR")] #[derive(Clone, Copy, DebugBits, FromBits)] pub struct Control { - /// `UARTEN` UART enable: 0 = UART is disabled. If the UART is disabled - /// in the middle of transmission or reception, it completes the current - /// character before stopping. 1 = the UART is enabled. Data - /// transmission and reception occurs for either UART signals or SIR - /// signals depending on the setting of the SIREN bit. + /// `UARTEN` UART enable: 0 = UART is disabled. pub enable_uart: bool, - /// `SIREN` `SIR` enable: 0 = IrDA SIR ENDEC is disabled. `nSIROUT` - /// remains LOW (no light pulse generated), and signal transitions on - /// SIRIN have no effect. 1 = IrDA SIR ENDEC is enabled. Data is - /// transmitted and received on nSIROUT and SIRIN. UARTTXD remains HIGH, - /// in the marking state. Signal transitions on UARTRXD or modem status - /// inputs have no effect. This bit has no effect if the UARTEN bit - /// disables the UART. + /// `SIREN` `SIR` enable: disable or enable IrDA SIR ENDEC. + /// QEMU does not model this. pub enable_sir: bool, - /// `SIRLP` SIR low-power IrDA mode. This bit selects the IrDA encoding - /// mode. If this bit is cleared to 0, low-level bits are transmitted as - /// an active high pulse with a width of 3/ 16th of the bit period. If - /// this bit is set to 1, low-level bits are transmitted with a pulse - /// width that is 3 times the period of the IrLPBaud16 input signal, - /// regardless of the selected bit rate. Setting this bit uses less - /// power, but might reduce transmission distances. + /// `SIRLP` SIR low-power IrDA mode. QEMU does not model this. pub sir_lowpower_irda_mode: u1, /// Reserved, do not modify, read as zero. _reserved_zero_no_modify: u4, - /// `LBE` Loopback enable. If this bit is set to 1 and the SIREN bit is - /// set to 1 and the SIRTEST bit in the Test Control register, UARTTCR - /// on page 4-5 is set to 1, then the nSIROUT path is inverted, and fed - /// through to the SIRIN path. The SIRTEST bit in the test register must - /// be set to 1 to override the normal half-duplex SIR operation. This - /// must be the requirement for accessing the test registers during - /// normal operation, and SIRTEST must be cleared to 0 when loopback - /// testing is finished. This feature reduces the amount of external - /// coupling required during system test. If this bit is set to 1, and - /// the SIRTEST bit is set to 0, the UARTTXD path is fed through to the - /// UARTRXD path. In either SIR mode or UART mode, when this bit is set, - /// the modem outputs are also fed through to the modem inputs. This bit - /// is cleared to 0 on reset, to disable loopback. + /// `LBE` Loopback enable: feed UART output back to the input pub enable_loopback: bool, - /// `TXE` Transmit enable. If this bit is set to 1, the transmit section - /// of the UART is enabled. Data transmission occurs for either UART - /// signals, or SIR signals depending on the setting of the SIREN bit. - /// When the UART is disabled in the middle of transmission, it - /// completes the current character before stopping. + /// `TXE` Transmit enable pub enable_transmit: bool, - /// `RXE` Receive enable. If this bit is set to 1, the receive section - /// of the UART is enabled. Data reception occurs for either UART - /// signals or SIR signals depending on the setting of the SIREN bit. - /// When the UART is disabled in the middle of reception, it completes - /// the current character before stopping. + /// `RXE` Receive enable pub enable_receive: bool, - /// `DTR` Data transmit ready. This bit is the complement of the UART - /// data transmit ready, `nUARTDTR`, modem status output. That is, when - /// the bit is programmed to a 1 then `nUARTDTR` is LOW. + /// `DTR` Data transmit ready pub data_transmit_ready: bool, - /// `RTS` Request to send. This bit is the complement of the UART - /// request to send, `nUARTRTS`, modem status output. That is, when the - /// bit is programmed to a 1 then `nUARTRTS` is LOW. + /// `RTS` Request to send pub request_to_send: bool, - /// `Out1` This bit is the complement of the UART Out1 (`nUARTOut1`) - /// modem status output. That is, when the bit is programmed to a 1 the - /// output is 0. For DTE this can be used as Data Carrier Detect (DCD). + /// `Out1` UART Out1 signal; can be used as DCD pub out_1: bool, - /// `Out2` This bit is the complement of the UART Out2 (`nUARTOut2`) - /// modem status output. That is, when the bit is programmed to a 1, the - /// output is 0. For DTE this can be used as Ring Indicator (RI). + /// `Out2` UART Out2 signal; can be used as RI pub out_2: bool, - /// `RTSEn` RTS hardware flow control enable. If this bit is set to 1, - /// RTS hardware flow control is enabled. Data is only requested when - /// there is space in the receive FIFO for it to be received. + /// `RTSEn` RTS hardware flow control enable pub rts_hardware_flow_control_enable: bool, - /// `CTSEn` CTS hardware flow control enable. If this bit is set to 1, - /// CTS hardware flow control is enabled. Data is only transmitted when - /// the `nUARTCTS` signal is asserted. + /// `CTSEn` CTS hardware flow control enable pub cts_hardware_flow_control_enable: bool, /// 31:16 - Reserved, do not modify, read as zero. _reserved_zero_no_modify2: u16, From patchwork Thu May 15 10:24:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890185 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062130wrr; Thu, 15 May 2025 03:35:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsxZgDs6bNWMWAhNIgAnxEk2gC5Qr3cdtYkaBBsTC6h9cdg6MCUUiQaXOgUFakT//ViyWHIA==@linaro.org X-Google-Smtp-Source: AGHT+IGwQG3PB+RUKDINYozozTPlULmZkPRYCmVO2za0D2HK1GGN5M5J0hOtB7s05wOil431WGND X-Received: by 2002:a05:620a:1a14:b0:7c5:7a1f:4d89 with SMTP id af79cd13be357-7cd3c82ec1bmr357872885a.54.1747305352149; Thu, 15 May 2025 03:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305352; cv=none; d=google.com; s=arc-20240605; b=cgBkCZb45j9fvDsWoQpmcXyC4ZVYX2B3trKRBubMHdu5b8VbUoozG595s6TotHhCMA 1hh8dXCD1ZdToD0mpsRjhr2JNg7zl53TnQ9xWlVV5+/2bxn1Jl8UrwghaE/hE/BQYbwO dvqAivKiUSsyBKPYtlubtcEWS7VgGKpJkcGKsiSlFCEw+4G7qj0ut35JGByNtQcVcyvT A1ewjhdazQy2jb8UidHFy+hU/H5WsT1SkfodjHPOhH8JhJzdhRIMOwWd0Zu1XjuMdnib gZVrb+eZYhCVtIXNtZxzo8J8xpcrYOaROC+Isx8j+5JW5gkArx7DpShG/axlkDDTOUTX sM5g== 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:to:from :dkim-signature; bh=kJS0qdxrcVwU1ns/laR+ZxTJ7In/lnQUzlm7LLPC2Cw=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=V9Nz7oppzpXn4twgYAisoZ9S34nKNdyOJYjabuQIOw7w6wxDWJYA5aAoP+SbrVY1FO XO728NfnxUJF+Cgts+oB6Rh/FpInoM10xbsH6g9kjbw76HJ7JcQG4DpKzkSpg3RZi98Q d+Ox1whYMAYExohFPVgBwEwnjuBnFCe602fy9Q5wncWMpYvWb/bH90BExbjP5L676kUW g+mD7aIzQHZ8zUYNBm7eJGuR5+jJ4fLZs3Rv2oaZIQdQhkYPhu19adL5XlrEVRkmglyC 9LRphF5z0YXZPSeuxkA+52rLurhymHuzLVh3LPEo7rhelP50TgPNpAvwSjKfPh981dYZ h2CA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PHzEMzLe; 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 af79cd13be357-7cd00f69ccasi1544741985a.149.2025.05.15.03.35.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:52 -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=PHzEMzLe; 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 1uFVn4-0004R0-3B; Thu, 15 May 2025 06:26:14 -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 1uFVn1-0004QV-SE for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:11 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmw-00088b-6t for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:11 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a0b7fbdde7so668984f8f.2 for ; Thu, 15 May 2025 03:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304764; x=1747909564; darn=nongnu.org; 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=kJS0qdxrcVwU1ns/laR+ZxTJ7In/lnQUzlm7LLPC2Cw=; b=PHzEMzLeAuNA36W6cQ1wT8CSV9nVvXP11dRWFEhQjHRAuix2kRKX3NIWLEybWbOhK8 jlHobTRQMJqD0JQY1rIOuZmrGQHE0Rt0T+mmWfBg3w1nFXP1VOt765A/A3fc+QPHjXEb s0FQX4iVtWt6zjfe8k7qOfRQtTUGpLEZF7fWdi9hTuByFEe8W0v/ZYXss1kE6LwTIYF1 44WNS54ugc6CEIywmPEk8sJ8XFA8W3V0CerLRBTYTGGmEhtiIPNmw/92pkI9gUOj+AjX Sx3hRpQDsTdIkrKVeQPyT+4nPGVxWSEencdbtibTtMvq+4EYq32UHj1ljsq0oGkHD4RJ 7f8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304764; x=1747909564; 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=kJS0qdxrcVwU1ns/laR+ZxTJ7In/lnQUzlm7LLPC2Cw=; b=w268kuZHRbhNGwhVesJ2UHSd9u90CqJyLp6SQWLPonVDgf+iG19qleb9zFS8QTS3xp AxwnquQWGMY4akuUEJyja900H71n5Z8MOyOzVvLlqPtOQHjnQrTZJgYIyFvzMObi0Lwh NQhZT5z151I00nZp1M0pgV3g8IJrN0wQvOlx9jVNOuMUIJ2LrPY6fwZtnDDpc3SMnfzM FAwjthUbxt+L9OjUPznqHVE+oLXio4L+icbTKsqxZksmu6aELfFNcdnzyLKfF6F5CA44 0eQlXX/oS+MA81DRv4af/oLURgNH24mjjuknG/S63tEehKg1cY5V5S7ax8QFSgZ9veKT oy0w== X-Gm-Message-State: AOJu0Yyda1J4ybcPf7zLS9Og2bprGWOuc3fToCiMIVI8BdNnRFM2oqXv xJHP6QHwa166u0kTwm3V7mjXmq9BSjT6ivUr35vcQir8QJILpVYSa2W8s1BIx0jV5i0uM+C4sJp 9OVA= X-Gm-Gg: ASbGncstCCyJxjz0OAQ4wXkJkrA/jj2XKJsIjY0seXP+EqmmmAzPajLL3z1luAxrDzg XfLlqUYplVfBoI2jg1j6NkH2q1q2YHhWa4tlEQcCKDPziJa62S4VKQ5V65WoxvdIm60TCrLnlXb c+wr6f1xrK56tJALooX73MJGXRK4TMzleUHGYTPhgRu04CdN0twu+gx1Q9xi4rD2ED8nyG2wyni H2ihrp2qBv42TpjNLTbHmABU+MCBXJlPDf5JxFjIYVSjVj/isqup61MmrZS3C76fk2/qHBpbaG3 YLsh3cWMkygP4/mloZpJxhsrTrIZRJ1UnzTbYEpVNt1JGGRqbUwpNkQD8A== X-Received: by 2002:a05:6000:2ac:b0:3a3:5ae4:6e8e with SMTP id ffacd0b85a97d-3a35ae471a7mr808069f8f.11.1747304762906; Thu, 15 May 2025 03:26:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/58] hw/arm: Replace TABs for spaces in OMAP board and device code Date: Thu, 15 May 2025 11:24:57 +0100 Message-ID: <20250515102546.2149601-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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: Santiago Monserrat Campanello In hw/arm and include/hw/arm, some source files for the OMAP SoC and the sx1 boards that are our only remaining OMAP boards still have hard-coded tabs (almost entirely used for the indent on inline comments, not for actual code indent). Replace the tabs with spaces using vim :retab. I used 4 spaces except in some defines and comments where I tried to put everything aligned in the same column for better readability. This commit is a purely whitespace-only change. Signed-off-by: Santiago Monserrat Campanello Message-id: 20250505131130.82206-1-santimonserr@gmail.com Resolves: https://gitlab.com/qemu-project/qemu/-/issues/373 [PMM: expanded commit message] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/omap.h | 534 ++++++++++---------- include/hw/arm/sharpsl.h | 2 +- include/hw/arm/soc_dma.h | 4 +- hw/arm/omap1.c | 1016 +++++++++++++++++++------------------- hw/arm/omap_sx1.c | 2 +- hw/dma/omap_dma.c | 334 ++++++------- hw/gpio/omap_gpio.c | 28 +- hw/i2c/omap_i2c.c | 178 +++---- hw/intc/omap_intc.c | 154 +++--- hw/misc/omap_clk.c | 470 +++++++++--------- hw/timer/pxa2xx_timer.c | 76 +-- 11 files changed, 1399 insertions(+), 1399 deletions(-) diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 6185507373d..bdb2e887e47 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -25,24 +25,24 @@ #include "qemu/log.h" #include "qom/object.h" -# define OMAP_EMIFS_BASE 0x00000000 -# define OMAP_CS0_BASE 0x00000000 -# define OMAP_CS1_BASE 0x04000000 -# define OMAP_CS2_BASE 0x08000000 -# define OMAP_CS3_BASE 0x0c000000 -# define OMAP_EMIFF_BASE 0x10000000 -# define OMAP_IMIF_BASE 0x20000000 -# define OMAP_LOCALBUS_BASE 0x30000000 -# define OMAP_MPUI_BASE 0xe1000000 +#define OMAP_EMIFS_BASE 0x00000000 +#define OMAP_CS0_BASE 0x00000000 +#define OMAP_CS1_BASE 0x04000000 +#define OMAP_CS2_BASE 0x08000000 +#define OMAP_CS3_BASE 0x0c000000 +#define OMAP_EMIFF_BASE 0x10000000 +#define OMAP_IMIF_BASE 0x20000000 +#define OMAP_LOCALBUS_BASE 0x30000000 +#define OMAP_MPUI_BASE 0xe1000000 -# define OMAP730_SRAM_SIZE 0x00032000 -# define OMAP15XX_SRAM_SIZE 0x00030000 -# define OMAP16XX_SRAM_SIZE 0x00004000 -# define OMAP1611_SRAM_SIZE 0x0003e800 -# define OMAP_CS0_SIZE 0x04000000 -# define OMAP_CS1_SIZE 0x04000000 -# define OMAP_CS2_SIZE 0x04000000 -# define OMAP_CS3_SIZE 0x04000000 +#define OMAP730_SRAM_SIZE 0x00032000 +#define OMAP15XX_SRAM_SIZE 0x00030000 +#define OMAP16XX_SRAM_SIZE 0x00004000 +#define OMAP1611_SRAM_SIZE 0x0003e800 +#define OMAP_CS0_SIZE 0x04000000 +#define OMAP_CS1_SIZE 0x04000000 +#define OMAP_CS2_SIZE 0x04000000 +#define OMAP_CS3_SIZE 0x04000000 /* omap_clk.c */ struct omap_mpu_state_s; @@ -103,228 +103,228 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk); * Common IRQ numbers for level 1 interrupt handler * See /usr/include/asm-arm/arch-omap/irqs.h in Linux. */ -# define OMAP_INT_CAMERA 1 -# define OMAP_INT_FIQ 3 -# define OMAP_INT_RTDX 6 -# define OMAP_INT_DSP_MMU_ABORT 7 -# define OMAP_INT_HOST 8 -# define OMAP_INT_ABORT 9 -# define OMAP_INT_BRIDGE_PRIV 13 -# define OMAP_INT_GPIO_BANK1 14 -# define OMAP_INT_UART3 15 -# define OMAP_INT_TIMER3 16 -# define OMAP_INT_DMA_CH0_6 19 -# define OMAP_INT_DMA_CH1_7 20 -# define OMAP_INT_DMA_CH2_8 21 -# define OMAP_INT_DMA_CH3 22 -# define OMAP_INT_DMA_CH4 23 -# define OMAP_INT_DMA_CH5 24 -# define OMAP_INT_DMA_LCD 25 -# define OMAP_INT_TIMER1 26 -# define OMAP_INT_WD_TIMER 27 -# define OMAP_INT_BRIDGE_PUB 28 -# define OMAP_INT_TIMER2 30 -# define OMAP_INT_LCD_CTRL 31 +#define OMAP_INT_CAMERA 1 +#define OMAP_INT_FIQ 3 +#define OMAP_INT_RTDX 6 +#define OMAP_INT_DSP_MMU_ABORT 7 +#define OMAP_INT_HOST 8 +#define OMAP_INT_ABORT 9 +#define OMAP_INT_BRIDGE_PRIV 13 +#define OMAP_INT_GPIO_BANK1 14 +#define OMAP_INT_UART3 15 +#define OMAP_INT_TIMER3 16 +#define OMAP_INT_DMA_CH0_6 19 +#define OMAP_INT_DMA_CH1_7 20 +#define OMAP_INT_DMA_CH2_8 21 +#define OMAP_INT_DMA_CH3 22 +#define OMAP_INT_DMA_CH4 23 +#define OMAP_INT_DMA_CH5 24 +#define OMAP_INT_DMA_LCD 25 +#define OMAP_INT_TIMER1 26 +#define OMAP_INT_WD_TIMER 27 +#define OMAP_INT_BRIDGE_PUB 28 +#define OMAP_INT_TIMER2 30 +#define OMAP_INT_LCD_CTRL 31 /* * Common OMAP-15xx IRQ numbers for level 1 interrupt handler */ -# define OMAP_INT_15XX_IH2_IRQ 0 -# define OMAP_INT_15XX_LB_MMU 17 -# define OMAP_INT_15XX_LOCAL_BUS 29 +#define OMAP_INT_15XX_IH2_IRQ 0 +#define OMAP_INT_15XX_LB_MMU 17 +#define OMAP_INT_15XX_LOCAL_BUS 29 /* * OMAP-1510 specific IRQ numbers for level 1 interrupt handler */ -# define OMAP_INT_1510_SPI_TX 4 -# define OMAP_INT_1510_SPI_RX 5 -# define OMAP_INT_1510_DSP_MAILBOX1 10 -# define OMAP_INT_1510_DSP_MAILBOX2 11 +#define OMAP_INT_1510_SPI_TX 4 +#define OMAP_INT_1510_SPI_RX 5 +#define OMAP_INT_1510_DSP_MAILBOX1 10 +#define OMAP_INT_1510_DSP_MAILBOX2 11 /* * OMAP-310 specific IRQ numbers for level 1 interrupt handler */ -# define OMAP_INT_310_McBSP2_TX 4 -# define OMAP_INT_310_McBSP2_RX 5 -# define OMAP_INT_310_HSB_MAILBOX1 12 -# define OMAP_INT_310_HSAB_MMU 18 +#define OMAP_INT_310_McBSP2_TX 4 +#define OMAP_INT_310_McBSP2_RX 5 +#define OMAP_INT_310_HSB_MAILBOX1 12 +#define OMAP_INT_310_HSAB_MMU 18 /* * OMAP-1610 specific IRQ numbers for level 1 interrupt handler */ -# define OMAP_INT_1610_IH2_IRQ 0 -# define OMAP_INT_1610_IH2_FIQ 2 -# define OMAP_INT_1610_McBSP2_TX 4 -# define OMAP_INT_1610_McBSP2_RX 5 -# define OMAP_INT_1610_DSP_MAILBOX1 10 -# define OMAP_INT_1610_DSP_MAILBOX2 11 -# define OMAP_INT_1610_LCD_LINE 12 -# define OMAP_INT_1610_GPTIMER1 17 -# define OMAP_INT_1610_GPTIMER2 18 -# define OMAP_INT_1610_SSR_FIFO_0 29 +#define OMAP_INT_1610_IH2_IRQ 0 +#define OMAP_INT_1610_IH2_FIQ 2 +#define OMAP_INT_1610_McBSP2_TX 4 +#define OMAP_INT_1610_McBSP2_RX 5 +#define OMAP_INT_1610_DSP_MAILBOX1 10 +#define OMAP_INT_1610_DSP_MAILBOX2 11 +#define OMAP_INT_1610_LCD_LINE 12 +#define OMAP_INT_1610_GPTIMER1 17 +#define OMAP_INT_1610_GPTIMER2 18 +#define OMAP_INT_1610_SSR_FIFO_0 29 /* * OMAP-730 specific IRQ numbers for level 1 interrupt handler */ -# define OMAP_INT_730_IH2_FIQ 0 -# define OMAP_INT_730_IH2_IRQ 1 -# define OMAP_INT_730_USB_NON_ISO 2 -# define OMAP_INT_730_USB_ISO 3 -# define OMAP_INT_730_ICR 4 -# define OMAP_INT_730_EAC 5 -# define OMAP_INT_730_GPIO_BANK1 6 -# define OMAP_INT_730_GPIO_BANK2 7 -# define OMAP_INT_730_GPIO_BANK3 8 -# define OMAP_INT_730_McBSP2TX 10 -# define OMAP_INT_730_McBSP2RX 11 -# define OMAP_INT_730_McBSP2RX_OVF 12 -# define OMAP_INT_730_LCD_LINE 14 -# define OMAP_INT_730_GSM_PROTECT 15 -# define OMAP_INT_730_TIMER3 16 -# define OMAP_INT_730_GPIO_BANK5 17 -# define OMAP_INT_730_GPIO_BANK6 18 -# define OMAP_INT_730_SPGIO_WR 29 +#define OMAP_INT_730_IH2_FIQ 0 +#define OMAP_INT_730_IH2_IRQ 1 +#define OMAP_INT_730_USB_NON_ISO 2 +#define OMAP_INT_730_USB_ISO 3 +#define OMAP_INT_730_ICR 4 +#define OMAP_INT_730_EAC 5 +#define OMAP_INT_730_GPIO_BANK1 6 +#define OMAP_INT_730_GPIO_BANK2 7 +#define OMAP_INT_730_GPIO_BANK3 8 +#define OMAP_INT_730_McBSP2TX 10 +#define OMAP_INT_730_McBSP2RX 11 +#define OMAP_INT_730_McBSP2RX_OVF 12 +#define OMAP_INT_730_LCD_LINE 14 +#define OMAP_INT_730_GSM_PROTECT 15 +#define OMAP_INT_730_TIMER3 16 +#define OMAP_INT_730_GPIO_BANK5 17 +#define OMAP_INT_730_GPIO_BANK6 18 +#define OMAP_INT_730_SPGIO_WR 29 /* * Common IRQ numbers for level 2 interrupt handler */ -# define OMAP_INT_KEYBOARD 1 -# define OMAP_INT_uWireTX 2 -# define OMAP_INT_uWireRX 3 -# define OMAP_INT_I2C 4 -# define OMAP_INT_MPUIO 5 -# define OMAP_INT_USB_HHC_1 6 -# define OMAP_INT_McBSP3TX 10 -# define OMAP_INT_McBSP3RX 11 -# define OMAP_INT_McBSP1TX 12 -# define OMAP_INT_McBSP1RX 13 -# define OMAP_INT_UART1 14 -# define OMAP_INT_UART2 15 -# define OMAP_INT_USB_W2FC 20 -# define OMAP_INT_1WIRE 21 -# define OMAP_INT_OS_TIMER 22 -# define OMAP_INT_OQN 23 -# define OMAP_INT_GAUGE_32K 24 -# define OMAP_INT_RTC_TIMER 25 -# define OMAP_INT_RTC_ALARM 26 -# define OMAP_INT_DSP_MMU 28 +#define OMAP_INT_KEYBOARD 1 +#define OMAP_INT_uWireTX 2 +#define OMAP_INT_uWireRX 3 +#define OMAP_INT_I2C 4 +#define OMAP_INT_MPUIO 5 +#define OMAP_INT_USB_HHC_1 6 +#define OMAP_INT_McBSP3TX 10 +#define OMAP_INT_McBSP3RX 11 +#define OMAP_INT_McBSP1TX 12 +#define OMAP_INT_McBSP1RX 13 +#define OMAP_INT_UART1 14 +#define OMAP_INT_UART2 15 +#define OMAP_INT_USB_W2FC 20 +#define OMAP_INT_1WIRE 21 +#define OMAP_INT_OS_TIMER 22 +#define OMAP_INT_OQN 23 +#define OMAP_INT_GAUGE_32K 24 +#define OMAP_INT_RTC_TIMER 25 +#define OMAP_INT_RTC_ALARM 26 +#define OMAP_INT_DSP_MMU 28 /* * OMAP-1510 specific IRQ numbers for level 2 interrupt handler */ -# define OMAP_INT_1510_BT_MCSI1TX 16 -# define OMAP_INT_1510_BT_MCSI1RX 17 -# define OMAP_INT_1510_SoSSI_MATCH 19 -# define OMAP_INT_1510_MEM_STICK 27 -# define OMAP_INT_1510_COM_SPI_RO 31 +#define OMAP_INT_1510_BT_MCSI1TX 16 +#define OMAP_INT_1510_BT_MCSI1RX 17 +#define OMAP_INT_1510_SoSSI_MATCH 19 +#define OMAP_INT_1510_MEM_STICK 27 +#define OMAP_INT_1510_COM_SPI_RO 31 /* * OMAP-310 specific IRQ numbers for level 2 interrupt handler */ -# define OMAP_INT_310_FAC 0 -# define OMAP_INT_310_USB_HHC_2 7 -# define OMAP_INT_310_MCSI1_FE 16 -# define OMAP_INT_310_MCSI2_FE 17 -# define OMAP_INT_310_USB_W2FC_ISO 29 -# define OMAP_INT_310_USB_W2FC_NON_ISO 30 -# define OMAP_INT_310_McBSP2RX_OF 31 +#define OMAP_INT_310_FAC 0 +#define OMAP_INT_310_USB_HHC_2 7 +#define OMAP_INT_310_MCSI1_FE 16 +#define OMAP_INT_310_MCSI2_FE 17 +#define OMAP_INT_310_USB_W2FC_ISO 29 +#define OMAP_INT_310_USB_W2FC_NON_ISO 30 +#define OMAP_INT_310_McBSP2RX_OF 31 /* * OMAP-1610 specific IRQ numbers for level 2 interrupt handler */ -# define OMAP_INT_1610_FAC 0 -# define OMAP_INT_1610_USB_HHC_2 7 -# define OMAP_INT_1610_USB_OTG 8 -# define OMAP_INT_1610_SoSSI 9 -# define OMAP_INT_1610_BT_MCSI1TX 16 -# define OMAP_INT_1610_BT_MCSI1RX 17 -# define OMAP_INT_1610_SoSSI_MATCH 19 -# define OMAP_INT_1610_MEM_STICK 27 -# define OMAP_INT_1610_McBSP2RX_OF 31 -# define OMAP_INT_1610_STI 32 -# define OMAP_INT_1610_STI_WAKEUP 33 -# define OMAP_INT_1610_GPTIMER3 34 -# define OMAP_INT_1610_GPTIMER4 35 -# define OMAP_INT_1610_GPTIMER5 36 -# define OMAP_INT_1610_GPTIMER6 37 -# define OMAP_INT_1610_GPTIMER7 38 -# define OMAP_INT_1610_GPTIMER8 39 -# define OMAP_INT_1610_GPIO_BANK2 40 -# define OMAP_INT_1610_GPIO_BANK3 41 -# define OMAP_INT_1610_MMC2 42 -# define OMAP_INT_1610_CF 43 -# define OMAP_INT_1610_WAKE_UP_REQ 46 -# define OMAP_INT_1610_GPIO_BANK4 48 -# define OMAP_INT_1610_SPI 49 -# define OMAP_INT_1610_DMA_CH6 53 -# define OMAP_INT_1610_DMA_CH7 54 -# define OMAP_INT_1610_DMA_CH8 55 -# define OMAP_INT_1610_DMA_CH9 56 -# define OMAP_INT_1610_DMA_CH10 57 -# define OMAP_INT_1610_DMA_CH11 58 -# define OMAP_INT_1610_DMA_CH12 59 -# define OMAP_INT_1610_DMA_CH13 60 -# define OMAP_INT_1610_DMA_CH14 61 -# define OMAP_INT_1610_DMA_CH15 62 -# define OMAP_INT_1610_NAND 63 +#define OMAP_INT_1610_FAC 0 +#define OMAP_INT_1610_USB_HHC_2 7 +#define OMAP_INT_1610_USB_OTG 8 +#define OMAP_INT_1610_SoSSI 9 +#define OMAP_INT_1610_BT_MCSI1TX 16 +#define OMAP_INT_1610_BT_MCSI1RX 17 +#define OMAP_INT_1610_SoSSI_MATCH 19 +#define OMAP_INT_1610_MEM_STICK 27 +#define OMAP_INT_1610_McBSP2RX_OF 31 +#define OMAP_INT_1610_STI 32 +#define OMAP_INT_1610_STI_WAKEUP 33 +#define OMAP_INT_1610_GPTIMER3 34 +#define OMAP_INT_1610_GPTIMER4 35 +#define OMAP_INT_1610_GPTIMER5 36 +#define OMAP_INT_1610_GPTIMER6 37 +#define OMAP_INT_1610_GPTIMER7 38 +#define OMAP_INT_1610_GPTIMER8 39 +#define OMAP_INT_1610_GPIO_BANK2 40 +#define OMAP_INT_1610_GPIO_BANK3 41 +#define OMAP_INT_1610_MMC2 42 +#define OMAP_INT_1610_CF 43 +#define OMAP_INT_1610_WAKE_UP_REQ 46 +#define OMAP_INT_1610_GPIO_BANK4 48 +#define OMAP_INT_1610_SPI 49 +#define OMAP_INT_1610_DMA_CH6 53 +#define OMAP_INT_1610_DMA_CH7 54 +#define OMAP_INT_1610_DMA_CH8 55 +#define OMAP_INT_1610_DMA_CH9 56 +#define OMAP_INT_1610_DMA_CH10 57 +#define OMAP_INT_1610_DMA_CH11 58 +#define OMAP_INT_1610_DMA_CH12 59 +#define OMAP_INT_1610_DMA_CH13 60 +#define OMAP_INT_1610_DMA_CH14 61 +#define OMAP_INT_1610_DMA_CH15 62 +#define OMAP_INT_1610_NAND 63 /* * OMAP-730 specific IRQ numbers for level 2 interrupt handler */ -# define OMAP_INT_730_HW_ERRORS 0 -# define OMAP_INT_730_NFIQ_PWR_FAIL 1 -# define OMAP_INT_730_CFCD 2 -# define OMAP_INT_730_CFIREQ 3 -# define OMAP_INT_730_I2C 4 -# define OMAP_INT_730_PCC 5 -# define OMAP_INT_730_MPU_EXT_NIRQ 6 -# define OMAP_INT_730_SPI_100K_1 7 -# define OMAP_INT_730_SYREN_SPI 8 -# define OMAP_INT_730_VLYNQ 9 -# define OMAP_INT_730_GPIO_BANK4 10 -# define OMAP_INT_730_McBSP1TX 11 -# define OMAP_INT_730_McBSP1RX 12 -# define OMAP_INT_730_McBSP1RX_OF 13 -# define OMAP_INT_730_UART_MODEM_IRDA_2 14 -# define OMAP_INT_730_UART_MODEM_1 15 -# define OMAP_INT_730_MCSI 16 -# define OMAP_INT_730_uWireTX 17 -# define OMAP_INT_730_uWireRX 18 -# define OMAP_INT_730_SMC_CD 19 -# define OMAP_INT_730_SMC_IREQ 20 -# define OMAP_INT_730_HDQ_1WIRE 21 -# define OMAP_INT_730_TIMER32K 22 -# define OMAP_INT_730_MMC_SDIO 23 -# define OMAP_INT_730_UPLD 24 -# define OMAP_INT_730_USB_HHC_1 27 -# define OMAP_INT_730_USB_HHC_2 28 -# define OMAP_INT_730_USB_GENI 29 -# define OMAP_INT_730_USB_OTG 30 -# define OMAP_INT_730_CAMERA_IF 31 -# define OMAP_INT_730_RNG 32 -# define OMAP_INT_730_DUAL_MODE_TIMER 33 -# define OMAP_INT_730_DBB_RF_EN 34 -# define OMAP_INT_730_MPUIO_KEYPAD 35 -# define OMAP_INT_730_SHA1_MD5 36 -# define OMAP_INT_730_SPI_100K_2 37 -# define OMAP_INT_730_RNG_IDLE 38 -# define OMAP_INT_730_MPUIO 39 -# define OMAP_INT_730_LLPC_LCD_CTRL_OFF 40 -# define OMAP_INT_730_LLPC_OE_FALLING 41 -# define OMAP_INT_730_LLPC_OE_RISING 42 -# define OMAP_INT_730_LLPC_VSYNC 43 -# define OMAP_INT_730_WAKE_UP_REQ 46 -# define OMAP_INT_730_DMA_CH6 53 -# define OMAP_INT_730_DMA_CH7 54 -# define OMAP_INT_730_DMA_CH8 55 -# define OMAP_INT_730_DMA_CH9 56 -# define OMAP_INT_730_DMA_CH10 57 -# define OMAP_INT_730_DMA_CH11 58 -# define OMAP_INT_730_DMA_CH12 59 -# define OMAP_INT_730_DMA_CH13 60 -# define OMAP_INT_730_DMA_CH14 61 -# define OMAP_INT_730_DMA_CH15 62 -# define OMAP_INT_730_NAND 63 +#define OMAP_INT_730_HW_ERRORS 0 +#define OMAP_INT_730_NFIQ_PWR_FAIL 1 +#define OMAP_INT_730_CFCD 2 +#define OMAP_INT_730_CFIREQ 3 +#define OMAP_INT_730_I2C 4 +#define OMAP_INT_730_PCC 5 +#define OMAP_INT_730_MPU_EXT_NIRQ 6 +#define OMAP_INT_730_SPI_100K_1 7 +#define OMAP_INT_730_SYREN_SPI 8 +#define OMAP_INT_730_VLYNQ 9 +#define OMAP_INT_730_GPIO_BANK4 10 +#define OMAP_INT_730_McBSP1TX 11 +#define OMAP_INT_730_McBSP1RX 12 +#define OMAP_INT_730_McBSP1RX_OF 13 +#define OMAP_INT_730_UART_MODEM_IRDA_2 14 +#define OMAP_INT_730_UART_MODEM_1 15 +#define OMAP_INT_730_MCSI 16 +#define OMAP_INT_730_uWireTX 17 +#define OMAP_INT_730_uWireRX 18 +#define OMAP_INT_730_SMC_CD 19 +#define OMAP_INT_730_SMC_IREQ 20 +#define OMAP_INT_730_HDQ_1WIRE 21 +#define OMAP_INT_730_TIMER32K 22 +#define OMAP_INT_730_MMC_SDIO 23 +#define OMAP_INT_730_UPLD 24 +#define OMAP_INT_730_USB_HHC_1 27 +#define OMAP_INT_730_USB_HHC_2 28 +#define OMAP_INT_730_USB_GENI 29 +#define OMAP_INT_730_USB_OTG 30 +#define OMAP_INT_730_CAMERA_IF 31 +#define OMAP_INT_730_RNG 32 +#define OMAP_INT_730_DUAL_MODE_TIMER 33 +#define OMAP_INT_730_DBB_RF_EN 34 +#define OMAP_INT_730_MPUIO_KEYPAD 35 +#define OMAP_INT_730_SHA1_MD5 36 +#define OMAP_INT_730_SPI_100K_2 37 +#define OMAP_INT_730_RNG_IDLE 38 +#define OMAP_INT_730_MPUIO 39 +#define OMAP_INT_730_LLPC_LCD_CTRL_OFF 40 +#define OMAP_INT_730_LLPC_OE_FALLING 41 +#define OMAP_INT_730_LLPC_OE_RISING 42 +#define OMAP_INT_730_LLPC_VSYNC 43 +#define OMAP_INT_730_WAKE_UP_REQ 46 +#define OMAP_INT_730_DMA_CH6 53 +#define OMAP_INT_730_DMA_CH7 54 +#define OMAP_INT_730_DMA_CH8 55 +#define OMAP_INT_730_DMA_CH9 56 +#define OMAP_INT_730_DMA_CH10 57 +#define OMAP_INT_730_DMA_CH11 58 +#define OMAP_INT_730_DMA_CH12 59 +#define OMAP_INT_730_DMA_CH13 60 +#define OMAP_INT_730_DMA_CH14 61 +#define OMAP_INT_730_DMA_CH15 62 +#define OMAP_INT_730_NAND 63 /* omap_dma.c */ enum omap_dma_model { @@ -353,9 +353,9 @@ struct dma_irq_map { enum omap_dma_port { emiff = 0, emifs, - imif, /* omap16xx: ocp_t1 */ + imif, /* omap16xx: ocp_t1 */ tipb, - local, /* omap16xx: ocp_t2 */ + local, /* omap16xx: ocp_t2 */ tipb_mpui, __omap_dma_port_last, }; @@ -418,65 +418,65 @@ struct omap_dma_lcd_channel_s { * DMA request numbers for OMAP1 * See /usr/include/asm-arm/arch-omap/dma.h in Linux. */ -# define OMAP_DMA_NO_DEVICE 0 -# define OMAP_DMA_MCSI1_TX 1 -# define OMAP_DMA_MCSI1_RX 2 -# define OMAP_DMA_I2C_RX 3 -# define OMAP_DMA_I2C_TX 4 -# define OMAP_DMA_EXT_NDMA_REQ0 5 -# define OMAP_DMA_EXT_NDMA_REQ1 6 -# define OMAP_DMA_UWIRE_TX 7 -# define OMAP_DMA_MCBSP1_TX 8 -# define OMAP_DMA_MCBSP1_RX 9 -# define OMAP_DMA_MCBSP3_TX 10 -# define OMAP_DMA_MCBSP3_RX 11 -# define OMAP_DMA_UART1_TX 12 -# define OMAP_DMA_UART1_RX 13 -# define OMAP_DMA_UART2_TX 14 -# define OMAP_DMA_UART2_RX 15 -# define OMAP_DMA_MCBSP2_TX 16 -# define OMAP_DMA_MCBSP2_RX 17 -# define OMAP_DMA_UART3_TX 18 -# define OMAP_DMA_UART3_RX 19 -# define OMAP_DMA_CAMERA_IF_RX 20 -# define OMAP_DMA_MMC_TX 21 -# define OMAP_DMA_MMC_RX 22 -# define OMAP_DMA_NAND 23 /* Not in OMAP310 */ -# define OMAP_DMA_IRQ_LCD_LINE 24 /* Not in OMAP310 */ -# define OMAP_DMA_MEMORY_STICK 25 /* Not in OMAP310 */ -# define OMAP_DMA_USB_W2FC_RX0 26 -# define OMAP_DMA_USB_W2FC_RX1 27 -# define OMAP_DMA_USB_W2FC_RX2 28 -# define OMAP_DMA_USB_W2FC_TX0 29 -# define OMAP_DMA_USB_W2FC_TX1 30 -# define OMAP_DMA_USB_W2FC_TX2 31 +#define OMAP_DMA_NO_DEVICE 0 +#define OMAP_DMA_MCSI1_TX 1 +#define OMAP_DMA_MCSI1_RX 2 +#define OMAP_DMA_I2C_RX 3 +#define OMAP_DMA_I2C_TX 4 +#define OMAP_DMA_EXT_NDMA_REQ0 5 +#define OMAP_DMA_EXT_NDMA_REQ1 6 +#define OMAP_DMA_UWIRE_TX 7 +#define OMAP_DMA_MCBSP1_TX 8 +#define OMAP_DMA_MCBSP1_RX 9 +#define OMAP_DMA_MCBSP3_TX 10 +#define OMAP_DMA_MCBSP3_RX 11 +#define OMAP_DMA_UART1_TX 12 +#define OMAP_DMA_UART1_RX 13 +#define OMAP_DMA_UART2_TX 14 +#define OMAP_DMA_UART2_RX 15 +#define OMAP_DMA_MCBSP2_TX 16 +#define OMAP_DMA_MCBSP2_RX 17 +#define OMAP_DMA_UART3_TX 18 +#define OMAP_DMA_UART3_RX 19 +#define OMAP_DMA_CAMERA_IF_RX 20 +#define OMAP_DMA_MMC_TX 21 +#define OMAP_DMA_MMC_RX 22 +#define OMAP_DMA_NAND 23 /* Not in OMAP310 */ +#define OMAP_DMA_IRQ_LCD_LINE 24 /* Not in OMAP310 */ +#define OMAP_DMA_MEMORY_STICK 25 /* Not in OMAP310 */ +#define OMAP_DMA_USB_W2FC_RX0 26 +#define OMAP_DMA_USB_W2FC_RX1 27 +#define OMAP_DMA_USB_W2FC_RX2 28 +#define OMAP_DMA_USB_W2FC_TX0 29 +#define OMAP_DMA_USB_W2FC_TX1 30 +#define OMAP_DMA_USB_W2FC_TX2 31 /* These are only for 1610 */ -# define OMAP_DMA_CRYPTO_DES_IN 32 -# define OMAP_DMA_SPI_TX 33 -# define OMAP_DMA_SPI_RX 34 -# define OMAP_DMA_CRYPTO_HASH 35 -# define OMAP_DMA_CCP_ATTN 36 -# define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37 -# define OMAP_DMA_CMT_APE_TX_CHAN_0 38 -# define OMAP_DMA_CMT_APE_RV_CHAN_0 39 -# define OMAP_DMA_CMT_APE_TX_CHAN_1 40 -# define OMAP_DMA_CMT_APE_RV_CHAN_1 41 -# define OMAP_DMA_CMT_APE_TX_CHAN_2 42 -# define OMAP_DMA_CMT_APE_RV_CHAN_2 43 -# define OMAP_DMA_CMT_APE_TX_CHAN_3 44 -# define OMAP_DMA_CMT_APE_RV_CHAN_3 45 -# define OMAP_DMA_CMT_APE_TX_CHAN_4 46 -# define OMAP_DMA_CMT_APE_RV_CHAN_4 47 -# define OMAP_DMA_CMT_APE_TX_CHAN_5 48 -# define OMAP_DMA_CMT_APE_RV_CHAN_5 49 -# define OMAP_DMA_CMT_APE_TX_CHAN_6 50 -# define OMAP_DMA_CMT_APE_RV_CHAN_6 51 -# define OMAP_DMA_CMT_APE_TX_CHAN_7 52 -# define OMAP_DMA_CMT_APE_RV_CHAN_7 53 -# define OMAP_DMA_MMC2_TX 54 -# define OMAP_DMA_MMC2_RX 55 -# define OMAP_DMA_CRYPTO_DES_OUT 56 +#define OMAP_DMA_CRYPTO_DES_IN 32 +#define OMAP_DMA_SPI_TX 33 +#define OMAP_DMA_SPI_RX 34 +#define OMAP_DMA_CRYPTO_HASH 35 +#define OMAP_DMA_CCP_ATTN 36 +#define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37 +#define OMAP_DMA_CMT_APE_TX_CHAN_0 38 +#define OMAP_DMA_CMT_APE_RV_CHAN_0 39 +#define OMAP_DMA_CMT_APE_TX_CHAN_1 40 +#define OMAP_DMA_CMT_APE_RV_CHAN_1 41 +#define OMAP_DMA_CMT_APE_TX_CHAN_2 42 +#define OMAP_DMA_CMT_APE_RV_CHAN_2 43 +#define OMAP_DMA_CMT_APE_TX_CHAN_3 44 +#define OMAP_DMA_CMT_APE_RV_CHAN_3 45 +#define OMAP_DMA_CMT_APE_TX_CHAN_4 46 +#define OMAP_DMA_CMT_APE_RV_CHAN_4 47 +#define OMAP_DMA_CMT_APE_TX_CHAN_5 48 +#define OMAP_DMA_CMT_APE_RV_CHAN_5 49 +#define OMAP_DMA_CMT_APE_TX_CHAN_6 50 +#define OMAP_DMA_CMT_APE_RV_CHAN_6 51 +#define OMAP_DMA_CMT_APE_TX_CHAN_7 52 +#define OMAP_DMA_CMT_APE_RV_CHAN_7 53 +#define OMAP_DMA_MMC2_TX 54 +#define OMAP_DMA_MMC2_RX 55 +#define OMAP_DMA_CRYPTO_DES_OUT 56 struct omap_uart_s; struct omap_uart_s *omap_uart_init(hwaddr base, @@ -542,14 +542,14 @@ void omap_mmc_set_clk(DeviceState *dev, omap_clk clk); /* omap_i2c.c */ I2CBus *omap_i2c_bus(DeviceState *omap_i2c); -# define cpu_is_omap310(cpu) (cpu->mpu_model == omap310) -# define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510) -# define cpu_is_omap1610(cpu) (cpu->mpu_model == omap1610) -# define cpu_is_omap1710(cpu) (cpu->mpu_model == omap1710) +#define cpu_is_omap310(cpu) (cpu->mpu_model == omap310) +#define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510) +#define cpu_is_omap1610(cpu) (cpu->mpu_model == omap1610) +#define cpu_is_omap1710(cpu) (cpu->mpu_model == omap1710) -# define cpu_is_omap15xx(cpu) \ +#define cpu_is_omap15xx(cpu) \ (cpu_is_omap310(cpu) || cpu_is_omap1510(cpu)) -# define cpu_is_omap16xx(cpu) \ +#define cpu_is_omap16xx(cpu) \ (cpu_is_omap1610(cpu) || cpu_is_omap1710(cpu)) struct omap_mpu_state_s { @@ -685,14 +685,14 @@ void omap_badwidth_write32(void *opaque, hwaddr addr, void omap_mpu_wakeup(void *opaque, int irq, int req); -# define OMAP_BAD_REG(paddr) \ +#define OMAP_BAD_REG(paddr) \ qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad register %#08"HWADDR_PRIx"\n", \ __func__, paddr) -# define OMAP_RO_REG(paddr) \ +#define OMAP_RO_REG(paddr) \ qemu_log_mask(LOG_GUEST_ERROR, "%s: Read-only register %#08" \ HWADDR_PRIx "\n", \ __func__, paddr) -# define OMAP_MPUI_REG_MASK 0x000007ff +#define OMAP_MPUI_REG_MASK 0x000007ff #endif diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h index e986b28c527..1e3992fcd00 100644 --- a/include/hw/arm/sharpsl.h +++ b/include/hw/arm/sharpsl.h @@ -11,7 +11,7 @@ /* zaurus.c */ -#define SL_PXA_PARAM_BASE 0xa0000a00 +#define SL_PXA_PARAM_BASE 0xa0000a00 void sl_bootparam_write(hwaddr ptr); #endif diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h index e93a7499a80..bcdb91425a5 100644 --- a/include/hw/arm/soc_dma.h +++ b/include/hw/arm/soc_dma.h @@ -54,7 +54,7 @@ struct soc_dma_ch_s { int bytes; /* Initialised by the DMA module, call soc_dma_ch_update after writing. */ enum soc_dma_access_type type[2]; - hwaddr vaddr[2]; /* Updated by .transfer_fn(). */ + hwaddr vaddr[2]; /* Updated by .transfer_fn(). */ /* Private */ void *paddr[2]; soc_dma_io_t io_fn[2]; @@ -70,7 +70,7 @@ struct soc_dma_ch_s { struct soc_dma_s { /* Following fields are set by the SoC DMA module and can be used * by anybody. */ - uint64_t drqbmp; /* Is zeroed by soc_dma_reset() */ + uint64_t drqbmp; /* Is zeroed by soc_dma_reset() */ qemu_irq *drq; void *opaque; int64_t freq; diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 91d7e3f04b5..74458fb7c69 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -144,7 +144,7 @@ static inline void omap_timer_update(struct omap_mpu_timer_s *timer) int64_t expires; if (timer->enable && timer->st && timer->rate) { - timer->val = timer->reset_val; /* Should skip this on clk enable */ + timer->val = timer->reset_val; /* Should skip this on clk enable */ expires = muldiv64((uint64_t) timer->val << (timer->ptv + 1), NANOSECONDS_PER_SECOND, timer->rate); @@ -212,13 +212,13 @@ static uint64_t omap_mpu_timer_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CNTL_TIMER */ + case 0x00: /* CNTL_TIMER */ return (s->enable << 5) | (s->ptv << 2) | (s->ar << 1) | s->st; - case 0x04: /* LOAD_TIM */ + case 0x04: /* LOAD_TIM */ break; - case 0x08: /* READ_TIM */ + case 0x08: /* READ_TIM */ return omap_timer_read(s); } @@ -237,7 +237,7 @@ static void omap_mpu_timer_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CNTL_TIMER */ + case 0x00: /* CNTL_TIMER */ omap_timer_sync(s); s->enable = (value >> 5) & 1; s->ptv = (value >> 2) & 7; @@ -246,11 +246,11 @@ static void omap_mpu_timer_write(void *opaque, hwaddr addr, omap_timer_update(s); return; - case 0x04: /* LOAD_TIM */ + case 0x04: /* LOAD_TIM */ s->reset_val = value; return; - case 0x08: /* READ_TIM */ + case 0x08: /* READ_TIM */ OMAP_RO_REG(addr); break; @@ -318,14 +318,14 @@ static uint64_t omap_wd_timer_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CNTL_TIMER */ + case 0x00: /* CNTL_TIMER */ return (s->timer.ptv << 9) | (s->timer.ar << 8) | (s->timer.st << 7) | (s->free << 1); - case 0x04: /* READ_TIMER */ + case 0x04: /* READ_TIMER */ return omap_timer_read(&s->timer); - case 0x08: /* TIMER_MODE */ + case 0x08: /* TIMER_MODE */ return s->mode << 15; } @@ -344,7 +344,7 @@ static void omap_wd_timer_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CNTL_TIMER */ + case 0x00: /* CNTL_TIMER */ omap_timer_sync(&s->timer); s->timer.ptv = (value >> 9) & 7; s->timer.ar = (value >> 8) & 1; @@ -353,11 +353,11 @@ static void omap_wd_timer_write(void *opaque, hwaddr addr, omap_timer_update(&s->timer); break; - case 0x04: /* LOAD_TIMER */ + case 0x04: /* LOAD_TIMER */ s->timer.reset_val = value & 0xffff; break; - case 0x08: /* TIMER_MODE */ + case 0x08: /* TIMER_MODE */ if (!s->mode && ((value >> 15) & 1)) omap_clk_get(s->timer.clk); s->mode |= (value >> 15) & 1; @@ -442,13 +442,13 @@ static uint64_t omap_os_timer_read(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* TVR */ + case 0x00: /* TVR */ return s->timer.reset_val; - case 0x04: /* TCR */ + case 0x04: /* TCR */ return omap_timer_read(&s->timer); - case 0x08: /* CR */ + case 0x08: /* CR */ return (s->timer.ar << 3) | (s->timer.it_ena << 2) | s->timer.st; default: @@ -470,15 +470,15 @@ static void omap_os_timer_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* TVR */ + case 0x00: /* TVR */ s->timer.reset_val = value & 0x00ffffff; break; - case 0x04: /* TCR */ + case 0x04: /* TCR */ OMAP_RO_REG(addr); break; - case 0x08: /* CR */ + case 0x08: /* CR */ s->timer.ar = (value >> 3) & 1; s->timer.it_ena = (value >> 2) & 1; if (s->timer.st != (value & 1) || (value & 2)) { @@ -543,34 +543,34 @@ static uint64_t omap_ulpd_pm_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x14: /* IT_STATUS */ + case 0x14: /* IT_STATUS */ ret = s->ulpd_pm_regs[addr >> 2]; s->ulpd_pm_regs[addr >> 2] = 0; qemu_irq_lower(qdev_get_gpio_in(s->ih[1], OMAP_INT_GAUGE_32K)); return ret; - case 0x18: /* Reserved */ - case 0x1c: /* Reserved */ - case 0x20: /* Reserved */ - case 0x28: /* Reserved */ - case 0x2c: /* Reserved */ + case 0x18: /* Reserved */ + case 0x1c: /* Reserved */ + case 0x20: /* Reserved */ + case 0x28: /* Reserved */ + case 0x2c: /* Reserved */ OMAP_BAD_REG(addr); /* fall through */ - case 0x00: /* COUNTER_32_LSB */ - case 0x04: /* COUNTER_32_MSB */ - case 0x08: /* COUNTER_HIGH_FREQ_LSB */ - case 0x0c: /* COUNTER_HIGH_FREQ_MSB */ - case 0x10: /* GAUGING_CTRL */ - case 0x24: /* SETUP_ANALOG_CELL3_ULPD1 */ - case 0x30: /* CLOCK_CTRL */ - case 0x34: /* SOFT_REQ */ - case 0x38: /* COUNTER_32_FIQ */ - case 0x3c: /* DPLL_CTRL */ - case 0x40: /* STATUS_REQ */ + case 0x00: /* COUNTER_32_LSB */ + case 0x04: /* COUNTER_32_MSB */ + case 0x08: /* COUNTER_HIGH_FREQ_LSB */ + case 0x0c: /* COUNTER_HIGH_FREQ_MSB */ + case 0x10: /* GAUGING_CTRL */ + case 0x24: /* SETUP_ANALOG_CELL3_ULPD1 */ + case 0x30: /* CLOCK_CTRL */ + case 0x34: /* SOFT_REQ */ + case 0x38: /* COUNTER_32_FIQ */ + case 0x3c: /* DPLL_CTRL */ + case 0x40: /* STATUS_REQ */ /* XXX: check clk::usecount state for every clock */ - case 0x48: /* LOCL_TIME */ - case 0x4c: /* APLL_CTRL */ - case 0x50: /* POWER_CTRL */ + case 0x48: /* LOCL_TIME */ + case 0x4c: /* APLL_CTRL */ + case 0x50: /* POWER_CTRL */ return s->ulpd_pm_regs[addr >> 2]; } @@ -581,22 +581,22 @@ static uint64_t omap_ulpd_pm_read(void *opaque, hwaddr addr, static inline void omap_ulpd_clk_update(struct omap_mpu_state_s *s, uint16_t diff, uint16_t value) { - if (diff & (1 << 4)) /* USB_MCLK_EN */ + if (diff & (1 << 4)) /* USB_MCLK_EN */ omap_clk_onoff(omap_findclk(s, "usb_clk0"), (value >> 4) & 1); - if (diff & (1 << 5)) /* DIS_USB_PVCI_CLK */ + if (diff & (1 << 5)) /* DIS_USB_PVCI_CLK */ omap_clk_onoff(omap_findclk(s, "usb_w2fc_ck"), (~value >> 5) & 1); } static inline void omap_ulpd_req_update(struct omap_mpu_state_s *s, uint16_t diff, uint16_t value) { - if (diff & (1 << 0)) /* SOFT_DPLL_REQ */ + if (diff & (1 << 0)) /* SOFT_DPLL_REQ */ omap_clk_canidle(omap_findclk(s, "dpll4"), (~value >> 0) & 1); - if (diff & (1 << 1)) /* SOFT_COM_REQ */ + if (diff & (1 << 1)) /* SOFT_COM_REQ */ omap_clk_canidle(omap_findclk(s, "com_mclk_out"), (~value >> 1) & 1); - if (diff & (1 << 2)) /* SOFT_SDW_REQ */ + if (diff & (1 << 2)) /* SOFT_SDW_REQ */ omap_clk_canidle(omap_findclk(s, "bt_mclk_out"), (~value >> 2) & 1); - if (diff & (1 << 3)) /* SOFT_USB_REQ */ + if (diff & (1 << 3)) /* SOFT_USB_REQ */ omap_clk_canidle(omap_findclk(s, "usb_clk0"), (~value >> 3) & 1); } @@ -615,16 +615,16 @@ static void omap_ulpd_pm_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* COUNTER_32_LSB */ - case 0x04: /* COUNTER_32_MSB */ - case 0x08: /* COUNTER_HIGH_FREQ_LSB */ - case 0x0c: /* COUNTER_HIGH_FREQ_MSB */ - case 0x14: /* IT_STATUS */ - case 0x40: /* STATUS_REQ */ + case 0x00: /* COUNTER_32_LSB */ + case 0x04: /* COUNTER_32_MSB */ + case 0x08: /* COUNTER_HIGH_FREQ_LSB */ + case 0x0c: /* COUNTER_HIGH_FREQ_MSB */ + case 0x14: /* IT_STATUS */ + case 0x40: /* STATUS_REQ */ OMAP_RO_REG(addr); break; - case 0x10: /* GAUGING_CTRL */ + case 0x10: /* GAUGING_CTRL */ /* Bits 0 and 1 seem to be confused in the OMAP 310 TRM */ if ((s->ulpd_pm_regs[addr >> 2] ^ value) & 1) { now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); @@ -638,50 +638,50 @@ static void omap_ulpd_pm_write(void *opaque, hwaddr addr, ticks = muldiv64(now, 32768, NANOSECONDS_PER_SECOND); s->ulpd_pm_regs[0x00 >> 2] = (ticks >> 0) & 0xffff; s->ulpd_pm_regs[0x04 >> 2] = (ticks >> 16) & 0xffff; - if (ticks >> 32) /* OVERFLOW_32K */ + if (ticks >> 32) /* OVERFLOW_32K */ s->ulpd_pm_regs[0x14 >> 2] |= 1 << 2; /* High frequency ticks */ ticks = muldiv64(now, 12000000, NANOSECONDS_PER_SECOND); s->ulpd_pm_regs[0x08 >> 2] = (ticks >> 0) & 0xffff; s->ulpd_pm_regs[0x0c >> 2] = (ticks >> 16) & 0xffff; - if (ticks >> 32) /* OVERFLOW_HI_FREQ */ + if (ticks >> 32) /* OVERFLOW_HI_FREQ */ s->ulpd_pm_regs[0x14 >> 2] |= 1 << 1; - s->ulpd_pm_regs[0x14 >> 2] |= 1 << 0; /* IT_GAUGING */ + s->ulpd_pm_regs[0x14 >> 2] |= 1 << 0; /* IT_GAUGING */ qemu_irq_raise(qdev_get_gpio_in(s->ih[1], OMAP_INT_GAUGE_32K)); } } s->ulpd_pm_regs[addr >> 2] = value; break; - case 0x18: /* Reserved */ - case 0x1c: /* Reserved */ - case 0x20: /* Reserved */ - case 0x28: /* Reserved */ - case 0x2c: /* Reserved */ + case 0x18: /* Reserved */ + case 0x1c: /* Reserved */ + case 0x20: /* Reserved */ + case 0x28: /* Reserved */ + case 0x2c: /* Reserved */ OMAP_BAD_REG(addr); /* fall through */ - case 0x24: /* SETUP_ANALOG_CELL3_ULPD1 */ - case 0x38: /* COUNTER_32_FIQ */ - case 0x48: /* LOCL_TIME */ - case 0x50: /* POWER_CTRL */ + case 0x24: /* SETUP_ANALOG_CELL3_ULPD1 */ + case 0x38: /* COUNTER_32_FIQ */ + case 0x48: /* LOCL_TIME */ + case 0x50: /* POWER_CTRL */ s->ulpd_pm_regs[addr >> 2] = value; break; - case 0x30: /* CLOCK_CTRL */ + case 0x30: /* CLOCK_CTRL */ diff = s->ulpd_pm_regs[addr >> 2] ^ value; s->ulpd_pm_regs[addr >> 2] = value & 0x3f; omap_ulpd_clk_update(s, diff, value); break; - case 0x34: /* SOFT_REQ */ + case 0x34: /* SOFT_REQ */ diff = s->ulpd_pm_regs[addr >> 2] ^ value; s->ulpd_pm_regs[addr >> 2] = value & 0x1f; omap_ulpd_req_update(s, diff, value); break; - case 0x3c: /* DPLL_CTRL */ + case 0x3c: /* DPLL_CTRL */ /* XXX: OMAP310 TRM claims bit 3 is PLL_ENABLE, and bit 4 is * omitted altogether, probably a typo. */ /* This register has identical semantics with DPLL(1:3) control @@ -689,11 +689,11 @@ static void omap_ulpd_pm_write(void *opaque, hwaddr addr, diff = s->ulpd_pm_regs[addr >> 2] & value; s->ulpd_pm_regs[addr >> 2] = value & 0x2fff; if (diff & (0x3ff << 2)) { - if (value & (1 << 4)) { /* PLL_ENABLE */ - div = ((value >> 5) & 3) + 1; /* PLL_DIV */ - mult = MIN((value >> 7) & 0x1f, 1); /* PLL_MULT */ + if (value & (1 << 4)) { /* PLL_ENABLE */ + div = ((value >> 5) & 3) + 1; /* PLL_DIV */ + mult = MIN((value >> 7) & 0x1f, 1); /* PLL_MULT */ } else { - div = bypass_div[((value >> 2) & 3)]; /* BYPASS_DIV */ + div = bypass_div[((value >> 2) & 3)]; /* BYPASS_DIV */ mult = 1; } omap_clk_setrate(omap_findclk(s, "dpll4"), div, mult); @@ -708,10 +708,10 @@ static void omap_ulpd_pm_write(void *opaque, hwaddr addr, s->ulpd_pm_regs[addr >> 2] |= 2; break; - case 0x4c: /* APLL_CTRL */ + case 0x4c: /* APLL_CTRL */ diff = s->ulpd_pm_regs[addr >> 2] & value; s->ulpd_pm_regs[addr >> 2] = value & 0xf; - if (diff & (1 << 0)) /* APLL_NDPLL_SWITCH */ + if (diff & (1 << 0)) /* APLL_NDPLL_SWITCH */ omap_clk_reparent(omap_findclk(s, "ck_48m"), omap_findclk(s, (value & (1 << 0)) ? "apll" : "dpll4")); break; @@ -775,43 +775,43 @@ static uint64_t omap_pin_cfg_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* FUNC_MUX_CTRL_0 */ - case 0x04: /* FUNC_MUX_CTRL_1 */ - case 0x08: /* FUNC_MUX_CTRL_2 */ + case 0x00: /* FUNC_MUX_CTRL_0 */ + case 0x04: /* FUNC_MUX_CTRL_1 */ + case 0x08: /* FUNC_MUX_CTRL_2 */ return s->func_mux_ctrl[addr >> 2]; - case 0x0c: /* COMP_MODE_CTRL_0 */ + case 0x0c: /* COMP_MODE_CTRL_0 */ return s->comp_mode_ctrl[0]; - case 0x10: /* FUNC_MUX_CTRL_3 */ - case 0x14: /* FUNC_MUX_CTRL_4 */ - case 0x18: /* FUNC_MUX_CTRL_5 */ - case 0x1c: /* FUNC_MUX_CTRL_6 */ - case 0x20: /* FUNC_MUX_CTRL_7 */ - case 0x24: /* FUNC_MUX_CTRL_8 */ - case 0x28: /* FUNC_MUX_CTRL_9 */ - case 0x2c: /* FUNC_MUX_CTRL_A */ - case 0x30: /* FUNC_MUX_CTRL_B */ - case 0x34: /* FUNC_MUX_CTRL_C */ - case 0x38: /* FUNC_MUX_CTRL_D */ + case 0x10: /* FUNC_MUX_CTRL_3 */ + case 0x14: /* FUNC_MUX_CTRL_4 */ + case 0x18: /* FUNC_MUX_CTRL_5 */ + case 0x1c: /* FUNC_MUX_CTRL_6 */ + case 0x20: /* FUNC_MUX_CTRL_7 */ + case 0x24: /* FUNC_MUX_CTRL_8 */ + case 0x28: /* FUNC_MUX_CTRL_9 */ + case 0x2c: /* FUNC_MUX_CTRL_A */ + case 0x30: /* FUNC_MUX_CTRL_B */ + case 0x34: /* FUNC_MUX_CTRL_C */ + case 0x38: /* FUNC_MUX_CTRL_D */ return s->func_mux_ctrl[(addr >> 2) - 1]; - case 0x40: /* PULL_DWN_CTRL_0 */ - case 0x44: /* PULL_DWN_CTRL_1 */ - case 0x48: /* PULL_DWN_CTRL_2 */ - case 0x4c: /* PULL_DWN_CTRL_3 */ + case 0x40: /* PULL_DWN_CTRL_0 */ + case 0x44: /* PULL_DWN_CTRL_1 */ + case 0x48: /* PULL_DWN_CTRL_2 */ + case 0x4c: /* PULL_DWN_CTRL_3 */ return s->pull_dwn_ctrl[(addr & 0xf) >> 2]; - case 0x50: /* GATE_INH_CTRL_0 */ + case 0x50: /* GATE_INH_CTRL_0 */ return s->gate_inh_ctrl[0]; - case 0x60: /* VOLTAGE_CTRL_0 */ + case 0x60: /* VOLTAGE_CTRL_0 */ return s->voltage_ctrl[0]; - case 0x70: /* TEST_DBG_CTRL_0 */ + case 0x70: /* TEST_DBG_CTRL_0 */ return s->test_dbg_ctrl[0]; - case 0x80: /* MOD_CONF_CTRL_0 */ + case 0x80: /* MOD_CONF_CTRL_0 */ return s->mod_conf_ctrl[0]; } @@ -823,10 +823,10 @@ static inline void omap_pin_funcmux0_update(struct omap_mpu_state_s *s, uint32_t diff, uint32_t value) { if (s->compat1509) { - if (diff & (1 << 9)) /* BLUETOOTH */ + if (diff & (1 << 9)) /* BLUETOOTH */ omap_clk_onoff(omap_findclk(s, "bt_mclk_out"), (~value >> 9) & 1); - if (diff & (1 << 7)) /* USB.CLKO */ + if (diff & (1 << 7)) /* USB.CLKO */ omap_clk_onoff(omap_findclk(s, "usb.clko"), (value >> 7) & 1); } @@ -856,23 +856,23 @@ static inline void omap_pin_modconf1_update(struct omap_mpu_state_s *s, omap_findclk(s, ((value >> 31) & 1) ? "ck_48m" : "armper_ck")); } - if (diff & (1 << 30)) /* CONF_MOD_UART2_CLK_MODE_R */ + if (diff & (1 << 30)) /* CONF_MOD_UART2_CLK_MODE_R */ omap_clk_reparent(omap_findclk(s, "uart2_ck"), omap_findclk(s, ((value >> 30) & 1) ? "ck_48m" : "armper_ck")); - if (diff & (1 << 29)) /* CONF_MOD_UART1_CLK_MODE_R */ + if (diff & (1 << 29)) /* CONF_MOD_UART1_CLK_MODE_R */ omap_clk_reparent(omap_findclk(s, "uart1_ck"), omap_findclk(s, ((value >> 29) & 1) ? "ck_48m" : "armper_ck")); - if (diff & (1 << 23)) /* CONF_MOD_MMC_SD_CLK_REQ_R */ + if (diff & (1 << 23)) /* CONF_MOD_MMC_SD_CLK_REQ_R */ omap_clk_reparent(omap_findclk(s, "mmc_ck"), omap_findclk(s, ((value >> 23) & 1) ? "ck_48m" : "armper_ck")); - if (diff & (1 << 12)) /* CONF_MOD_COM_MCLK_12_48_S */ + if (diff & (1 << 12)) /* CONF_MOD_COM_MCLK_12_48_S */ omap_clk_reparent(omap_findclk(s, "com_mclk_out"), omap_findclk(s, ((value >> 12) & 1) ? "ck_48m" : "armper_ck")); - if (diff & (1 << 9)) /* CONF_MOD_USB_HOST_HHC_UHO */ + if (diff & (1 << 9)) /* CONF_MOD_USB_HOST_HHC_UHO */ omap_clk_onoff(omap_findclk(s, "usb_hhc_ck"), (value >> 9) & 1); } @@ -888,63 +888,63 @@ static void omap_pin_cfg_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* FUNC_MUX_CTRL_0 */ + case 0x00: /* FUNC_MUX_CTRL_0 */ diff = s->func_mux_ctrl[addr >> 2] ^ value; s->func_mux_ctrl[addr >> 2] = value; omap_pin_funcmux0_update(s, diff, value); return; - case 0x04: /* FUNC_MUX_CTRL_1 */ + case 0x04: /* FUNC_MUX_CTRL_1 */ diff = s->func_mux_ctrl[addr >> 2] ^ value; s->func_mux_ctrl[addr >> 2] = value; omap_pin_funcmux1_update(s, diff, value); return; - case 0x08: /* FUNC_MUX_CTRL_2 */ + case 0x08: /* FUNC_MUX_CTRL_2 */ s->func_mux_ctrl[addr >> 2] = value; return; - case 0x0c: /* COMP_MODE_CTRL_0 */ + case 0x0c: /* COMP_MODE_CTRL_0 */ s->comp_mode_ctrl[0] = value; s->compat1509 = (value != 0x0000eaef); omap_pin_funcmux0_update(s, ~0, s->func_mux_ctrl[0]); omap_pin_funcmux1_update(s, ~0, s->func_mux_ctrl[1]); return; - case 0x10: /* FUNC_MUX_CTRL_3 */ - case 0x14: /* FUNC_MUX_CTRL_4 */ - case 0x18: /* FUNC_MUX_CTRL_5 */ - case 0x1c: /* FUNC_MUX_CTRL_6 */ - case 0x20: /* FUNC_MUX_CTRL_7 */ - case 0x24: /* FUNC_MUX_CTRL_8 */ - case 0x28: /* FUNC_MUX_CTRL_9 */ - case 0x2c: /* FUNC_MUX_CTRL_A */ - case 0x30: /* FUNC_MUX_CTRL_B */ - case 0x34: /* FUNC_MUX_CTRL_C */ - case 0x38: /* FUNC_MUX_CTRL_D */ + case 0x10: /* FUNC_MUX_CTRL_3 */ + case 0x14: /* FUNC_MUX_CTRL_4 */ + case 0x18: /* FUNC_MUX_CTRL_5 */ + case 0x1c: /* FUNC_MUX_CTRL_6 */ + case 0x20: /* FUNC_MUX_CTRL_7 */ + case 0x24: /* FUNC_MUX_CTRL_8 */ + case 0x28: /* FUNC_MUX_CTRL_9 */ + case 0x2c: /* FUNC_MUX_CTRL_A */ + case 0x30: /* FUNC_MUX_CTRL_B */ + case 0x34: /* FUNC_MUX_CTRL_C */ + case 0x38: /* FUNC_MUX_CTRL_D */ s->func_mux_ctrl[(addr >> 2) - 1] = value; return; - case 0x40: /* PULL_DWN_CTRL_0 */ - case 0x44: /* PULL_DWN_CTRL_1 */ - case 0x48: /* PULL_DWN_CTRL_2 */ - case 0x4c: /* PULL_DWN_CTRL_3 */ + case 0x40: /* PULL_DWN_CTRL_0 */ + case 0x44: /* PULL_DWN_CTRL_1 */ + case 0x48: /* PULL_DWN_CTRL_2 */ + case 0x4c: /* PULL_DWN_CTRL_3 */ s->pull_dwn_ctrl[(addr & 0xf) >> 2] = value; return; - case 0x50: /* GATE_INH_CTRL_0 */ + case 0x50: /* GATE_INH_CTRL_0 */ s->gate_inh_ctrl[0] = value; return; - case 0x60: /* VOLTAGE_CTRL_0 */ + case 0x60: /* VOLTAGE_CTRL_0 */ s->voltage_ctrl[0] = value; return; - case 0x70: /* TEST_DBG_CTRL_0 */ + case 0x70: /* TEST_DBG_CTRL_0 */ s->test_dbg_ctrl[0] = value; return; - case 0x80: /* MOD_CONF_CTRL_0 */ + case 0x80: /* MOD_CONF_CTRL_0 */ diff = s->mod_conf_ctrl[0] ^ value; s->mod_conf_ctrl[0] = value; omap_pin_modconf1_update(s, diff, value); @@ -998,17 +998,17 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr, } switch (addr) { - case 0xfffe1800: /* DIE_ID_LSB */ + case 0xfffe1800: /* DIE_ID_LSB */ return 0xc9581f0e; - case 0xfffe1804: /* DIE_ID_MSB */ + case 0xfffe1804: /* DIE_ID_MSB */ return 0xa8858bfa; - case 0xfffe2000: /* PRODUCT_ID_LSB */ + case 0xfffe2000: /* PRODUCT_ID_LSB */ return 0x00aaaafc; - case 0xfffe2004: /* PRODUCT_ID_MSB */ + case 0xfffe2004: /* PRODUCT_ID_MSB */ return 0xcafeb574; - case 0xfffed400: /* JTAG_ID_LSB */ + case 0xfffed400: /* JTAG_ID_LSB */ switch (s->mpu_model) { case omap310: return 0x03310315; @@ -1019,7 +1019,7 @@ static uint64_t omap_id_read(void *opaque, hwaddr addr, } break; - case 0xfffed404: /* JTAG_ID_MSB */ + case 0xfffed404: /* JTAG_ID_MSB */ switch (s->mpu_model) { case omap310: return 0xfb57402f; @@ -1080,22 +1080,22 @@ static uint64_t omap_mpui_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CTRL */ + case 0x00: /* CTRL */ return s->mpui_ctrl; - case 0x04: /* DEBUG_ADDR */ + case 0x04: /* DEBUG_ADDR */ return 0x01ffffff; - case 0x08: /* DEBUG_DATA */ + case 0x08: /* DEBUG_DATA */ return 0xffffffff; - case 0x0c: /* DEBUG_FLAG */ + case 0x0c: /* DEBUG_FLAG */ return 0x00000800; - case 0x10: /* STATUS */ + case 0x10: /* STATUS */ return 0x00000000; /* Not in OMAP310 */ - case 0x14: /* DSP_STATUS */ - case 0x18: /* DSP_BOOT_CONFIG */ + case 0x14: /* DSP_STATUS */ + case 0x18: /* DSP_BOOT_CONFIG */ return 0x00000000; - case 0x1c: /* DSP_MPUI_CONFIG */ + case 0x1c: /* DSP_MPUI_CONFIG */ return 0x0000ffff; } @@ -1114,20 +1114,20 @@ static void omap_mpui_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* CTRL */ + case 0x00: /* CTRL */ s->mpui_ctrl = value & 0x007fffff; break; - case 0x04: /* DEBUG_ADDR */ - case 0x08: /* DEBUG_DATA */ - case 0x0c: /* DEBUG_FLAG */ - case 0x10: /* STATUS */ + case 0x04: /* DEBUG_ADDR */ + case 0x08: /* DEBUG_DATA */ + case 0x0c: /* DEBUG_FLAG */ + case 0x10: /* STATUS */ /* Not in OMAP310 */ - case 0x14: /* DSP_STATUS */ + case 0x14: /* DSP_STATUS */ OMAP_RO_REG(addr); break; - case 0x18: /* DSP_BOOT_CONFIG */ - case 0x1c: /* DSP_MPUI_CONFIG */ + case 0x18: /* DSP_BOOT_CONFIG */ + case 0x1c: /* DSP_MPUI_CONFIG */ break; default: @@ -1178,19 +1178,19 @@ static uint64_t omap_tipb_bridge_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* TIPB_CNTL */ + case 0x00: /* TIPB_CNTL */ return s->control; - case 0x04: /* TIPB_BUS_ALLOC */ + case 0x04: /* TIPB_BUS_ALLOC */ return s->alloc; - case 0x08: /* MPU_TIPB_CNTL */ + case 0x08: /* MPU_TIPB_CNTL */ return s->buffer; - case 0x0c: /* ENHANCED_TIPB_CNTL */ + case 0x0c: /* ENHANCED_TIPB_CNTL */ return s->enh_control; - case 0x10: /* ADDRESS_DBG */ - case 0x14: /* DATA_DEBUG_LOW */ - case 0x18: /* DATA_DEBUG_HIGH */ + case 0x10: /* ADDRESS_DBG */ + case 0x14: /* DATA_DEBUG_LOW */ + case 0x18: /* DATA_DEBUG_HIGH */ return 0xffff; - case 0x1c: /* DEBUG_CNTR_SIG */ + case 0x1c: /* DEBUG_CNTR_SIG */ return 0x00f8; } @@ -1209,27 +1209,27 @@ static void omap_tipb_bridge_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* TIPB_CNTL */ + case 0x00: /* TIPB_CNTL */ s->control = value & 0xffff; break; - case 0x04: /* TIPB_BUS_ALLOC */ + case 0x04: /* TIPB_BUS_ALLOC */ s->alloc = value & 0x003f; break; - case 0x08: /* MPU_TIPB_CNTL */ + case 0x08: /* MPU_TIPB_CNTL */ s->buffer = value & 0x0003; break; - case 0x0c: /* ENHANCED_TIPB_CNTL */ + case 0x0c: /* ENHANCED_TIPB_CNTL */ s->width_intr = !(value & 2); s->enh_control = value & 0x000f; break; - case 0x10: /* ADDRESS_DBG */ - case 0x14: /* DATA_DEBUG_LOW */ - case 0x18: /* DATA_DEBUG_HIGH */ - case 0x1c: /* DEBUG_CNTR_SIG */ + case 0x10: /* ADDRESS_DBG */ + case 0x14: /* DATA_DEBUG_LOW */ + case 0x18: /* DATA_DEBUG_HIGH */ + case 0x1c: /* DEBUG_CNTR_SIG */ OMAP_RO_REG(addr); break; @@ -1280,23 +1280,23 @@ static uint64_t omap_tcmi_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* IMIF_PRIO */ - case 0x04: /* EMIFS_PRIO */ - case 0x08: /* EMIFF_PRIO */ - case 0x0c: /* EMIFS_CONFIG */ - case 0x10: /* EMIFS_CS0_CONFIG */ - case 0x14: /* EMIFS_CS1_CONFIG */ - case 0x18: /* EMIFS_CS2_CONFIG */ - case 0x1c: /* EMIFS_CS3_CONFIG */ - case 0x24: /* EMIFF_MRS */ - case 0x28: /* TIMEOUT1 */ - case 0x2c: /* TIMEOUT2 */ - case 0x30: /* TIMEOUT3 */ - case 0x3c: /* EMIFF_SDRAM_CONFIG_2 */ - case 0x40: /* EMIFS_CFG_DYN_WAIT */ + case 0x00: /* IMIF_PRIO */ + case 0x04: /* EMIFS_PRIO */ + case 0x08: /* EMIFF_PRIO */ + case 0x0c: /* EMIFS_CONFIG */ + case 0x10: /* EMIFS_CS0_CONFIG */ + case 0x14: /* EMIFS_CS1_CONFIG */ + case 0x18: /* EMIFS_CS2_CONFIG */ + case 0x1c: /* EMIFS_CS3_CONFIG */ + case 0x24: /* EMIFF_MRS */ + case 0x28: /* TIMEOUT1 */ + case 0x2c: /* TIMEOUT2 */ + case 0x30: /* TIMEOUT3 */ + case 0x3c: /* EMIFF_SDRAM_CONFIG_2 */ + case 0x40: /* EMIFS_CFG_DYN_WAIT */ return s->tcmi_regs[addr >> 2]; - case 0x20: /* EMIFF_SDRAM_CONFIG */ + case 0x20: /* EMIFF_SDRAM_CONFIG */ ret = s->tcmi_regs[addr >> 2]; s->tcmi_regs[addr >> 2] &= ~1; /* XXX: Clear SLRF on SDRAM access */ /* XXX: We can try using the VGA_DIRTY flag for this */ @@ -1318,23 +1318,23 @@ static void omap_tcmi_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* IMIF_PRIO */ - case 0x04: /* EMIFS_PRIO */ - case 0x08: /* EMIFF_PRIO */ - case 0x10: /* EMIFS_CS0_CONFIG */ - case 0x14: /* EMIFS_CS1_CONFIG */ - case 0x18: /* EMIFS_CS2_CONFIG */ - case 0x1c: /* EMIFS_CS3_CONFIG */ - case 0x20: /* EMIFF_SDRAM_CONFIG */ - case 0x24: /* EMIFF_MRS */ - case 0x28: /* TIMEOUT1 */ - case 0x2c: /* TIMEOUT2 */ - case 0x30: /* TIMEOUT3 */ - case 0x3c: /* EMIFF_SDRAM_CONFIG_2 */ - case 0x40: /* EMIFS_CFG_DYN_WAIT */ + case 0x00: /* IMIF_PRIO */ + case 0x04: /* EMIFS_PRIO */ + case 0x08: /* EMIFF_PRIO */ + case 0x10: /* EMIFS_CS0_CONFIG */ + case 0x14: /* EMIFS_CS1_CONFIG */ + case 0x18: /* EMIFS_CS2_CONFIG */ + case 0x1c: /* EMIFS_CS3_CONFIG */ + case 0x20: /* EMIFF_SDRAM_CONFIG */ + case 0x24: /* EMIFF_MRS */ + case 0x28: /* TIMEOUT1 */ + case 0x2c: /* TIMEOUT2 */ + case 0x30: /* TIMEOUT3 */ + case 0x3c: /* EMIFF_SDRAM_CONFIG_2 */ + case 0x40: /* EMIFS_CFG_DYN_WAIT */ s->tcmi_regs[addr >> 2] = value; break; - case 0x0c: /* EMIFS_CONFIG */ + case 0x0c: /* EMIFS_CONFIG */ s->tcmi_regs[addr >> 2] = (value & 0xf) | (1 << 4); break; @@ -1393,7 +1393,7 @@ static uint64_t omap_dpll_read(void *opaque, hwaddr addr, return omap_badwidth_read16(opaque, addr); } - if (addr == 0x00) /* CTL_REG */ + if (addr == 0x00) /* CTL_REG */ return s->mode; OMAP_BAD_REG(addr); @@ -1413,16 +1413,16 @@ static void omap_dpll_write(void *opaque, hwaddr addr, return; } - if (addr == 0x00) { /* CTL_REG */ + if (addr == 0x00) { /* CTL_REG */ /* See omap_ulpd_pm_write() too */ diff = s->mode & value; s->mode = value & 0x2fff; if (diff & (0x3ff << 2)) { - if (value & (1 << 4)) { /* PLL_ENABLE */ - div = ((value >> 5) & 3) + 1; /* PLL_DIV */ - mult = MIN((value >> 7) & 0x1f, 1); /* PLL_MULT */ + if (value & (1 << 4)) { /* PLL_ENABLE */ + div = ((value >> 5) & 3) + 1; /* PLL_DIV */ + mult = MIN((value >> 7) & 0x1f, 1); /* PLL_MULT */ } else { - div = bypass_div[((value >> 2) & 3)]; /* BYPASS_DIV */ + div = bypass_div[((value >> 2) & 3)]; /* BYPASS_DIV */ mult = 1; } omap_clk_setrate(s->dpll, div, mult); @@ -1474,31 +1474,31 @@ static uint64_t omap_clkm_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* ARM_CKCTL */ + case 0x00: /* ARM_CKCTL */ return s->clkm.arm_ckctl; - case 0x04: /* ARM_IDLECT1 */ + case 0x04: /* ARM_IDLECT1 */ return s->clkm.arm_idlect1; - case 0x08: /* ARM_IDLECT2 */ + case 0x08: /* ARM_IDLECT2 */ return s->clkm.arm_idlect2; - case 0x0c: /* ARM_EWUPCT */ + case 0x0c: /* ARM_EWUPCT */ return s->clkm.arm_ewupct; - case 0x10: /* ARM_RSTCT1 */ + case 0x10: /* ARM_RSTCT1 */ return s->clkm.arm_rstct1; - case 0x14: /* ARM_RSTCT2 */ + case 0x14: /* ARM_RSTCT2 */ return s->clkm.arm_rstct2; - case 0x18: /* ARM_SYSST */ + case 0x18: /* ARM_SYSST */ return (s->clkm.clocking_scheme << 11) | s->clkm.cold_start; - case 0x1c: /* ARM_CKOUT1 */ + case 0x1c: /* ARM_CKOUT1 */ return s->clkm.arm_ckout1; - case 0x20: /* ARM_CKOUT2 */ + case 0x20: /* ARM_CKOUT2 */ break; } @@ -1511,7 +1511,7 @@ static inline void omap_clkm_ckctl_update(struct omap_mpu_state_s *s, { omap_clk clk; - if (diff & (1 << 14)) { /* ARM_INTHCK_SEL */ + if (diff & (1 << 14)) { /* ARM_INTHCK_SEL */ if (value & (1 << 14)) /* Reserved */; else { @@ -1519,7 +1519,7 @@ static inline void omap_clkm_ckctl_update(struct omap_mpu_state_s *s, omap_clk_reparent(clk, omap_findclk(s, "tc_ck")); } } - if (diff & (1 << 12)) { /* ARM_TIMXO */ + if (diff & (1 << 12)) { /* ARM_TIMXO */ clk = omap_findclk(s, "armtim_ck"); if (value & (1 << 12)) omap_clk_reparent(clk, omap_findclk(s, "clkin")); @@ -1527,27 +1527,27 @@ static inline void omap_clkm_ckctl_update(struct omap_mpu_state_s *s, omap_clk_reparent(clk, omap_findclk(s, "ck_gen1")); } /* XXX: en_dspck */ - if (diff & (3 << 10)) { /* DSPMMUDIV */ + if (diff & (3 << 10)) { /* DSPMMUDIV */ clk = omap_findclk(s, "dspmmu_ck"); omap_clk_setrate(clk, 1 << ((value >> 10) & 3), 1); } - if (diff & (3 << 8)) { /* TCDIV */ + if (diff & (3 << 8)) { /* TCDIV */ clk = omap_findclk(s, "tc_ck"); omap_clk_setrate(clk, 1 << ((value >> 8) & 3), 1); } - if (diff & (3 << 6)) { /* DSPDIV */ + if (diff & (3 << 6)) { /* DSPDIV */ clk = omap_findclk(s, "dsp_ck"); omap_clk_setrate(clk, 1 << ((value >> 6) & 3), 1); } - if (diff & (3 << 4)) { /* ARMDIV */ + if (diff & (3 << 4)) { /* ARMDIV */ clk = omap_findclk(s, "arm_ck"); omap_clk_setrate(clk, 1 << ((value >> 4) & 3), 1); } - if (diff & (3 << 2)) { /* LCDDIV */ + if (diff & (3 << 2)) { /* LCDDIV */ clk = omap_findclk(s, "lcd_ck"); omap_clk_setrate(clk, 1 << ((value >> 2) & 3), 1); } - if (diff & (3 << 0)) { /* PERDIV */ + if (diff & (3 << 0)) { /* PERDIV */ clk = omap_findclk(s, "armper_ck"); omap_clk_setrate(clk, 1 << ((value >> 0) & 3), 1); } @@ -1566,25 +1566,25 @@ static inline void omap_clkm_idlect1_update(struct omap_mpu_state_s *s, qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } -#define SET_CANIDLE(clock, bit) \ - if (diff & (1 << bit)) { \ - clk = omap_findclk(s, clock); \ - omap_clk_canidle(clk, (value >> bit) & 1); \ +#define SET_CANIDLE(clock, bit) \ + if (diff & (1 << bit)) { \ + clk = omap_findclk(s, clock); \ + omap_clk_canidle(clk, (value >> bit) & 1); \ } - SET_CANIDLE("mpuwd_ck", 0) /* IDLWDT_ARM */ - SET_CANIDLE("armxor_ck", 1) /* IDLXORP_ARM */ - SET_CANIDLE("mpuper_ck", 2) /* IDLPER_ARM */ - SET_CANIDLE("lcd_ck", 3) /* IDLLCD_ARM */ - SET_CANIDLE("lb_ck", 4) /* IDLLB_ARM */ - SET_CANIDLE("hsab_ck", 5) /* IDLHSAB_ARM */ - SET_CANIDLE("tipb_ck", 6) /* IDLIF_ARM */ - SET_CANIDLE("dma_ck", 6) /* IDLIF_ARM */ - SET_CANIDLE("tc_ck", 6) /* IDLIF_ARM */ - SET_CANIDLE("dpll1", 7) /* IDLDPLL_ARM */ - SET_CANIDLE("dpll2", 7) /* IDLDPLL_ARM */ - SET_CANIDLE("dpll3", 7) /* IDLDPLL_ARM */ - SET_CANIDLE("mpui_ck", 8) /* IDLAPI_ARM */ - SET_CANIDLE("armtim_ck", 9) /* IDLTIM_ARM */ + SET_CANIDLE("mpuwd_ck", 0) /* IDLWDT_ARM */ + SET_CANIDLE("armxor_ck", 1) /* IDLXORP_ARM */ + SET_CANIDLE("mpuper_ck", 2) /* IDLPER_ARM */ + SET_CANIDLE("lcd_ck", 3) /* IDLLCD_ARM */ + SET_CANIDLE("lb_ck", 4) /* IDLLB_ARM */ + SET_CANIDLE("hsab_ck", 5) /* IDLHSAB_ARM */ + SET_CANIDLE("tipb_ck", 6) /* IDLIF_ARM */ + SET_CANIDLE("dma_ck", 6) /* IDLIF_ARM */ + SET_CANIDLE("tc_ck", 6) /* IDLIF_ARM */ + SET_CANIDLE("dpll1", 7) /* IDLDPLL_ARM */ + SET_CANIDLE("dpll2", 7) /* IDLDPLL_ARM */ + SET_CANIDLE("dpll3", 7) /* IDLDPLL_ARM */ + SET_CANIDLE("mpui_ck", 8) /* IDLAPI_ARM */ + SET_CANIDLE("armtim_ck", 9) /* IDLTIM_ARM */ } static inline void omap_clkm_idlect2_update(struct omap_mpu_state_s *s, @@ -1592,22 +1592,22 @@ static inline void omap_clkm_idlect2_update(struct omap_mpu_state_s *s, { omap_clk clk; -#define SET_ONOFF(clock, bit) \ - if (diff & (1 << bit)) { \ - clk = omap_findclk(s, clock); \ - omap_clk_onoff(clk, (value >> bit) & 1); \ +#define SET_ONOFF(clock, bit) \ + if (diff & (1 << bit)) { \ + clk = omap_findclk(s, clock); \ + omap_clk_onoff(clk, (value >> bit) & 1); \ } - SET_ONOFF("mpuwd_ck", 0) /* EN_WDTCK */ - SET_ONOFF("armxor_ck", 1) /* EN_XORPCK */ - SET_ONOFF("mpuper_ck", 2) /* EN_PERCK */ - SET_ONOFF("lcd_ck", 3) /* EN_LCDCK */ - SET_ONOFF("lb_ck", 4) /* EN_LBCK */ - SET_ONOFF("hsab_ck", 5) /* EN_HSABCK */ - SET_ONOFF("mpui_ck", 6) /* EN_APICK */ - SET_ONOFF("armtim_ck", 7) /* EN_TIMCK */ - SET_CANIDLE("dma_ck", 8) /* DMACK_REQ */ - SET_ONOFF("arm_gpio_ck", 9) /* EN_GPIOCK */ - SET_ONOFF("lbfree_ck", 10) /* EN_LBFREECK */ + SET_ONOFF("mpuwd_ck", 0) /* EN_WDTCK */ + SET_ONOFF("armxor_ck", 1) /* EN_XORPCK */ + SET_ONOFF("mpuper_ck", 2) /* EN_PERCK */ + SET_ONOFF("lcd_ck", 3) /* EN_LCDCK */ + SET_ONOFF("lb_ck", 4) /* EN_LBCK */ + SET_ONOFF("hsab_ck", 5) /* EN_HSABCK */ + SET_ONOFF("mpui_ck", 6) /* EN_APICK */ + SET_ONOFF("armtim_ck", 7) /* EN_TIMCK */ + SET_CANIDLE("dma_ck", 8) /* DMACK_REQ */ + SET_ONOFF("arm_gpio_ck", 9) /* EN_GPIOCK */ + SET_ONOFF("lbfree_ck", 10) /* EN_LBFREECK */ } static inline void omap_clkm_ckout1_update(struct omap_mpu_state_s *s, @@ -1615,7 +1615,7 @@ static inline void omap_clkm_ckout1_update(struct omap_mpu_state_s *s, { omap_clk clk; - if (diff & (3 << 4)) { /* TCLKOUT */ + if (diff & (3 << 4)) { /* TCLKOUT */ clk = omap_findclk(s, "tclk_out"); switch ((value >> 4) & 3) { case 1: @@ -1630,7 +1630,7 @@ static inline void omap_clkm_ckout1_update(struct omap_mpu_state_s *s, omap_clk_onoff(clk, 0); } } - if (diff & (3 << 2)) { /* DCLKOUT */ + if (diff & (3 << 2)) { /* DCLKOUT */ clk = omap_findclk(s, "dclk_out"); switch ((value >> 2) & 3) { case 0: @@ -1647,7 +1647,7 @@ static inline void omap_clkm_ckout1_update(struct omap_mpu_state_s *s, break; } } - if (diff & (3 << 0)) { /* ACLKOUT */ + if (diff & (3 << 0)) { /* ACLKOUT */ clk = omap_findclk(s, "aclk_out"); switch ((value >> 0) & 3) { case 1: @@ -1685,51 +1685,51 @@ static void omap_clkm_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x00: /* ARM_CKCTL */ + case 0x00: /* ARM_CKCTL */ diff = s->clkm.arm_ckctl ^ value; s->clkm.arm_ckctl = value & 0x7fff; omap_clkm_ckctl_update(s, diff, value); return; - case 0x04: /* ARM_IDLECT1 */ + case 0x04: /* ARM_IDLECT1 */ diff = s->clkm.arm_idlect1 ^ value; s->clkm.arm_idlect1 = value & 0x0fff; omap_clkm_idlect1_update(s, diff, value); return; - case 0x08: /* ARM_IDLECT2 */ + case 0x08: /* ARM_IDLECT2 */ diff = s->clkm.arm_idlect2 ^ value; s->clkm.arm_idlect2 = value & 0x07ff; omap_clkm_idlect2_update(s, diff, value); return; - case 0x0c: /* ARM_EWUPCT */ + case 0x0c: /* ARM_EWUPCT */ s->clkm.arm_ewupct = value & 0x003f; return; - case 0x10: /* ARM_RSTCT1 */ + case 0x10: /* ARM_RSTCT1 */ diff = s->clkm.arm_rstct1 ^ value; s->clkm.arm_rstct1 = value & 0x0007; if (value & 9) { qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); s->clkm.cold_start = 0xa; } - if (diff & ~value & 4) { /* DSP_RST */ + if (diff & ~value & 4) { /* DSP_RST */ omap_mpui_reset(s); omap_tipb_bridge_reset(s->private_tipb); omap_tipb_bridge_reset(s->public_tipb); } - if (diff & 2) { /* DSP_EN */ + if (diff & 2) { /* DSP_EN */ clk = omap_findclk(s, "dsp_ck"); omap_clk_canidle(clk, (~value >> 1) & 1); } return; - case 0x14: /* ARM_RSTCT2 */ + case 0x14: /* ARM_RSTCT2 */ s->clkm.arm_rstct2 = value & 0x0001; return; - case 0x18: /* ARM_SYSST */ + case 0x18: /* ARM_SYSST */ if ((s->clkm.clocking_scheme ^ (value >> 11)) & 7) { s->clkm.clocking_scheme = (value >> 11) & 7; trace_omap1_pwl_clocking_scheme( @@ -1738,13 +1738,13 @@ static void omap_clkm_write(void *opaque, hwaddr addr, s->clkm.cold_start &= value & 0x3f; return; - case 0x1c: /* ARM_CKOUT1 */ + case 0x1c: /* ARM_CKOUT1 */ diff = s->clkm.arm_ckout1 ^ value; s->clkm.arm_ckout1 = value & 0x003f; omap_clkm_ckout1_update(s, diff, value); return; - case 0x20: /* ARM_CKOUT2 */ + case 0x20: /* ARM_CKOUT2 */ default: OMAP_BAD_REG(addr); } @@ -1767,16 +1767,16 @@ static uint64_t omap_clkdsp_read(void *opaque, hwaddr addr, } switch (addr) { - case 0x04: /* DSP_IDLECT1 */ + case 0x04: /* DSP_IDLECT1 */ return s->clkm.dsp_idlect1; - case 0x08: /* DSP_IDLECT2 */ + case 0x08: /* DSP_IDLECT2 */ return s->clkm.dsp_idlect2; - case 0x14: /* DSP_RSTCT2 */ + case 0x14: /* DSP_RSTCT2 */ return s->clkm.dsp_rstct2; - case 0x18: /* DSP_SYSST */ + case 0x18: /* DSP_SYSST */ return (s->clkm.clocking_scheme << 11) | s->clkm.cold_start | (cpu->halted << 6); /* Quite useless... */ } @@ -1790,7 +1790,7 @@ static inline void omap_clkdsp_idlect1_update(struct omap_mpu_state_s *s, { omap_clk clk; - SET_CANIDLE("dspxor_ck", 1); /* IDLXORP_DSP */ + SET_CANIDLE("dspxor_ck", 1); /* IDLXORP_DSP */ } static inline void omap_clkdsp_idlect2_update(struct omap_mpu_state_s *s, @@ -1798,7 +1798,7 @@ static inline void omap_clkdsp_idlect2_update(struct omap_mpu_state_s *s, { omap_clk clk; - SET_ONOFF("dspxor_ck", 1); /* EN_XORPCK */ + SET_ONOFF("dspxor_ck", 1); /* EN_XORPCK */ } static void omap_clkdsp_write(void *opaque, hwaddr addr, @@ -1813,23 +1813,23 @@ static void omap_clkdsp_write(void *opaque, hwaddr addr, } switch (addr) { - case 0x04: /* DSP_IDLECT1 */ + case 0x04: /* DSP_IDLECT1 */ diff = s->clkm.dsp_idlect1 ^ value; s->clkm.dsp_idlect1 = value & 0x01f7; omap_clkdsp_idlect1_update(s, diff, value); break; - case 0x08: /* DSP_IDLECT2 */ + case 0x08: /* DSP_IDLECT2 */ s->clkm.dsp_idlect2 = value & 0x0037; diff = s->clkm.dsp_idlect1 ^ value; omap_clkdsp_idlect2_update(s, diff, value); break; - case 0x14: /* DSP_RSTCT2 */ + case 0x14: /* DSP_RSTCT2 */ s->clkm.dsp_rstct2 = value & 0x0001; break; - case 0x18: /* DSP_SYSST */ + case 0x18: /* DSP_SYSST */ s->clkm.cold_start &= value & 0x3f; break; @@ -1928,8 +1928,8 @@ static void omap_mpuio_set(void *opaque, int line, int level) qemu_irq_raise(s->irq); /* TODO: wakeup */ } - if ((s->event & (1 << 0)) && /* SET_GPIO_EVENT_MODE */ - (s->event >> 1) == line) /* PIN_SELECT */ + if ((s->event & (1 << 0)) && /* SET_GPIO_EVENT_MODE */ + (s->event >> 1) == line) /* PIN_SELECT */ s->latch = s->inputs; } } @@ -1959,47 +1959,47 @@ static uint64_t omap_mpuio_read(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* INPUT_LATCH */ + case 0x00: /* INPUT_LATCH */ return s->inputs; - case 0x04: /* OUTPUT_REG */ + case 0x04: /* OUTPUT_REG */ return s->outputs; - case 0x08: /* IO_CNTL */ + case 0x08: /* IO_CNTL */ return s->dir; - case 0x10: /* KBR_LATCH */ + case 0x10: /* KBR_LATCH */ return s->row_latch; - case 0x14: /* KBC_REG */ + case 0x14: /* KBC_REG */ return s->cols; - case 0x18: /* GPIO_EVENT_MODE_REG */ + case 0x18: /* GPIO_EVENT_MODE_REG */ return s->event; - case 0x1c: /* GPIO_INT_EDGE_REG */ + case 0x1c: /* GPIO_INT_EDGE_REG */ return s->edge; - case 0x20: /* KBD_INT */ + case 0x20: /* KBD_INT */ return (~s->row_latch & 0x1f) && !s->kbd_mask; - case 0x24: /* GPIO_INT */ + case 0x24: /* GPIO_INT */ ret = s->ints; s->ints &= s->mask; if (ret) qemu_irq_lower(s->irq); return ret; - case 0x28: /* KBD_MASKIT */ + case 0x28: /* KBD_MASKIT */ return s->kbd_mask; - case 0x2c: /* GPIO_MASKIT */ + case 0x2c: /* GPIO_MASKIT */ return s->mask; - case 0x30: /* GPIO_DEBOUNCING_REG */ + case 0x30: /* GPIO_DEBOUNCING_REG */ return s->debounce; - case 0x34: /* GPIO_LATCH_REG */ + case 0x34: /* GPIO_LATCH_REG */ return s->latch; } @@ -2021,7 +2021,7 @@ static void omap_mpuio_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x04: /* OUTPUT_REG */ + case 0x04: /* OUTPUT_REG */ diff = (s->outputs ^ value) & ~s->dir; s->outputs = value; while ((ln = ctz32(diff)) != 32) { @@ -2031,7 +2031,7 @@ static void omap_mpuio_write(void *opaque, hwaddr addr, } break; - case 0x08: /* IO_CNTL */ + case 0x08: /* IO_CNTL */ diff = s->outputs & (s->dir ^ value); s->dir = value; @@ -2043,37 +2043,37 @@ static void omap_mpuio_write(void *opaque, hwaddr addr, } break; - case 0x14: /* KBC_REG */ + case 0x14: /* KBC_REG */ s->cols = value; omap_mpuio_kbd_update(s); break; - case 0x18: /* GPIO_EVENT_MODE_REG */ + case 0x18: /* GPIO_EVENT_MODE_REG */ s->event = value & 0x1f; break; - case 0x1c: /* GPIO_INT_EDGE_REG */ + case 0x1c: /* GPIO_INT_EDGE_REG */ s->edge = value; break; - case 0x28: /* KBD_MASKIT */ + case 0x28: /* KBD_MASKIT */ s->kbd_mask = value & 1; omap_mpuio_kbd_update(s); break; - case 0x2c: /* GPIO_MASKIT */ + case 0x2c: /* GPIO_MASKIT */ s->mask = value; break; - case 0x30: /* GPIO_DEBOUNCING_REG */ + case 0x30: /* GPIO_DEBOUNCING_REG */ s->debounce = value & 0x1ff; break; - case 0x00: /* INPUT_LATCH */ - case 0x10: /* KBR_LATCH */ - case 0x20: /* KBD_INT */ - case 0x24: /* GPIO_INT */ - case 0x34: /* GPIO_LATCH_REG */ + case 0x00: /* INPUT_LATCH */ + case 0x10: /* KBR_LATCH */ + case 0x20: /* KBD_INT */ + case 0x24: /* GPIO_INT */ + case 0x34: /* GPIO_LATCH_REG */ OMAP_RO_REG(addr); return; @@ -2176,24 +2176,24 @@ struct omap_uwire_s { static void omap_uwire_transfer_start(struct omap_uwire_s *s) { - int chipselect = (s->control >> 10) & 3; /* INDEX */ + int chipselect = (s->control >> 10) & 3; /* INDEX */ - if ((s->control >> 5) & 0x1f) { /* NB_BITS_WR */ + if ((s->control >> 5) & 0x1f) { /* NB_BITS_WR */ if (s->control & (1 << 12)) { /* CS_CMD */ qemu_log_mask(LOG_UNIMP, "uWireSlave TX CS:%d data:0x%04x\n", chipselect, s->txbuf >> (16 - ((s->control >> 5) & 0x1f))); } - s->control &= ~(1 << 14); /* CSRB */ + s->control &= ~(1 << 14); /* CSRB */ /* TODO: depending on s->setup[4] bits [1:0] assert an IRQ or * a DRQ. When is the level IRQ supposed to be reset? */ } - if ((s->control >> 0) & 0x1f) { /* NB_BITS_RD */ + if ((s->control >> 0) & 0x1f) { /* NB_BITS_RD */ if (s->control & (1 << 12)) { /* CS_CMD */ qemu_log_mask(LOG_UNIMP, "uWireSlave RX CS:%d\n", chipselect); } - s->control |= 1 << 15; /* RDRB */ + s->control |= 1 << 15; /* RDRB */ /* TODO: depending on s->setup[4] bits [1:0] assert an IRQ or * a DRQ. When is the level IRQ supposed to be reset? */ } @@ -2209,22 +2209,22 @@ static uint64_t omap_uwire_read(void *opaque, hwaddr addr, unsigned size) } switch (offset) { - case 0x00: /* RDR */ - s->control &= ~(1 << 15); /* RDRB */ + case 0x00: /* RDR */ + s->control &= ~(1 << 15); /* RDRB */ return s->rxbuf; - case 0x04: /* CSR */ + case 0x04: /* CSR */ return s->control; - case 0x08: /* SR1 */ + case 0x08: /* SR1 */ return s->setup[0]; - case 0x0c: /* SR2 */ + case 0x0c: /* SR2 */ return s->setup[1]; - case 0x10: /* SR3 */ + case 0x10: /* SR3 */ return s->setup[2]; - case 0x14: /* SR4 */ + case 0x14: /* SR4 */ return s->setup[3]; - case 0x18: /* SR5 */ + case 0x18: /* SR5 */ return s->setup[4]; } @@ -2244,39 +2244,39 @@ static void omap_uwire_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* TDR */ - s->txbuf = value; /* TD */ - if ((s->setup[4] & (1 << 2)) && /* AUTO_TX_EN */ - ((s->setup[4] & (1 << 3)) || /* CS_TOGGLE_TX_EN */ - (s->control & (1 << 12)))) { /* CS_CMD */ - s->control |= 1 << 14; /* CSRB */ + case 0x00: /* TDR */ + s->txbuf = value; /* TD */ + if ((s->setup[4] & (1 << 2)) && /* AUTO_TX_EN */ + ((s->setup[4] & (1 << 3)) || /* CS_TOGGLE_TX_EN */ + (s->control & (1 << 12)))) { /* CS_CMD */ + s->control |= 1 << 14; /* CSRB */ omap_uwire_transfer_start(s); } break; - case 0x04: /* CSR */ + case 0x04: /* CSR */ s->control = value & 0x1fff; - if (value & (1 << 13)) /* START */ + if (value & (1 << 13)) /* START */ omap_uwire_transfer_start(s); break; - case 0x08: /* SR1 */ + case 0x08: /* SR1 */ s->setup[0] = value & 0x003f; break; - case 0x0c: /* SR2 */ + case 0x0c: /* SR2 */ s->setup[1] = value & 0x0fc0; break; - case 0x10: /* SR3 */ + case 0x10: /* SR3 */ s->setup[2] = value & 0x0003; break; - case 0x14: /* SR4 */ + case 0x14: /* SR4 */ s->setup[3] = value & 0x0001; break; - case 0x18: /* SR5 */ + case 0x18: /* SR5 */ s->setup[4] = value & 0x000f; break; @@ -2350,9 +2350,9 @@ static uint64_t omap_pwl_read(void *opaque, hwaddr addr, unsigned size) } switch (offset) { - case 0x00: /* PWL_LEVEL */ + case 0x00: /* PWL_LEVEL */ return s->level; - case 0x04: /* PWL_CTRL */ + case 0x04: /* PWL_CTRL */ return s->enable; } OMAP_BAD_REG(addr); @@ -2371,11 +2371,11 @@ static void omap_pwl_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* PWL_LEVEL */ + case 0x00: /* PWL_LEVEL */ s->level = value; omap_pwl_update(s); break; - case 0x04: /* PWL_CTRL */ + case 0x04: /* PWL_CTRL */ s->enable = value & 1; omap_pwl_update(s); break; @@ -2443,11 +2443,11 @@ static uint64_t omap_pwt_read(void *opaque, hwaddr addr, unsigned size) } switch (offset) { - case 0x00: /* FRC */ + case 0x00: /* FRC */ return s->frc; - case 0x04: /* VCR */ + case 0x04: /* VCR */ return s->vrc; - case 0x08: /* GCR */ + case 0x08: /* GCR */ return s->gcr; } OMAP_BAD_REG(addr); @@ -2466,10 +2466,10 @@ static void omap_pwt_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* FRC */ + case 0x00: /* FRC */ s->frc = value & 0x3f; break; - case 0x04: /* VRC */ + case 0x04: /* VRC */ if ((value ^ s->vrc) & 1) { if (value & 1) { trace_omap1_pwt_buzz( @@ -2494,7 +2494,7 @@ static void omap_pwt_write(void *opaque, hwaddr addr, } s->vrc = value & 0x7f; break; - case 0x08: /* GCR */ + case 0x08: /* GCR */ s->gcr = value & 3; break; default: @@ -2577,69 +2577,69 @@ static uint64_t omap_rtc_read(void *opaque, hwaddr addr, unsigned size) } switch (offset) { - case 0x00: /* SECONDS_REG */ + case 0x00: /* SECONDS_REG */ return to_bcd(s->current_tm.tm_sec); - case 0x04: /* MINUTES_REG */ + case 0x04: /* MINUTES_REG */ return to_bcd(s->current_tm.tm_min); - case 0x08: /* HOURS_REG */ + case 0x08: /* HOURS_REG */ if (s->pm_am) return ((s->current_tm.tm_hour > 11) << 7) | to_bcd(((s->current_tm.tm_hour - 1) % 12) + 1); else return to_bcd(s->current_tm.tm_hour); - case 0x0c: /* DAYS_REG */ + case 0x0c: /* DAYS_REG */ return to_bcd(s->current_tm.tm_mday); - case 0x10: /* MONTHS_REG */ + case 0x10: /* MONTHS_REG */ return to_bcd(s->current_tm.tm_mon + 1); - case 0x14: /* YEARS_REG */ + case 0x14: /* YEARS_REG */ return to_bcd(s->current_tm.tm_year % 100); - case 0x18: /* WEEK_REG */ + case 0x18: /* WEEK_REG */ return s->current_tm.tm_wday; - case 0x20: /* ALARM_SECONDS_REG */ + case 0x20: /* ALARM_SECONDS_REG */ return to_bcd(s->alarm_tm.tm_sec); - case 0x24: /* ALARM_MINUTES_REG */ + case 0x24: /* ALARM_MINUTES_REG */ return to_bcd(s->alarm_tm.tm_min); - case 0x28: /* ALARM_HOURS_REG */ + case 0x28: /* ALARM_HOURS_REG */ if (s->pm_am) return ((s->alarm_tm.tm_hour > 11) << 7) | to_bcd(((s->alarm_tm.tm_hour - 1) % 12) + 1); else return to_bcd(s->alarm_tm.tm_hour); - case 0x2c: /* ALARM_DAYS_REG */ + case 0x2c: /* ALARM_DAYS_REG */ return to_bcd(s->alarm_tm.tm_mday); - case 0x30: /* ALARM_MONTHS_REG */ + case 0x30: /* ALARM_MONTHS_REG */ return to_bcd(s->alarm_tm.tm_mon + 1); - case 0x34: /* ALARM_YEARS_REG */ + case 0x34: /* ALARM_YEARS_REG */ return to_bcd(s->alarm_tm.tm_year % 100); - case 0x40: /* RTC_CTRL_REG */ + case 0x40: /* RTC_CTRL_REG */ return (s->pm_am << 3) | (s->auto_comp << 2) | (s->round << 1) | s->running; - case 0x44: /* RTC_STATUS_REG */ + case 0x44: /* RTC_STATUS_REG */ i = s->status; s->status &= ~0x3d; return i; - case 0x48: /* RTC_INTERRUPTS_REG */ + case 0x48: /* RTC_INTERRUPTS_REG */ return s->interrupts; - case 0x4c: /* RTC_COMP_LSB_REG */ + case 0x4c: /* RTC_COMP_LSB_REG */ return ((uint16_t) s->comp_reg) & 0xff; - case 0x50: /* RTC_COMP_MSB_REG */ + case 0x50: /* RTC_COMP_MSB_REG */ return ((uint16_t) s->comp_reg) >> 8; } @@ -2661,17 +2661,17 @@ static void omap_rtc_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* SECONDS_REG */ + case 0x00: /* SECONDS_REG */ s->ti -= s->current_tm.tm_sec; s->ti += from_bcd(value); return; - case 0x04: /* MINUTES_REG */ + case 0x04: /* MINUTES_REG */ s->ti -= s->current_tm.tm_min * 60; s->ti += from_bcd(value) * 60; return; - case 0x08: /* HOURS_REG */ + case 0x08: /* HOURS_REG */ s->ti -= s->current_tm.tm_hour * 3600; if (s->pm_am) { s->ti += (from_bcd(value & 0x3f) & 12) * 3600; @@ -2680,12 +2680,12 @@ static void omap_rtc_write(void *opaque, hwaddr addr, s->ti += from_bcd(value & 0x3f) * 3600; return; - case 0x0c: /* DAYS_REG */ + case 0x0c: /* DAYS_REG */ s->ti -= s->current_tm.tm_mday * 86400; s->ti += from_bcd(value) * 86400; return; - case 0x10: /* MONTHS_REG */ + case 0x10: /* MONTHS_REG */ memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_mon = from_bcd(value); ti[0] = mktimegm(&s->current_tm); @@ -2701,7 +2701,7 @@ static void omap_rtc_write(void *opaque, hwaddr addr, } return; - case 0x14: /* YEARS_REG */ + case 0x14: /* YEARS_REG */ memcpy(&new_tm, &s->current_tm, sizeof(new_tm)); new_tm.tm_year += from_bcd(value) - (new_tm.tm_year % 100); ti[0] = mktimegm(&s->current_tm); @@ -2717,20 +2717,20 @@ static void omap_rtc_write(void *opaque, hwaddr addr, } return; - case 0x18: /* WEEK_REG */ - return; /* Ignored */ + case 0x18: /* WEEK_REG */ + return; /* Ignored */ - case 0x20: /* ALARM_SECONDS_REG */ + case 0x20: /* ALARM_SECONDS_REG */ s->alarm_tm.tm_sec = from_bcd(value); omap_rtc_alarm_update(s); return; - case 0x24: /* ALARM_MINUTES_REG */ + case 0x24: /* ALARM_MINUTES_REG */ s->alarm_tm.tm_min = from_bcd(value); omap_rtc_alarm_update(s); return; - case 0x28: /* ALARM_HOURS_REG */ + case 0x28: /* ALARM_HOURS_REG */ if (s->pm_am) s->alarm_tm.tm_hour = ((from_bcd(value & 0x3f)) % 12) + @@ -2740,22 +2740,22 @@ static void omap_rtc_write(void *opaque, hwaddr addr, omap_rtc_alarm_update(s); return; - case 0x2c: /* ALARM_DAYS_REG */ + case 0x2c: /* ALARM_DAYS_REG */ s->alarm_tm.tm_mday = from_bcd(value); omap_rtc_alarm_update(s); return; - case 0x30: /* ALARM_MONTHS_REG */ + case 0x30: /* ALARM_MONTHS_REG */ s->alarm_tm.tm_mon = from_bcd(value); omap_rtc_alarm_update(s); return; - case 0x34: /* ALARM_YEARS_REG */ + case 0x34: /* ALARM_YEARS_REG */ s->alarm_tm.tm_year = from_bcd(value); omap_rtc_alarm_update(s); return; - case 0x40: /* RTC_CTRL_REG */ + case 0x40: /* RTC_CTRL_REG */ s->pm_am = (value >> 3) & 1; s->auto_comp = (value >> 2) & 1; s->round = (value >> 1) & 1; @@ -2764,21 +2764,21 @@ static void omap_rtc_write(void *opaque, hwaddr addr, s->status |= s->running << 1; return; - case 0x44: /* RTC_STATUS_REG */ + case 0x44: /* RTC_STATUS_REG */ s->status &= ~((value & 0xc0) ^ 0x80); omap_rtc_interrupts_update(s); return; - case 0x48: /* RTC_INTERRUPTS_REG */ + case 0x48: /* RTC_INTERRUPTS_REG */ s->interrupts = value; return; - case 0x4c: /* RTC_COMP_LSB_REG */ + case 0x4c: /* RTC_COMP_LSB_REG */ s->comp_reg &= 0xff00; s->comp_reg |= 0x00ff & value; return; - case 0x50: /* RTC_COMP_MSB_REG */ + case 0x50: /* RTC_COMP_MSB_REG */ s->comp_reg &= 0x00ff; s->comp_reg |= 0xff00 & (value << 8); return; @@ -2929,12 +2929,12 @@ static void omap_mcbsp_intr_update(struct omap_mcbsp_s *s) { int irq; - switch ((s->spcr[0] >> 4) & 3) { /* RINTM */ + switch ((s->spcr[0] >> 4) & 3) { /* RINTM */ case 0: - irq = (s->spcr[0] >> 1) & 1; /* RRDY */ + irq = (s->spcr[0] >> 1) & 1; /* RRDY */ break; case 3: - irq = (s->spcr[0] >> 3) & 1; /* RSYNCERR */ + irq = (s->spcr[0] >> 3) & 1; /* RSYNCERR */ break; default: irq = 0; @@ -2944,12 +2944,12 @@ static void omap_mcbsp_intr_update(struct omap_mcbsp_s *s) if (irq) qemu_irq_pulse(s->rxirq); - switch ((s->spcr[1] >> 4) & 3) { /* XINTM */ + switch ((s->spcr[1] >> 4) & 3) { /* XINTM */ case 0: - irq = (s->spcr[1] >> 1) & 1; /* XRDY */ + irq = (s->spcr[1] >> 1) & 1; /* XRDY */ break; case 3: - irq = (s->spcr[1] >> 3) & 1; /* XSYNCERR */ + irq = (s->spcr[1] >> 3) & 1; /* XSYNCERR */ break; default: irq = 0; @@ -2962,9 +2962,9 @@ static void omap_mcbsp_intr_update(struct omap_mcbsp_s *s) static void omap_mcbsp_rx_newdata(struct omap_mcbsp_s *s) { - if ((s->spcr[0] >> 1) & 1) /* RRDY */ - s->spcr[0] |= 1 << 2; /* RFULL */ - s->spcr[0] |= 1 << 1; /* RRDY */ + if ((s->spcr[0] >> 1) & 1) /* RRDY */ + s->spcr[0] |= 1 << 2; /* RFULL */ + s->spcr[0] |= 1 << 1; /* RRDY */ qemu_irq_raise(s->rxdrq); omap_mcbsp_intr_update(s); } @@ -3004,14 +3004,14 @@ static void omap_mcbsp_rx_stop(struct omap_mcbsp_s *s) static void omap_mcbsp_rx_done(struct omap_mcbsp_s *s) { - s->spcr[0] &= ~(1 << 1); /* RRDY */ + s->spcr[0] &= ~(1 << 1); /* RRDY */ qemu_irq_lower(s->rxdrq); omap_mcbsp_intr_update(s); } static void omap_mcbsp_tx_newdata(struct omap_mcbsp_s *s) { - s->spcr[1] |= 1 << 1; /* XRDY */ + s->spcr[1] |= 1 << 1; /* XRDY */ qemu_irq_raise(s->txdrq); omap_mcbsp_intr_update(s); } @@ -3046,7 +3046,7 @@ static void omap_mcbsp_tx_start(struct omap_mcbsp_s *s) static void omap_mcbsp_tx_done(struct omap_mcbsp_s *s) { - s->spcr[1] &= ~(1 << 1); /* XRDY */ + s->spcr[1] &= ~(1 << 1); /* XRDY */ qemu_irq_lower(s->txdrq); omap_mcbsp_intr_update(s); if (s->codec && s->codec->cts) @@ -3064,27 +3064,27 @@ static void omap_mcbsp_req_update(struct omap_mcbsp_s *s) { int prev_rx_rate, prev_tx_rate; int rx_rate = 0, tx_rate = 0; - int cpu_rate = 1500000; /* XXX */ + int cpu_rate = 1500000; /* XXX */ /* TODO: check CLKSTP bit */ - if (s->spcr[1] & (1 << 6)) { /* GRST */ - if (s->spcr[0] & (1 << 0)) { /* RRST */ - if ((s->srgr[1] & (1 << 13)) && /* CLKSM */ - (s->pcr & (1 << 8))) { /* CLKRM */ - if (~s->pcr & (1 << 7)) /* SCLKME */ + if (s->spcr[1] & (1 << 6)) { /* GRST */ + if (s->spcr[0] & (1 << 0)) { /* RRST */ + if ((s->srgr[1] & (1 << 13)) && /* CLKSM */ + (s->pcr & (1 << 8))) { /* CLKRM */ + if (~s->pcr & (1 << 7)) /* SCLKME */ rx_rate = cpu_rate / - ((s->srgr[0] & 0xff) + 1); /* CLKGDV */ + ((s->srgr[0] & 0xff) + 1); /* CLKGDV */ } else if (s->codec) rx_rate = s->codec->rx_rate; } - if (s->spcr[1] & (1 << 0)) { /* XRST */ - if ((s->srgr[1] & (1 << 13)) && /* CLKSM */ - (s->pcr & (1 << 9))) { /* CLKXM */ - if (~s->pcr & (1 << 7)) /* SCLKME */ + if (s->spcr[1] & (1 << 0)) { /* XRST */ + if ((s->srgr[1] & (1 << 13)) && /* CLKSM */ + (s->pcr & (1 << 9))) { /* CLKXM */ + if (~s->pcr & (1 << 7)) /* SCLKME */ tx_rate = cpu_rate / - ((s->srgr[0] & 0xff) + 1); /* CLKGDV */ + ((s->srgr[0] & 0xff) + 1); /* CLKGDV */ } else if (s->codec) tx_rate = s->codec->tx_rate; @@ -3121,11 +3121,11 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* DRR2 */ - if (((s->rcr[0] >> 5) & 7) < 3) /* RWDLEN1 */ + case 0x00: /* DRR2 */ + if (((s->rcr[0] >> 5) & 7) < 3) /* RWDLEN1 */ return 0x0000; /* Fall through. */ - case 0x02: /* DRR1 */ + case 0x02: /* DRR1 */ if (s->rx_req < 2) { qemu_log_mask(LOG_GUEST_ERROR, "%s: Rx FIFO underrun\n", __func__); omap_mcbsp_rx_done(s); @@ -3143,63 +3143,63 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr, } return 0x0000; - case 0x04: /* DXR2 */ - case 0x06: /* DXR1 */ + case 0x04: /* DXR2 */ + case 0x06: /* DXR1 */ return 0x0000; - case 0x08: /* SPCR2 */ + case 0x08: /* SPCR2 */ return s->spcr[1]; - case 0x0a: /* SPCR1 */ + case 0x0a: /* SPCR1 */ return s->spcr[0]; - case 0x0c: /* RCR2 */ + case 0x0c: /* RCR2 */ return s->rcr[1]; - case 0x0e: /* RCR1 */ + case 0x0e: /* RCR1 */ return s->rcr[0]; - case 0x10: /* XCR2 */ + case 0x10: /* XCR2 */ return s->xcr[1]; - case 0x12: /* XCR1 */ + case 0x12: /* XCR1 */ return s->xcr[0]; - case 0x14: /* SRGR2 */ + case 0x14: /* SRGR2 */ return s->srgr[1]; - case 0x16: /* SRGR1 */ + case 0x16: /* SRGR1 */ return s->srgr[0]; - case 0x18: /* MCR2 */ + case 0x18: /* MCR2 */ return s->mcr[1]; - case 0x1a: /* MCR1 */ + case 0x1a: /* MCR1 */ return s->mcr[0]; - case 0x1c: /* RCERA */ + case 0x1c: /* RCERA */ return s->rcer[0]; - case 0x1e: /* RCERB */ + case 0x1e: /* RCERB */ return s->rcer[1]; - case 0x20: /* XCERA */ + case 0x20: /* XCERA */ return s->xcer[0]; - case 0x22: /* XCERB */ + case 0x22: /* XCERB */ return s->xcer[1]; - case 0x24: /* PCR0 */ + case 0x24: /* PCR0 */ return s->pcr; - case 0x26: /* RCERC */ + case 0x26: /* RCERC */ return s->rcer[2]; - case 0x28: /* RCERD */ + case 0x28: /* RCERD */ return s->rcer[3]; - case 0x2a: /* XCERC */ + case 0x2a: /* XCERC */ return s->xcer[2]; - case 0x2c: /* XCERD */ + case 0x2c: /* XCERD */ return s->xcer[3]; - case 0x2e: /* RCERE */ + case 0x2e: /* RCERE */ return s->rcer[4]; - case 0x30: /* RCERF */ + case 0x30: /* RCERF */ return s->rcer[5]; - case 0x32: /* XCERE */ + case 0x32: /* XCERE */ return s->xcer[4]; - case 0x34: /* XCERF */ + case 0x34: /* XCERF */ return s->xcer[5]; - case 0x36: /* RCERG */ + case 0x36: /* RCERG */ return s->rcer[6]; - case 0x38: /* RCERH */ + case 0x38: /* RCERH */ return s->rcer[7]; - case 0x3a: /* XCERG */ + case 0x3a: /* XCERG */ return s->xcer[6]; - case 0x3c: /* XCERH */ + case 0x3c: /* XCERH */ return s->xcer[7]; } @@ -3214,16 +3214,16 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; switch (offset) { - case 0x00: /* DRR2 */ - case 0x02: /* DRR1 */ + case 0x00: /* DRR2 */ + case 0x02: /* DRR1 */ OMAP_RO_REG(addr); return; - case 0x04: /* DXR2 */ - if (((s->xcr[0] >> 5) & 7) < 3) /* XWDLEN1 */ + case 0x04: /* DXR2 */ + if (((s->xcr[0] >> 5) & 7) < 3) /* XWDLEN1 */ return; /* Fall through. */ - case 0x06: /* DXR1 */ + case 0x06: /* DXR1 */ if (s->tx_req > 1) { s->tx_req -= 2; if (s->codec && s->codec->cts) { @@ -3237,15 +3237,15 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, } return; - case 0x08: /* SPCR2 */ + case 0x08: /* SPCR2 */ s->spcr[1] &= 0x0002; s->spcr[1] |= 0x03f9 & value; - s->spcr[1] |= 0x0004 & (value << 2); /* XEMPTY := XRST */ - if (~value & 1) /* XRST */ + s->spcr[1] |= 0x0004 & (value << 2); /* XEMPTY := XRST */ + if (~value & 1) /* XRST */ s->spcr[1] &= ~6; omap_mcbsp_req_update(s); return; - case 0x0a: /* SPCR1 */ + case 0x0a: /* SPCR1 */ s->spcr[0] &= 0x0006; s->spcr[0] |= 0xf8f9 & value; if (value & (1 << 15)) { /* DLB */ @@ -3253,7 +3253,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, "%s: Digital Loopback mode enable attempt\n", __func__); } - if (~value & 1) { /* RRST */ + if (~value & 1) { /* RRST */ s->spcr[0] &= ~6; s->rx_req = 0; omap_mcbsp_rx_done(s); @@ -3261,27 +3261,27 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, omap_mcbsp_req_update(s); return; - case 0x0c: /* RCR2 */ + case 0x0c: /* RCR2 */ s->rcr[1] = value & 0xffff; return; - case 0x0e: /* RCR1 */ + case 0x0e: /* RCR1 */ s->rcr[0] = value & 0x7fe0; return; - case 0x10: /* XCR2 */ + case 0x10: /* XCR2 */ s->xcr[1] = value & 0xffff; return; - case 0x12: /* XCR1 */ + case 0x12: /* XCR1 */ s->xcr[0] = value & 0x7fe0; return; - case 0x14: /* SRGR2 */ + case 0x14: /* SRGR2 */ s->srgr[1] = value & 0xffff; omap_mcbsp_req_update(s); return; - case 0x16: /* SRGR1 */ + case 0x16: /* SRGR1 */ s->srgr[0] = value & 0xffff; omap_mcbsp_req_update(s); return; - case 0x18: /* MCR2 */ + case 0x18: /* MCR2 */ s->mcr[1] = value & 0x03e3; if (value & 3) { /* XMCM */ qemu_log_mask(LOG_UNIMP, @@ -3289,7 +3289,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, __func__); } return; - case 0x1a: /* MCR1 */ + case 0x1a: /* MCR1 */ s->mcr[0] = value & 0x03e1; if (value & 1) { /* RMCM */ qemu_log_mask(LOG_UNIMP, @@ -3297,55 +3297,55 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr addr, __func__); } return; - case 0x1c: /* RCERA */ + case 0x1c: /* RCERA */ s->rcer[0] = value & 0xffff; return; - case 0x1e: /* RCERB */ + case 0x1e: /* RCERB */ s->rcer[1] = value & 0xffff; return; - case 0x20: /* XCERA */ + case 0x20: /* XCERA */ s->xcer[0] = value & 0xffff; return; - case 0x22: /* XCERB */ + case 0x22: /* XCERB */ s->xcer[1] = value & 0xffff; return; - case 0x24: /* PCR0 */ + case 0x24: /* PCR0 */ s->pcr = value & 0x7faf; return; - case 0x26: /* RCERC */ + case 0x26: /* RCERC */ s->rcer[2] = value & 0xffff; return; - case 0x28: /* RCERD */ + case 0x28: /* RCERD */ s->rcer[3] = value & 0xffff; return; - case 0x2a: /* XCERC */ + case 0x2a: /* XCERC */ s->xcer[2] = value & 0xffff; return; - case 0x2c: /* XCERD */ + case 0x2c: /* XCERD */ s->xcer[3] = value & 0xffff; return; - case 0x2e: /* RCERE */ + case 0x2e: /* RCERE */ s->rcer[4] = value & 0xffff; return; - case 0x30: /* RCERF */ + case 0x30: /* RCERF */ s->rcer[5] = value & 0xffff; return; - case 0x32: /* XCERE */ + case 0x32: /* XCERE */ s->xcer[4] = value & 0xffff; return; - case 0x34: /* XCERF */ + case 0x34: /* XCERF */ s->xcer[5] = value & 0xffff; return; - case 0x36: /* RCERG */ + case 0x36: /* RCERG */ s->rcer[6] = value & 0xffff; return; - case 0x38: /* RCERH */ + case 0x38: /* RCERH */ s->rcer[7] = value & 0xffff; return; - case 0x3a: /* XCERG */ + case 0x3a: /* XCERG */ s->xcer[6] = value & 0xffff; return; - case 0x3c: /* XCERH */ + case 0x3c: /* XCERH */ s->xcer[7] = value & 0xffff; return; } @@ -3359,8 +3359,8 @@ static void omap_mcbsp_writew(void *opaque, hwaddr addr, struct omap_mcbsp_s *s = opaque; int offset = addr & OMAP_MPUI_REG_MASK; - if (offset == 0x04) { /* DXR */ - if (((s->xcr[0] >> 5) & 7) < 3) /* XWDLEN1 */ + if (offset == 0x04) { /* DXR */ + if (((s->xcr[0] >> 5) & 7) < 3) /* XWDLEN1 */ return; if (s->tx_req > 3) { s->tx_req -= 4; @@ -3504,15 +3504,15 @@ static void omap_lpg_update(struct omap_lpg_s *s) int64_t on, period = 1, ticks = 1000; static const int per[8] = { 1, 2, 4, 8, 12, 16, 20, 24 }; - if (~s->control & (1 << 6)) /* LPGRES */ + if (~s->control & (1 << 6)) /* LPGRES */ on = 0; - else if (s->control & (1 << 7)) /* PERM_ON */ + else if (s->control & (1 << 7)) /* PERM_ON */ on = period; else { - period = muldiv64(ticks, per[s->control & 7], /* PERCTRL */ + period = muldiv64(ticks, per[s->control & 7], /* PERCTRL */ 256 / 32); on = (s->clk && s->power) ? muldiv64(ticks, - per[(s->control >> 3) & 7], 256) : 0; /* ONCTRL */ + per[(s->control >> 3) & 7], 256) : 0; /* ONCTRL */ } timer_del(s->tm); @@ -3550,10 +3550,10 @@ static uint64_t omap_lpg_read(void *opaque, hwaddr addr, unsigned size) } switch (offset) { - case 0x00: /* LCR */ + case 0x00: /* LCR */ return s->control; - case 0x04: /* PMR */ + case 0x04: /* PMR */ return s->power; } @@ -3573,14 +3573,14 @@ static void omap_lpg_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* LCR */ - if (~value & (1 << 6)) /* LPGRES */ + case 0x00: /* LCR */ + if (~value & (1 << 6)) /* LPGRES */ omap_lpg_reset(s); s->control = value & 0xff; omap_lpg_update(s); return; - case 0x04: /* PMR */ + case 0x04: /* PMR */ s->power = value & 0x01; omap_lpg_update(s); return; @@ -3630,7 +3630,7 @@ static uint64_t omap_mpui_io_read(void *opaque, hwaddr addr, return omap_badwidth_read16(opaque, addr); } - if (addr == OMAP_MPUI_BASE) /* CMR */ + if (addr == OMAP_MPUI_BASE) /* CMR */ return 0xfe4d; OMAP_BAD_REG(addr); @@ -3703,25 +3703,25 @@ static const struct omap_map_s { const char *name; } omap15xx_dsp_mm[] = { /* Strobe 0 */ - { 0xe1010000, 0xfffb0000, 0x800, "UART1 BT" }, /* CS0 */ - { 0xe1010800, 0xfffb0800, 0x800, "UART2 COM" }, /* CS1 */ - { 0xe1011800, 0xfffb1800, 0x800, "McBSP1 audio" }, /* CS3 */ - { 0xe1012000, 0xfffb2000, 0x800, "MCSI2 communication" }, /* CS4 */ - { 0xe1012800, 0xfffb2800, 0x800, "MCSI1 BT u-Law" }, /* CS5 */ - { 0xe1013000, 0xfffb3000, 0x800, "uWire" }, /* CS6 */ - { 0xe1013800, 0xfffb3800, 0x800, "I^2C" }, /* CS7 */ - { 0xe1014000, 0xfffb4000, 0x800, "USB W2FC" }, /* CS8 */ - { 0xe1014800, 0xfffb4800, 0x800, "RTC" }, /* CS9 */ - { 0xe1015000, 0xfffb5000, 0x800, "MPUIO" }, /* CS10 */ - { 0xe1015800, 0xfffb5800, 0x800, "PWL" }, /* CS11 */ - { 0xe1016000, 0xfffb6000, 0x800, "PWT" }, /* CS12 */ - { 0xe1017000, 0xfffb7000, 0x800, "McBSP3" }, /* CS14 */ - { 0xe1017800, 0xfffb7800, 0x800, "MMC" }, /* CS15 */ - { 0xe1019000, 0xfffb9000, 0x800, "32-kHz timer" }, /* CS18 */ - { 0xe1019800, 0xfffb9800, 0x800, "UART3" }, /* CS19 */ - { 0xe101c800, 0xfffbc800, 0x800, "TIPB switches" }, /* CS25 */ + { 0xe1010000, 0xfffb0000, 0x800, "UART1 BT" }, /* CS0 */ + { 0xe1010800, 0xfffb0800, 0x800, "UART2 COM" }, /* CS1 */ + { 0xe1011800, 0xfffb1800, 0x800, "McBSP1 audio" }, /* CS3 */ + { 0xe1012000, 0xfffb2000, 0x800, "MCSI2 communication" }, /* CS4 */ + { 0xe1012800, 0xfffb2800, 0x800, "MCSI1 BT u-Law" }, /* CS5 */ + { 0xe1013000, 0xfffb3000, 0x800, "uWire" }, /* CS6 */ + { 0xe1013800, 0xfffb3800, 0x800, "I^2C" }, /* CS7 */ + { 0xe1014000, 0xfffb4000, 0x800, "USB W2FC" }, /* CS8 */ + { 0xe1014800, 0xfffb4800, 0x800, "RTC" }, /* CS9 */ + { 0xe1015000, 0xfffb5000, 0x800, "MPUIO" }, /* CS10 */ + { 0xe1015800, 0xfffb5800, 0x800, "PWL" }, /* CS11 */ + { 0xe1016000, 0xfffb6000, 0x800, "PWT" }, /* CS12 */ + { 0xe1017000, 0xfffb7000, 0x800, "McBSP3" }, /* CS14 */ + { 0xe1017800, 0xfffb7800, 0x800, "MMC" }, /* CS15 */ + { 0xe1019000, 0xfffb9000, 0x800, "32-kHz timer" }, /* CS18 */ + { 0xe1019800, 0xfffb9800, 0x800, "UART3" }, /* CS19 */ + { 0xe101c800, 0xfffbc800, 0x800, "TIPB switches" }, /* CS25 */ /* Strobe 1 */ - { 0xe101e000, 0xfffce000, 0x800, "GPIOs" }, /* CS28 */ + { 0xe101e000, 0xfffce000, 0x800, "GPIOs" }, /* CS28 */ { 0 } }; @@ -4025,18 +4025,18 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *dram, 0xfffbd800, omap_findclk(s, "clk32-kHz")); /* Register mappings not currently implemented: - * MCSI2 Comm fffb2000 - fffb27ff (not mapped on OMAP310) - * MCSI1 Bluetooth fffb2800 - fffb2fff (not mapped on OMAP310) - * USB W2FC fffb4000 - fffb47ff - * Camera Interface fffb6800 - fffb6fff - * USB Host fffba000 - fffba7ff - * FAC fffba800 - fffbafff - * HDQ/1-Wire fffbc000 - fffbc7ff - * TIPB switches fffbc800 - fffbcfff - * Mailbox fffcf000 - fffcf7ff - * Local bus IF fffec100 - fffec1ff - * Local bus MMU fffec200 - fffec2ff - * DSP MMU fffed200 - fffed2ff + * MCSI2 Comm fffb2000 - fffb27ff (not mapped on OMAP310) + * MCSI1 Bluetooth fffb2800 - fffb2fff (not mapped on OMAP310) + * USB W2FC fffb4000 - fffb47ff + * Camera Interface fffb6800 - fffb6fff + * USB Host fffba000 - fffba7ff + * FAC fffba800 - fffbafff + * HDQ/1-Wire fffbc000 - fffbc7ff + * TIPB switches fffbc800 - fffbcfff + * Mailbox fffcf000 - fffcf7ff + * Local bus IF fffec100 - fffec1ff + * Local bus MMU fffec200 - fffec2ff + * DSP MMU fffed200 - fffed2ff */ omap_setup_dsp_mapping(system_memory, omap15xx_dsp_mm); diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 1d89a202bb9..5d4a31b7aed 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -1,7 +1,7 @@ /* omap_sx1.c Support for the Siemens SX1 smartphone emulation. * * Copyright (C) 2008 - * Jean-Christophe PLAGNIOL-VILLARD + * Jean-Christophe PLAGNIOL-VILLARD * Copyright (C) 2007 Vladimir Ananiev * * based on PalmOne's (TM) PDAs support (palm.c) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 9a8c3c34a07..101f91f4a33 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -131,9 +131,9 @@ struct omap_dma_s { #define LAST_FRAME_INTR (1 << 4) #define END_BLOCK_INTR (1 << 5) #define SYNC (1 << 6) -#define END_PKT_INTR (1 << 7) -#define TRANS_ERR_INTR (1 << 8) -#define MISALIGN_INTR (1 << 11) +#define END_PKT_INTR (1 << 7) +#define TRANS_ERR_INTR (1 << 8) +#define MISALIGN_INTR (1 << 11) static inline void omap_dma_interrupts_update(struct omap_dma_s *s) { @@ -526,12 +526,12 @@ static void omap_dma_transfer_setup(struct soc_dma_ch_s *dma) /* Check all the conditions that terminate the transfer starting * with those that can occur the soonest. */ -#define INTR_CHECK(cond, id, nelements) \ - if (cond) { \ - elements[id] = nelements; \ - if (elements[id] < min_elems) \ - min_elems = elements[id]; \ - } else \ +#define INTR_CHECK(cond, id, nelements) \ + if (cond) { \ + elements[id] = nelements; \ + if (elements[id] < min_elems) \ + min_elems = elements[id]; \ + } else \ elements[id] = INT_MAX; /* Elements */ @@ -740,7 +740,7 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, struct omap_dma_channel_s *ch, int reg, uint16_t *value) { switch (reg) { - case 0x00: /* SYS_DMA_CSDP_CH0 */ + case 0x00: /* SYS_DMA_CSDP_CH0 */ *value = (ch->burst[1] << 14) | (ch->pack[1] << 13) | (ch->port[1] << 9) | @@ -750,9 +750,9 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, (ch->data_type >> 1); break; - case 0x02: /* SYS_DMA_CCR_CH0 */ + case 0x02: /* SYS_DMA_CCR_CH0 */ if (s->model <= omap_dma_3_1) - *value = 0 << 10; /* FIFO_FLUSH reads as 0 */ + *value = 0 << 10; /* FIFO_FLUSH reads as 0 */ else *value = ch->omap_3_1_compatible_disable << 10; *value |= (ch->mode[1] << 14) | @@ -765,11 +765,11 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, (ch->fs << 5) | ch->sync; break; - case 0x04: /* SYS_DMA_CICR_CH0 */ + case 0x04: /* SYS_DMA_CICR_CH0 */ *value = ch->interrupts; break; - case 0x06: /* SYS_DMA_CSR_CH0 */ + case 0x06: /* SYS_DMA_CSR_CH0 */ *value = ch->status; ch->status &= SYNC; if (!ch->omap_3_1_compatible_disable && ch->sibling) { @@ -779,77 +779,77 @@ static int omap_dma_ch_reg_read(struct omap_dma_s *s, qemu_irq_lower(ch->irq); break; - case 0x08: /* SYS_DMA_CSSA_L_CH0 */ + case 0x08: /* SYS_DMA_CSSA_L_CH0 */ *value = ch->addr[0] & 0x0000ffff; break; - case 0x0a: /* SYS_DMA_CSSA_U_CH0 */ + case 0x0a: /* SYS_DMA_CSSA_U_CH0 */ *value = ch->addr[0] >> 16; break; - case 0x0c: /* SYS_DMA_CDSA_L_CH0 */ + case 0x0c: /* SYS_DMA_CDSA_L_CH0 */ *value = ch->addr[1] & 0x0000ffff; break; - case 0x0e: /* SYS_DMA_CDSA_U_CH0 */ + case 0x0e: /* SYS_DMA_CDSA_U_CH0 */ *value = ch->addr[1] >> 16; break; - case 0x10: /* SYS_DMA_CEN_CH0 */ + case 0x10: /* SYS_DMA_CEN_CH0 */ *value = ch->elements; break; - case 0x12: /* SYS_DMA_CFN_CH0 */ + case 0x12: /* SYS_DMA_CFN_CH0 */ *value = ch->frames; break; - case 0x14: /* SYS_DMA_CFI_CH0 */ + case 0x14: /* SYS_DMA_CFI_CH0 */ *value = ch->frame_index[0]; break; - case 0x16: /* SYS_DMA_CEI_CH0 */ + case 0x16: /* SYS_DMA_CEI_CH0 */ *value = ch->element_index[0]; break; - case 0x18: /* SYS_DMA_CPC_CH0 or DMA_CSAC */ + case 0x18: /* SYS_DMA_CPC_CH0 or DMA_CSAC */ if (ch->omap_3_1_compatible_disable) - *value = ch->active_set.src & 0xffff; /* CSAC */ + *value = ch->active_set.src & 0xffff; /* CSAC */ else *value = ch->cpc; break; - case 0x1a: /* DMA_CDAC */ - *value = ch->active_set.dest & 0xffff; /* CDAC */ + case 0x1a: /* DMA_CDAC */ + *value = ch->active_set.dest & 0xffff; /* CDAC */ break; - case 0x1c: /* DMA_CDEI */ + case 0x1c: /* DMA_CDEI */ *value = ch->element_index[1]; break; - case 0x1e: /* DMA_CDFI */ + case 0x1e: /* DMA_CDFI */ *value = ch->frame_index[1]; break; - case 0x20: /* DMA_COLOR_L */ + case 0x20: /* DMA_COLOR_L */ *value = ch->color & 0xffff; break; - case 0x22: /* DMA_COLOR_U */ + case 0x22: /* DMA_COLOR_U */ *value = ch->color >> 16; break; - case 0x24: /* DMA_CCR2 */ + case 0x24: /* DMA_CCR2 */ *value = (ch->bs << 2) | (ch->transparent_copy << 1) | ch->constant_fill; break; - case 0x28: /* DMA_CLNK_CTRL */ + case 0x28: /* DMA_CLNK_CTRL */ *value = (ch->link_enabled << 15) | (ch->link_next_ch & 0xf); break; - case 0x2a: /* DMA_LCH_CTRL */ + case 0x2a: /* DMA_LCH_CTRL */ *value = (ch->interleave_disabled << 15) | ch->type; break; @@ -864,7 +864,7 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, struct omap_dma_channel_s *ch, int reg, uint16_t value) { switch (reg) { - case 0x00: /* SYS_DMA_CSDP_CH0 */ + case 0x00: /* SYS_DMA_CSDP_CH0 */ ch->burst[1] = (value & 0xc000) >> 14; ch->pack[1] = (value & 0x2000) >> 13; ch->port[1] = (enum omap_dma_port) ((value & 0x1e00) >> 9); @@ -887,7 +887,7 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, } break; - case 0x02: /* SYS_DMA_CCR_CH0 */ + case 0x02: /* SYS_DMA_CCR_CH0 */ ch->mode[1] = (omap_dma_addressing_t) ((value & 0xc000) >> 14); ch->mode[0] = (omap_dma_addressing_t) ((value & 0x3000) >> 12); ch->end_prog = (value & 0x0800) >> 11; @@ -909,88 +909,88 @@ static int omap_dma_ch_reg_write(struct omap_dma_s *s, break; - case 0x04: /* SYS_DMA_CICR_CH0 */ + case 0x04: /* SYS_DMA_CICR_CH0 */ ch->interrupts = value & 0x3f; break; - case 0x06: /* SYS_DMA_CSR_CH0 */ + case 0x06: /* SYS_DMA_CSR_CH0 */ OMAP_RO_REG((hwaddr) reg); break; - case 0x08: /* SYS_DMA_CSSA_L_CH0 */ + case 0x08: /* SYS_DMA_CSSA_L_CH0 */ ch->addr[0] &= 0xffff0000; ch->addr[0] |= value; break; - case 0x0a: /* SYS_DMA_CSSA_U_CH0 */ + case 0x0a: /* SYS_DMA_CSSA_U_CH0 */ ch->addr[0] &= 0x0000ffff; ch->addr[0] |= (uint32_t) value << 16; break; - case 0x0c: /* SYS_DMA_CDSA_L_CH0 */ + case 0x0c: /* SYS_DMA_CDSA_L_CH0 */ ch->addr[1] &= 0xffff0000; ch->addr[1] |= value; break; - case 0x0e: /* SYS_DMA_CDSA_U_CH0 */ + case 0x0e: /* SYS_DMA_CDSA_U_CH0 */ ch->addr[1] &= 0x0000ffff; ch->addr[1] |= (uint32_t) value << 16; break; - case 0x10: /* SYS_DMA_CEN_CH0 */ + case 0x10: /* SYS_DMA_CEN_CH0 */ ch->elements = value; break; - case 0x12: /* SYS_DMA_CFN_CH0 */ + case 0x12: /* SYS_DMA_CFN_CH0 */ ch->frames = value; break; - case 0x14: /* SYS_DMA_CFI_CH0 */ + case 0x14: /* SYS_DMA_CFI_CH0 */ ch->frame_index[0] = (int16_t) value; break; - case 0x16: /* SYS_DMA_CEI_CH0 */ + case 0x16: /* SYS_DMA_CEI_CH0 */ ch->element_index[0] = (int16_t) value; break; - case 0x18: /* SYS_DMA_CPC_CH0 or DMA_CSAC */ + case 0x18: /* SYS_DMA_CPC_CH0 or DMA_CSAC */ OMAP_RO_REG((hwaddr) reg); break; - case 0x1c: /* DMA_CDEI */ + case 0x1c: /* DMA_CDEI */ ch->element_index[1] = (int16_t) value; break; - case 0x1e: /* DMA_CDFI */ + case 0x1e: /* DMA_CDFI */ ch->frame_index[1] = (int16_t) value; break; - case 0x20: /* DMA_COLOR_L */ + case 0x20: /* DMA_COLOR_L */ ch->color &= 0xffff0000; ch->color |= value; break; - case 0x22: /* DMA_COLOR_U */ + case 0x22: /* DMA_COLOR_U */ ch->color &= 0xffff; ch->color |= (uint32_t)value << 16; break; - case 0x24: /* DMA_CCR2 */ + case 0x24: /* DMA_CCR2 */ ch->bs = (value >> 2) & 0x1; ch->transparent_copy = (value >> 1) & 0x1; ch->constant_fill = value & 0x1; break; - case 0x28: /* DMA_CLNK_CTRL */ + case 0x28: /* DMA_CLNK_CTRL */ ch->link_enabled = (value >> 15) & 0x1; - if (value & (1 << 14)) { /* Stop_Lnk */ + if (value & (1 << 14)) { /* Stop_Lnk */ ch->link_enabled = 0; omap_dma_disable_channel(s, ch); } ch->link_next_ch = value & 0x1f; break; - case 0x2a: /* DMA_LCH_CTRL */ + case 0x2a: /* DMA_LCH_CTRL */ ch->interleave_disabled = (value >> 15) & 0x1; ch->type = value & 0xf; break; @@ -1005,7 +1005,7 @@ static int omap_dma_3_2_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, uint16_t value) { switch (offset) { - case 0xbc0: /* DMA_LCD_CSDP */ + case 0xbc0: /* DMA_LCD_CSDP */ s->brust_f2 = (value >> 14) & 0x3; s->pack_f2 = (value >> 13) & 0x1; s->data_type_f2 = (1 << ((value >> 11) & 0x3)); @@ -1014,7 +1014,7 @@ static int omap_dma_3_2_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, s->data_type_f1 = (1 << ((value >> 0) & 0x3)); break; - case 0xbc2: /* DMA_LCD_CCR */ + case 0xbc2: /* DMA_LCD_CCR */ s->mode_f2 = (value >> 14) & 0x3; s->mode_f1 = (value >> 12) & 0x3; s->end_prog = (value >> 11) & 0x1; @@ -1026,7 +1026,7 @@ static int omap_dma_3_2_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, s->bs = (value >> 4) & 0x1; break; - case 0xbc4: /* DMA_LCD_CTRL */ + case 0xbc4: /* DMA_LCD_CTRL */ s->dst = (value >> 8) & 0x1; s->src = ((value >> 6) & 0x3) << 1; s->condition = 0; @@ -1035,91 +1035,91 @@ static int omap_dma_3_2_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, s->dual = value & 1; break; - case 0xbc8: /* TOP_B1_L */ + case 0xbc8: /* TOP_B1_L */ s->src_f1_top &= 0xffff0000; s->src_f1_top |= 0x0000ffff & value; break; - case 0xbca: /* TOP_B1_U */ + case 0xbca: /* TOP_B1_U */ s->src_f1_top &= 0x0000ffff; s->src_f1_top |= (uint32_t)value << 16; break; - case 0xbcc: /* BOT_B1_L */ + case 0xbcc: /* BOT_B1_L */ s->src_f1_bottom &= 0xffff0000; s->src_f1_bottom |= 0x0000ffff & value; break; - case 0xbce: /* BOT_B1_U */ + case 0xbce: /* BOT_B1_U */ s->src_f1_bottom &= 0x0000ffff; s->src_f1_bottom |= (uint32_t) value << 16; break; - case 0xbd0: /* TOP_B2_L */ + case 0xbd0: /* TOP_B2_L */ s->src_f2_top &= 0xffff0000; s->src_f2_top |= 0x0000ffff & value; break; - case 0xbd2: /* TOP_B2_U */ + case 0xbd2: /* TOP_B2_U */ s->src_f2_top &= 0x0000ffff; s->src_f2_top |= (uint32_t) value << 16; break; - case 0xbd4: /* BOT_B2_L */ + case 0xbd4: /* BOT_B2_L */ s->src_f2_bottom &= 0xffff0000; s->src_f2_bottom |= 0x0000ffff & value; break; - case 0xbd6: /* BOT_B2_U */ + case 0xbd6: /* BOT_B2_U */ s->src_f2_bottom &= 0x0000ffff; s->src_f2_bottom |= (uint32_t) value << 16; break; - case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ + case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ s->element_index_f1 = value; break; - case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ + case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ s->frame_index_f1 &= 0xffff0000; s->frame_index_f1 |= 0x0000ffff & value; break; - case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ + case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ s->frame_index_f1 &= 0x0000ffff; s->frame_index_f1 |= (uint32_t) value << 16; break; - case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ + case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ s->element_index_f2 = value; break; - case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ + case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ s->frame_index_f2 &= 0xffff0000; s->frame_index_f2 |= 0x0000ffff & value; break; - case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ + case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ s->frame_index_f2 &= 0x0000ffff; s->frame_index_f2 |= (uint32_t) value << 16; break; - case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ + case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ s->elements_f1 = value; break; - case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ + case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ s->frames_f1 = value; break; - case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ + case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ s->elements_f2 = value; break; - case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ + case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ s->frames_f2 = value; break; - case 0xbea: /* DMA_LCD_LCH_CTRL */ + case 0xbea: /* DMA_LCD_LCH_CTRL */ s->lch_type = value & 0xf; break; @@ -1133,7 +1133,7 @@ static int omap_dma_3_2_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, uint16_t *ret) { switch (offset) { - case 0xbc0: /* DMA_LCD_CSDP */ + case 0xbc0: /* DMA_LCD_CSDP */ *ret = (s->brust_f2 << 14) | (s->pack_f2 << 13) | ((s->data_type_f2 >> 1) << 11) | @@ -1142,7 +1142,7 @@ static int omap_dma_3_2_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, ((s->data_type_f1 >> 1) << 0); break; - case 0xbc2: /* DMA_LCD_CCR */ + case 0xbc2: /* DMA_LCD_CCR */ *ret = (s->mode_f2 << 14) | (s->mode_f1 << 12) | (s->end_prog << 11) | @@ -1154,7 +1154,7 @@ static int omap_dma_3_2_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, (s->bs << 4); break; - case 0xbc4: /* DMA_LCD_CTRL */ + case 0xbc4: /* DMA_LCD_CTRL */ qemu_irq_lower(s->irq); *ret = (s->dst << 8) | ((s->src & 0x6) << 5) | @@ -1163,79 +1163,79 @@ static int omap_dma_3_2_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, s->dual; break; - case 0xbc8: /* TOP_B1_L */ + case 0xbc8: /* TOP_B1_L */ *ret = s->src_f1_top & 0xffff; break; - case 0xbca: /* TOP_B1_U */ + case 0xbca: /* TOP_B1_U */ *ret = s->src_f1_top >> 16; break; - case 0xbcc: /* BOT_B1_L */ + case 0xbcc: /* BOT_B1_L */ *ret = s->src_f1_bottom & 0xffff; break; - case 0xbce: /* BOT_B1_U */ + case 0xbce: /* BOT_B1_U */ *ret = s->src_f1_bottom >> 16; break; - case 0xbd0: /* TOP_B2_L */ + case 0xbd0: /* TOP_B2_L */ *ret = s->src_f2_top & 0xffff; break; - case 0xbd2: /* TOP_B2_U */ + case 0xbd2: /* TOP_B2_U */ *ret = s->src_f2_top >> 16; break; - case 0xbd4: /* BOT_B2_L */ + case 0xbd4: /* BOT_B2_L */ *ret = s->src_f2_bottom & 0xffff; break; - case 0xbd6: /* BOT_B2_U */ + case 0xbd6: /* BOT_B2_U */ *ret = s->src_f2_bottom >> 16; break; - case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ + case 0xbd8: /* DMA_LCD_SRC_EI_B1 */ *ret = s->element_index_f1; break; - case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ + case 0xbda: /* DMA_LCD_SRC_FI_B1_L */ *ret = s->frame_index_f1 & 0xffff; break; - case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ + case 0xbf4: /* DMA_LCD_SRC_FI_B1_U */ *ret = s->frame_index_f1 >> 16; break; - case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ + case 0xbdc: /* DMA_LCD_SRC_EI_B2 */ *ret = s->element_index_f2; break; - case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ + case 0xbde: /* DMA_LCD_SRC_FI_B2_L */ *ret = s->frame_index_f2 & 0xffff; break; - case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ + case 0xbf6: /* DMA_LCD_SRC_FI_B2_U */ *ret = s->frame_index_f2 >> 16; break; - case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ + case 0xbe0: /* DMA_LCD_SRC_EN_B1 */ *ret = s->elements_f1; break; - case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ + case 0xbe4: /* DMA_LCD_SRC_FN_B1 */ *ret = s->frames_f1; break; - case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ + case 0xbe2: /* DMA_LCD_SRC_EN_B2 */ *ret = s->elements_f2; break; - case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ + case 0xbe6: /* DMA_LCD_SRC_FN_B2 */ *ret = s->frames_f2; break; - case 0xbea: /* DMA_LCD_LCH_CTRL */ + case 0xbea: /* DMA_LCD_LCH_CTRL */ *ret = s->lch_type; break; @@ -1249,7 +1249,7 @@ static int omap_dma_3_1_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, uint16_t value) { switch (offset) { - case 0x300: /* SYS_DMA_LCD_CTRL */ + case 0x300: /* SYS_DMA_LCD_CTRL */ s->src = (value & 0x40) ? imif : emiff; s->condition = 0; /* Assume no bus errors and thus no BUS_ERROR irq bits. */ @@ -1257,42 +1257,42 @@ static int omap_dma_3_1_lcd_write(struct omap_dma_lcd_channel_s *s, int offset, s->dual = value & 1; break; - case 0x302: /* SYS_DMA_LCD_TOP_F1_L */ + case 0x302: /* SYS_DMA_LCD_TOP_F1_L */ s->src_f1_top &= 0xffff0000; s->src_f1_top |= 0x0000ffff & value; break; - case 0x304: /* SYS_DMA_LCD_TOP_F1_U */ + case 0x304: /* SYS_DMA_LCD_TOP_F1_U */ s->src_f1_top &= 0x0000ffff; s->src_f1_top |= (uint32_t)value << 16; break; - case 0x306: /* SYS_DMA_LCD_BOT_F1_L */ + case 0x306: /* SYS_DMA_LCD_BOT_F1_L */ s->src_f1_bottom &= 0xffff0000; s->src_f1_bottom |= 0x0000ffff & value; break; - case 0x308: /* SYS_DMA_LCD_BOT_F1_U */ + case 0x308: /* SYS_DMA_LCD_BOT_F1_U */ s->src_f1_bottom &= 0x0000ffff; s->src_f1_bottom |= (uint32_t)value << 16; break; - case 0x30a: /* SYS_DMA_LCD_TOP_F2_L */ + case 0x30a: /* SYS_DMA_LCD_TOP_F2_L */ s->src_f2_top &= 0xffff0000; s->src_f2_top |= 0x0000ffff & value; break; - case 0x30c: /* SYS_DMA_LCD_TOP_F2_U */ + case 0x30c: /* SYS_DMA_LCD_TOP_F2_U */ s->src_f2_top &= 0x0000ffff; s->src_f2_top |= (uint32_t)value << 16; break; - case 0x30e: /* SYS_DMA_LCD_BOT_F2_L */ + case 0x30e: /* SYS_DMA_LCD_BOT_F2_L */ s->src_f2_bottom &= 0xffff0000; s->src_f2_bottom |= 0x0000ffff & value; break; - case 0x310: /* SYS_DMA_LCD_BOT_F2_U */ + case 0x310: /* SYS_DMA_LCD_BOT_F2_U */ s->src_f2_bottom &= 0x0000ffff; s->src_f2_bottom |= (uint32_t)value << 16; break; @@ -1309,7 +1309,7 @@ static int omap_dma_3_1_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, int i; switch (offset) { - case 0x300: /* SYS_DMA_LCD_CTRL */ + case 0x300: /* SYS_DMA_LCD_CTRL */ i = s->condition; s->condition = 0; qemu_irq_lower(s->irq); @@ -1317,35 +1317,35 @@ static int omap_dma_3_1_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, (s->interrupts << 1) | s->dual; break; - case 0x302: /* SYS_DMA_LCD_TOP_F1_L */ + case 0x302: /* SYS_DMA_LCD_TOP_F1_L */ *ret = s->src_f1_top & 0xffff; break; - case 0x304: /* SYS_DMA_LCD_TOP_F1_U */ + case 0x304: /* SYS_DMA_LCD_TOP_F1_U */ *ret = s->src_f1_top >> 16; break; - case 0x306: /* SYS_DMA_LCD_BOT_F1_L */ + case 0x306: /* SYS_DMA_LCD_BOT_F1_L */ *ret = s->src_f1_bottom & 0xffff; break; - case 0x308: /* SYS_DMA_LCD_BOT_F1_U */ + case 0x308: /* SYS_DMA_LCD_BOT_F1_U */ *ret = s->src_f1_bottom >> 16; break; - case 0x30a: /* SYS_DMA_LCD_TOP_F2_L */ + case 0x30a: /* SYS_DMA_LCD_TOP_F2_L */ *ret = s->src_f2_top & 0xffff; break; - case 0x30c: /* SYS_DMA_LCD_TOP_F2_U */ + case 0x30c: /* SYS_DMA_LCD_TOP_F2_U */ *ret = s->src_f2_top >> 16; break; - case 0x30e: /* SYS_DMA_LCD_BOT_F2_L */ + case 0x30e: /* SYS_DMA_LCD_BOT_F2_L */ *ret = s->src_f2_bottom & 0xffff; break; - case 0x310: /* SYS_DMA_LCD_BOT_F2_U */ + case 0x310: /* SYS_DMA_LCD_BOT_F2_U */ *ret = s->src_f2_bottom >> 16; break; @@ -1358,18 +1358,18 @@ static int omap_dma_3_1_lcd_read(struct omap_dma_lcd_channel_s *s, int offset, static int omap_dma_sys_write(struct omap_dma_s *s, int offset, uint16_t value) { switch (offset) { - case 0x400: /* SYS_DMA_GCR */ + case 0x400: /* SYS_DMA_GCR */ s->gcr = value; break; - case 0x404: /* DMA_GSCR */ + case 0x404: /* DMA_GSCR */ if (value & 0x8) omap_dma_disable_3_1_mapping(s); else omap_dma_enable_3_1_mapping(s); break; - case 0x408: /* DMA_GRST */ + case 0x408: /* DMA_GRST */ if (value & 0x1) omap_dma_reset(s->dma); break; @@ -1384,57 +1384,57 @@ static int omap_dma_sys_read(struct omap_dma_s *s, int offset, uint16_t *ret) { switch (offset) { - case 0x400: /* SYS_DMA_GCR */ + case 0x400: /* SYS_DMA_GCR */ *ret = s->gcr; break; - case 0x404: /* DMA_GSCR */ + case 0x404: /* DMA_GSCR */ *ret = s->omap_3_1_mapping_disabled << 3; break; - case 0x408: /* DMA_GRST */ + case 0x408: /* DMA_GRST */ *ret = 0; break; - case 0x442: /* DMA_HW_ID */ - case 0x444: /* DMA_PCh2_ID */ - case 0x446: /* DMA_PCh0_ID */ - case 0x448: /* DMA_PCh1_ID */ - case 0x44a: /* DMA_PChG_ID */ - case 0x44c: /* DMA_PChD_ID */ + case 0x442: /* DMA_HW_ID */ + case 0x444: /* DMA_PCh2_ID */ + case 0x446: /* DMA_PCh0_ID */ + case 0x448: /* DMA_PCh1_ID */ + case 0x44a: /* DMA_PChG_ID */ + case 0x44c: /* DMA_PChD_ID */ *ret = 1; break; - case 0x44e: /* DMA_CAPS_0_U */ + case 0x44e: /* DMA_CAPS_0_U */ *ret = (s->caps[0] >> 16) & 0xffff; break; - case 0x450: /* DMA_CAPS_0_L */ + case 0x450: /* DMA_CAPS_0_L */ *ret = (s->caps[0] >> 0) & 0xffff; break; - case 0x452: /* DMA_CAPS_1_U */ + case 0x452: /* DMA_CAPS_1_U */ *ret = (s->caps[1] >> 16) & 0xffff; break; - case 0x454: /* DMA_CAPS_1_L */ + case 0x454: /* DMA_CAPS_1_L */ *ret = (s->caps[1] >> 0) & 0xffff; break; - case 0x456: /* DMA_CAPS_2 */ + case 0x456: /* DMA_CAPS_2 */ *ret = s->caps[2]; break; - case 0x458: /* DMA_CAPS_3 */ + case 0x458: /* DMA_CAPS_3 */ *ret = s->caps[3]; break; - case 0x45a: /* DMA_CAPS_4 */ + case 0x45a: /* DMA_CAPS_4 */ *ret = s->caps[4]; break; - case 0x460: /* DMA_PCh2_SR */ - case 0x480: /* DMA_PCh0_SR */ - case 0x482: /* DMA_PCh1_SR */ - case 0x4c0: /* DMA_PChD_SR_0 */ + case 0x460: /* DMA_PCh2_SR */ + case 0x480: /* DMA_PCh0_SR */ + case 0x482: /* DMA_PCh1_SR */ + case 0x4c0: /* DMA_PChD_SR_0 */ qemu_log_mask(LOG_UNIMP, "%s: Physical Channel Status Registers not implemented\n", __func__); @@ -1582,38 +1582,38 @@ static void omap_dma_setcaps(struct omap_dma_s *s) case omap_dma_3_2: /* XXX Only available for sDMA */ s->caps[0] = - (1 << 19) | /* Constant Fill Capability */ - (1 << 18); /* Transparent BLT Capability */ + (1 << 19) | /* Constant Fill Capability */ + (1 << 18); /* Transparent BLT Capability */ s->caps[1] = - (1 << 1); /* 1-bit palettized capability (DMA 3.2 only) */ + (1 << 1); /* 1-bit palettized capability (DMA 3.2 only) */ s->caps[2] = - (1 << 8) | /* SEPARATE_SRC_AND_DST_INDEX_CPBLTY */ - (1 << 7) | /* DST_DOUBLE_INDEX_ADRS_CPBLTY */ - (1 << 6) | /* DST_SINGLE_INDEX_ADRS_CPBLTY */ - (1 << 5) | /* DST_POST_INCRMNT_ADRS_CPBLTY */ - (1 << 4) | /* DST_CONST_ADRS_CPBLTY */ - (1 << 3) | /* SRC_DOUBLE_INDEX_ADRS_CPBLTY */ - (1 << 2) | /* SRC_SINGLE_INDEX_ADRS_CPBLTY */ - (1 << 1) | /* SRC_POST_INCRMNT_ADRS_CPBLTY */ - (1 << 0); /* SRC_CONST_ADRS_CPBLTY */ + (1 << 8) | /* SEPARATE_SRC_AND_DST_INDEX_CPBLTY */ + (1 << 7) | /* DST_DOUBLE_INDEX_ADRS_CPBLTY */ + (1 << 6) | /* DST_SINGLE_INDEX_ADRS_CPBLTY */ + (1 << 5) | /* DST_POST_INCRMNT_ADRS_CPBLTY */ + (1 << 4) | /* DST_CONST_ADRS_CPBLTY */ + (1 << 3) | /* SRC_DOUBLE_INDEX_ADRS_CPBLTY */ + (1 << 2) | /* SRC_SINGLE_INDEX_ADRS_CPBLTY */ + (1 << 1) | /* SRC_POST_INCRMNT_ADRS_CPBLTY */ + (1 << 0); /* SRC_CONST_ADRS_CPBLTY */ s->caps[3] = - (1 << 6) | /* BLOCK_SYNCHR_CPBLTY (DMA 4 only) */ - (1 << 7) | /* PKT_SYNCHR_CPBLTY (DMA 4 only) */ - (1 << 5) | /* CHANNEL_CHAINING_CPBLTY */ - (1 << 4) | /* LCh_INTERLEAVE_CPBLTY */ - (1 << 3) | /* AUTOINIT_REPEAT_CPBLTY (DMA 3.2 only) */ - (1 << 2) | /* AUTOINIT_ENDPROG_CPBLTY (DMA 3.2 only) */ - (1 << 1) | /* FRAME_SYNCHR_CPBLTY */ - (1 << 0); /* ELMNT_SYNCHR_CPBLTY */ + (1 << 6) | /* BLOCK_SYNCHR_CPBLTY (DMA 4 only) */ + (1 << 7) | /* PKT_SYNCHR_CPBLTY (DMA 4 only) */ + (1 << 5) | /* CHANNEL_CHAINING_CPBLTY */ + (1 << 4) | /* LCh_INTERLEAVE_CPBLTY */ + (1 << 3) | /* AUTOINIT_REPEAT_CPBLTY (DMA 3.2 only) */ + (1 << 2) | /* AUTOINIT_ENDPROG_CPBLTY (DMA 3.2 only) */ + (1 << 1) | /* FRAME_SYNCHR_CPBLTY */ + (1 << 0); /* ELMNT_SYNCHR_CPBLTY */ s->caps[4] = - (1 << 7) | /* PKT_INTERRUPT_CPBLTY (DMA 4 only) */ - (1 << 6) | /* SYNC_STATUS_CPBLTY */ - (1 << 5) | /* BLOCK_INTERRUPT_CPBLTY */ - (1 << 4) | /* LAST_FRAME_INTERRUPT_CPBLTY */ - (1 << 3) | /* FRAME_INTERRUPT_CPBLTY */ - (1 << 2) | /* HALF_FRAME_INTERRUPT_CPBLTY */ - (1 << 1) | /* EVENT_DROP_INTERRUPT_CPBLTY */ - (1 << 0); /* TIMEOUT_INTERRUPT_CPBLTY (DMA 3.2 only) */ + (1 << 7) | /* PKT_INTERRUPT_CPBLTY (DMA 4 only) */ + (1 << 6) | /* SYNC_STATUS_CPBLTY */ + (1 << 5) | /* BLOCK_INTERRUPT_CPBLTY */ + (1 << 4) | /* LAST_FRAME_INTERRUPT_CPBLTY */ + (1 << 3) | /* FRAME_INTERRUPT_CPBLTY */ + (1 << 2) | /* HALF_FRAME_INTERRUPT_CPBLTY */ + (1 << 1) | /* EVENT_DROP_INTERRUPT_CPBLTY */ + (1 << 0); /* TIMEOUT_INTERRUPT_CPBLTY (DMA 3.2 only) */ break; } } diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 61ea7862afe..f27806b774a 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -80,25 +80,25 @@ static uint64_t omap_gpio_read(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* DATA_INPUT */ + case 0x00: /* DATA_INPUT */ return s->inputs & s->pins; - case 0x04: /* DATA_OUTPUT */ + case 0x04: /* DATA_OUTPUT */ return s->outputs; - case 0x08: /* DIRECTION_CONTROL */ + case 0x08: /* DIRECTION_CONTROL */ return s->dir; - case 0x0c: /* INTERRUPT_CONTROL */ + case 0x0c: /* INTERRUPT_CONTROL */ return s->edge; - case 0x10: /* INTERRUPT_MASK */ + case 0x10: /* INTERRUPT_MASK */ return s->mask; - case 0x14: /* INTERRUPT_STATUS */ + case 0x14: /* INTERRUPT_STATUS */ return s->ints; - case 0x18: /* PIN_CONTROL (not in OMAP310) */ + case 0x18: /* PIN_CONTROL (not in OMAP310) */ OMAP_BAD_REG(addr); return s->pins; } @@ -121,11 +121,11 @@ static void omap_gpio_write(void *opaque, hwaddr addr, } switch (offset) { - case 0x00: /* DATA_INPUT */ + case 0x00: /* DATA_INPUT */ OMAP_RO_REG(addr); return; - case 0x04: /* DATA_OUTPUT */ + case 0x04: /* DATA_OUTPUT */ diff = (s->outputs ^ value) & ~s->dir; s->outputs = value; while ((ln = ctz32(diff)) != 32) { @@ -135,7 +135,7 @@ static void omap_gpio_write(void *opaque, hwaddr addr, } break; - case 0x08: /* DIRECTION_CONTROL */ + case 0x08: /* DIRECTION_CONTROL */ diff = s->outputs & (s->dir ^ value); s->dir = value; @@ -147,21 +147,21 @@ static void omap_gpio_write(void *opaque, hwaddr addr, } break; - case 0x0c: /* INTERRUPT_CONTROL */ + case 0x0c: /* INTERRUPT_CONTROL */ s->edge = value; break; - case 0x10: /* INTERRUPT_MASK */ + case 0x10: /* INTERRUPT_MASK */ s->mask = value; break; - case 0x14: /* INTERRUPT_STATUS */ + case 0x14: /* INTERRUPT_STATUS */ s->ints &= ~value; if (!s->ints) qemu_irq_lower(s->irq); break; - case 0x18: /* PIN_CONTROL (not in OMAP310 TRM) */ + case 0x18: /* PIN_CONTROL (not in OMAP310 TRM) */ OMAP_BAD_REG(addr); s->pins = value; break; diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 2e45266e74b..751bf748fd9 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -55,16 +55,16 @@ struct OMAPI2CState { uint16_t test; }; -#define OMAP2_INTR_REV 0x34 -#define OMAP2_GC_REV 0x34 +#define OMAP2_INTR_REV 0x34 +#define OMAP2_GC_REV 0x34 static void omap_i2c_interrupts_update(OMAPI2CState *s) { qemu_set_irq(s->irq, s->stat & s->mask); - if ((s->dma >> 15) & 1) /* RDMA_EN */ - qemu_set_irq(s->drq[0], (s->stat >> 3) & 1); /* RRDY */ - if ((s->dma >> 7) & 1) /* XDMA_EN */ - qemu_set_irq(s->drq[1], (s->stat >> 4) & 1); /* XRDY */ + if ((s->dma >> 15) & 1) /* RDMA_EN */ + qemu_set_irq(s->drq[0], (s->stat >> 3) & 1); /* RRDY */ + if ((s->dma >> 7) & 1) /* XDMA_EN */ + qemu_set_irq(s->drq[1], (s->stat >> 4) & 1); /* XRDY */ } static void omap_i2c_fifo_run(OMAPI2CState *s) @@ -74,25 +74,25 @@ static void omap_i2c_fifo_run(OMAPI2CState *s) if (!i2c_bus_busy(s->bus)) return; - if ((s->control >> 2) & 1) { /* RM */ - if ((s->control >> 1) & 1) { /* STP */ + if ((s->control >> 2) & 1) { /* RM */ + if ((s->control >> 1) & 1) { /* STP */ i2c_end_transfer(s->bus); - s->control &= ~(1 << 1); /* STP */ + s->control &= ~(1 << 1); /* STP */ s->count_cur = s->count; s->txlen = 0; - } else if ((s->control >> 9) & 1) { /* TRX */ + } else if ((s->control >> 9) & 1) { /* TRX */ while (ack && s->txlen) ack = (i2c_send(s->bus, (s->fifo >> ((-- s->txlen) << 3)) & 0xff) >= 0); - s->stat |= 1 << 4; /* XRDY */ + s->stat |= 1 << 4; /* XRDY */ } else { while (s->rxlen < 4) s->fifo |= i2c_recv(s->bus) << ((s->rxlen ++) << 3); - s->stat |= 1 << 3; /* RRDY */ + s->stat |= 1 << 3; /* RRDY */ } } else { - if ((s->control >> 9) & 1) { /* TRX */ + if ((s->control >> 9) & 1) { /* TRX */ while (ack && s->count_cur && s->txlen) { ack = (i2c_send(s->bus, (s->fifo >> ((-- s->txlen) << 3)) & @@ -100,12 +100,12 @@ static void omap_i2c_fifo_run(OMAPI2CState *s) s->count_cur --; } if (ack && s->count_cur) - s->stat |= 1 << 4; /* XRDY */ + s->stat |= 1 << 4; /* XRDY */ else - s->stat &= ~(1 << 4); /* XRDY */ + s->stat &= ~(1 << 4); /* XRDY */ if (!s->count_cur) { - s->stat |= 1 << 2; /* ARDY */ - s->control &= ~(1 << 10); /* MST */ + s->stat |= 1 << 2; /* ARDY */ + s->control &= ~(1 << 10); /* MST */ } } else { while (s->count_cur && s->rxlen < 4) { @@ -113,26 +113,26 @@ static void omap_i2c_fifo_run(OMAPI2CState *s) s->count_cur --; } if (s->rxlen) - s->stat |= 1 << 3; /* RRDY */ + s->stat |= 1 << 3; /* RRDY */ else - s->stat &= ~(1 << 3); /* RRDY */ + s->stat &= ~(1 << 3); /* RRDY */ } if (!s->count_cur) { - if ((s->control >> 1) & 1) { /* STP */ + if ((s->control >> 1) & 1) { /* STP */ i2c_end_transfer(s->bus); - s->control &= ~(1 << 1); /* STP */ + s->control &= ~(1 << 1); /* STP */ s->count_cur = s->count; s->txlen = 0; } else { - s->stat |= 1 << 2; /* ARDY */ - s->control &= ~(1 << 10); /* MST */ + s->stat |= 1 << 2; /* ARDY */ + s->control &= ~(1 << 10); /* MST */ } } } - s->stat |= (!ack) << 1; /* NACK */ + s->stat |= (!ack) << 1; /* NACK */ if (!ack) - s->control &= ~(1 << 1); /* STP */ + s->control &= ~(1 << 1); /* STP */ } static void omap_i2c_reset(DeviceState *dev) @@ -163,16 +163,16 @@ static uint32_t omap_i2c_read(void *opaque, hwaddr addr) uint16_t ret; switch (offset) { - case 0x00: /* I2C_REV */ - return s->revision; /* REV */ + case 0x00: /* I2C_REV */ + return s->revision; /* REV */ - case 0x04: /* I2C_IE */ + case 0x04: /* I2C_IE */ return s->mask; - case 0x08: /* I2C_STAT */ + case 0x08: /* I2C_STAT */ return s->stat | (i2c_bus_busy(s->bus) << 12); - case 0x0c: /* I2C_IV */ + case 0x0c: /* I2C_IV */ if (s->revision >= OMAP2_INTR_REV) break; ret = ctz32(s->stat & s->mask); @@ -185,18 +185,18 @@ static uint32_t omap_i2c_read(void *opaque, hwaddr addr) omap_i2c_interrupts_update(s); return ret; - case 0x10: /* I2C_SYSS */ - return (s->control >> 15) & 1; /* I2C_EN */ + case 0x10: /* I2C_SYSS */ + return (s->control >> 15) & 1; /* I2C_EN */ - case 0x14: /* I2C_BUF */ + case 0x14: /* I2C_BUF */ return s->dma; - case 0x18: /* I2C_CNT */ - return s->count_cur; /* DCOUNT */ + case 0x18: /* I2C_CNT */ + return s->count_cur; /* DCOUNT */ - case 0x1c: /* I2C_DATA */ + case 0x1c: /* I2C_DATA */ ret = 0; - if (s->control & (1 << 14)) { /* BE */ + if (s->control & (1 << 14)) { /* BE */ ret |= ((s->fifo >> 0) & 0xff) << 8; ret |= ((s->fifo >> 8) & 0xff) << 0; } else { @@ -204,7 +204,7 @@ static uint32_t omap_i2c_read(void *opaque, hwaddr addr) ret |= ((s->fifo >> 0) & 0xff) << 0; } if (s->rxlen == 1) { - s->stat |= 1 << 15; /* SBD */ + s->stat |= 1 << 15; /* SBD */ s->rxlen = 0; } else if (s->rxlen > 1) { if (s->rxlen > 2) @@ -214,41 +214,41 @@ static uint32_t omap_i2c_read(void *opaque, hwaddr addr) /* XXX: remote access (qualifier) error - what's that? */ } if (!s->rxlen) { - s->stat &= ~(1 << 3); /* RRDY */ - if (((s->control >> 10) & 1) && /* MST */ - ((~s->control >> 9) & 1)) { /* TRX */ - s->stat |= 1 << 2; /* ARDY */ - s->control &= ~(1 << 10); /* MST */ + s->stat &= ~(1 << 3); /* RRDY */ + if (((s->control >> 10) & 1) && /* MST */ + ((~s->control >> 9) & 1)) { /* TRX */ + s->stat |= 1 << 2; /* ARDY */ + s->control &= ~(1 << 10); /* MST */ } } - s->stat &= ~(1 << 11); /* ROVR */ + s->stat &= ~(1 << 11); /* ROVR */ omap_i2c_fifo_run(s); omap_i2c_interrupts_update(s); return ret; - case 0x20: /* I2C_SYSC */ + case 0x20: /* I2C_SYSC */ return 0; - case 0x24: /* I2C_CON */ + case 0x24: /* I2C_CON */ return s->control; - case 0x28: /* I2C_OA */ + case 0x28: /* I2C_OA */ return s->addr[0]; - case 0x2c: /* I2C_SA */ + case 0x2c: /* I2C_SA */ return s->addr[1]; - case 0x30: /* I2C_PSC */ + case 0x30: /* I2C_PSC */ return s->divider; - case 0x34: /* I2C_SCLL */ + case 0x34: /* I2C_SCLL */ return s->times[0]; - case 0x38: /* I2C_SCLH */ + case 0x38: /* I2C_SCLH */ return s->times[1]; - case 0x3c: /* I2C_SYSTEST */ - if (s->test & (1 << 15)) { /* ST_EN */ + case 0x3c: /* I2C_SYSTEST */ + if (s->test & (1 << 15)) { /* ST_EN */ s->test ^= 0xa; return s->test; } else @@ -267,17 +267,17 @@ static void omap_i2c_write(void *opaque, hwaddr addr, int nack; switch (offset) { - case 0x00: /* I2C_REV */ - case 0x0c: /* I2C_IV */ - case 0x10: /* I2C_SYSS */ + case 0x00: /* I2C_REV */ + case 0x0c: /* I2C_IV */ + case 0x10: /* I2C_SYSS */ OMAP_RO_REG(addr); return; - case 0x04: /* I2C_IE */ + case 0x04: /* I2C_IE */ s->mask = value & (s->revision < OMAP2_GC_REV ? 0x1f : 0x3f); break; - case 0x08: /* I2C_STAT */ + case 0x08: /* I2C_STAT */ if (s->revision < OMAP2_INTR_REV) { OMAP_RO_REG(addr); return; @@ -288,40 +288,40 @@ static void omap_i2c_write(void *opaque, hwaddr addr, omap_i2c_interrupts_update(s); break; - case 0x14: /* I2C_BUF */ + case 0x14: /* I2C_BUF */ s->dma = value & 0x8080; - if (value & (1 << 15)) /* RDMA_EN */ - s->mask &= ~(1 << 3); /* RRDY_IE */ - if (value & (1 << 7)) /* XDMA_EN */ - s->mask &= ~(1 << 4); /* XRDY_IE */ + if (value & (1 << 15)) /* RDMA_EN */ + s->mask &= ~(1 << 3); /* RRDY_IE */ + if (value & (1 << 7)) /* XDMA_EN */ + s->mask &= ~(1 << 4); /* XRDY_IE */ break; - case 0x18: /* I2C_CNT */ - s->count = value; /* DCOUNT */ + case 0x18: /* I2C_CNT */ + s->count = value; /* DCOUNT */ break; - case 0x1c: /* I2C_DATA */ + case 0x1c: /* I2C_DATA */ if (s->txlen > 2) { /* XXX: remote access (qualifier) error - what's that? */ break; } s->fifo <<= 16; s->txlen += 2; - if (s->control & (1 << 14)) { /* BE */ + if (s->control & (1 << 14)) { /* BE */ s->fifo |= ((value >> 8) & 0xff) << 8; s->fifo |= ((value >> 0) & 0xff) << 0; } else { s->fifo |= ((value >> 0) & 0xff) << 8; s->fifo |= ((value >> 8) & 0xff) << 0; } - s->stat &= ~(1 << 10); /* XUDF */ + s->stat &= ~(1 << 10); /* XUDF */ if (s->txlen > 2) - s->stat &= ~(1 << 4); /* XRDY */ + s->stat &= ~(1 << 4); /* XRDY */ omap_i2c_fifo_run(s); omap_i2c_interrupts_update(s); break; - case 0x20: /* I2C_SYSC */ + case 0x20: /* I2C_SYSC */ if (s->revision < OMAP2_INTR_REV) { OMAP_BAD_REG(addr); return; @@ -332,9 +332,9 @@ static void omap_i2c_write(void *opaque, hwaddr addr, } break; - case 0x24: /* I2C_CON */ + case 0x24: /* I2C_CON */ s->control = value & 0xcf87; - if (~value & (1 << 15)) { /* I2C_EN */ + if (~value & (1 << 15)) { /* I2C_EN */ if (s->revision < OMAP2_INTR_REV) { omap_i2c_reset(DEVICE(s)); } @@ -351,14 +351,14 @@ static void omap_i2c_write(void *opaque, hwaddr addr, __func__); break; } - if ((value & (1 << 15)) && value & (1 << 0)) { /* STT */ - nack = !!i2c_start_transfer(s->bus, s->addr[1], /* SA */ - (~value >> 9) & 1); /* TRX */ - s->stat |= nack << 1; /* NACK */ - s->control &= ~(1 << 0); /* STT */ + if ((value & (1 << 15)) && value & (1 << 0)) { /* STT */ + nack = !!i2c_start_transfer(s->bus, s->addr[1], /* SA */ + (~value >> 9) & 1); /* TRX */ + s->stat |= nack << 1; /* NACK */ + s->control &= ~(1 << 0); /* STT */ s->fifo = 0; if (nack) - s->control &= ~(1 << 1); /* STP */ + s->control &= ~(1 << 1); /* STP */ else { s->count_cur = s->count; omap_i2c_fifo_run(s); @@ -367,34 +367,34 @@ static void omap_i2c_write(void *opaque, hwaddr addr, } break; - case 0x28: /* I2C_OA */ + case 0x28: /* I2C_OA */ s->addr[0] = value & 0x3ff; break; - case 0x2c: /* I2C_SA */ + case 0x2c: /* I2C_SA */ s->addr[1] = value & 0x3ff; break; - case 0x30: /* I2C_PSC */ + case 0x30: /* I2C_PSC */ s->divider = value; break; - case 0x34: /* I2C_SCLL */ + case 0x34: /* I2C_SCLL */ s->times[0] = value; break; - case 0x38: /* I2C_SCLH */ + case 0x38: /* I2C_SCLH */ s->times[1] = value; break; - case 0x3c: /* I2C_SYSTEST */ + case 0x3c: /* I2C_SYSTEST */ s->test = value & 0xf80f; - if (value & (1 << 11)) /* SBB */ + if (value & (1 << 11)) /* SBB */ if (s->revision >= OMAP2_INTR_REV) { s->stat |= 0x3f; omap_i2c_interrupts_update(s); } - if (value & (1 << 15)) { /* ST_EN */ + if (value & (1 << 15)) { /* ST_EN */ qemu_log_mask(LOG_UNIMP, "%s: System Test not supported\n", __func__); } @@ -413,7 +413,7 @@ static void omap_i2c_writeb(void *opaque, hwaddr addr, int offset = addr & OMAP_MPUI_REG_MASK; switch (offset) { - case 0x1c: /* I2C_DATA */ + case 0x1c: /* I2C_DATA */ if (s->txlen > 2) { /* XXX: remote access (qualifier) error - what's that? */ break; @@ -421,9 +421,9 @@ static void omap_i2c_writeb(void *opaque, hwaddr addr, s->fifo <<= 8; s->txlen += 1; s->fifo |= value & 0xff; - s->stat &= ~(1 << 10); /* XUDF */ + s->stat &= ~(1 << 10); /* XUDF */ if (s->txlen > 2) - s->stat &= ~(1 << 4); /* XRDY */ + s->stat &= ~(1 << 4); /* XRDY */ omap_i2c_fifo_run(s); omap_i2c_interrupts_update(s); break; diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 9e8737be338..c61158bddd3 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -102,8 +102,8 @@ static inline void omap_inth_update(OMAPIntcState *s, int is_fiq) } } -#define INT_FALLING_EDGE 0 -#define INT_LOW_LEVEL 1 +#define INT_FALLING_EDGE 0 +#define INT_LOW_LEVEL 1 static void omap_set_intr(void *opaque, int irq, int req) { @@ -142,13 +142,13 @@ static uint64_t omap_inth_read(void *opaque, hwaddr addr, offset &= 0xff; switch (offset) { - case 0x00: /* ITR */ + case 0x00: /* ITR */ return bank->irqs; - case 0x04: /* MIR */ + case 0x04: /* MIR */ return bank->mask; - case 0x10: /* SIR_IRQ_CODE */ + case 0x10: /* SIR_IRQ_CODE */ case 0x14: /* SIR_FIQ_CODE */ if (bank_no != 0) break; @@ -159,49 +159,49 @@ static uint64_t omap_inth_read(void *opaque, hwaddr addr, bank->irqs &= ~(1 << i); return line_no; - case 0x18: /* CONTROL_REG */ + case 0x18: /* CONTROL_REG */ if (bank_no != 0) break; return 0; - case 0x1c: /* ILR0 */ - case 0x20: /* ILR1 */ - case 0x24: /* ILR2 */ - case 0x28: /* ILR3 */ - case 0x2c: /* ILR4 */ - case 0x30: /* ILR5 */ - case 0x34: /* ILR6 */ - case 0x38: /* ILR7 */ - case 0x3c: /* ILR8 */ - case 0x40: /* ILR9 */ - case 0x44: /* ILR10 */ - case 0x48: /* ILR11 */ - case 0x4c: /* ILR12 */ - case 0x50: /* ILR13 */ - case 0x54: /* ILR14 */ - case 0x58: /* ILR15 */ - case 0x5c: /* ILR16 */ - case 0x60: /* ILR17 */ - case 0x64: /* ILR18 */ - case 0x68: /* ILR19 */ - case 0x6c: /* ILR20 */ - case 0x70: /* ILR21 */ - case 0x74: /* ILR22 */ - case 0x78: /* ILR23 */ - case 0x7c: /* ILR24 */ - case 0x80: /* ILR25 */ - case 0x84: /* ILR26 */ - case 0x88: /* ILR27 */ - case 0x8c: /* ILR28 */ - case 0x90: /* ILR29 */ - case 0x94: /* ILR30 */ - case 0x98: /* ILR31 */ + case 0x1c: /* ILR0 */ + case 0x20: /* ILR1 */ + case 0x24: /* ILR2 */ + case 0x28: /* ILR3 */ + case 0x2c: /* ILR4 */ + case 0x30: /* ILR5 */ + case 0x34: /* ILR6 */ + case 0x38: /* ILR7 */ + case 0x3c: /* ILR8 */ + case 0x40: /* ILR9 */ + case 0x44: /* ILR10 */ + case 0x48: /* ILR11 */ + case 0x4c: /* ILR12 */ + case 0x50: /* ILR13 */ + case 0x54: /* ILR14 */ + case 0x58: /* ILR15 */ + case 0x5c: /* ILR16 */ + case 0x60: /* ILR17 */ + case 0x64: /* ILR18 */ + case 0x68: /* ILR19 */ + case 0x6c: /* ILR20 */ + case 0x70: /* ILR21 */ + case 0x74: /* ILR22 */ + case 0x78: /* ILR23 */ + case 0x7c: /* ILR24 */ + case 0x80: /* ILR25 */ + case 0x84: /* ILR26 */ + case 0x88: /* ILR27 */ + case 0x8c: /* ILR28 */ + case 0x90: /* ILR29 */ + case 0x94: /* ILR30 */ + case 0x98: /* ILR31 */ i = (offset - 0x1c) >> 2; return (bank->priority[i] << 2) | (((bank->sens_edge >> i) & 1) << 1) | ((bank->fiq >> i) & 1); - case 0x9c: /* ISR */ + case 0x9c: /* ISR */ return 0x00000000; } @@ -219,24 +219,24 @@ static void omap_inth_write(void *opaque, hwaddr addr, offset &= 0xff; switch (offset) { - case 0x00: /* ITR */ + case 0x00: /* ITR */ /* Important: ignore the clearing if the IRQ is level-triggered and the input bit is 1 */ bank->irqs &= value | (bank->inputs & bank->sens_edge); return; - case 0x04: /* MIR */ + case 0x04: /* MIR */ bank->mask = value; omap_inth_update(s, 0); omap_inth_update(s, 1); return; - case 0x10: /* SIR_IRQ_CODE */ - case 0x14: /* SIR_FIQ_CODE */ + case 0x10: /* SIR_IRQ_CODE */ + case 0x14: /* SIR_FIQ_CODE */ OMAP_RO_REG(addr); break; - case 0x18: /* CONTROL_REG */ + case 0x18: /* CONTROL_REG */ if (bank_no != 0) break; if (value & 2) { @@ -251,38 +251,38 @@ static void omap_inth_write(void *opaque, hwaddr addr, } return; - case 0x1c: /* ILR0 */ - case 0x20: /* ILR1 */ - case 0x24: /* ILR2 */ - case 0x28: /* ILR3 */ - case 0x2c: /* ILR4 */ - case 0x30: /* ILR5 */ - case 0x34: /* ILR6 */ - case 0x38: /* ILR7 */ - case 0x3c: /* ILR8 */ - case 0x40: /* ILR9 */ - case 0x44: /* ILR10 */ - case 0x48: /* ILR11 */ - case 0x4c: /* ILR12 */ - case 0x50: /* ILR13 */ - case 0x54: /* ILR14 */ - case 0x58: /* ILR15 */ - case 0x5c: /* ILR16 */ - case 0x60: /* ILR17 */ - case 0x64: /* ILR18 */ - case 0x68: /* ILR19 */ - case 0x6c: /* ILR20 */ - case 0x70: /* ILR21 */ - case 0x74: /* ILR22 */ - case 0x78: /* ILR23 */ - case 0x7c: /* ILR24 */ - case 0x80: /* ILR25 */ - case 0x84: /* ILR26 */ - case 0x88: /* ILR27 */ - case 0x8c: /* ILR28 */ - case 0x90: /* ILR29 */ - case 0x94: /* ILR30 */ - case 0x98: /* ILR31 */ + case 0x1c: /* ILR0 */ + case 0x20: /* ILR1 */ + case 0x24: /* ILR2 */ + case 0x28: /* ILR3 */ + case 0x2c: /* ILR4 */ + case 0x30: /* ILR5 */ + case 0x34: /* ILR6 */ + case 0x38: /* ILR7 */ + case 0x3c: /* ILR8 */ + case 0x40: /* ILR9 */ + case 0x44: /* ILR10 */ + case 0x48: /* ILR11 */ + case 0x4c: /* ILR12 */ + case 0x50: /* ILR13 */ + case 0x54: /* ILR14 */ + case 0x58: /* ILR15 */ + case 0x5c: /* ILR16 */ + case 0x60: /* ILR17 */ + case 0x64: /* ILR18 */ + case 0x68: /* ILR19 */ + case 0x6c: /* ILR20 */ + case 0x70: /* ILR21 */ + case 0x74: /* ILR22 */ + case 0x78: /* ILR23 */ + case 0x7c: /* ILR24 */ + case 0x80: /* ILR25 */ + case 0x84: /* ILR26 */ + case 0x88: /* ILR27 */ + case 0x8c: /* ILR28 */ + case 0x90: /* ILR29 */ + case 0x94: /* ILR30 */ + case 0x98: /* ILR31 */ i = (offset - 0x1c) >> 2; bank->priority[i] = (value >> 2) & 0x1f; bank->sens_edge &= ~(1 << i); @@ -291,7 +291,7 @@ static void omap_inth_write(void *opaque, hwaddr addr, bank->fiq |= (value & 1) << i; return; - case 0x9c: /* ISR */ + case 0x9c: /* ISR */ for (i = 0; i < 32; i ++) if (value & (1 << i)) { omap_set_intr(s, 32 * bank_no + i, 1); diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index 0157c9be759..da95c4ace58 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -30,170 +30,170 @@ struct clk { struct clk *parent; struct clk *child1; struct clk *sibling; -#define ALWAYS_ENABLED (1 << 0) -#define CLOCK_IN_OMAP310 (1 << 10) -#define CLOCK_IN_OMAP730 (1 << 11) -#define CLOCK_IN_OMAP1510 (1 << 12) -#define CLOCK_IN_OMAP16XX (1 << 13) +#define ALWAYS_ENABLED (1 << 0) +#define CLOCK_IN_OMAP310 (1 << 10) +#define CLOCK_IN_OMAP730 (1 << 11) +#define CLOCK_IN_OMAP1510 (1 << 12) +#define CLOCK_IN_OMAP16XX (1 << 13) uint32_t flags; int id; - int running; /* Is currently ticking */ - int enabled; /* Is enabled, regardless of its input clk */ - unsigned long rate; /* Current rate (if .running) */ - unsigned int divisor; /* Rate relative to input (if .enabled) */ - unsigned int multiplier; /* Rate relative to input (if .enabled) */ - qemu_irq users[16]; /* Who to notify on change */ - int usecount; /* Automatically idle when unused */ + int running; /* Is currently ticking */ + int enabled; /* Is enabled, regardless of its input clk */ + unsigned long rate; /* Current rate (if .running) */ + unsigned int divisor; /* Rate relative to input (if .enabled) */ + unsigned int multiplier; /* Rate relative to input (if .enabled) */ + qemu_irq users[16]; /* Who to notify on change */ + int usecount; /* Automatically idle when unused */ }; static struct clk xtal_osc12m = { - .name = "xtal_osc_12m", - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "xtal_osc_12m", + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk xtal_osc32k = { - .name = "xtal_osc_32k", - .rate = 32768, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "xtal_osc_32k", + .rate = 32768, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk ck_ref = { - .name = "ck_ref", - .alias = "clkin", - .parent = &xtal_osc12m, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "ck_ref", + .alias = "clkin", + .parent = &xtal_osc12m, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; /* If a dpll is disabled it becomes a bypass, child clocks don't stop */ static struct clk dpll1 = { - .name = "dpll1", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "dpll1", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk dpll2 = { - .name = "dpll2", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .name = "dpll2", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk dpll3 = { - .name = "dpll3", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .name = "dpll3", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk dpll4 = { - .name = "dpll4", - .parent = &ck_ref, - .multiplier = 4, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "dpll4", + .parent = &ck_ref, + .multiplier = 4, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk apll = { - .name = "apll", - .parent = &ck_ref, - .multiplier = 48, - .divisor = 12, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "apll", + .parent = &ck_ref, + .multiplier = 48, + .divisor = 12, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk ck_48m = { - .name = "ck_48m", - .parent = &dpll4, /* either dpll4 or apll */ - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "ck_48m", + .parent = &dpll4, /* either dpll4 or apll */ + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk ck_dpll1out = { - .name = "ck_dpll1out", - .parent = &dpll1, - .flags = CLOCK_IN_OMAP16XX, + .name = "ck_dpll1out", + .parent = &dpll1, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk sossi_ck = { - .name = "ck_sossi", - .parent = &ck_dpll1out, - .flags = CLOCK_IN_OMAP16XX, + .name = "ck_sossi", + .parent = &ck_dpll1out, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk clkm1 = { - .name = "clkm1", - .alias = "ck_gen1", - .parent = &dpll1, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "clkm1", + .alias = "ck_gen1", + .parent = &dpll1, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk clkm2 = { - .name = "clkm2", - .alias = "ck_gen2", - .parent = &dpll1, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "clkm2", + .alias = "ck_gen2", + .parent = &dpll1, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk clkm3 = { - .name = "clkm3", - .alias = "ck_gen3", - .parent = &dpll1, /* either dpll1 or ck_ref */ - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "clkm3", + .alias = "ck_gen3", + .parent = &dpll1, /* either dpll1 or ck_ref */ + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk arm_ck = { - .name = "arm_ck", - .alias = "mpu_ck", - .parent = &clkm1, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "arm_ck", + .alias = "mpu_ck", + .parent = &clkm1, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk armper_ck = { - .name = "armper_ck", - .alias = "mpuper_ck", - .parent = &clkm1, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "armper_ck", + .alias = "mpuper_ck", + .parent = &clkm1, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk arm_gpio_ck = { - .name = "arm_gpio_ck", - .alias = "mpu_gpio_ck", - .parent = &clkm1, - .divisor = 1, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .name = "arm_gpio_ck", + .alias = "mpu_gpio_ck", + .parent = &clkm1, + .divisor = 1, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk armxor_ck = { - .name = "armxor_ck", - .alias = "mpuxor_ck", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "armxor_ck", + .alias = "mpuxor_ck", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk armtim_ck = { - .name = "armtim_ck", - .alias = "mputim_ck", - .parent = &ck_ref, /* either CLKIN or DPLL1 */ - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "armtim_ck", + .alias = "mputim_ck", + .parent = &ck_ref, /* either CLKIN or DPLL1 */ + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk armwdt_ck = { - .name = "armwdt_ck", - .alias = "mpuwd_ck", - .parent = &clkm1, - .divisor = 14, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "armwdt_ck", + .alias = "mpuwd_ck", + .parent = &clkm1, + .divisor = 14, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk arminth_ck16xx = { - .name = "arminth_ck", - .parent = &arm_ck, - .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, + .name = "arminth_ck", + .parent = &arm_ck, + .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, /* Note: On 16xx the frequency can be divided by 2 by programming * ARM_CKCTL:ARM_INTHCK_SEL(14) to 1 * @@ -202,48 +202,48 @@ static struct clk arminth_ck16xx = { }; static struct clk dsp_ck = { - .name = "dsp_ck", - .parent = &clkm2, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "dsp_ck", + .parent = &clkm2, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk dspmmu_ck = { - .name = "dspmmu_ck", - .parent = &clkm2, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | + .name = "dspmmu_ck", + .parent = &clkm2, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, }; static struct clk dspper_ck = { - .name = "dspper_ck", - .parent = &clkm2, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "dspper_ck", + .parent = &clkm2, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk dspxor_ck = { - .name = "dspxor_ck", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "dspxor_ck", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk dsptim_ck = { - .name = "dsptim_ck", - .parent = &ck_ref, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "dsptim_ck", + .parent = &ck_ref, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk tc_ck = { - .name = "tc_ck", - .parent = &clkm3, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | + .name = "tc_ck", + .parent = &clkm3, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP730 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk arminth_ck15xx = { - .name = "arminth_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .name = "arminth_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, /* Note: On 1510 the frequency follows TC_CK * * 16xx version is in MPU clocks. @@ -252,259 +252,259 @@ static struct clk arminth_ck15xx = { static struct clk tipb_ck = { /* No-idle controlled by "tc_ck" */ - .name = "tipb_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .name = "tipb_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk l3_ocpi_ck = { /* No-idle controlled by "tc_ck" */ - .name = "l3_ocpi_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX, + .name = "l3_ocpi_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk tc1_ck = { - .name = "tc1_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX, + .name = "tc1_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk tc2_ck = { - .name = "tc2_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX, + .name = "tc2_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk dma_ck = { /* No-idle controlled by "tc_ck" */ - .name = "dma_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .name = "dma_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk dma_lcdfree_ck = { - .name = "dma_lcdfree_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, + .name = "dma_lcdfree_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, }; static struct clk api_ck = { - .name = "api_ck", - .alias = "mpui_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .name = "api_ck", + .alias = "mpui_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk lb_ck = { - .name = "lb_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .name = "lb_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk lbfree_ck = { - .name = "lbfree_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .name = "lbfree_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk hsab_ck = { - .name = "hsab_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .name = "hsab_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk rhea1_ck = { - .name = "rhea1_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, + .name = "rhea1_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, }; static struct clk rhea2_ck = { - .name = "rhea2_ck", - .parent = &tc_ck, - .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, + .name = "rhea2_ck", + .parent = &tc_ck, + .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, }; static struct clk lcd_ck_16xx = { - .name = "lcd_ck", - .parent = &clkm3, - .flags = CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP730, + .name = "lcd_ck", + .parent = &clkm3, + .flags = CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP730, }; static struct clk lcd_ck_1510 = { - .name = "lcd_ck", - .parent = &clkm3, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .name = "lcd_ck", + .parent = &clkm3, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk uart1_1510 = { - .name = "uart1_ck", + .name = "uart1_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck, /* either armper_ck or dpll4 */ - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .parent = &armper_ck, /* either armper_ck or dpll4 */ + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk uart1_16xx = { - .name = "uart1_ck", + .name = "uart1_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck, - .rate = 48000000, - .flags = CLOCK_IN_OMAP16XX, + .parent = &armper_ck, + .rate = 48000000, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk uart2_ck = { - .name = "uart2_ck", + .name = "uart2_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck, /* either armper_ck or dpll4 */ - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | + .parent = &armper_ck, /* either armper_ck or dpll4 */ + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk uart3_1510 = { - .name = "uart3_ck", + .name = "uart3_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck, /* either armper_ck or dpll4 */ - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, + .parent = &armper_ck, /* either armper_ck or dpll4 */ + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310 | ALWAYS_ENABLED, }; static struct clk uart3_16xx = { - .name = "uart3_ck", + .name = "uart3_ck", /* Direct from ULPD, no real parent */ - .parent = &armper_ck, - .rate = 48000000, - .flags = CLOCK_IN_OMAP16XX, + .parent = &armper_ck, + .rate = 48000000, + .flags = CLOCK_IN_OMAP16XX, }; -static struct clk usb_clk0 = { /* 6 MHz output on W4_USB_CLK0 */ - .name = "usb_clk0", - .alias = "usb.clko", +static struct clk usb_clk0 = { /* 6 MHz output on W4_USB_CLK0 */ + .name = "usb_clk0", + .alias = "usb.clko", /* Direct from ULPD, no parent */ - .rate = 6000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .rate = 6000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk usb_hhc_ck1510 = { - .name = "usb_hhc_ck", + .name = "usb_hhc_ck", /* Direct from ULPD, no parent */ - .rate = 48000000, /* Actually 2 clocks, 12MHz and 48MHz */ - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, + .rate = 48000000, /* Actually 2 clocks, 12MHz and 48MHz */ + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP310, }; static struct clk usb_hhc_ck16xx = { - .name = "usb_hhc_ck", + .name = "usb_hhc_ck", /* Direct from ULPD, no parent */ - .rate = 48000000, + .rate = 48000000, /* OTG_SYSCON_2.OTG_PADEN == 0 (not 1510-compatible) */ - .flags = CLOCK_IN_OMAP16XX, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk usb_w2fc_mclk = { - .name = "usb_w2fc_mclk", - .alias = "usb_w2fc_ck", - .parent = &ck_48m, - .rate = 48000000, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "usb_w2fc_mclk", + .alias = "usb_w2fc_ck", + .parent = &ck_48m, + .rate = 48000000, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk mclk_1510 = { - .name = "mclk", + .name = "mclk", /* Direct from ULPD, no parent. May be enabled by ext hardware. */ - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510, + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510, }; static struct clk bclk_310 = { - .name = "bt_mclk_out", /* Alias midi_mclk_out? */ - .parent = &armper_ck, - .flags = CLOCK_IN_OMAP310, + .name = "bt_mclk_out", /* Alias midi_mclk_out? */ + .parent = &armper_ck, + .flags = CLOCK_IN_OMAP310, }; static struct clk mclk_310 = { - .name = "com_mclk_out", - .parent = &armper_ck, - .flags = CLOCK_IN_OMAP310, + .name = "com_mclk_out", + .parent = &armper_ck, + .flags = CLOCK_IN_OMAP310, }; static struct clk mclk_16xx = { - .name = "mclk", + .name = "mclk", /* Direct from ULPD, no parent. May be enabled by ext hardware. */ - .flags = CLOCK_IN_OMAP16XX, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk bclk_1510 = { - .name = "bclk", + .name = "bclk", /* Direct from ULPD, no parent. May be enabled by ext hardware. */ - .rate = 12000000, - .flags = CLOCK_IN_OMAP1510, + .rate = 12000000, + .flags = CLOCK_IN_OMAP1510, }; static struct clk bclk_16xx = { - .name = "bclk", + .name = "bclk", /* Direct from ULPD, no parent. May be enabled by ext hardware. */ - .flags = CLOCK_IN_OMAP16XX, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk mmc1_ck = { - .name = "mmc_ck", - .id = 1, + .name = "mmc_ck", + .id = 1, /* Functional clock is direct from ULPD, interface clock is ARMPER */ - .parent = &armper_ck, /* either armper_ck or dpll4 */ - .rate = 48000000, - .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, + .parent = &armper_ck, /* either armper_ck or dpll4 */ + .rate = 48000000, + .flags = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | CLOCK_IN_OMAP310, }; static struct clk mmc2_ck = { - .name = "mmc_ck", - .id = 2, + .name = "mmc_ck", + .id = 2, /* Functional clock is direct from ULPD, interface clock is ARMPER */ - .parent = &armper_ck, - .rate = 48000000, - .flags = CLOCK_IN_OMAP16XX, + .parent = &armper_ck, + .rate = 48000000, + .flags = CLOCK_IN_OMAP16XX, }; static struct clk cam_mclk = { - .name = "cam.mclk", - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, - .rate = 12000000, + .name = "cam.mclk", + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .rate = 12000000, }; static struct clk cam_exclk = { - .name = "cam.exclk", - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "cam.exclk", + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, /* Either 12M from cam.mclk or 48M from dpll4 */ - .parent = &cam_mclk, + .parent = &cam_mclk, }; static struct clk cam_lclk = { - .name = "cam.lclk", - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, + .name = "cam.lclk", + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX, }; static struct clk i2c_fck = { - .name = "i2c_fck", - .id = 1, - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | + .name = "i2c_fck", + .id = 1, + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, - .parent = &armxor_ck, + .parent = &armxor_ck, }; static struct clk i2c_ick = { - .name = "i2c_ick", - .id = 1, - .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, - .parent = &armper_ck, + .name = "i2c_ick", + .id = 1, + .flags = CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, + .parent = &armper_ck, }; static struct clk clk32k = { - .name = "clk32-kHz", - .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | + .name = "clk32-kHz", + .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ALWAYS_ENABLED, - .parent = &xtal_osc32k, + .parent = &xtal_osc32k, }; static struct clk *onchip_clks[] = { diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 7a94366b0f8..6d4ac31574e 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -19,41 +19,41 @@ #include "qom/object.h" #include "system/watchdog.h" -#define OSMR0 0x00 -#define OSMR1 0x04 -#define OSMR2 0x08 -#define OSMR3 0x0c -#define OSMR4 0x80 -#define OSMR5 0x84 -#define OSMR6 0x88 -#define OSMR7 0x8c -#define OSMR8 0x90 -#define OSMR9 0x94 -#define OSMR10 0x98 -#define OSMR11 0x9c -#define OSCR 0x10 /* OS Timer Count */ -#define OSCR4 0x40 -#define OSCR5 0x44 -#define OSCR6 0x48 -#define OSCR7 0x4c -#define OSCR8 0x50 -#define OSCR9 0x54 -#define OSCR10 0x58 -#define OSCR11 0x5c -#define OSSR 0x14 /* Timer status register */ -#define OWER 0x18 -#define OIER 0x1c /* Interrupt enable register 3-0 to E3-E0 */ -#define OMCR4 0xc0 /* OS Match Control registers */ -#define OMCR5 0xc4 -#define OMCR6 0xc8 -#define OMCR7 0xcc -#define OMCR8 0xd0 -#define OMCR9 0xd4 -#define OMCR10 0xd8 -#define OMCR11 0xdc -#define OSNR 0x20 +#define OSMR0 0x00 +#define OSMR1 0x04 +#define OSMR2 0x08 +#define OSMR3 0x0c +#define OSMR4 0x80 +#define OSMR5 0x84 +#define OSMR6 0x88 +#define OSMR7 0x8c +#define OSMR8 0x90 +#define OSMR9 0x94 +#define OSMR10 0x98 +#define OSMR11 0x9c +#define OSCR 0x10 /* OS Timer Count */ +#define OSCR4 0x40 +#define OSCR5 0x44 +#define OSCR6 0x48 +#define OSCR7 0x4c +#define OSCR8 0x50 +#define OSCR9 0x54 +#define OSCR10 0x58 +#define OSCR11 0x5c +#define OSSR 0x14 /* Timer status register */ +#define OWER 0x18 +#define OIER 0x1c /* Interrupt enable register 3-0 to E3-E0 */ +#define OMCR4 0xc0 /* OS Match Control registers */ +#define OMCR5 0xc4 +#define OMCR6 0xc8 +#define OMCR7 0xcc +#define OMCR8 0xd0 +#define OMCR9 0xd4 +#define OMCR10 0xd8 +#define OMCR11 0xdc +#define OSNR 0x20 -#define PXA25X_FREQ 3686400 /* 3.6864 MHz */ +#define PXA25X_FREQ 3686400 /* 3.6864 MHz */ static int pxa2xx_timer4_freq[8] = { [0] = 0, @@ -106,7 +106,7 @@ struct PXA2xxTimerInfo { PXA2xxTimer4 tm4[8]; }; -#define PXA2XX_TIMER_HAVE_TM4 0 +#define PXA2XX_TIMER_HAVE_TM4 0 static inline int pxa2xx_timer_has_tm4(PXA2xxTimerInfo *s) { @@ -230,7 +230,7 @@ static uint64_t pxa2xx_timer_read(void *opaque, hwaddr offset, NANOSECONDS_PER_SECOND); case OIER: return s->irq_enabled; - case OSSR: /* Status register */ + case OSSR: /* Status register */ return s->events; case OWER: return s->reset3; @@ -336,7 +336,7 @@ static void pxa2xx_timer_write(void *opaque, hwaddr offset, case OIER: s->irq_enabled = value & 0xfff; break; - case OSSR: /* Status register */ + case OSSR: /* Status register */ value &= s->events; s->events &= ~value; for (i = 0; i < 4; i ++, value >>= 1) @@ -345,7 +345,7 @@ static void pxa2xx_timer_write(void *opaque, hwaddr offset, if (pxa2xx_timer_has_tm4(s) && !(s->events & 0xff0) && value) qemu_irq_lower(s->irq4); break; - case OWER: /* XXX: Reset on OSMR3 match? */ + case OWER: /* XXX: Reset on OSMR3 match? */ s->reset3 = value; break; case OMCR7: tm ++; From patchwork Thu May 15 10:24:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890174 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061420wrr; Thu, 15 May 2025 03:33:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1vwt3Ps/pzy97QepFbq6X3sh/burpWsTsdZHrcLgVM1iznrdDc7CQnJ6JUfWpFLgIWu4GDQ==@linaro.org X-Google-Smtp-Source: AGHT+IEaiQYq2CfSevKEltE3ZRbrR/4Lyp0WmWMdIWYvnQI/nu+mOP7AGz/ZrlhSpD8mkNaCTNTO X-Received: by 2002:a05:622a:4245:b0:477:c04:b512 with SMTP id d75a77b69052e-494a3361be7mr37961991cf.16.1747305238018; Thu, 15 May 2025 03:33:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305238; cv=none; d=google.com; s=arc-20240605; b=DNSk3/8DD/EiKE5sErckW1F1UlyjdhVBlm/0UbW1c++Dz7bUK52T9PDFB35jeuiSD5 CpkEK1hvu+w2ZW2iXJZXkX2QmKYxXi2pHeWRmkphL1SAa7SZWVD5dgbRzWvdSFls/Dvd 7hCipmoxb4CAQx/kH2fZbycSZ+cNoz3N8K2zCVclAnrt8Lhfry7jz80ISWRgA6YV2L4S 9xbfYeacpI6FfrDbsj6FslvfP8iVtRu9+SwdIF+AmL75BOYvNi/ugEBtz9dPblgWcnjK 08ZtcUuEZGkQ5lw+xE/EU5ZljIVfpix5tEcaCx6OZtN3oU2oR9hIkYfz1MCsr/eyM8rO k60A== 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:to:from :dkim-signature; bh=CEFPr6cyWXqfoeIE3F4AoQQqrdnfTceL/5vMmBbgJT4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=j81my9SsX6ZWotlEwBdzwpoWXo2XJerDVJM4pL7dOL+RDmDqL592sL73dQZu37akjY borhwACaAZ9nK8mLaMLMRrBM0etw6mj+lPyQdsYsIxt0pfy+65eojmIn2A90GyIV0BH5 vWHuztd68zuxdY8Ccash9l/n1agP2SIIvTWL+ydV0wjQc3+5xwVwpzuM8rAordaM4ain NOs7Pf5LT4REMgHMrG0Dy/rm/fW7Z6otialf00nUdTZmp+WsHg8MBHOSn1j1tfTSlSTX ZLKs9cgMzSqnZ7FPKF5PyNN6cuHemqwfmYF/RSMZlEfArBVALqsZb4roOVoqPUw/cG4w khbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nqrp2efD; 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 d75a77b69052e-49452555b6bsi162280491cf.240.2025.05.15.03.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:33:57 -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=Nqrp2efD; 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 1uFVn0-0004Pd-4e; Thu, 15 May 2025 06:26:10 -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 1uFVmx-0004Og-Jj for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:07 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmv-00088Z-IZ for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:07 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-442f4a3a4d6so5010035e9.0 for ; Thu, 15 May 2025 03:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304764; x=1747909564; darn=nongnu.org; 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=CEFPr6cyWXqfoeIE3F4AoQQqrdnfTceL/5vMmBbgJT4=; b=Nqrp2efDTgsLTiFHqLZe5cKN+FDHNvXNTAQpyZljW6+t30mRPNNP3Zhtu5k0Kwfqq5 4wZfHzh26Cf7inGTB1TCsPN4DgdhhBu6B+AIF9sHU77SY1iZw3/shn+e84+VCkvsBtK+ wzJZINsNpgFkKV4ci5XegeaRrcYo+evOWVC1Wddw7S57avNt7Gb5JHkzKB1Vo4U3ILiK sVLEwUx6UUk05f5dQGhxCrWFl06+Of5VErn4b1m/FTSm2qys+RZZfctfdTSYIvMPHhbw iGngC1dCe/t+T+Qt3j2ecEXxkSIO/m0dob9xE/xu9pBsn1oZBQrC7CuHM6PwUZZIsZG2 Pxsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304764; x=1747909564; 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=CEFPr6cyWXqfoeIE3F4AoQQqrdnfTceL/5vMmBbgJT4=; b=KSJxY0g3+beG5n4E8l+k/y67l3C7WdkN1AWJdHkn75QDXpu3dLfd4a+tlobjnGvgUz XA/FGpQtP5DJYbTbzWMImf1WyLys5UAkeev+L5iD+sk5Vk7coRUzSjGbCgZlOb3c8Pil hP73qvidS+FrKa1oURZdZTuIJcj9y1uSjbt2Dtasj2aJwgJvRX/HKSjtLag3kTeN0Ea9 LKe/Ew1fzWNIOqnY1AkEn1VkWBTvTEVWcKD0HVPyAtn0+O/HdvYGSSq6LQcTnq0o8O1l OSn+nfhg6e/1Ea2CDngtr2+AizQiz4Gnb0pdG/P2+SYr88kjxnmPIqlYomhs/0rZ3dlV SjQg== X-Gm-Message-State: AOJu0YzT4PRGZC9j28GyHfQcTWpaWiG+qjz0VaJllLxGsbEvEi61Ygra Pes1owTHnbsyKc3giQT64dn5xWg+qpTtFRkXftP/QV+Fg8Kf0jj0afLHr2gAbPRntzZLfomPN4Z QEdM= X-Gm-Gg: ASbGncsX+ABY3gtNXWfuYu/jOI2ymRI7NQWN7lP3IgF5GqgJov62me+yggBP6x57xI1 32RGrQJXpOciqhmvNgcA07LksWnTC8FRLBjbU342eyU8CvYlOwuNGsxtCDauf9UH4VfWpgrfz/q gGnM3iNeZ48B51iZpVFeY/iZp6z7AC6v0qxfd3CBzGGSdPxAAqGxMs+LavPn0rBoOgXKgF8rq0L 7xITHM/HRlBAHEMVtgXxKN+VjIzj5I7petXw/dP0cSGZaIzO0D1e66hL+n5/mATjcTwflyswmel Pnm3LDLo+CFQrwEBOvnExM63arGo6pEkLxgaeIMM1tJYWuDeq9Se8WYGPQ== X-Received: by 2002:a05:600c:4508:b0:439:5f04:4f8d with SMTP id 5b1f17b1804b1-442f84f8ec2mr26475245e9.12.1747304764095; Thu, 15 May 2025 03:26:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:03 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/58] MAINTAINERS: Add an entry for the Bananapi machine Date: Thu, 15 May 2025 11:24:58 +0100 Message-ID: <20250515102546.2149601-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Thomas Huth This machine was still missing from the MAINTAINERS file. Since there is likely no active maintainer around for this machine (I didn't spot any contributions from Qianfan Zhao in the git log after 2023), I'm suggesting Peter as maintainer with status set to "Odd fixes". Signed-off-by: Thomas Huth Message-id: 20250508072706.114278-1-thuth@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- MAINTAINERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6dacd6d004d..ca0ffc02d4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -732,6 +732,16 @@ F: include/hw/timer/armv7m_systick.h F: include/hw/misc/armv7m_ras.h F: tests/qtest/test-arm-mptimer.c +Bananapi M2U +M: Peter Maydell +L: qemu-arm@nongnu.org +S: Odd Fixes +F: docs/system/arm/bananapi_m2u.rst +F: hw/*/allwinner-r40*.c +F: hw/arm/bananapi_m2u.c +F: include/hw/*/allwinner-r40*.h +F: tests/functional/test_arm_bpim2u.py + B-L475E-IOT01A IoT Node M: Samuel Tardieu L: qemu-arm@nongnu.org From patchwork Thu May 15 10:24:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890164 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059613wrr; Thu, 15 May 2025 03:29:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX77UHYsmECns1H+vvwvHLJ/16l2fh9h80e5lQlcq6Q184UKM/Ozar1HT+21fDDX6lsQW4ETQ==@linaro.org X-Google-Smtp-Source: AGHT+IF++ZfcuU8KsImlhHBVD/603Il2SVpLn3e2nnxKflfMFYUo3OBbFeq0nkBxqjkdPxiCbTsq X-Received: by 2002:a05:620a:460c:b0:7cc:fd28:8c6d with SMTP id af79cd13be357-7cd28800f92mr994419985a.30.1747304966666; Thu, 15 May 2025 03:29:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304966; cv=none; d=google.com; s=arc-20240605; b=YuVUzCRVYi7QgynDGOV3oZLKzHjNzDpIn1/yUmCOyAf8v4XELhqrdGNLtwsOKDHyCR sLDgxLLWwlxhJWe6RIIDj9+WFHfH9F27WRBhyjmUOpgVXj68QXSHxSos4MpK3AubUbL3 JH3qGrFANslC6zcy0Vyn/QaKI+7FyZP8SpyBjHzlzEKCiuh7lZAVghoGUCQvuOzv9BTR WL3LhIh7a0tYIp0HXqL5McyZalnSDkMslQgRiX4iy6uxc5vqY4YBdWJsx3AEhNva1ZUH fC+0+OQ4cY+ppZnA3AzgWcdNjsDd6uW5mjPv/soqA61xG5w6DRw/PZovOwUjzQnHfGrG oKSg== 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:to:from :dkim-signature; bh=45OXTNzjwjDe6TE6ZCe7ioq6XmOCBuiCA+I7gKEs7n0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=iX3e025T1QKLK24vrdRVRiwww9L2dLU41Oo6XWJBq9Wh7Gucq8lIlhXNk/VRXwjnvz 8r4Hrl9BfbLlY7BWVmhrChXf3mfU+uGEXbwKs8KkibXGGEcvN1pcgNEme5uuCmu/3sov 79A55JL509BqaKjDaz37nrhdVWSQXgZvp+rSOteq4iHD7hmjY7CK6I/CvRAf0v/5V05+ s+I7c/ZReRzLx2I4J0A9X96ecE9Xzmcv0YHdUMVmD6XXG2T7sxMDIzeBrkicetKNwql1 HARbIqwZci5i8sTa8x816eqwJGwwBKYg7Ol9tcfovATp5vXlYo0Q5dExAb8WynytA4mM K0FA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uN0htnB7; 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 ESMTP id af79cd13be357-7cd00f698f4si1578358285a.178.2025.05.15.03.29.26 for ; Thu, 15 May 2025 03:29:26 -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=uN0htnB7; 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 1uFVmz-0004PN-DS; Thu, 15 May 2025 06:26:09 -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 1uFVmy-0004P8-O0 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:08 -0400 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 1uFVmw-00088i-NT for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:08 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so8368895e9.3 for ; Thu, 15 May 2025 03:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304765; x=1747909565; darn=nongnu.org; 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=45OXTNzjwjDe6TE6ZCe7ioq6XmOCBuiCA+I7gKEs7n0=; b=uN0htnB7mWJPnPhW0XXlk9f1lisd/MLd6cY7+XW+oGnIcF5Grqj9KPcTFGBMdfToYU B9Jvw2Q+GPV1Sop9PmEI/jtu1eH/0JaYT5Uq4XjNsifirbF+SKsGbNgE5CoMPTgCiubV pVcGhEczA1XFIEEFyNo4Ufoi87r66TSnjGyADa32Zhe6Dy/CuC0uvKD5V417mG+3jQUX AuNyS6D/uij94NWL9eKRIYyhNcscx2jOqssDRQYS6MdvzOV7lAy/ec/uJb0NPRUEXS4H +t32fLmYbIkP1UtoOTpv8giFUUqicKxXTAUEhveXECCCbABHbFUqccFE3OmGpF5sYUWZ X7Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304765; x=1747909565; 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=45OXTNzjwjDe6TE6ZCe7ioq6XmOCBuiCA+I7gKEs7n0=; b=b4i3WFfajl5LoDZvuf/XapVzfAjQTKkZG0+xgXmpSR3ZNsbV2I2tsOxnBYCIzpF6NN y5gTo5PMTRFjHfygW53P+Hoxo1Ljk1PMEdREKVW0D+UkimvjHdCsPB93lQpVmZAwWYR9 yLjznCNKGmLggTz2MZ1a3AayBK55Tn6ivKpsKK1h2hWwYuuiU1qKhW1KkuwEhrNbfy+r LJjTPrm7VIZkMBxl001yXrtd14yNAvAz9HXB10pifJV9ZEudB01S77RORI1XL38XDZcU AaTGtfP1tcrGTbFUrhuEi62fpw2ZSi+TdAZtVeden75ccn/lcq/7/84yrfT8O7Bmbtu4 TBMA== X-Gm-Message-State: AOJu0Yz4VgY5JcSKmshFoVJn79pUV8xvkcERzi7/3d9BiG/MRCrsn81d Re6JNYDjIRcenbycKrpfxAiOY4MgBQrdRee0qUo8Ma08m/jDaVUXGkGrrAGXeyf+Gimpwl3Gusy M0Rc= X-Gm-Gg: ASbGncv9jLGe+96rf06TnKSiRz49TAzAx2jmSDhJ7jhOAA/McKYrJAciNQAxyJSG8na vFjE721JwDlTqnA365vA8mfB2u8xruwOvF+G01F3yY+iFVzlrF5GbSGYKKmzTxjeUxn8ESR/xBO 2UB6AS7vL816DNdVpotbF4QxWbNnntcYUndPtKQSlngFgK5QPl0w6hYVX13pZhPBzNO7v7z2s6U O9dsNS63MW+S8WO7jfDBtzwb0UzQ9VqcjmTkdCcHl9r//NH2Mtc5Vio7brCdV+X71rY40hPlQqM VPfRscJQhxg8gtR34gEANOIcJQ6RSlrnateN/AgIcdNFCDKdZIFGSVdsUA== X-Received: by 2002:a05:600c:698c:b0:43c:fa52:7d2d with SMTP id 5b1f17b1804b1-442fbbdd46dmr5380835e9.20.1747304765129; Thu, 15 May 2025 03:26:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/58] target/arm: Replace target_ulong -> vaddr for HWBreakpoint Date: Thu, 15 May 2025 11:24:59 +0100 Message-ID: <20250515102546.2149601-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-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: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-2-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 6 +++--- target/arm/hyp_gdbstub.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 702eb1a5483..3360de9150f 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1948,9 +1948,9 @@ extern GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc); -int insert_hw_breakpoint(target_ulong pc); -int delete_hw_breakpoint(target_ulong pc); +bool find_hw_breakpoint(CPUState *cpu, vaddr pc); +int insert_hw_breakpoint(vaddr pc); +int delete_hw_breakpoint(vaddr pc); bool check_watchpoint_in_range(int i, vaddr addr); CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, vaddr addr); diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index 0512d67f8cf..bb5969720ce 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -54,7 +54,7 @@ GArray *hw_breakpoints, *hw_watchpoints; * here so future PC comparisons will work properly. */ -int insert_hw_breakpoint(target_ulong addr) +int insert_hw_breakpoint(vaddr addr) { HWBreakpoint brk = { .bcr = 0x1, /* BCR E=1, enable */ @@ -80,7 +80,7 @@ int insert_hw_breakpoint(target_ulong addr) * Delete a breakpoint and shuffle any above down */ -int delete_hw_breakpoint(target_ulong pc) +int delete_hw_breakpoint(vaddr pc) { int i; for (i = 0; i < hw_breakpoints->len; i++) { @@ -226,7 +226,7 @@ int delete_hw_watchpoint(vaddr addr, vaddr len, int type) return -ENOENT; } -bool find_hw_breakpoint(CPUState *cpu, target_ulong pc) +bool find_hw_breakpoint(CPUState *cpu, vaddr pc) { int i; From patchwork Thu May 15 10:25:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890188 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062239wrr; Thu, 15 May 2025 03:36:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQ3SeYpsc/74cx/SpVwBSJqc++/BWA+DFCkjl3PUSu3UJCn2uEaxAoIOljIEu7PK5D59hrNg==@linaro.org X-Google-Smtp-Source: AGHT+IGq666ceO7rCKW+TP2H3YfkZt2kPC49DXiGAC+ZvhmG7Pt2GYIPOb7HDG2IwOoS9m9bL+YV X-Received: by 2002:a05:622a:2585:b0:477:6f28:8c16 with SMTP id d75a77b69052e-494a333ea26mr38039051cf.6.1747305371332; Thu, 15 May 2025 03:36:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305371; cv=none; d=google.com; s=arc-20240605; b=j+AWl4BTqTdBF+X64YIRhNYtwFYeFf3Uu0erYH1/Yc8pxO2rLnq78UcGVKMFm3Pd90 a9UsDcw6Og8QqmWdv269tPovaFvNZslIVSOuYy/KMe2ljARILL8uVWy5N8kDylzKptGK 0jOSqRnFkGyLY4RADnFvddGGRenbfhe6Fgm1cKgRV0f9rQg6h3K2VlxvYMvVQh79iUcK 7C2knfUfHaAAzWp/3Di2J4/x3NHZbmoo6hp/iB3trYTt3YJe59UOPjCUvyWbPgWd6qDt Ypc4qldD71S7PvQFj6ovTWP8+H58keYu3XsBc9HU49XP1cm0kAjDiu+kgTz6ZWvcr2Kg F0fw== 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:to:from :dkim-signature; bh=CHj4ncL69V76HEaBcKrQS1jymf4RbpKZzaXqYG1J/L0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=YjfBkvJX+bQFZCAqqgA86901yZM90yihWh9DqEgiHc4er0Qvf0KCcVRONil3tK1gZz 4Eezxd10XExmWgDkkDNgs45ISJLUiU/Jsw7O7JV66J5MRGTF22EByB0w5kxHf0jNgPYb h2nV9bmAdJuerT7eyV86SlJ7H1hqisvdpFZKiRIhJOq26vmKXwU6MITqgnJYv/O3HTm4 HAAUykzW0BNZFKTovIpFpqewUJc1SGNv0UF5vOz1mmQLg8KdoPEAYVtZjP3bqxOGXN43 jhyhkkhHUnbioke/YrFjNwgs1OSl0DFECYH2b6QcVwSgSgulGkTq2vbgNUlPCtLQpa2N bD0Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sa4+g99p; 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 d75a77b69052e-494524601e6si156449351cf.54.2025.05.15.03.36.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:36:11 -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=sa4+g99p; 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 1uFVn3-0004Qp-54; Thu, 15 May 2025 06:26:13 -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 1uFVmz-0004PO-Dg for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:09 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmx-00088z-Ls for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:09 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso5736765e9.3 for ; Thu, 15 May 2025 03:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304766; x=1747909566; darn=nongnu.org; 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=CHj4ncL69V76HEaBcKrQS1jymf4RbpKZzaXqYG1J/L0=; b=sa4+g99pNfNulT0kf0qXHGo9jEI4FFqOWDogj5PLmB/fBg67CAGM56HrfJQ82+LQAI 5hISOTYxxLf594coy/SCQk52cJuKNIV5NqvAac39bT8FMAT8Zl8cnBwCgqlar7JqdZpU dqvuvp8gAlVkVaxd16vaBzDZBhUYWbfpCpjh99nVGFxYbr3NRXnX3Jh9XUh8JxB7ODb8 CbmZmdlZCV3jksqfIV5X4kemq6zBRmqoSrhk4BHQPedRbFzdUNFGtrRglWhgVChlJ6Ir taisAIIHWZggPifweUFXg0JtKXJ+A58ZtNVcAq+6llyWlU4FtauAAz7SEbuFQb7IV6ts Dang== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304766; x=1747909566; 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=CHj4ncL69V76HEaBcKrQS1jymf4RbpKZzaXqYG1J/L0=; b=KMlLweh1zrvoQukdvrLzkF+PK1harDAfeuruLEad0JB0tbcx8d9wjHQgZmR9XujFGE B58kQxyR4c36QOp4/kKf0CDQmmHV6+HxkO4ZS8Nqz7QGTThGOQBfmBeHGJhsnY+QtaHj u3P4B5yOQIey4StXal/I9SoVpef9t7n7lpZ5tSDf2XznVxU4ItgeZJ1PGwCscU5Spmn9 DTeOh+Fo0zf2ricJ+7mwWG3CLsaCMhkP7QndWqu2JYJxChbUb0G6jBnmsSvNQSXU3yW5 zNSXABafFN3qUmQCs6oGa6mJwjZ4bNriUaqxA3e8g7n4xI4lzWJ6Cm3eGi+JYZVB1BiP Za1A== X-Gm-Message-State: AOJu0Ywp4y3YjR0f1fPPC8RkH4JYhmxf5Nzy3EiAsCjSoi8DjrD6VVae 0TkjAtQJgTeoaA+J9Kzoszj1Q4s57DM666VbS00GJk2CJOCVs1hqZqPDvn+livTkQxtY1yMTBoU KyX0= X-Gm-Gg: ASbGnctjCAt+51c/9G8gvHQP3FFDxrX/A3m1FRhtRQl+4aKoCE3+dFqV6BrE3Tk3UsU /R0YPHrY9oQ7Ts3ZYuoJd7NrcdqPttqkv3LCWd0qxkhZQa21RGZn84PJceY7KJR9XiU2vZRVihM BxAqDPw/prvw+yfzYu8UdHiUlQSDCK1XN8kscOuBjzdAMQJeNtlYB2VtI9kjg9f6TsL17gm5zDq guBpkD1x2gCa/Q7gerBNJTok9dSLc6DazyGd4Do6wWmtwv/s15oWebEeW36TJfOI9O6+CH0Klt0 PB7bTHWM21+BjN7lPXUfvtsL+GEIMI6EGG+wcFBqfxNeasIfdLc2o4wBjg== X-Received: by 2002:a05:6000:250a:b0:3a0:6f92:ef7c with SMTP id ffacd0b85a97d-3a35373a1ddmr1718079f8f.17.1747304766141; Thu, 15 May 2025 03:26:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/58] include/system/hvf: missing vaddr include Date: Thu, 15 May 2025 11:25:00 +0100 Message-ID: <20250515102546.2149601-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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: Pierrick Bouvier On MacOS x86_64: In file included from ../target/i386/hvf/x86_task.c:13: /Users/runner/work/qemu/qemu/include/system/hvf.h:42:5: error: unknown type name 'vaddr' vaddr pc; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:43:5: error: unknown type name 'vaddr' vaddr saved_insn; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:5: error: type name requires a specifier or qualifier QTAILQ_ENTRY(hvf_sw_breakpoint) entry; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:18: error: a parameter list without types is only allowed in a function definition QTAILQ_ENTRY(hvf_sw_breakpoint) entry; ^ /Users/runner/work/qemu/qemu/include/system/hvf.h:45:36: error: expected ';' at end of declaration list QTAILQ_ENTRY(hvf_sw_breakpoint) entry; Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-3-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- include/system/hvf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/system/hvf.h b/include/system/hvf.h index 7b45a2e1988..a9a502f0c8f 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -17,6 +17,7 @@ #include "qemu/queue.h" #include "exec/vaddr.h" #include "qom/object.h" +#include "exec/vaddr.h" #ifdef COMPILING_PER_TARGET # ifdef CONFIG_HVF From patchwork Thu May 15 10:25:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890153 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3058730wrr; Thu, 15 May 2025 03:26:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQU6NftpMFdaR4hcNRRT5MRHisieZdytEc7X8hVhdKat88GaFdPVIc38GEGSDt/V3qbnEkpg==@linaro.org X-Google-Smtp-Source: AGHT+IHu6Mb/Il9ozBXpQS6saVawb/Ap0vX7H+vZ3o1WL0mpjP1zggkmUnwUpXYPkHnv45JL9v/a X-Received: by 2002:a05:620a:1918:b0:7c9:6531:53c1 with SMTP id af79cd13be357-7cd287f8d5emr850228385a.26.1747304818297; Thu, 15 May 2025 03:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304818; cv=none; d=google.com; s=arc-20240605; b=JJ7JX2m5z5bveRwYA0G4RAF+1Li65SBIy3PDfz3VZNL3HnFvmLpvo9yMndwhKrkq8k mz+SieZuB+DRA6JCFDmKsmc2UUzI5HQdinKZq42emRBPI8CAp+sRdWjRkXyqDlIsTx3E 9n2TSoLx1HpUMsnj9suQBH4QLjOv4+3yOW/j44ILEaBpVBkmXPH5MReDomW3FqfHx+uK YnmtTSVay/roDwR54k32OvbWegZ7ysqUlrdGYwzmVKCJ0VsQbUwMKKFz/xRtmQgySJ7E f3vDeV6CLIzRzmd//9txEe/GoEGBhDmeRryh4xpisnze8uSagNCW5b4hFDWdy/AqX0Sb Vdow== 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:to:from :dkim-signature; bh=+fk+E1hNI4ene4uIKK/hnLRnqA1uMFK4Q9d7SpDJgfs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=lk4MDBGUpff2oKVpE85Sfgip4I9L6Fxx3c0Jf0kjSpj/2nhTChlm9/mPfaCKH4ja6y 0uC4n/6zjdAVOx9sPqrXooCTBkrG6SGkp8viGQFn+bgmMc898T3Jyk51ISJ8uKi1HEmF pVMGHbStqAqy6MIXWyz9E5pBn+aFPULYipKnCcrZJz5OUEa0jbd6CJxTRgizm8/xnFzj 2qcO6x7D2c747j/uaUS7rdL7n/D5VDRuLo8dRr1qHtECh8K0qs1FGfgJ8cRdlkI2hFDr Bv+fHOBHyxID8PMt4EEnuuyQ9FscADhbK9mT44PgJ9n3xInZTbmY10CHSvDOXc0gXpmE OS/A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="QT/4dH0C"; 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 af79cd13be357-7cd00fd4519si1638587285a.304.2025.05.15.03.26.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:26:58 -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="QT/4dH0C"; 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 1uFVn2-0004Qj-RL; Thu, 15 May 2025 06:26:12 -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 1uFVn1-0004QM-3a for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVmy-00089E-Os for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:10 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so8369085e9.3 for ; Thu, 15 May 2025 03:26:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304767; x=1747909567; darn=nongnu.org; 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=+fk+E1hNI4ene4uIKK/hnLRnqA1uMFK4Q9d7SpDJgfs=; b=QT/4dH0CRGnOn4Q/ecROuTXpvzynOWf3ZOX2+2VcvU3XVEwbEq3N4wuzHD0FxK33j3 zIIrI4908idSjkWCmxPzBECyOl9afRuG1/usXFZpTy/kRztyK2BGPg0UKSNHFYppqeu+ pj+TEez1XcDLuSP4RzrWq1CFjJKMo6PEK1ngXNbBGPV7h8V5Hb6J9uxKsk8zqQk2fGWr 9uVgeyaeUiX/Vmz6kw7i8t8UbD5RWMSrgdxi5iDOqCGgZ19tXzxxCTvZ2yFmORlLLijJ twvArvSbkNmvW1uODP0ZMgLSIVD42lxYIxcnREz5rdetLj9qdgy4tvOJqD/34hRkDMHb hisg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304767; x=1747909567; 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=+fk+E1hNI4ene4uIKK/hnLRnqA1uMFK4Q9d7SpDJgfs=; b=jlDt5r2HauqByIKyL8VaiNQ2Gvm8QTN81+TQhdz9Tft6kSh1L64tHBw+46Iongyida SjNUbu3gisIbZy0jGvNB7B8AXhLkUC9buKzBAF20W1PVNMSikrI5C2t3SHlzPwv3Ns7I nBa8bauFLpYPZZMoq/d+Qq1tHFG1SWsz+IISu6BfkhdDJ9FfWL2ijiieBkFyf7ltIxxV u3fG3Ft97OhFzgoY9LPf/PCqjirtzcTbYsOck3W16n3XmszS5BAl+hv8wk0/D2Aa6klk /gacRxgJHnDrvbNJozCAfMSeny956ySLt3EVYnx0Maa6QGO4585q/N05NzaN3KHvITc2 7g7Q== X-Gm-Message-State: AOJu0YzeZpqz3P9kLrbji0ZoUD7r8x55ZPhi6htz/3KpLD7KMMqcdHVb hFQaLpXdOVZfSuVjyOMyRoIu3He9Yn/e2lL2QdO8UuWad38nh7l8lqv24zkiBAv8h2z9mFmFG05 KKKI= X-Gm-Gg: ASbGncuky1d3y77bCo8YUAkFc9kGVpHD3gcnRQGTM77l0qm6VTnY0QwAbLo9jPVjVd+ kzSpZ5EhPEBgPmnWMIONaVNRhNtlWB4A8mpN9LfR6U/5sm7/wVbllPKayZjcyKAQKVjoCasUdw+ 2Mt5EhT6+eKGufb3uIB6rsML0vclcwbeVgwINrdpi9MVZaQx79vQpm/Boxf4ttqSARYoZp4i2of THTtLDWTEACBTRuKOklFyvu0frQEPLCNWgCf3TrFn2w5y28NvxEq8POoCZFQMm9+qPXpmnmUGmQ syy1AQVeTaj5n4p35u0woY+M6637ulZnD3cws4Y5L+mjmi6fHHQG0V3W5g== X-Received: by 2002:a05:600c:4e09:b0:43d:1b74:e89a with SMTP id 5b1f17b1804b1-442f96e8949mr19588185e9.9.1747304767095; Thu, 15 May 2025 03:26:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/58] meson: add common libs for target and target_system Date: Thu, 15 May 2025 11:25:01 +0100 Message-ID: <20250515102546.2149601-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Following what we did for hw/, we need target specific common libraries for target. We need 2 different libraries: - code common to a base architecture - system code common to a base architecture For user code, it can stay compiled per target for now. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-4-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- meson.build | 78 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 7f91500bb73..ad2053f968b 100644 --- a/meson.build +++ b/meson.build @@ -3709,6 +3709,8 @@ target_arch = {} target_system_arch = {} target_user_arch = {} hw_common_arch = {} +target_common_arch = {} +target_common_system_arch = {} # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. @@ -4107,29 +4109,59 @@ common_all = static_library('common', # construct common libraries per base architecture hw_common_arch_libs = {} +target_common_arch_libs = {} +target_common_system_arch_libs = {} foreach target : target_dirs config_target = config_target_mak[target] target_base_arch = config_target['TARGET_BASE_ARCH'] + target_inc = [include_directories('target' / target_base_arch)] + inc = [common_user_inc + target_inc] - # check if already generated - if target_base_arch in hw_common_arch_libs - continue - endif + # prevent common code to access cpu compile time definition, + # but still allow access to cpu.h + target_c_args = ['-DCPU_DEFS_H'] + target_system_c_args = target_c_args + ['-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'] if target_base_arch in hw_common_arch - target_inc = [include_directories('target' / target_base_arch)] - src = hw_common_arch[target_base_arch] - lib = static_library( - 'hw_' + target_base_arch, - build_by_default: false, - sources: src.all_sources() + genh, - include_directories: common_user_inc + target_inc, - implicit_include_directories: false, - # prevent common code to access cpu compile time - # definition, but still allow access to cpu.h - c_args: ['-DCPU_DEFS_H', '-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'], - dependencies: src.all_dependencies()) - hw_common_arch_libs += {target_base_arch: lib} + if target_base_arch not in hw_common_arch_libs + src = hw_common_arch[target_base_arch] + lib = static_library( + 'hw_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies()) + hw_common_arch_libs += {target_base_arch: lib} + endif + endif + + if target_base_arch in target_common_arch + if target_base_arch not in target_common_arch_libs + src = target_common_arch[target_base_arch] + lib = static_library( + 'target_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_c_args, + dependencies: src.all_dependencies()) + target_common_arch_libs += {target_base_arch: lib} + endif + endif + + if target_base_arch in target_common_system_arch + if target_base_arch not in target_common_system_arch_libs + src = target_common_system_arch[target_base_arch] + lib = static_library( + 'target_system_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args, + dependencies: src.all_dependencies()) + target_common_system_arch_libs += {target_base_arch: lib} + endif endif endforeach @@ -4300,12 +4332,24 @@ foreach target : target_dirs target_common = common_ss.apply(config_target, strict: false) objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() + if target_base_arch in target_common_arch_libs + src = target_common_arch[target_base_arch].apply(config_target, strict: false) + lib = target_common_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif if target_type == 'system' and target_base_arch in hw_common_arch_libs src = hw_common_arch[target_base_arch].apply(config_target, strict: false) lib = hw_common_arch_libs[target_base_arch] objects += lib.extract_objects(src.sources()) arch_deps += src.dependencies() endif + if target_type == 'system' and target_base_arch in target_common_system_arch_libs + src = target_common_system_arch[target_base_arch].apply(config_target, strict: false) + lib = target_common_system_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif target_specific = specific_ss.apply(config_target, strict: false) arch_srcs += target_specific.sources() From patchwork Thu May 15 10:25:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890160 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059372wrr; Thu, 15 May 2025 03:28:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW37STzoP7IKJabbJvDvWgATZql0D9gHSci7joCjiuae7OEmQ968nJ6oYi8W2yJe+jTpSvsUg==@linaro.org X-Google-Smtp-Source: AGHT+IHPGePklpYLm2f+J+WQOnKrvjVfPRNgwhMGL8HrIA2haDtXPqwX9Qmqvi7Hl/iw53h5iYoT X-Received: by 2002:ad4:5cc6:0:b0:6f2:be2b:c95b with SMTP id 6a1803df08f44-6f8a3210c0dmr46507466d6.15.1747304920660; Thu, 15 May 2025 03:28:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304920; cv=none; d=google.com; s=arc-20240605; b=ivV1BxMkI3Q5CTOwyoBXCCgFHAHe4LSkpWROiFzm0hnadrbMuTVz4IgJf4UMgQbWqA G743Zu6in0ZZFGUKq92r2Y3tNKCb0ggHgz36U2Ux7ToiLysZ619EOsSzx4oNMKlF0f2M deT+xAJH3f8hTUcIICc/lKRBLYFShukt70j0T+2hS3dkx3i4ffUsjUAy3GGQmV07EmtX gR72SuUquQkHjPZCpaXU3GnEYPaU/0295gxQuvFWowsfCtyIYZDWBdvkbl04qTIZeX41 tak0bqhkPdPragcV+kRHTMvDJvaYVQIcjmRsF7qMuZ/fygNxCputqUjseMq5SZeHWXwd pcAw== 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:to:from :dkim-signature; bh=HJ2vzUkmCNfhfxZp85kg68jtmVNXafBvWG/WJXtDBrM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XAYnpLHqY+CUcCyXQseDiKYpk3lSkfkVFouAnOhNGVIJUyCcgsV0qfhbFwLK/2cCoK IJmdsa9877bCfOHRJ3w4Hk5bGanHsnUtMFGUG8PtIQiVaYxYboPCoqB1YWeF1CMyti2s GodsxVa4STRvTzujiT1kG1wr70AOZwd2oveDm3EM/SNDkrd+mivRuBOJFrJPNPcgDXWE hQUunqrX118Ury60xn5eHCTOeGYokLSFaKrbUNuh5DcyqjpBP7VJMkVnwKGDilta2BKg +Ns3Pk3FeTHo09ELFQuFKauWxBxKvQxMrauaqT+PUypuFxEWtOsjyXfjUwOtZMVQqtJQ QXjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fSGTL+ww; 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-6f6e39e6e55si157198796d6.6.2025.05.15.03.28.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:40 -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=fSGTL+ww; 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 1uFVn8-0004bE-HO; Thu, 15 May 2025 06:26:18 -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 1uFVn2-0004Qg-KN for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:12 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn0-00089X-QS for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:12 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a0bdcd7357so600199f8f.1 for ; Thu, 15 May 2025 03:26:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304769; x=1747909569; darn=nongnu.org; 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=HJ2vzUkmCNfhfxZp85kg68jtmVNXafBvWG/WJXtDBrM=; b=fSGTL+wwtDiiH4Qr0OI450+U8UOvSznFmjCc23siJq85ZmoThSd9cEaxFhEbNFCBRr dJCdIx4FaBnjlgs3EtrKfVLpxxI5t1rTPRKJfevVSaFUClXc2/xu0QzZi1yiGNOY9ov7 biL6pcWrh6WvJDdNtejkhVlj5cWQXTNAyHJszGJhVzxtBegtfNVKEHDHtEPg73Vqu6UZ GjL1omSjSAa8ncYpO8WP7LMuUaI5e9u+r7CVqIJwETm7KiAZXMP+/AY67R1kmqAlOTxD iVtlNif2SjmfanKl6+0DOaB1YGHfvHsW4n2+f4/36U/nR7reDsNMX09rZi6SyKJ2J3KX mw4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304769; x=1747909569; 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=HJ2vzUkmCNfhfxZp85kg68jtmVNXafBvWG/WJXtDBrM=; b=hj5GndYg6PG8IRfov9obkwMBDAn1hT/jjJpPzNDMCCfrtvyqq6uIByufvQgFzLCfxZ 0SUfxlltxaHYBAFdkrQq6V896AN4MM/UGgmIjGybp45uBKyQS4H4NhLpTazDsGKChrfH X/N5MMTkyAqQ2yucBRbSez3CpMUubtB8zLVsKkvt7xS2teN5RBXo91wgO06/uhDENxnG BfGzezb+FmKXmSkX9HYxTF0mDYrqN9E3uPG+2EkeePneKRy+dtZPbj+5rnJwGtQQwgQE jlHr0MFlO7Z4fZgL5dgbQQsMg3hvETvZUBKq52Q95iHJi9qAUcDSgxG35Cde2GtvMK5q 8Nmg== X-Gm-Message-State: AOJu0YxQQj41411/zTsf6Pi/1sdRgDZ9NHp3RCED0d1smLsR2zlWnsE7 V7Kzlgnf4OUSKonT5CTW2P/hioibFM6g9zEgvGoFzJs5CRata+k7x21EC93cJ9L99zpTKH6aw9l CUBE= X-Gm-Gg: ASbGncsafX82ig+Y30VX6Bw9hWLohGLTi0wGlPxH3TBdPOgkBwtFleqA0EYcLdSKkzQ pgM8HMhTZ9o7y9ij/J905ZmLPQ4BCo8o8wBu/zmTDZMM9haQwGCPO0v46k+D0apo1ZhO/ozxwby 11YBLpK3llWVoSGM6rHU3+fMOoxuJh5c7KK+NVT0ZKrLSbCO4UB7CCgGW4KavP9S4L3AD4Bs7vS WZ1EXwrcpYWLHZugsz6ThZ8B5xlYjENt1Uz+Qikf0Ln4fKWrlZP2Ag3uF47Wo9h+SQpo7FIDAuI wAi+vhH1yRdZW07pdvpO6b+9aAIsC/Qx/X8Ivtl7+vFLXNx6hT6lzXccpg== X-Received: by 2002:a05:6000:4007:b0:39f:175b:a68d with SMTP id ffacd0b85a97d-3a349699c4fmr6323255f8f.11.1747304768816; Thu, 15 May 2025 03:26:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/58] target/arm: move kvm stubs and remove CONFIG_KVM from kvm_arm.h Date: Thu, 15 May 2025 11:25:02 +0100 Message-ID: <20250515102546.2149601-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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: Pierrick Bouvier Add a forward decl for struct kvm_vcpu_init to avoid pulling all kvm headers. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-5-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 83 +------------------------------------------ target/arm/kvm-stub.c | 77 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 82 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 5f17fc2f3d5..5bf5d56648f 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -94,7 +94,7 @@ void kvm_arm_cpu_post_load(ARMCPU *cpu); */ void kvm_arm_reset_vcpu(ARMCPU *cpu); -#ifdef CONFIG_KVM +struct kvm_vcpu_init; /** * kvm_arm_create_scratch_host_vcpu: * @fdarray: filled in with kvmfd, vmfd, cpufd file descriptors in that order @@ -216,85 +216,4 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); void kvm_arm_enable_mte(Object *cpuobj, Error **errp); -#else - -/* - * It's safe to call these functions without KVM support. - * They should either do nothing or return "not supported". - */ -static inline bool kvm_arm_aarch32_supported(void) -{ - return false; -} - -static inline bool kvm_arm_pmu_supported(void) -{ - return false; -} - -static inline bool kvm_arm_sve_supported(void) -{ - return false; -} - -static inline bool kvm_arm_mte_supported(void) -{ - return false; -} - -/* - * These functions should never actually be called without KVM support. - */ -static inline void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_add_vcpu_properties(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) -{ - g_assert_not_reached(); -} - -static inline int kvm_arm_vgic_probe(void) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pmu_set_irq(ARMCPU *cpu, int irq) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pmu_init(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_pvtime_init(ARMCPU *cpu, uint64_t ipa) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp) -{ - g_assert_not_reached(); -} - -static inline uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) -{ - g_assert_not_reached(); -} - -static inline void kvm_arm_enable_mte(Object *cpuobj, Error **errp) -{ - g_assert_not_reached(); -} - -#endif - #endif diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 965a486b320..2b73d0598c1 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -22,3 +22,80 @@ bool write_list_to_kvmstate(ARMCPU *cpu, int level) { g_assert_not_reached(); } + +/* + * It's safe to call these functions without KVM support. + * They should either do nothing or return "not supported". + */ +bool kvm_arm_aarch32_supported(void) +{ + return false; +} + +bool kvm_arm_pmu_supported(void) +{ + return false; +} + +bool kvm_arm_sve_supported(void) +{ + return false; +} + +bool kvm_arm_mte_supported(void) +{ + return false; +} + +/* + * These functions should never actually be called without KVM support. + */ +void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_add_vcpu_properties(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) +{ + g_assert_not_reached(); +} + +int kvm_arm_vgic_probe(void) +{ + g_assert_not_reached(); +} + +void kvm_arm_pmu_set_irq(ARMCPU *cpu, int irq) +{ + g_assert_not_reached(); +} + +void kvm_arm_pmu_init(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_pvtime_init(ARMCPU *cpu, uint64_t ipa) +{ + g_assert_not_reached(); +} + +void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +void kvm_arm_enable_mte(Object *cpuobj, Error **errp) +{ + g_assert_not_reached(); +} From patchwork Thu May 15 10:25:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890152 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3058729wrr; Thu, 15 May 2025 03:26:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW8jAxi8H5aEd/MxYn+yimEE/LX9PXcdbEwNlxKNlNLfqw+pQ5Y9HfwQCxJVuVsK1IWhhfKow==@linaro.org X-Google-Smtp-Source: AGHT+IHkJIyDHzwNVzLrX7hpqMinzNL8DWGhpYz6m8LQw1h1eYvFpIANLH9+15H9TiGoBHIUQ/hP X-Received: by 2002:a05:6214:768:b0:6f5:4711:2980 with SMTP id 6a1803df08f44-6f8a4c40835mr35072196d6.42.1747304818265; Thu, 15 May 2025 03:26:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304818; cv=none; d=google.com; s=arc-20240605; b=XHRyChqlnrT/KnCVZhq8kS9aO64f611s22CtmKcJsLg2dsttHce0CSk6MFwyYWUaQJ QvWTax4gfhj9zblym28vbzUvUUP79vyZHn9sntzJCV7bkC5otQLBUm9ImAryOqdSf0vX FTQra0ed04GrYVdQcUqKaZVbCfzfghFKkJgz202UGLKz8Run1PV4LfWd+tIFptxjTxer 7pYREkV6kgDfbBDxbMlgoQOHlNJNkHfjaHeCCT4GcGQSrAP5cRgEWAOGDn3JT38kQCaA dtQ3q199C+QTxWVQN09urk0bHYfmaIy2ph/QJx/a5Ps/9TpSBnvvZ5w5YWf375j5W4g7 i3cQ== 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:to:from :dkim-signature; bh=+6ury5Sg2Jud9itYU7h3OKlx8pJe0hJxXUnirJFm93U=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=W3LPPQYQEsFCuH2xPc0Olis9Wzc3BpqR2sehS1TdMpFt3YK0Vum/AZmO9HnxxgFLt4 WJrNqIoLTKAFxs7xBbrVtBHqfkFeAm5P97ThrQn46rn7vwlWsD5SGrtB6j467QlX9w2u fWQzizUdQHFMnxUMc2xjDxBkKSABswHJ5Q90aeBNrE/tjggu0AiUCcqd5vE9c3jhyQY8 k2G6d3so0s5CLBd3E7ZF3GR3v8QJnPXVplq4lbkd0kbSuhzg/Q8r+dF5YjEW2A1r3ep6 ahAiVrfAoKu0HRITOycHKxcQJ1aOAOphR17FlV/P1JdJO6ab4KEvnwi12wuFjM4zluIs 9hlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vpNslmbw; 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-6f6e3a63efbsi158426536d6.480.2025.05.15.03.26.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:26:58 -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=vpNslmbw; 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 1uFVnB-0004lN-3q; Thu, 15 May 2025 06:26:21 -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 1uFVn3-0004Qr-DE for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:13 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn1-00089k-Sl for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:13 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-441d437cfaaso4618375e9.1 for ; Thu, 15 May 2025 03:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304770; x=1747909570; darn=nongnu.org; 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=+6ury5Sg2Jud9itYU7h3OKlx8pJe0hJxXUnirJFm93U=; b=vpNslmbw+gzKOlII17nWYqzxxc48EtkrqbqTkv6QLobr8wcVYHjgY/WvudQEn2eNdN pyc8uw4trLsaQGqqLmeCovvAmK10ts026LCzwfIiFcZuxAPudEYWo5JiO96GZlb6LsRA M/XZ5MevUCyV1Bt17M74SbtGTqJPpuZyFBHK8HHpEr8TI22+c8abpvmR4ut06KmDEozo mF4mOwJL7MD048xnQVMXTLoUKAOSUtou8e58HVjZ7O27qsZBC8E0evyJug+UN6754DsF DhG5hoy/4b9R32xwz1d7qkAzwokNQLb3ziNBGXqJICWag7vv58cOtRGksmfVz/hunDLW BqkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304770; x=1747909570; 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=+6ury5Sg2Jud9itYU7h3OKlx8pJe0hJxXUnirJFm93U=; b=F/kwZJzEWXxOOQ9WbRQ4c3cCRL/U4kaDIaaNi1F5yIcda4QUj3MnEEGhW5ImwdCwQi NA0V6ZxpJj/1r47Kh6ByzGsT9mnIKVo/LncjL+s69pT5d6varylfUPpkfxTdvVh2Gwxb 0oZsfmCRs8if/cKfBNXmdayL5AgIxIWWlVzTcnVT9Of2ozTqK7kt+f2XahC51LF7tBqR GxBHrszxOuXzbtD9YDS4+apZ2/V3pYKWQ8o6cGq1/nx+3wmOvldiPs1t+zYnNTU5Dy6G Z29EE9YrU92bjveajZ9SEfVJ2cSShhK6/FnQLielr8tYp9bCAWOEdJ98x9Iuu++APfyU y04A== X-Gm-Message-State: AOJu0YxXWJlAyHZJvOWNQdnRuTsXIW84PHb1GZtxbLUGVIDGbed4Cg1n /DAFz0YUE4RXE7ZTg04t+M0GR1TSGiMFAbDd1e4Dp7uyjpUd0sSLgvNE/WJCbfJH82237pmxAJt wiCw= X-Gm-Gg: ASbGncvYhLfzbA49m40cQcLcbxY9Qk0B3hTpVp7BgOyHLDDindtIAjwKB1hmCJhEX0l cCvWNbdCanZigk5FN0sZ2+M93OodsazyFgiUGli3xoHb9DrDCbIXsDuvXtDJwri6INgu32Mg84f Z4JBzqRCDThjOF1gvjGpo+4Oi0dLDMFPOGhaIqSZ2gED4u/KVbG8IXfRRO8gIalojBZA+AP2iVY 3wLxZpu0N79STqU/wsD1AOsRm+vTw1Rr9AtkpdeI3NzlfKbEkNlOLAgZmMpQIV0bGf3h4VOjOCz XitYbmH5oQqnHvqzD+gt/f/xggx2JannUZo8sS03WUDS1xRE2fOAPpmerA== X-Received: by 2002:a05:600c:a014:b0:43c:ef13:7e5e with SMTP id 5b1f17b1804b1-442f970b0d5mr15516245e9.26.1747304769921; Thu, 15 May 2025 03:26:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/58] target/arm/kvm-stub: add kvm_arm_reset_vcpu stub Date: Thu, 15 May 2025 11:25:03 +0100 Message-ID: <20250515102546.2149601-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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: Pierrick Bouvier Needed in target/arm/cpu.c once kvm is possible. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-6-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm-stub.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 2b73d0598c1..e34d3f5e6b4 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -99,3 +99,8 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) { g_assert_not_reached(); } + +void kvm_arm_reset_vcpu(ARMCPU *cpu) +{ + g_assert_not_reached(); +} From patchwork Thu May 15 10:25:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890158 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059141wrr; Thu, 15 May 2025 03:28:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6T7rffzaH4D9H9gGNdGbgT0eR5SZhfa71ZWjTK/ojGBcmF/1wzUKg5SUjKrSR9MdQG8ECCg==@linaro.org X-Google-Smtp-Source: AGHT+IGTb5NCsTF8itBaNXeiyZoDQPQCY/eNoG0AdsjxvPnOITS9GYwL8PLIREiwMRA10pipc4oH X-Received: by 2002:a05:6214:1bc8:b0:6ed:df6:cdcd with SMTP id 6a1803df08f44-6f896e334bemr107351886d6.21.1747304883345; Thu, 15 May 2025 03:28:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304883; cv=none; d=google.com; s=arc-20240605; b=F2VtGVVzLEhVEs6EbvcmfDXDElOjQap8foPkSA6Q116Fr/xm21s9VvLqlc7Qhvz771 gUP55lWISB7Mxy5pBdmdkCo5V9rYbWZYEPYmtlb+LYia+cMbX7F+cYZeTqtYZkSpmyWn 40gjRdHVdz0CU7W0wf3TRdXpz5aO/D8kM1SR38QavPUO5iSvmERMAvWNvPSVP4C5K/XC 4pz33f6e98yfPkxjWWGJB51xJuJSE+5cHIfUJ750kcsqV7gGkQ/egNzgr9iDqfQ8HTlp pg3bO9kDw3RDfhX4/roXGrXPoIknNcYd2RUpMc4L+9LcZswh5+Rqrtxu4gHAab8cJkk0 AArQ== 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:to:from :dkim-signature; bh=FaYh3VlkdCKvRFw8QcW3CmdcVFOTvth6Gi2E4GKc2o0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=DFXOthAo7+9V1td0g2/TJrSzJf1zR+SifOU99d2aCfiV68bSOdZ8cTOChpwGxLoMRT y5TKbbf5mN7kKgf/cemI2NL7Q0LhctQ71lfqOMtzHQFINPMNvdItH44Dn/hLbqWmlIuf dG14vXyg3PkXnuTnFp22HbqZT6rcrQCxOiVD1bFM+sjC26E005pM1MLmI9TXdMX8Mrli z49mtnCAL9Qc3OtpEdnOFGLAX+p0YotRpqJSVMDxz42QcZKDNCXOfdOuqhsrAcKMRNNM ho/oCrZVROxvqncGIAzE7G775S8+11pj3+uWv5M0GVo09P3ZeXBL8WKs+C4O1A7iWM+4 2dXw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SoGHyxcd; 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-6f6e3a4b8edsi156636316d6.336.2025.05.15.03.28.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:03 -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=SoGHyxcd; 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 1uFVnF-0004uE-Ca; Thu, 15 May 2025 06:26:25 -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 1uFVn6-0004Zu-RM for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:17 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn3-0008A7-DV for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-440685d6afcso8443035e9.0 for ; Thu, 15 May 2025 03:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304772; x=1747909572; darn=nongnu.org; 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=FaYh3VlkdCKvRFw8QcW3CmdcVFOTvth6Gi2E4GKc2o0=; b=SoGHyxcdaYad3YIv8OXhwph8u+Uhm5dQp5ivoC0mvcAFqVy4HREf3OZec+OzG+zEnM +a4Yh2WdauFc4MF6tNq0fO5Lm0rC6SATWgOaJQxugpzst5av7mdvduDtWKR8DdKMyL6V gUTITw+UAxwTyXJaZ0FV9qDdm2s2dbLjlo1Voi7iqBocQBcfjoBs4r40Jk6MnChrZOp5 b+P/a3FSMLjgR7ln4My99+swe4Nrk8GYnQC5V8zl0a9hjDT7VbPJ7P2XBmJ7U0BM4eg1 C5cOCLgdcatyvzof5L8hzm81sDZy6wue2b5vMo93fcrxTUcQ/m4pkxzDw8fOnTXKK5Bh NJ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304772; x=1747909572; 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=FaYh3VlkdCKvRFw8QcW3CmdcVFOTvth6Gi2E4GKc2o0=; b=L6IpuxRCUeFMGeMoebrr48EFgcCz3RH8RcNVDutCoBddOYbhR06Y22OXF7sQgw1nzo HrZLMG2hjn7N2R1QP21XKiKDjCG1EZj43l+so+wPgey4CxC4Hs2CvWW/79LWY7Y5I/bu 3DmwgJfchF8mP5Sg7Q//tLK4+kd0hH77tG9ZUDfQEnhYDdarMuon2iw//+7tiuQHTIkw U7ZCNy88naS+twdPjjo6F0uOcOdBZZOzQHWmMeYoPfUFt5xx8N89kIwaMOKSO2ICiRBK q+g72DuJ0wEAZ9hFNeNxnHO6+VPPMQgyJh/jElxP7nAIXemcvibDbdRWgS+xXQ9DkiBI yjkw== X-Gm-Message-State: AOJu0Yzn2n2oAl/qhaBxpfweMFH7c9RiGGOF2X6OEmLAZM5YhDT7SC2B vaLEYwkeyIu0k7lALq0F1dTSUGmdewSbjZkPoy1NrZBoVFz8Guc87xmdCyWnsWJK3c9JzzEjbc9 /iCg= X-Gm-Gg: ASbGncvNzTYlC7lwW454UwbtEDKOno3H7b7g1JsJxGKZKz67odNDwBbLNmad+yAdoIj Ud39YLmbTKFm4l/ui44ay/dHxfVHkXMPRzXoFrRwFA1sCj7tVYRnfcbzlevrBs5kGcX10fGFXeu qFCS1mBDIZYorJ5AMqpnD5438ABdSSELtcJuzAFAZ7cxKpwBdWjbwtoCWMPyQHOTtaRXFxsXxg7 rUcHjDydRxLVlX0B1S5pjAtESa3+/4u6Sm6lvcNJ8Fr6Yplc5i+uSS3g9TixLDW7UmHerxqzbcq C9Cy+T712lm97yJnl7tS1p7Sr+SNRvwK7U0qb/IScTBfjMACvOUSMINzVw== X-Received: by 2002:a05:600c:540f:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-442f96e88damr23789105e9.10.1747304771617; Thu, 15 May 2025 03:26:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:10 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/58] target/arm/cpu: move arm_cpu_kvm_set_irq to kvm.c Date: Thu, 15 May 2025 11:25:04 +0100 Message-ID: <20250515102546.2149601-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Allow to get rid of CONFIG_KVM in target/arm/cpu.c Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-7-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 2 ++ target/arm/cpu.c | 31 ------------------------------- target/arm/kvm-stub.c | 5 +++++ target/arm/kvm.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 5bf5d56648f..b638e09a687 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -216,4 +216,6 @@ int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); void kvm_arm_enable_mte(Object *cpuobj, Error **errp); +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level); + #endif diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 603f08d05a0..66047693415 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1098,37 +1098,6 @@ static void arm_cpu_set_irq(void *opaque, int irq, int level) } } -static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) -{ -#ifdef CONFIG_KVM - ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - CPUState *cs = CPU(cpu); - uint32_t linestate_bit; - int irq_id; - - switch (irq) { - case ARM_CPU_IRQ: - irq_id = KVM_ARM_IRQ_CPU_IRQ; - linestate_bit = CPU_INTERRUPT_HARD; - break; - case ARM_CPU_FIQ: - irq_id = KVM_ARM_IRQ_CPU_FIQ; - linestate_bit = CPU_INTERRUPT_FIQ; - break; - default: - g_assert_not_reached(); - } - - if (level) { - env->irq_line_state |= linestate_bit; - } else { - env->irq_line_state &= ~linestate_bit; - } - kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); -#endif -} - static bool arm_cpu_virtio_is_big_endian(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index e34d3f5e6b4..4806365cdc5 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -104,3 +104,8 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu) { g_assert_not_reached(); } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + g_assert_not_reached(); +} diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 85911e30242..82668d64385 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -2428,3 +2428,32 @@ void kvm_arm_enable_mte(Object *cpuobj, Error **errp) cpu->kvm_mte = true; } } + +void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) +{ + ARMCPU *cpu = arm_cpu; + CPUARMState *env = &cpu->env; + CPUState *cs = CPU(cpu); + uint32_t linestate_bit; + int irq_id; + + switch (irq) { + case ARM_CPU_IRQ: + irq_id = KVM_ARM_IRQ_CPU_IRQ; + linestate_bit = CPU_INTERRUPT_HARD; + break; + case ARM_CPU_FIQ: + irq_id = KVM_ARM_IRQ_CPU_FIQ; + linestate_bit = CPU_INTERRUPT_FIQ; + break; + default: + g_assert_not_reached(); + } + + if (level) { + env->irq_line_state |= linestate_bit; + } else { + env->irq_line_state &= ~linestate_bit; + } + kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); +} From patchwork Thu May 15 10:25:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890184 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062107wrr; Thu, 15 May 2025 03:35:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUWUNfL9h6JJaM64WwXL3y8CrSuhzYRu9gfJqjStkP9mMznAozZepDzsVa6oRDCJARngS1CQ==@linaro.org X-Google-Smtp-Source: AGHT+IEhlalU5e0TEHjSedMSK+ccjUDhOIQIoaD328u3cz+uQ+6m7E3zumlFPda1W6O0mqPP+9ZS X-Received: by 2002:a05:600c:1e84:b0:43c:f64c:44a4 with SMTP id 5b1f17b1804b1-442f97a5d2amr18261995e9.8.1747305349272; Thu, 15 May 2025 03:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305349; cv=none; d=google.com; s=arc-20240605; b=JTbamBrNwwBTy+Eftb1WrRwnWufeh3Ze5LGA51gUcpowk8pXN1uwzWBSGXMDVWPqq4 FuqiCNHXklIOdftVyWhSxvmXMjD8UAZmESCBRQo/mwyD3YRB+5GqkCjW4X0OznzTMMAU 0qQcVgqx1lzZBNjsQn8yJbc9OK2pHTEj2oIkSpCEF6R8lgWLRpfa13oyMJ2HqcSPonak jM59wqoKnJUxnTOur2+L5uIgRZx6mUfkQGcrnC+g046aUDUPiGK5ikD38CtxHlKjRGHT sCGI550be+39NBnZPBk2+ML/SCquOlg8+0tEyqZCDaDK3PfWAauqtMYo+XApnq15zZcw q7tw== 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:to:from :dkim-signature; bh=NyucHiYe/4GviI/GxcYBQGa71mt/U6jQw0yXKQyqmn0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=iH5vt+DRvAv/25dBPsUqRUDEFCZGONvDgBC4OzFZhS0plD5/IVaStdrDFUA5IfxrYN jgfNbYiSJXYJv2+Ai48X31HpFPVbQMLX/qqChplAQxYGuTqcoHyYRksS7YeIkJFh3TWn c7Jygz3fUGEhkx5U052kAqS8XItAQ488wBGS7ki2rvMR+v/X9RY720UzHkFHXIGuAUSE kfNa9fteWDdqy8qPWO8AtGxgYCWsYljVWamI/NqMoiksc85DKjy5UPtLZzefIsRRKs/J j2EnrmRjhyCVpqBCp/ZT+Vmenw1hQK4l4xUKTPeh2D3Y+Q+knSxluV/cP1Twm2wTWRl0 NgBw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sl+MJctA; 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 ffacd0b85a97d-3a1f5be460fsi11154843f8f.372.2025.05.15.03.35.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:49 -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=Sl+MJctA; 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 1uFVnE-0004rN-7b; Thu, 15 May 2025 06:26:24 -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 1uFVn8-0004b1-3u for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:18 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn6-0008AS-2Q for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:17 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-441d1ed82dbso7751565e9.0 for ; Thu, 15 May 2025 03:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304773; x=1747909573; darn=nongnu.org; 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=NyucHiYe/4GviI/GxcYBQGa71mt/U6jQw0yXKQyqmn0=; b=Sl+MJctAAI5E1mqTHDKU8hrIWKtBmQgkrwWxmYGdq7Iaw6GIVyqK5nPMPTYkcxT/nR 1XR92lQyd/PfKTygKcBPKkA9LkD55CpFUyfE64wwGy/V/hWBk3tFM87wW86nnrE9bxPJ LkhMeglq08znvYzQ7GZK9qMvICvGwQ6rYvF/HmJt6AOirYO7iO1FGiplHry4prrUgtpS 9a/Ko6jwzWr8okxH2bHidwsb1giqh5RkJo6LTA4S3agHarjekXZanWWvljlgfODaGodq lcS+nwFpMtUNSK42BXxRb3ohaY4l+6BpD1s3ahjr9+iKWtI3egoY/xGPKtWPO9jfZDO3 XowQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304773; x=1747909573; 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=NyucHiYe/4GviI/GxcYBQGa71mt/U6jQw0yXKQyqmn0=; b=TgO/LHY5xFrS+C5pJ2lfF05qIQUf5Zsxe+v7tJtNXdsB1xXlrLh69FFQPXV4ZZCA4Z 7S4GYfqv+AGQ0NROMl2fwl1sF3IHkA08lInQyTp/3bhmrG2tNcTk4D8DkZMUq1hY9/p6 C1oTYbkWHKDeSeOvZ+VoSsXaCuf9cBi2DoExRmkY8Xjr6xTUeAXSYSMRLpi/r6tC+Qlb cZgasKUG0xWQiIoOtb2A/20WcCeiUUTRgls86PZ1FRuGF9PyTmTYwEfGFaYuG/byhGn1 tGQTjwwLcXSCE/zt88fZgK+3wad3OuQUlxRQV19aei4kWtcm3FMV20/q9/uOzo7mO13c NSog== X-Gm-Message-State: AOJu0YzAH3K9CB9BXPNJwwB2AZntkYXaWBAMYz9gkr6HFZ1Xbv8jN+eq 8YhuJfAOd8I9arx/1tC4+dPJAXFNC7wS0Cd7jntfkz1mrGnHe7EUKxxdvZf5jT9mYvnSoV73JWX WVG8= X-Gm-Gg: ASbGnctQyfGEQkn08SZpyT/tUJs16esslSj87gGfsR+WX5prYu8GYkPxFDpp0KDxiUA HyYVsPypwwDHS3jckjNZzM82l4dQwRxBgrkLwhTOaICJsDpBac9riZ4YY0dU2ksu1Z2kn5W2k3j JPwp0TSZEkaV7rgo04WmseV5AY6jkjlDBOe+G/CHNu+K/IlKK2WXK8CfPPvo4sHjWwianrwYY67 gRIELRcBt0NZDBWbie+mhwF37YnR6KfAfv/dCb+b0CeNOsXtIk5dlm22ULbdTIUgCYq44lN8ZNl ceGQp5cZBZT5CPGTmBCxb0PqL/O00TfGv4FMhAxD02Tz0bjtGEZOAsGO/A== X-Received: by 2002:a05:6000:4007:b0:3a0:88d5:7fca with SMTP id ffacd0b85a97d-3a3496999ebmr5471488f8f.12.1747304773392; Thu, 15 May 2025 03:26:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/58] target/arm/cpu: remove TARGET_BIG_ENDIAN dependency Date: Thu, 15 May 2025 11:25:05 +0100 Message-ID: <20250515102546.2149601-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Anton Johansson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-8-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 66047693415..c7e00e64325 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -23,6 +23,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "exec/page-vary.h" +#include "exec/tswap.h" #include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h" @@ -1171,7 +1172,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) info->endian = BFD_ENDIAN_LITTLE; if (bswap_code(sctlr_b)) { - info->endian = TARGET_BIG_ENDIAN ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG; + info->endian = target_big_endian() ? BFD_ENDIAN_LITTLE : BFD_ENDIAN_BIG; } info->flags &= ~INSN_ARM_BE32; #ifndef CONFIG_USER_ONLY From patchwork Thu May 15 10:25:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890204 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3071593wrr; Thu, 15 May 2025 04:02:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJqyXE3IcctJxwOflQKLYTQnXMRYaHA8TPNKbQ+PuvcaUxx8fo1OLkGyJOdByG8Y8m+rckVQ==@linaro.org X-Google-Smtp-Source: AGHT+IGdi0vieL2v/3tJxLsx9WCIzvAuWMuuKKiQ/B5+V2qHMRhCQ3cY4PDCPhCjCDwtnl7L6RVL X-Received: by 2002:a05:6402:26c9:b0:5fc:aa51:4d9a with SMTP id 4fb4d7f45d1cf-5ffd06578cbmr1804903a12.26.1747306954614; Thu, 15 May 2025 04:02:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306954; cv=none; d=google.com; s=arc-20240605; b=ZMmICatyjuu1WD3maITKeKbVau5PPczeeIClSVDv2qqKp+/Y86U0VjtFbyGTRhkexu Hp5SgPporNaWym6TAEMZtJcbVbbwi0ssGWZsxtcO3yz7XpyPwwIorHklqNynWm1jnCTN s2vZnKM3FHOQefUTOKqoOuAGhQfRKnNGVO8VHJ7wuBB800fKSCHMKltV43m1sm1OEOUM C4DTzUyct1OD73QizG2wGnkVGmh0RHkhFacWKdvdge7ykVakshLp+5hcrHbUvUGGNGME Zhthqqs/UT6Zv+wX9+QuYFBnvZcILiZeI1IRWM0ND8dc39yEYYeIFbGlPqChbUy3CZOC DysQ== 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:to:from :dkim-signature; bh=8Dy35+lWv+I9/27nBCmYWY9enGRMPHxuuOHBDG39r8w=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ZP20EZZT7l7D4mSXrS6hTkgui94CuFos2rY4AEcbBAZkahzlx1g28FfbxefrJ/UxB3 gd0taYrVJsCg0qJZwH6BsHiIzOIyzEzcvk+ozm0IdJXsF3JFZKGruvPsF3AVkEf8qNj/ 6WnQhOr4NlzPNRxQ+5UqFPGXycvT6poT/M3I63bhlF9zn5hPgCM6KmgzXtVKSRN5goxD zFzBMEcIojsl46qo5vLApe6QZi3takHOUlB3l3Hyn4wfrGyT+chraL7zD0o7ttDAZO/6 icjhLYIuDq4okuannAHaEhs2Ha2G/1Ni12jXT5eo8nsnkCvIlovDL7n1l52kTPpAkzlg v4Pw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CiJh5cxg; 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 4fb4d7f45d1cf-5ffacfeb319si2263466a12.282.2025.05.15.04.02.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:02:34 -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=CiJh5cxg; 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 1uFVnu-0005fC-BP; Thu, 15 May 2025 06:27:06 -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 1uFVn9-0004f3-Lo for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:19 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn7-0008AX-Ku for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:19 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cf257158fso5247835e9.2 for ; Thu, 15 May 2025 03:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304774; x=1747909574; darn=nongnu.org; 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=8Dy35+lWv+I9/27nBCmYWY9enGRMPHxuuOHBDG39r8w=; b=CiJh5cxgTUOrZlT0zNgLpGafG1jhFbrxrPYnQaPMcOeXmgVWT1KDNsJ6Bgxpbyyyd2 Bj6erS8bqxLT5H1o1TtPcvfm9VLGwf16HVAJS1OXZgHKCx+1bysJxBOCdBb5TMFwuCYM PSsmaI63BDCxB3R8A6T+vyjTKUOytQP5eZXPP6MzLPx+D+aQ1wNUyMpX30i54owMPKXS 28uKA1urNKB0ruSDZeydQlks58ZbIBeVtUe01LCFI37kZhD54fgAZ+HL+q2+D+2xnC61 KvY1JB3r8RtdTgfofjR0w+RziMSxGtjzMUArSOAGSJ5YI+lVE/nXzReyh6pTi8r11Z4x +3oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304774; x=1747909574; 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=8Dy35+lWv+I9/27nBCmYWY9enGRMPHxuuOHBDG39r8w=; b=eH/0BBgZfouI/PI6mA5SffsPkaeEDroDPj/Vve8L1eshWGXVs8mAsZRoEdv17hfpKI UcbSvFt1KlE4grooJsnQI8kFypKdX4wW/ZWvks2ivnZlqnw+DQGdKJmsL551N0pKE+uJ UOLDYe3vUrWF64ccBqvpaSSMGY6z4lAZt+hLIk7o56HpR36vLJfAkIE3NfhAHTvSmsFk wag7zpgknMI2Jk8gFZZLvUKnLAhD4NLwOBny8B7x/gsp7OIZD6mBMM9lhy0HypJa6p0w l6gq7by1/r9CWExjLHib1ffpILcwL/PJ4Hr1wE7sxKXGsgs+y9hIUNmH9KdW9M/gBNd+ UmyA== X-Gm-Message-State: AOJu0YxyTJMgqK9e67FfSDrSsBotUHDu3dSBxmINmtPawCv70TecWdZ+ lcVVmE1noNC+V6Q+IQrb9QIUDcP+6KwikroxsmHG1Z5X10BcVyGcSW8RwawUOguyelOgYsF0Wa8 P3wg= X-Gm-Gg: ASbGncsuzq/GrzgXJAjygf6zZIPlDUhNuK5gDuNC207wwwM2l1wdyQn7lkSjCWaOdev QOycH9Nx3TIUqM6KryrCZzOs5Yy0GnGBLQzodxCXBObnWkJ7cYtyMR+5GvBnDg8jsQizmiE/q0R M8IA71uyqQ/gjK8eUCFVNV1yYfQYothj05ebURPYdGotklkv/DfcPT925i4IekvGSwrNQcTwJVk ROwMNFG3gWfl5ZNB0Kau2L6NFdcKARoogecJtMx1c5rWlfFUpHH0GmvnPKON3pVjoMZcP242wz1 SgwgHz+U71vaT2i3TvfFDNA5vFAKED20NN/QKuthlXzxLD66MAiTznv+7g== X-Received: by 2002:a05:600c:a014:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-442f9714d93mr20815915e9.30.1747304774408; Thu, 15 May 2025 03:26:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/58] target/arm/cpu: remove TARGET_AARCH64 around aarch64_cpu_dump_state common Date: Thu, 15 May 2025 11:25:06 +0100 Message-ID: <20250515102546.2149601-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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: Pierrick Bouvier Call is guarded by is_a64(env), so it's safe to expose without needing to assert anything. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-9-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index c7e00e64325..ec9bc72c3d6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1182,8 +1182,6 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) #endif } -#ifdef TARGET_AARCH64 - static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) { ARMCPU *cpu = ARM_CPU(cs); @@ -1341,15 +1339,6 @@ static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) } } -#else - -static inline void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags) -{ - g_assert_not_reached(); -} - -#endif - static void arm_cpu_dump_state(CPUState *cs, FILE *f, int flags) { ARMCPU *cpu = ARM_CPU(cs); From patchwork Thu May 15 10:25:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890154 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3058740wrr; Thu, 15 May 2025 03:26:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3J42UVLcttXQk3HurZgCtf2XzmDRAuJuRj2fh1qeELeiC7WGR2sThrHTMG8dD0I1ErShwjg==@linaro.org X-Google-Smtp-Source: AGHT+IFiIevQ0kx7zelT/gfm5P6wiiQyZh60rHhnkOiSm0CuzLorQFvfOX+NU4NxkNSYDQMRe9NP X-Received: by 2002:a05:6214:29e3:b0:6e8:f3af:ed59 with SMTP id 6a1803df08f44-6f896e2e3afmr102485376d6.22.1747304819610; Thu, 15 May 2025 03:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304819; cv=none; d=google.com; s=arc-20240605; b=GvedhtBBX+yWgpjDM6JdyFzYXsASpyPniR7UbdXqsJ0emXlmet5yBxCDVHCP0y9WcP UlFHk+rYHUofaDnNL6MoOw+Fpl4cwS8DRdKvIrWdnbpjdDFj8LjWxNzutfSmj74yq6XX vVs0JtkWEw9pgMSDOERc74YJlPQXOvwW19jk22jOEGVqIY8o4Gwb/vn9pR9Qp1a2gmhc SA9CsXarFAw8wL5HVSGppD3RMrVqDLq3G/q1D7s7jPKQptsBV1IQgafOM9jN2YyENM8g XcmnCpDCX55j/VS5Ew/h0wPDdhhZMfM7DhShp5b1hwTmEq/8zR3ROuhiHMYHrhh9BpkJ zGtg== 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:to:from :dkim-signature; bh=RG8Ka89WGECPxEN9oHVhNLbmDepbN7rDBbuob6DhDg4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=gD1e3EXkt5nD0Xy0+YDvNTi5Kra6T72ou90hg0FblZxDpBjgU2hUPEvYw70mzqstiC LHyo70/Zb0ZxXJm3X0oHSnEOesyOUZqFWta5M/dcayoXdaiWeIyPbbDIzYWqlxTqo4Jg pVnQaZ7/AdoObosnAtwbTHIuoozWJTXfSqNZ0ks/AhYAc7AnumNkQKCEQqVu/fLYgnq5 OEyc2KrGTM/UdyKXq3lI7DvWLrBUmqomdrOTNq6VHgPa60/wMQ5P75sXw4+YNp/qDwDe LrhyaIcWg0TEBteURcoyzJWapkmvQnxaA86nurqvS5fnDI/uGlMZqrEBrxl7/Al+EsQ8 1F1g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=se4HmPfr; 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-6f6e3a42759si159264936d6.247.2025.05.15.03.26.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:26:59 -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=se4HmPfr; 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 1uFVnJ-0004yb-KD; Thu, 15 May 2025 06:26:30 -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 1uFVn8-0004cO-VA for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:19 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn7-0008Af-5n for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:18 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3a1d8c0966fso530966f8f.1 for ; Thu, 15 May 2025 03:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304775; x=1747909575; darn=nongnu.org; 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=RG8Ka89WGECPxEN9oHVhNLbmDepbN7rDBbuob6DhDg4=; b=se4HmPfr6ryKxfn9E7+km11kM5AJ3U/zw3vAN2k4jgWKyML1X0reLjrGWGsYrSaFhG uSAbc8VS99WGAxyYn39KFZWfHbJFDuLKXnPj7j2M40aa6q3cT+KW1J0whKvkf5ghpbSc hzUH51YiKJJctFK1/c9YTnzKcu4TD3O+jwYAozbVuc6boUIbHxpwlTrb+L7fXN+gZwew 4P821+9vgEgFpd8+nLBtGu1WOsp2Q9sme2Vb6OXaxTuZ9hEv7DrzPwIzIUmgPClt09Yp y6S4EaGMJ5GtqluJvdJx/siEQSCCebQ8A2Z6i0/ipqhObgavEWS4hs+ted0v/gIBwPM9 zJoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304775; x=1747909575; 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=RG8Ka89WGECPxEN9oHVhNLbmDepbN7rDBbuob6DhDg4=; b=MInsAtC8Uf8ueunT0d8aXkQIzyx+aHHK/2OjqeZkz2fu8cYHLldjC0B2ao08mLcTFg ycyoFu8GXJaftSkzO6hWqAQ6QQ76Z2EbCiWMwfTvox7H/qG0yaBmv8LUcJ5K4HoY7+jf e6hLCdDazgYuolKlD6i202/MI7+BK8nxv4YLh0Ucq2W2mjezM3tGE1b/x1UDmdhdVB8V WvHiWIXrloFh5l1bBmDbeVdlv93ths4c4WAqbHD6zi7T17/cIoZtBy1qAmMTSUhRTb+E t5fUPRbDyFoAgKe6gMKJc+qBxXjjhav1TcdAPzH/QsYsjpWSXYQN1ysSmrAl3FK7mQsz vYYQ== X-Gm-Message-State: AOJu0YxOK0q4SOMq4BojN/tEp9pOw20kL9BLx2vk49XEVjFXnwwSVDB9 SpYp7MBA8g447X5Qh79hAiVx/92JgcoQXl2Q9kbqhS3naumjkj8B1P5ZlZ4GfJIIhogNp7t+XZG jv6xqjIE= X-Gm-Gg: ASbGnctifTtY6rMflW24IjQ71by0mhf8VqEXYzUFUSOc207jPBs82u+u37NRPPT5AB2 5wU7QhLv+oo/AwGdtZdSBRDQ/A/evAIldlxW65MvUvnpm9BDImkSG1jRlhk7BlADz8mUAS2n7LS pqSVfvDK6yM2oPTvfNMl+qrAQKwhSE/Ou25W9VptHb6RFilTeezhJzXwC8aqOGK46AaLLCwHlge 5nZKnrfUpQHe9P85DVOxOtbmokq7HihqLdd6XLWYBbjXi30AcI5B+Gsbri6D/WDxPKnfL5qTlsQ bi6JKchtqHF7AGeLMU+9/jM3g0cTjietO4WwDddZrJ11LjN30J05mhf6pg== X-Received: by 2002:a05:6000:2a5:b0:3a0:b817:2d7a with SMTP id ffacd0b85a97d-3a351222edemr2489026f8f.29.1747304775317; Thu, 15 May 2025 03:26:15 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:14 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/58] target/arm/cpu: remove TARGET_AARCH64 in arm_cpu_finalize_features Date: Thu, 15 May 2025 11:25:07 +0100 Message-ID: <20250515102546.2149601-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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: Pierrick Bouvier Need to stub cpu64 finalize functions. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-10-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 2 -- target/arm/cpu32-stubs.c | 26 ++++++++++++++++++++++++++ target/arm/meson.build | 11 +++++++---- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 target/arm/cpu32-stubs.c diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ec9bc72c3d6..ca5ed7892e4 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1913,7 +1913,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) { Error *local_err = NULL; -#ifdef TARGET_AARCH64 if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { arm_cpu_sve_finalize(cpu, &local_err); if (local_err != NULL) { @@ -1949,7 +1948,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp) return; } } -#endif if (kvm_enabled()) { kvm_arm_steal_time_finalize(cpu, &local_err); diff --git a/target/arm/cpu32-stubs.c b/target/arm/cpu32-stubs.c new file mode 100644 index 00000000000..81be44d8462 --- /dev/null +++ b/target/arm/cpu32-stubs.c @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "target/arm/cpu.h" +#include "target/arm/internals.h" +#include + +void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} + +void arm_cpu_lpa2_finalize(ARMCPU *cpu, Error **errp) +{ + g_assert_not_reached(); +} diff --git a/target/arm/meson.build b/target/arm/meson.build index 3065081d241..c39ddc4427b 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,10 +11,13 @@ arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', -)) +arm_ss.add(when: 'TARGET_AARCH64', + if_true: files( + 'cpu64.c', + 'gdbstub64.c'), + if_false: files( + 'cpu32-stubs.c'), +) arm_system_ss = ss.source_set() arm_system_ss.add(files( From patchwork Thu May 15 10:25:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890182 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062085wrr; Thu, 15 May 2025 03:35:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8lxsvtowinRUi9O/4JkCHliyA1supyYArMq2SLbbh9BxVDIkKP2dm+qsTuXESvAN1emswJw==@linaro.org X-Google-Smtp-Source: AGHT+IFPeIy+1h9ImRf8CkvDp/XmeHIuUTXESots+dXtHdPRecy+HnFZ7hhZH3TF5ouUsDN0ROSq X-Received: by 2002:ad4:5ae2:0:b0:6f5:e0c:b203 with SMTP id 6a1803df08f44-6f8a4b9ef48mr29504016d6.11.1747305346029; Thu, 15 May 2025 03:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305346; cv=none; d=google.com; s=arc-20240605; b=kc4aWnbzy6+4l3eUH1yDEklsS90BmgeKNftFXh3jJOjaj9j4/PunegeG2Dbhz6lDDz OzLiuhTipDT4VgdyR5luw7S5SSoUyx7eci7HrBvAZtxZw4O8GQWvYHu5aQYwNFlwB0n/ qA6lzjITqkZTj/RjxOC7+x3Rm5Mw3QXiw2EHdk6PWzCess9qu47JDtF5HTf+qGLvz3F4 BY0AmwlGpNL251Gh5FoIX+wv9c2vS1RGwvMPSpxPUO+q/HMmbSlawLvspTYz4Nl78vXm Vzju1Yo3VhwG88RkfI8V0xHBgji7T4bWRD50DBQKZd/XiiUImy+rmQiw4XPKT+QLc+Uo 9LSw== 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:to:from :dkim-signature; bh=5iuDbPPf5lEYT71cv+B0giQZmGA3HvyTgZbPr6A9ErE=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=luHtGWarA09uoSjU44NE+SFGtd4LgjKR1s42ArZSGHPR0f2+uf/KH3H6adU2Y1Ygqx 0S8MuG7Y0TaZ8cmftzk1avBX9hsJQIN5+HXKztnZ+DFqIjZQOjdFSaNvSrKU9qrptnrz XdicYd62EsLqPS6xOMMCrgWtJSq12Dj53SAPTQXNPKliqsiP+qYdnj1Jy6+hGPziHLog /txGI4ztq/mYq3cigdmXOCfJo5AxnAN7gszNxAQHRpqIWeRcgTM24bMNggw7+Hq3Fp6H zhPZLHlRNbuUJiJo+ckBi36yAGLWdNGkgvgmxG3+j19q5g0RaNN06t0apH0LEOdrHC1+ A6qQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soKSFVKx; 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-6f6e3a5a451si163913486d6.471.2025.05.15.03.35.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:46 -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=soKSFVKx; 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 1uFVnc-0005Ks-9E; Thu, 15 May 2025 06:26:48 -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 1uFVn9-0004gJ-TT for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:20 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn7-0008Aq-Q7 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:19 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so8012725e9.3 for ; Thu, 15 May 2025 03:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304776; x=1747909576; darn=nongnu.org; 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=5iuDbPPf5lEYT71cv+B0giQZmGA3HvyTgZbPr6A9ErE=; b=soKSFVKxFAS+oKZMe6UoBJ9H2LvmWRB9THjpCl23OLOVbh+4JDxnnikwz9OXoVCTc3 4OtsPU8bZX7qQ+GJEyAsTh9cjp0hvwNZTGW9GWEkCbQ/F3D5yP6BmflwH9Lp04Lx5GzN WrVuUjSKvtDujtsM12cLS/nogiQvKuQ3gWdgAglLiEzGv/ASRv+WdlNBf/5gSfqvHmfx F33fFEUeV9IQE4NBxdeswoTzAcX+bg2j9idLlVQWKIsVNyrI+dknuqVu6Fq3fAPvbzIN VgFsLttNjplaU6tluAeDkE1CINiZWOnhvmiiiBWKl9jGhDzESYzqJHuZ2YWscfaqcFfk elow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304776; x=1747909576; 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=5iuDbPPf5lEYT71cv+B0giQZmGA3HvyTgZbPr6A9ErE=; b=NZCPkf/2MnlTKrUmhi9Y6ECXB8W/NwN9sk/u6qeD5laQ+TuUbTePOgdlSj+hQ6gAuV ORvP4e/6TXI8xpDgts/j6rl8JFSVGZubZDM2Sa852oq83yXa68lxWw9Brk5Taf4AZzlw 2HAo8+k9EIlFt0/8JF8dFdWU0UP3QSAd2JgY4JwQUb7QtI3LcRdrDjUj2/fzYGgUBRAt RGGY9tLDiADFo19GV1+80qZQ3V45I0Hs3qYHdShf8WaeIiwK6qGEmIPgXRxJLimGJQTq nzkUA17SMCNSceFOv9pfmXfEDIB1SFm0oyA7NX+6mTs5Pzx9HcIpW+D2jQR11MmtjBNJ wokw== X-Gm-Message-State: AOJu0Yz8EfnZBmJvbriRd7mLvSYh6TA6ABmz35QMbYNXm7vLknl6w1z8 tiiiFgGIVdH/68Ekk4zFP0JbCZuurTqWUO/in5m7SxBqqXEq9yuGcVwOFq9uQEtNkDqHGdkCVaw Sjk0= X-Gm-Gg: ASbGnctKx72pVWi3LfQH4yP/4pdIiWdY7qqNoD6M4xGfTQbHDPZzEkjuzRugllWNEH5 qNYgeTOAvnoWCWHnr+vrSLeqOJVwuo3uAG8ztFO/Tjuq9XtHaGv6/fblcmXW5NyNnFawgu91c/u fpEuGLnD5r56j++Duvh8BYSMbUFbFy54zrwqtINVB97suKsEv3OoM4Cmodw3Plr1dr+KXQt/6yS 9KIic1EwEwvk29XrhH1aJisAFQtpNp+wvTlP3sO4NMOtNVAIZsoE3l66aYPambDUoTP+RRwcx6f cgfvGCfbmrtfKtzOiRN/3V/8hsA5SUkc1B1V3wBbGkUiNl7pzFMoPTqYYv90IOp1Io+V X-Received: by 2002:a05:600c:3483:b0:442:d9f2:c753 with SMTP id 5b1f17b1804b1-442f21684b4mr58321475e9.26.1747304776361; Thu, 15 May 2025 03:26:16 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/58] target/arm/cpu: compile file twice (user, system) only Date: Thu, 15 May 2025 11:25:08 +0100 Message-ID: <20250515102546.2149601-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-11-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index c39ddc4427b..89e305eb56a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -1,6 +1,6 @@ arm_ss = ss.source_set() +arm_common_ss = ss.source_set() arm_ss.add(files( - 'cpu.c', 'debug_helper.c', 'gdbstub.c', 'helper.c', @@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64', ) arm_system_ss = ss.source_set() +arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', @@ -30,6 +31,9 @@ arm_system_ss.add(files( )) arm_user_ss = ss.source_set() +arm_user_ss.add(files('cpu.c')) + +arm_common_system_ss.add(files('cpu.c'), capstone) subdir('hvf') @@ -42,3 +46,5 @@ endif target_arch += {'arm': arm_ss} target_system_arch += {'arm': arm_system_ss} target_user_arch += {'arm': arm_user_ss} +target_common_arch += {'arm': arm_common_ss} +target_common_system_arch += {'arm': arm_common_system_ss} From patchwork Thu May 15 10:25:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890159 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059229wrr; Thu, 15 May 2025 03:28:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXaCPrBMHA7VKmcF9vZyU2SbZWCiXkDsKQvsjTzjIZmhdPTCz3ciBhkpvOX1oZg15zRKt/muw==@linaro.org X-Google-Smtp-Source: AGHT+IEywkHyV5VMwKY8KjbjiOBs949Xw4Ygjq+CEXdvni6J9BFqsA+YPfoDhCS6SCOsKonSOPbu X-Received: by 2002:a05:620a:2404:b0:7ca:f349:4265 with SMTP id af79cd13be357-7cd287df076mr864673285a.4.1747304895037; Thu, 15 May 2025 03:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304895; cv=none; d=google.com; s=arc-20240605; b=Gh17bR4YMQIC9iu2zC1dXLXQqYK/nHlnWMQcS3gBCwNMNCsehoA4Yp9ftkkZkS6CY4 ijtiNFdG1uwHsNf8k+uY2cjqYoKbCFdOKMA1IOXlppDx/9R9/PrSfm6zvrE8ev+AhYu7 qQONuirca9xPgeVMykjw+ndrwi4z1mJh0k0ecEOSoCOtRb8lUlNjxpC0VN+rZ8qFG6Fc 6U/GzsIQv8Sw8F/uitHNKmbeDj8oZ5hUP7eDGdL0xt/w++NhTA+GHkVoNcsylrHixCXJ JrAJpTkzvKFltkLY4o0Tt0KQp1JEVUem4xT2HayLY+NeWxA4LiTT5B6tS55KYNgntjbO VyFg== 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:to:from :dkim-signature; bh=ZkRqD+LMx6swHQ6xUEIIe9lCbzC5g6w0oxlU/fhgdns=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=R7ClMkyWRZgHhZMg4TUXHl2HYwyLYU6DzvitfgZcci98jpZBgWz44PGDkkxOZ4ZftX zUZx6Tc5FTLAj8mNzDqxjop48NHrX49gfvIjcjgU1/KI2H7X/thv3sbH9DZmudeu9khu FWnzKoWc257/ajxFtYaLzgo44H6Jtf3dqHfTEvH1E4xBVWkzyJdnfXRS0hLXxb3f2X8o S/5+A9wYF9LZmKBhQLWpQXo6yLiIlR79qwFACxQLW9JIWS8Aa28yOcNXSrPMg+Otz3hF 7hZZwmVhmUSe1nanos/T6bzv8RdLewJXkLgqSIwv5hfiIfcbkY3Ig2fIF5reDutLEhzs I0wQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xrtVaEQm; 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 af79cd13be357-7cd13245584si1080872085a.250.2025.05.15.03.28.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:15 -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=xrtVaEQm; 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 1uFVnD-0004q0-P1; Thu, 15 May 2025 06:26:23 -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 1uFVnB-0004lt-3G for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:21 -0400 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 1uFVn9-0008B0-09 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-442ed8a275fso8398095e9.2 for ; Thu, 15 May 2025 03:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304777; x=1747909577; darn=nongnu.org; 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=ZkRqD+LMx6swHQ6xUEIIe9lCbzC5g6w0oxlU/fhgdns=; b=xrtVaEQm9jSjMWAhfgxfzNuJ7t9MrRWT6xnCCusKvbwOaoi4BCwU8T0VpLG2gD7V2d Per4h4YwYuBCedbGJueC25cubgveFeL0dVV+NbHjxeGkBIuvSTfUNOr620zcjlU7/eWv 1cW4ivrDzP5jyLeO/h8YNtPTzi5g28R9/yvldo8UlC57HXmENVmzZFFcN1hOp/S2G1D8 7MG49ZNGmoUaK3dqsCdSUJBG1huRztEWwoNWJwtBGdilmLCYruqY1t/YG2ivyrLfJpvt zGD+aSPIPeLZAKX6kuD/AYAh3NFfAtwR8iNsjSwgI7dxYoGNWNl7+jCv3lSGbZdzNcg6 4YZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304777; x=1747909577; 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=ZkRqD+LMx6swHQ6xUEIIe9lCbzC5g6w0oxlU/fhgdns=; b=m1PpK3cVW5LWtL0n138gqBRyhR+Fbmw5VJiNT2FqQWjomL1fdueX9B4DFTw8lrlGD6 YiRdyH7xi4ucS8mio/X/PaIXpl4IBL7EgSHwS2i972XI1uBjX6nm2Q5zr9O+1pkiRGD4 4D0GKAKKoSDHImxMQPlMIgHWfbDnBrzCPSmJYHqmJFl1HjhDWbwEScv7DrF7Wwsegiqm 4Sv59k6TTskr6EBtxg+Pvf+SmThOQhjt0HHtl3PjMHwH9TJJKNP1ZapkcdVmxRjcWar8 0+D1KWf9gSLvruY87/hTSdiEkfxJ0T8pVc41pj0fH+lVNDfqpakzCfXzTKuWdQslNQcD vATg== X-Gm-Message-State: AOJu0YxlK5509Ky1Rx6bc51SsSzllfzDSFBJ/0mhZ6faFEP1BObjixKP zxCzpwo/ibzNkEDbD+Xgk21JMrbZGiH4KtMGBQKkpJiXx6dG6w460XtYRCIE9NX8nwVh6lqg7xZ upwY= X-Gm-Gg: ASbGncsGPdW6socxIqG5FV3VIn5gyCozwxf1V8W3Df3xZb4QTgSuHq84oxqCEbgCyuM OJY5jHcODURCUUViRTSRusNEAu/1AAIDzwryL9IIy+mwkplv0szowRI0NM1+7Ob4VQR3iIMjvJY MalTQU1b6FSaa8fVg9C6tsvGYlHQFTVnlhryJ+wpbDnWfPZgEMLlmdXwGdNcc4CKOYsqozvWkPx X7s2hOBTjMgQ0vb37+Z8oeIhgBx01qMm9pJc7fmymPsODahmo9E6H+349BOZ/Ty7rkFTYXV9r9A I5h+MZwr4Nv3pNBCdYfcVraXX65NCyL3ef3/gP4mwGLJz123GWu5u/R4+Q== X-Received: by 2002:a05:600c:1d1c:b0:43c:fda5:41e9 with SMTP id 5b1f17b1804b1-442f2178679mr71249315e9.31.1747304777280; Thu, 15 May 2025 03:26:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/58] target/arm/cpu32-stubs.c: compile file twice (user, system) Date: Thu, 15 May 2025 11:25:09 +0100 Message-ID: <20250515102546.2149601-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-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: Pierrick Bouvier It could be squashed with commit introducing it, but I would prefer to introduce target/arm/cpu.c first. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-12-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 89e305eb56a..de214fe5d56 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -11,13 +11,9 @@ arm_ss.add(zlib) arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) -arm_ss.add(when: 'TARGET_AARCH64', - if_true: files( - 'cpu64.c', - 'gdbstub64.c'), - if_false: files( - 'cpu32-stubs.c'), -) +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c')) arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() @@ -32,8 +28,12 @@ arm_system_ss.add(files( arm_user_ss = ss.source_set() arm_user_ss.add(files('cpu.c')) +arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( + 'cpu32-stubs.c')) arm_common_system_ss.add(files('cpu.c'), capstone) +arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( + 'cpu32-stubs.c')) subdir('hvf') From patchwork Thu May 15 10:25:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890157 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059139wrr; Thu, 15 May 2025 03:28:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU39fV5JuQRWRoKaknIbxoxrT7TT7qMb/bQYGh7HXROG0r1+Ckds59ue5ngQowU9NJxz4H55g==@linaro.org X-Google-Smtp-Source: AGHT+IHhGXW7konPT9awFS1bhjsz9W4kEEXTROfEodV6vj7CizkbGN5NgolnCERulaKMG3LxqP8L X-Received: by 2002:a05:622a:5a98:b0:477:1edc:baaa with SMTP id d75a77b69052e-494a32ba992mr36641411cf.6.1747304883310; Thu, 15 May 2025 03:28:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304883; cv=none; d=google.com; s=arc-20240605; b=d/r/RqUiAtIC2tEN+2ptJ3227O2GHWuX0SfY/LFz7Askftwq3hkzIEIfjj0JTR266e ddrpyiaFYoqQ3+7scTB1VB4dKdMR+s5ByGLH8pkoIfVVxE2ex7aLltgVmMsHPibNAKxV 3nvpNX5e1YksmOyv41R2t8PkUlokSTbjDcQvCgV9pbkIZDC8Llz5Az7jyanmQr9tA5fE AGCuaNn9E4r82pitihI/1QxqayreTubI2A0WOhmNEq0BxIjD5FjakPh13xFvnvV6QY// T0nMV0fIDl1gtm5aIJRD2QbK0EhX6+VZrr6RT/JKNbFem4k8rrfAKPv9SNtDciT2fQOU b86g== 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:to:from :dkim-signature; bh=JBwP4MINLJbGQNTaVfNpgXGCUDV61F8mAdNh5p7lyQQ=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=lJzyZl9Lx330gV/3gBWyxcnmsd+EbaDAoYpoz463ISPkm4qz6jYLEZUNHYZUq77Vzh pnzVCmPOF6gxEguukLdq1vrMexsAbSym2WMtcwdRSS3SP8e0SGhgkhDvU8A5biRkukWX +6zYeNQKb1vUZXXFtceROH82+UaGb+xH+XzmWaVy5kFGIIx5Us7E4CYGyNmQlUN+gid+ 9NYEwCZesgGhnAFBdnY80KbBZq/JDxzJCLl8H7J0wRz8PEr0RD8HQHjkWrLpSuZMSssq gVpsuxXXmApVjnrV+IpwveWuJFreh13qtOfqwvSf05kICCykXAihloX3sXiY8WKOLVdj YbVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PKsc4F5C; 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 d75a77b69052e-494525b3f8asi153137631cf.671.2025.05.15.03.28.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:03 -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=PKsc4F5C; 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 1uFVo9-00065E-U0; Thu, 15 May 2025 06:27:23 -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 1uFVnB-0004ot-Rz for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:21 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVn9-0008BE-Rz for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:21 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a206845eadso427406f8f.3 for ; Thu, 15 May 2025 03:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304778; x=1747909578; darn=nongnu.org; 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=JBwP4MINLJbGQNTaVfNpgXGCUDV61F8mAdNh5p7lyQQ=; b=PKsc4F5CRS4zcTDIm1s32VA3CEvfJAnm1cDEui6MQ/4cy7JWx3dUyeADSFcJDDw9HX U638S0wIleTnv0HYFvneL3nX/7C13k3x8cm98kwbwpUbrdEXBRU9sGl1y8YwdrdN+cXe hqff1fzB9OyboWw1pWXZHsr7zR5I8302vd+Erfaag5jgxZD6vX+stWMqJsMU9rAkc0K0 bZmkewarMAnwI0vr+FN4FmT11vXXq5okNX6eTgHLA0vf0t0fspBX5VjVwQvoZeTgoR6V JncSY+t+67ALMmzyoC5chGe2DrI7hP6CVtVq8Tlr+sL7XP7QV+f4aXGa/hfjukcVGkBK 4BaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304778; x=1747909578; 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=JBwP4MINLJbGQNTaVfNpgXGCUDV61F8mAdNh5p7lyQQ=; b=Lxl3pF3YxNTK0a+aGYf4o6ocwF8FkoGUXo1T8DL7LrxyIiCxRNSXyH2o285DCE2mmF ZQdwKNqT2vKm1Rp7Cn2bvZkOQ/8S7nZCGjvUqP0qkojHQrp80uV3L7t5tn1shP95iDl3 TAEqJoYLxfxBiFVC+MHfcCl7Ia/YRlebo3S8YuggGr6LH/RjV5twLPBZtCguOHtezway rzUAcAXvpYHU9vCHgsB8jNLb+fGL9x9SHKU9L6PB5ik7WGIkZy9LducIdwxSO8hx9efs vggvIhWXqo/WlGUrfSmQLAW7n4fhygolEBGbNWJtXqQdpH9+jR/FT86XvT8IHra/MoIp kIzw== X-Gm-Message-State: AOJu0Yw9N5LQxw/Sd7J5B4M1MllNoOGBTUlSCNl4Cydf8cy591nGn87D ZdVI3re3E7EXLAschhApeGyVIkL0Jg8QJCQVq8mXGccUBnaSILXVPbg0l4P/9vgtywUTBApFcTj jdEU= X-Gm-Gg: ASbGnctpBFd3CcldbnZgglOg6j/FRcndOubiR9dhInib1HSkmQ0z4OVrJojSsG7LPfF AZ+8inCRbfedb7KE3tXedlDcGaC8gZJfy4lGIaf33V5St7KFXupsWYVgGhIq2EhrGESk1V2N4Dw 2tY2Chn/QlS/Ygy01mDYVwOPji5X+/fwVg5QXCodx+nI9TDLrhKPFvCbVzDW/oyLVpTaT/zUM0o pcWvxUvtulWn+5I/2CLUiyQcMvOLgSkGA4maAHmn40TIdVWxQDO32FRqBpjoKhsYtCv96ArHQv2 FqChsABFHKSPrF7jdMlWrZjvN+n7rXnt1JBXRVenQFnNP72CtHY2XFTSGPR7ZnAKlXO3 X-Received: by 2002:a5d:598f:0:b0:3a3:4a1a:de6f with SMTP id ffacd0b85a97d-3a353748601mr1742158f8f.26.1747304778277; Thu, 15 May 2025 03:26:18 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/58] tcg: add vaddr type for helpers Date: Thu, 15 May 2025 11:25:10 +0100 Message-ID: <20250515102546.2149601-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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: Pierrick Bouvier Defined as an alias of i32/i64 depending on host pointer size. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-13-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- include/tcg/tcg-op-common.h | 1 + include/tcg/tcg.h | 14 ++++++++++++++ include/exec/helper-head.h.inc | 11 +++++++++++ tcg/tcg.c | 5 +++++ 4 files changed, 31 insertions(+) diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index b439bdb385a..e1071adebf2 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -14,6 +14,7 @@ TCGv_i32 tcg_constant_i32(int32_t val); TCGv_i64 tcg_constant_i64(int64_t val); +TCGv_vaddr tcg_constant_vaddr(uintptr_t val); TCGv_vec tcg_constant_vec(TCGType type, unsigned vece, int64_t val); TCGv_vec tcg_constant_vec_matching(TCGv_vec match, unsigned vece, int64_t val); diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index a8c00c72cc8..3fa5a7aed2c 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -189,6 +189,7 @@ typedef tcg_target_ulong TCGArg; * TCGv_i64 : 64 bit integer type * TCGv_i128 : 128 bit integer type * TCGv_ptr : a host pointer type + * TCGv_vaddr: an integer type wide enough to hold a target pointer type * TCGv_vec : a host vector type; the exact size is not exposed to the CPU front-end code. * TCGv : an integer type the same size as target_ulong @@ -217,6 +218,14 @@ typedef struct TCGv_ptr_d *TCGv_ptr; typedef struct TCGv_vec_d *TCGv_vec; typedef TCGv_ptr TCGv_env; +#if __SIZEOF_POINTER__ == 4 +typedef TCGv_i32 TCGv_vaddr; +#elif __SIZEOF_POINTER__ == 8 +typedef TCGv_i64 TCGv_vaddr; +#else +# error "sizeof pointer is different from {4,8}" +#endif /* __SIZEOF_POINTER__ */ + /* call flags */ /* Helper does not read globals (either directly or through an exception). It implies TCG_CALL_NO_WRITE_GLOBALS. */ @@ -577,6 +586,11 @@ static inline TCGv_ptr temp_tcgv_ptr(TCGTemp *t) return (TCGv_ptr)temp_tcgv_i32(t); } +static inline TCGv_vaddr temp_tcgv_vaddr(TCGTemp *t) +{ + return (TCGv_vaddr)temp_tcgv_i32(t); +} + static inline TCGv_vec temp_tcgv_vec(TCGTemp *t) { return (TCGv_vec)temp_tcgv_i32(t); diff --git a/include/exec/helper-head.h.inc b/include/exec/helper-head.h.inc index bce5db06ef3..5b248fd7138 100644 --- a/include/exec/helper-head.h.inc +++ b/include/exec/helper-head.h.inc @@ -58,6 +58,17 @@ # define dh_ctype_tl target_ulong #endif /* COMPILING_PER_TARGET */ +#if __SIZEOF_POINTER__ == 4 +# define dh_alias_vaddr i32 +# define dh_typecode_vaddr dh_typecode_i32 +#elif __SIZEOF_POINTER__ == 8 +# define dh_alias_vaddr i64 +# define dh_typecode_vaddr dh_typecode_i64 +#else +# error "sizeof pointer is different from {4,8}" +#endif /* __SIZEOF_POINTER__ */ +# define dh_ctype_vaddr uintptr_t + /* We can't use glue() here because it falls foul of C preprocessor recursive expansion rules. */ #define dh_retvar_decl0_void void diff --git a/tcg/tcg.c b/tcg/tcg.c index 648333a9fb7..ae27a2607df 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2367,6 +2367,11 @@ TCGv_i64 tcg_constant_i64(int64_t val) return temp_tcgv_i64(tcg_constant_internal(TCG_TYPE_I64, val)); } +TCGv_vaddr tcg_constant_vaddr(uintptr_t val) +{ + return temp_tcgv_vaddr(tcg_constant_internal(TCG_TYPE_PTR, val)); +} + TCGv_ptr tcg_constant_ptr_int(intptr_t val) { return temp_tcgv_ptr(tcg_constant_internal(TCG_TYPE_PTR, val)); From patchwork Thu May 15 10:25:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890178 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061931wrr; Thu, 15 May 2025 03:35:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsKijjr4VJkqNLTHc3o1p9ce2YO/6H1/l689aN8To0sXRu2Otxvj7wfgq1xZ+Y/OoDHsL53w==@linaro.org X-Google-Smtp-Source: AGHT+IGM3Xm3hqLAn0VUJwHatcR0PCYwhL+400q0vojfkPzRvy0CYRJ8ouTIvEpsNqShlKftPBxx X-Received: by 2002:a05:620a:f11:b0:7cd:35:52d0 with SMTP id af79cd13be357-7cd286fabf3mr813422585a.0.1747305318940; Thu, 15 May 2025 03:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305318; cv=none; d=google.com; s=arc-20240605; b=KKJUm1YR1fVLjFWu9kooh63oUXSa+YXMqAnEHHzNKYg52YhW4y0mhb74yMu2j3aFvS LvQsKmRfmbOZuFYI0a6aBQiZh9Bawb5Ig4p5UD9x4jpT6lYsyVWy2O1w/5vw0Fs0J4Aa ixyOjEuR4kP9uK/O8VNyfPY8gRHyxZ+HBb45NaElexk/y3lXJG0wrTMOuLm7zGya/0WK Lp5WTDgy4hXIXBL6FF1nlSnt1D119Vo0Fhi7gtfVkjCfnlJ8yhl3TsaXqwPbGmjNNZ0o DA+0BhoQjS2rOC0iRk8/V+jUYwW9NFCYrfQz1v41z5RNHyOksFPtm5Oe142o+zmv2Iut 1kIw== 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:to:from :dkim-signature; bh=qEjjZFV3p0k5EuEPSBS07Rotsbv4ZYzcl6u4h6fFTZI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=GY88GiNIx4cyRW1JB52jNuo7nT/JbDsF4D8bhccgz2dvHkPWRd0svY3IZIEOY1oP5H OQuJO6OlGUarS5pjkImFuu6SzudxmcqWlMO4rM7tQi7Wt+/KcOqj/sXFSthwJ+zDr+Oy 1+srFyiWC5Aw/n4n0rtRTPhcawM3RRwfVQvXxQIibChF9kl8XpHqRSIscy4ccxp2D1pW Rq+CDA4CINcPiq1HyblY2E5gsBL2opLzxVLdqw/x9xyEAmvMY2ITHnZFbS+tNbdkgApV nri5QoYGPXldslmDKZ8vI0zs26NqfKF/tBfuqUMyzAEyB/2j/6aPiMes+47ldJreJzhA XQmA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fqOr+uGu; 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 af79cd13be357-7cd00f51a75si1508460885a.25.2025.05.15.03.35.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:18 -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=fqOr+uGu; 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 1uFVnH-0004yK-6d; Thu, 15 May 2025 06:26:29 -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 1uFVnD-0004q3-Ad for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:23 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnB-0008BW-F4 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:23 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a206845eadso427422f8f.3 for ; Thu, 15 May 2025 03:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304779; x=1747909579; darn=nongnu.org; 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=qEjjZFV3p0k5EuEPSBS07Rotsbv4ZYzcl6u4h6fFTZI=; b=fqOr+uGuIOjoJ4wdZQZqSBW7rFVanps8EKpvpdStwutjwbo1w9yVRYmHqpkfQ0Rfai vmBY0Jh5NbeKYbbnIquX68BD86dhTNUu99k5DgykV9s4XDnSiMI+MfwJ5VKEbE/bxyYd F7IdRyZLiQ7HZf1n3Ai84oKHPCPZHJahpm70cS3Z5yOrI3mBEPyi6v7UpbKbPaGBD3jo V9olb2PIo5Bayma9wVY9ElPsKbUF9wS17tI2172IuwgZ6N58XGVf4D/+/DyWmpb0La2C EqfVB9xH6luAIDpB5Sw5eAoDgvAB2oyOV7o0zUM+86aFEd5M4B4MOortiiL0vvmanhzf XwoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304779; x=1747909579; 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=qEjjZFV3p0k5EuEPSBS07Rotsbv4ZYzcl6u4h6fFTZI=; b=uX141nZpgJ0DaQvao5g8F363WNcd/gZJimQKN1FP+ZctGpnT9FJ4wGyUlBiMTSuM7c tjpqD54O5ToB7/y8KhH+eNPOWY5hV7AkFxa7fIYgvi4ee1uRlUNOXP2tw52lGXkdX5Nm HH0FzyZWLJtkPqK4wERN+ITr3t3771lGseC0nQ3GqyPBKXg2ID4Ynik4+fWc1A7JdrF7 Z2V3T1XtekLOuwIpX1nZ1Ht69hAd+Nhfclwj/wfE4S7gOXKFjWWz+NR9BrSWDbi3URGK XdHYx+whGTs4vVj77cQ6VtsHEKa1PbtxqGBuxfzTe1G4MNFeqeFu/lVxDsMGjL6vb8wn HlGQ== X-Gm-Message-State: AOJu0Yz3umJXB0qYwG3TM6RndFwWbxdIaGS0zlYmLL0OMz7qvBLLpej4 qE3gcyDa24fDDRLAoJ5KV+X0TfLyModTmgEkDX914jGi+D2GToFP8LtmzO4H5p31+pgbgJ7afrC ZWmk= X-Gm-Gg: ASbGncu2ik/GeTmh+yq0e0jjWN0majlLSgaPNpFIyjymf6RuNT+wlOcpXSVfn10Cjc0 h8bHguDWxwGdaZPZGGD6MY681WxC4/dIs9tFVmOha9BoJJuhfAq1ZMe/qsdDb1i8B9fqWNsE15E sQSDYtFYg1mr2EyLtLwMs/v+WfJMMH9U2dXCQbjLpCKVIxfZ2FWO+tys7nPKRnqhDDtp6B3vGO2 0I62tkzzy6CbDaukypacoSJEtfR+wh0o0rXJOwcKfbatId5Nfsvigb2fLC0QIlIez9cou8hUFy2 +c2TnTSrHBZxT81gX6gWkmyCnxwPstOjrWfwFim/Rv4k1FMXja/k1r4kmA== X-Received: by 2002:a05:6000:2504:b0:3a0:8298:143d with SMTP id ffacd0b85a97d-3a3537354e5mr1505269f8f.13.1747304779548; Thu, 15 May 2025 03:26:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/58] target/arm/helper: use vaddr instead of target_ulong for exception_pc_alignment Date: Thu, 15 May 2025 11:25:11 +0100 Message-ID: <20250515102546.2149601-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-14-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.h | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/translate-a64.c | 2 +- target/arm/tcg/translate.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 09075058391..95b9211c6f4 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -49,7 +49,7 @@ DEF_HELPER_3(exception_with_syndrome, noreturn, env, i32, i32) DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32) DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32) DEF_HELPER_2(exception_swstep, noreturn, env, i32) -DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl) +DEF_HELPER_2(exception_pc_alignment, noreturn, env, vaddr) DEF_HELPER_1(setend, void, env) DEF_HELPER_2(wfi, void, env, i32) DEF_HELPER_1(wfe, void, env) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 5ea4d6590f2..d9e6c827d43 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -276,7 +276,7 @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, arm_deliver_fault(cpu, vaddr, access_type, mmu_idx, &fi); } -void helper_exception_pc_alignment(CPUARMState *env, target_ulong pc) +void helper_exception_pc_alignment(CPUARMState *env, vaddr pc) { ARMMMUFaultInfo fi = { .type = ARMFault_Alignment }; int target_el = exception_target_el(env); diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 52cf47e775f..ac80f572a2d 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -10242,7 +10242,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * start of the TB. */ assert(s->base.num_insns == 1); - gen_helper_exception_pc_alignment(tcg_env, tcg_constant_tl(pc)); + gen_helper_exception_pc_alignment(tcg_env, tcg_constant_vaddr(pc)); s->base.is_jmp = DISAS_NORETURN; s->base.pc_next = QEMU_ALIGN_UP(pc, 4); return; diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index e773ab72685..9962f43b1d0 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -7791,7 +7791,7 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) * be possible after an indirect branch, at the start of the TB. */ assert(dc->base.num_insns == 1); - gen_helper_exception_pc_alignment(tcg_env, tcg_constant_tl(pc)); + gen_helper_exception_pc_alignment(tcg_env, tcg_constant_vaddr(pc)); dc->base.is_jmp = DISAS_NORETURN; dc->base.pc_next = QEMU_ALIGN_UP(pc, 4); return; From patchwork Thu May 15 10:25:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890169 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060457wrr; Thu, 15 May 2025 03:31:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVoZhQKYAZforDWvMlIlfguyTTE3DEBejZitxnJkF6YxU6WHtnsyI4jpSIZgle5inCJxp9V/A==@linaro.org X-Google-Smtp-Source: AGHT+IFVScV5UsLBa+vZ3UUNANege+gUi9Qec5lu1UB4cyHbEWXzhAM3wzdKlA87V/kRXB2VhhNC X-Received: by 2002:a05:620a:1922:b0:7c5:562d:ccfa with SMTP id af79cd13be357-7cd3c8079f3mr279658785a.36.1747305090914; Thu, 15 May 2025 03:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305090; cv=none; d=google.com; s=arc-20240605; b=ZIpNinzlw+2J0prvVvEqxhQi3aTkPdkCoUBFFKMV+kUFQC3+NAIbtiMo7yizzrf9SU zTa1d2VaUmtzdVPTD+sJfruZjoQ0/QlPCbOP2pWcSNm0mHHgvXWqH4Do18ZVG1CdL9jq G2TJAFesUnDiJ6ZavmJTwTodatewmx+o0BBwWB5oMRv0KXvPGrGeGPnxy01l5Vtvs4bR ur7NnFTftXTe87ZOgKCBM/NseWuctgA+SW1WPoW8qAQ/G/VGireaoZ4un/DvJsJb/wvL F0S1hXltZOBaNQuPhINafuNxMXriL96cJ1S+xOclX12IfSVKbm7pPeE/oKAniPZ9ALTG pNGQ== 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:to:from :dkim-signature; bh=axQheGhKwsHVWYKqF7lq4kkpLFgSDSMUn3Mtx8Bq+VA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ZvaTfQjKgsocIabgHJqJ3ZovBk1JxFrSZdev8ZmZwzq3lJ7XhXtNZaArzRdqkiylF0 eyuLmmsuXQ0aQBNWR+VlSlNbJvuBZdSdO/Kp+0mAyM+eGmSY5uzlP3KNwFA/lSYnnBNj 9lZjvY6fUCTyaMb7lcsuZwxFnqrquBIkqYYiP8EzA2yG4m2KIo81qdR0o77TCmuOFEvi q661rw3zYVlEiAWDnnAHeJ7rMncFSuasl4TOtCSUFlOssQRdrEGJoabUZrQPROvG1gyf SUHTf5jF1SLKiEOKTV/xMYFfjJTENyLJqR/ny3NMkW2J67DAHB/ROcXHEFuOYUgcEvEf ELqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EaMEX0UG; 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-6f6e7241dc2si149172966d6.252.2025.05.15.03.31.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:31: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=EaMEX0UG; 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 1uFVne-0005Mw-KX; Thu, 15 May 2025 06:26:51 -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 1uFVnE-0004rr-3Z for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:24 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnC-0008Bj-AI for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:23 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so8013375e9.3 for ; Thu, 15 May 2025 03:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304781; x=1747909581; darn=nongnu.org; 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=axQheGhKwsHVWYKqF7lq4kkpLFgSDSMUn3Mtx8Bq+VA=; b=EaMEX0UGk0YfTeMxYyrif6RLt0vBQCF/+hW/pyVE7G3kQojd2Y5rWjZ9kjQBQXL5Od nCGQ9fTZkDLeQsvP8CKavF6AQ+91/h1HflVS0CUGBINIhBNb2AaTjjWbSt++9fw4lXg3 qdj1SgvFxrr6mGBAEsH6pR6IGOPbbU0MgZYQls+8haeb5Kt+aIPODDfkYfv4cCh7DjYD h4MDC9L+dUMEKcGxpZ2cA03Twp48pU3GTfsPekp4klqm5CpVgkMLu73RID88AD87Ox6J 1wGFR2pkd40kQSIAzTLmm8HtkmCp3dJ9vb7O+q3awVEcmpRykF3/Otwdnw8wkckBaQYu 7qSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304781; x=1747909581; 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=axQheGhKwsHVWYKqF7lq4kkpLFgSDSMUn3Mtx8Bq+VA=; b=No6TOfj5LnBg0QeJE0/iIhSjZw7Wzeh5LtOCtoYSlCzLUhP+nc+kG8zYSv1G1P++C+ n98wGu4ky7L0AiAy1JPOoJT3KpUDZ7rpzYDk6rPk5PE/O7BDGa64PjITaD7DMYYrDxzX lZPr6hvygM8d+XtgpMnOk5VoSfVHK7muvaqdh74fMPBc7rWmfb26z9AqFy7ciXpbmIvJ +aD155HmAmprwN/RtvwU5IK3l2EG2onFA01nRNwgMtp6f0I/ufe4dgjy/zaahq9ZJ/9U f3VOUdalbdQD3LLBBmiIdd5uRLdudzypdcT3OteuUPfRMWWoU21VJrRizjIl+2OIVkK5 DN2w== X-Gm-Message-State: AOJu0Yyf4xEgdmgATTaeFUjo9pCVSFJuzd4UJUz64JJmkFW4nEvFjOCe iO7lDCgCZyX+2sTqMhZvMb6ZoTA09PeWLAl1trccKeqP/2dAH2Yf7AyKQaCmhTKuNL+ahPaP4h7 +LQM= X-Gm-Gg: ASbGnctGZiCGvEkjsxK14OaKl34zzzAJtt97ye5jRrsEGvrEuIR8b8PVvxwLoxVc6P4 DMefrjLMmVHcczMy0ghzsZUhGUIiQUrm9Y7+IfrXcXBhbUD93ZQUXhCyRrA48pPb4UNUNd6On7b KFjUCb+ARPeA1kRIAzkN9tDyeqgK6ctUc0zDiJJHzxGo2CT2rib1OWgLUzmVQxgWOo3BUgy7Qlb kpdkiD7mzY9IE2AmQQNymiEwaxuNMe/xsuAQJRWbQrxLvoZOv+GQRD4x9wc3XicJQNql0gXmNPF U/UJnJTwvOIlt2n06zdN6mLneMBo6/TUHIjh2Af8EaKe/ddTvpF2diyu/w== X-Received: by 2002:a05:600c:1d1c:b0:43c:fda5:41e9 with SMTP id 5b1f17b1804b1-442f2178679mr71251815e9.31.1747304780684; Thu, 15 May 2025 03:26:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/58] target/arm/helper: use vaddr instead of target_ulong for probe_access Date: Thu, 15 May 2025 11:25:12 +0100 Message-ID: <20250515102546.2149601-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-15-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.h | 2 +- target/arm/tcg/op_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 95b9211c6f4..0a4fc90fa8b 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -104,7 +104,7 @@ DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env) DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int) DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int) -DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, tl, i32, i32, i32) +DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, vaddr, i32, i32, i32) DEF_HELPER_1(vfp_get_fpscr, i32, env) DEF_HELPER_2(vfp_set_fpscr, void, env, i32) diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index dc3f83c37dc..575e566280b 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -1222,7 +1222,7 @@ uint32_t HELPER(ror_cc)(CPUARMState *env, uint32_t x, uint32_t i) } } -void HELPER(probe_access)(CPUARMState *env, target_ulong ptr, +void HELPER(probe_access)(CPUARMState *env, vaddr ptr, uint32_t access_type, uint32_t mmu_idx, uint32_t size) { From patchwork Thu May 15 10:25:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890165 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060149wrr; Thu, 15 May 2025 03:30:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTyU3rSJ3/3Jj1tPYZHfeBNETe6cSXgUA9YTKKrYrQcBlaPCn/6FyW59MTVA/3CcpJy+a21w==@linaro.org X-Google-Smtp-Source: AGHT+IGBSNQKXweAZa9V4vGVDIifGd5V2igikYeF+fHA+GOZlqywhUIhH8nvFFqc6mhvQcirm+N9 X-Received: by 2002:a05:6214:2b08:b0:6e8:8e10:424d with SMTP id 6a1803df08f44-6f896ec2fa8mr96585146d6.41.1747305050950; Thu, 15 May 2025 03:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305050; cv=none; d=google.com; s=arc-20240605; b=ElovEIRB82wH0+YXgg45GdZVUlUctg69WRT3hjcIoKXvKEvxTmDGjL5wvCAHyLgWSb paCATYiKXBDHtm1OGTLRYD0FtncmdWAyg2p6J+x8PJ84eMVK2lvPAFVscvrtr2jqgL46 ZNug4Dpo3JxYAznk4DTjUE9W0HfDFMB0U2z5D8HacrLRACisHe6TRdmKYBRBJCTZL/tB +ISou0d6Hd0G0I1CNBO5/kcCpfcH+5xFChmyAJYJWUd3jplFir/K+eO6KUEZl7ohvjKK ERNz9rsJBfjDfK62zxTCiNq6CPZyGUtX/utcNeC54n71jVyBguETyiKlkSq1/cl2AFZp G15w== 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:to:from :dkim-signature; bh=LysuqBZEQ7TEXzoI4X5szGeQ4D/3+Ej8EqCa4rKNEJg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Awuy1QluHYpnuEUC7MdXesD0tkNLI1u/H9Ql/3q0jmr7/JmkybfahTolswbKh4VdY9 QSjbo3yH//ldCUA7s7Q74/iHl5bso08sQYKNknjihG9a6ObrDr8m1iC8ZgYAEBTxdPNw cKlEiMLIev88E7ZEft8z3gPBHCgElXfXPuulJMF7aQ9tfslaKbfTSDcHglqW3skougdH llkgnseGibHJ6r/xA/qX5WjdR+alY8Pm1/fGVG4SOQK7SWxkJVYsn+T7gbsv2EO1sNZO Jc1PEEkJIpfA3M3fh+zMWt+V7z83/pI2NSxMCslfGOtVk6J3PE5KhQibgdjNzoW4BD8s SeYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B8Ps/Zoq"; 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 d75a77b69052e-4945259aa61si160940411cf.511.2025.05.15.03.30.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:30:50 -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="B8Ps/Zoq"; 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 1uFVne-0005OZ-OI; Thu, 15 May 2025 06:26:51 -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 1uFVnJ-00050L-QD for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:30 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnE-0008C1-Ca for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:29 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-442e9c00bf4so5680865e9.3 for ; Thu, 15 May 2025 03:26:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304782; x=1747909582; darn=nongnu.org; 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=LysuqBZEQ7TEXzoI4X5szGeQ4D/3+Ej8EqCa4rKNEJg=; b=B8Ps/ZoqSqAwT+al6sJlLEzvFRn/wuLCAmctmvTUVsfVTqpzdxahdiMZYcdy8ZiN9T 48odWcK1rFEwCXoTjaM+DHxNoSMedXvJUtZNjCUxAMY2jJdkZrJ3ZBqtfCoTkoS6tuZR HtXk56wlz1HG0Rty+JsMeSZ08l6ITFG5g/d27PV/XTm9DN3U1ZUuyQoui/+dcEMqk1KP z+EsoQhkZooooHn3vg+xrUAOGmfAaA9g1Fcc37GSU7aE4TFcmYVbMWcxlH5x3jbfGzMi Wha1XQoKUFYMSnBOJIM+rMs6s7lFcDrVdbcBhGl4aoc5mJDSsv13B9/gqNRjP2C8QzyD Zo8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304782; x=1747909582; 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=LysuqBZEQ7TEXzoI4X5szGeQ4D/3+Ej8EqCa4rKNEJg=; b=kB8oljs9e71Vt5GZTaP+3o18PCt6pFPMB7g/vvbW1V++MybBwVEPAzAWzNhY5Qi8Nd FVRAMIS3Mv/Idw3hBg7L9m5z6fXv8Lqxn4hIcfUZebuht4hVUgc7QfeZlfRndxgv1LSB qj4fl4hJTTzi4tSwWcHEKIkvhjEVcU133W5VTjVD+VCsttY50s84rh58ZjWS/0Lhxfye VI+GlNh3dGyH9/EaONFnZXynhznNdVpoXVQakE0y7DsxVmsPWU3lgA1XqO0P9DQ2V6hv zbFU9NDOrotxwE1CM3e7A1EnbuWxx1O0kd+QZjcFW1TYrdHzbzmh79QvTj3OXeqp4Zo0 ZSyg== X-Gm-Message-State: AOJu0YwCLJ8Y7px1PMXHEJ8jHpTtpoFVUBCcfD01miDQm9ulo20HhSOT WrmO80q7+n1Gn32IwMWZa9J7KBQrxnmnXaF/hcfcDMBTi9gT0dTUEVghs3cPkuo6M3TAKdI3IDe 7h80= X-Gm-Gg: ASbGncvUvDtSlv5RlwtWkKWtCLn2TZh6KShQmaQBKKjJCPr+CUQd8y+/xSJdgbuT9Gj PhqvO8dlTRPfq09/vMgLqMI862c2rYQi21SGzmuzA0i8S/Ns2fXd4AHqSxp9zTP7dDjjQWuOmCl RCyFZQHdc7HKrjFRYS3GUJpp2R5nsJTly3JI/vIl8BhoNofgHXhe634hmjgU8+MYpx1S9+tUDU6 u6hQ3Y/sLV4t7xJSZDaWtqYB6UahJMDirkYGjLX9iLghk4K6+dgS6skFzEcyRtiD3yPt+SktOVC TRvxc/39/v86Vw/JWDLyF++lJWSp0gJpYE2UeFsT8d54Ed9OnN9nmYnhlQ== X-Received: by 2002:a05:600c:154a:b0:442:d9f2:c6ef with SMTP id 5b1f17b1804b1-442f96e5234mr16640345e9.2.1747304782024; Thu, 15 May 2025 03:26:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/58] target/arm/helper: extract common helpers Date: Thu, 15 May 2025 11:25:13 +0100 Message-ID: <20250515102546.2149601-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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: Pierrick Bouvier Allow later commits to include only the "new" tcg/helper.h, thus preventing to pull aarch64 helpers (+ target/arm/helper.h contains a ifdef TARGET_AARCH64). Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-16-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.h | 1152 +-------------------------------- target/arm/{ => tcg}/helper.h | 10 +- 2 files changed, 4 insertions(+), 1158 deletions(-) copy target/arm/{ => tcg}/helper.h (99%) diff --git a/target/arm/helper.h b/target/arm/helper.h index 0a4fc90fa8b..f340a49a28a 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -1,1154 +1,6 @@ -DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32) -DEF_HELPER_FLAGS_1(uxtb16, TCG_CALL_NO_RWG_SE, i32, i32) +/* SPDX-License-Identifier: GPL-2.0-or-later */ -DEF_HELPER_3(add_setq, i32, env, i32, i32) -DEF_HELPER_3(add_saturate, i32, env, i32, i32) -DEF_HELPER_3(sub_saturate, i32, env, i32, i32) -DEF_HELPER_3(add_usaturate, i32, env, i32, i32) -DEF_HELPER_3(sub_usaturate, i32, env, i32, i32) -DEF_HELPER_FLAGS_3(sdiv, TCG_CALL_NO_RWG, s32, env, s32, s32) -DEF_HELPER_FLAGS_3(udiv, TCG_CALL_NO_RWG, i32, env, i32, i32) -DEF_HELPER_FLAGS_1(rbit, TCG_CALL_NO_RWG_SE, i32, i32) - -#define PAS_OP(pfx) \ - DEF_HELPER_3(pfx ## add8, i32, i32, i32, ptr) \ - DEF_HELPER_3(pfx ## sub8, i32, i32, i32, ptr) \ - DEF_HELPER_3(pfx ## sub16, i32, i32, i32, ptr) \ - DEF_HELPER_3(pfx ## add16, i32, i32, i32, ptr) \ - DEF_HELPER_3(pfx ## addsubx, i32, i32, i32, ptr) \ - DEF_HELPER_3(pfx ## subaddx, i32, i32, i32, ptr) - -PAS_OP(s) -PAS_OP(u) -#undef PAS_OP - -#define PAS_OP(pfx) \ - DEF_HELPER_2(pfx ## add8, i32, i32, i32) \ - DEF_HELPER_2(pfx ## sub8, i32, i32, i32) \ - DEF_HELPER_2(pfx ## sub16, i32, i32, i32) \ - DEF_HELPER_2(pfx ## add16, i32, i32, i32) \ - DEF_HELPER_2(pfx ## addsubx, i32, i32, i32) \ - DEF_HELPER_2(pfx ## subaddx, i32, i32, i32) -PAS_OP(q) -PAS_OP(sh) -PAS_OP(uq) -PAS_OP(uh) -#undef PAS_OP - -DEF_HELPER_3(ssat, i32, env, i32, i32) -DEF_HELPER_3(usat, i32, env, i32, i32) -DEF_HELPER_3(ssat16, i32, env, i32, i32) -DEF_HELPER_3(usat16, i32, env, i32, i32) - -DEF_HELPER_FLAGS_2(usad8, TCG_CALL_NO_RWG_SE, i32, i32, i32) - -DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE, - i32, i32, i32, i32) -DEF_HELPER_2(exception_internal, noreturn, env, i32) -DEF_HELPER_3(exception_with_syndrome, noreturn, env, i32, i32) -DEF_HELPER_4(exception_with_syndrome_el, noreturn, env, i32, i32, i32) -DEF_HELPER_2(exception_bkpt_insn, noreturn, env, i32) -DEF_HELPER_2(exception_swstep, noreturn, env, i32) -DEF_HELPER_2(exception_pc_alignment, noreturn, env, vaddr) -DEF_HELPER_1(setend, void, env) -DEF_HELPER_2(wfi, void, env, i32) -DEF_HELPER_1(wfe, void, env) -DEF_HELPER_2(wfit, void, env, i64) -DEF_HELPER_1(yield, void, env) -DEF_HELPER_1(pre_hvc, void, env) -DEF_HELPER_2(pre_smc, void, env, i32) -DEF_HELPER_1(vesb, void, env) - -DEF_HELPER_3(cpsr_write, void, env, i32, i32) -DEF_HELPER_2(cpsr_write_eret, void, env, i32) -DEF_HELPER_1(cpsr_read, i32, env) - -DEF_HELPER_3(v7m_msr, void, env, i32, i32) -DEF_HELPER_2(v7m_mrs, i32, env, i32) - -DEF_HELPER_2(v7m_bxns, void, env, i32) -DEF_HELPER_2(v7m_blxns, void, env, i32) - -DEF_HELPER_3(v7m_tt, i32, env, i32, i32) - -DEF_HELPER_1(v7m_preserve_fp_state, void, env) - -DEF_HELPER_2(v7m_vlstm, void, env, i32) -DEF_HELPER_2(v7m_vlldm, void, env, i32) - -DEF_HELPER_2(v8m_stackcheck, void, env, i32) - -DEF_HELPER_FLAGS_2(check_bxj_trap, TCG_CALL_NO_WG, void, env, i32) - -DEF_HELPER_4(access_check_cp_reg, cptr, env, i32, i32, i32) -DEF_HELPER_FLAGS_2(lookup_cp_reg, TCG_CALL_NO_RWG_SE, cptr, env, i32) -DEF_HELPER_FLAGS_2(tidcp_el0, TCG_CALL_NO_WG, void, env, i32) -DEF_HELPER_FLAGS_2(tidcp_el1, TCG_CALL_NO_WG, void, env, i32) -DEF_HELPER_3(set_cp_reg, void, env, cptr, i32) -DEF_HELPER_2(get_cp_reg, i32, env, cptr) -DEF_HELPER_3(set_cp_reg64, void, env, cptr, i64) -DEF_HELPER_2(get_cp_reg64, i64, env, cptr) - -DEF_HELPER_2(get_r13_banked, i32, env, i32) -DEF_HELPER_3(set_r13_banked, void, env, i32, i32) - -DEF_HELPER_3(mrs_banked, i32, env, i32, i32) -DEF_HELPER_4(msr_banked, void, env, i32, i32, i32) - -DEF_HELPER_2(get_user_reg, i32, env, i32) -DEF_HELPER_3(set_user_reg, void, env, i32, i32) - -DEF_HELPER_FLAGS_1(rebuild_hflags_m32_newel, TCG_CALL_NO_RWG, void, env) -DEF_HELPER_FLAGS_2(rebuild_hflags_m32, TCG_CALL_NO_RWG, void, env, int) -DEF_HELPER_FLAGS_1(rebuild_hflags_a32_newel, TCG_CALL_NO_RWG, void, env) -DEF_HELPER_FLAGS_2(rebuild_hflags_a32, TCG_CALL_NO_RWG, void, env, int) -DEF_HELPER_FLAGS_2(rebuild_hflags_a64, TCG_CALL_NO_RWG, void, env, int) - -DEF_HELPER_FLAGS_5(probe_access, TCG_CALL_NO_WG, void, env, vaddr, i32, i32, i32) - -DEF_HELPER_1(vfp_get_fpscr, i32, env) -DEF_HELPER_2(vfp_set_fpscr, void, env, i32) - -DEF_HELPER_3(vfp_addh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_adds, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_addd, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_subh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_subs, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_subd, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_mulh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_muls, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_muld, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_divh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_divs, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_divd, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_maxh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_maxs, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_maxd, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_minh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_mins, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_mind, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_maxnumh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_maxnums, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_maxnumd, f64, f64, f64, fpst) -DEF_HELPER_3(vfp_minnumh, f16, f16, f16, fpst) -DEF_HELPER_3(vfp_minnums, f32, f32, f32, fpst) -DEF_HELPER_3(vfp_minnumd, f64, f64, f64, fpst) -DEF_HELPER_2(vfp_sqrth, f16, f16, fpst) -DEF_HELPER_2(vfp_sqrts, f32, f32, fpst) -DEF_HELPER_2(vfp_sqrtd, f64, f64, fpst) -DEF_HELPER_3(vfp_cmph, void, f16, f16, env) -DEF_HELPER_3(vfp_cmps, void, f32, f32, env) -DEF_HELPER_3(vfp_cmpd, void, f64, f64, env) -DEF_HELPER_3(vfp_cmpeh, void, f16, f16, env) -DEF_HELPER_3(vfp_cmpes, void, f32, f32, env) -DEF_HELPER_3(vfp_cmped, void, f64, f64, env) - -DEF_HELPER_2(vfp_fcvtds, f64, f32, fpst) -DEF_HELPER_2(vfp_fcvtsd, f32, f64, fpst) -DEF_HELPER_FLAGS_2(bfcvt, TCG_CALL_NO_RWG, i32, f32, fpst) -DEF_HELPER_FLAGS_2(bfcvt_pair, TCG_CALL_NO_RWG, i32, i64, fpst) - -DEF_HELPER_2(vfp_uitoh, f16, i32, fpst) -DEF_HELPER_2(vfp_uitos, f32, i32, fpst) -DEF_HELPER_2(vfp_uitod, f64, i32, fpst) -DEF_HELPER_2(vfp_sitoh, f16, i32, fpst) -DEF_HELPER_2(vfp_sitos, f32, i32, fpst) -DEF_HELPER_2(vfp_sitod, f64, i32, fpst) - -DEF_HELPER_2(vfp_touih, i32, f16, fpst) -DEF_HELPER_2(vfp_touis, i32, f32, fpst) -DEF_HELPER_2(vfp_touid, i32, f64, fpst) -DEF_HELPER_2(vfp_touizh, i32, f16, fpst) -DEF_HELPER_2(vfp_touizs, i32, f32, fpst) -DEF_HELPER_2(vfp_touizd, i32, f64, fpst) -DEF_HELPER_2(vfp_tosih, s32, f16, fpst) -DEF_HELPER_2(vfp_tosis, s32, f32, fpst) -DEF_HELPER_2(vfp_tosid, s32, f64, fpst) -DEF_HELPER_2(vfp_tosizh, s32, f16, fpst) -DEF_HELPER_2(vfp_tosizs, s32, f32, fpst) -DEF_HELPER_2(vfp_tosizd, s32, f64, fpst) - -DEF_HELPER_3(vfp_toshh_round_to_zero, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toslh_round_to_zero, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_touhh_round_to_zero, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toulh_round_to_zero, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toshs_round_to_zero, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_tosls_round_to_zero, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_touhs_round_to_zero, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_touls_round_to_zero, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_toshd_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tosld_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tosqd_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_touhd_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tould_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_touqd_round_to_zero, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_touhh, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toshh, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toulh, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_toslh, i32, f16, i32, fpst) -DEF_HELPER_3(vfp_touqh, i64, f16, i32, fpst) -DEF_HELPER_3(vfp_tosqh, i64, f16, i32, fpst) -DEF_HELPER_3(vfp_toshs, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_tosls, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_tosqs, i64, f32, i32, fpst) -DEF_HELPER_3(vfp_touhs, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_touls, i32, f32, i32, fpst) -DEF_HELPER_3(vfp_touqs, i64, f32, i32, fpst) -DEF_HELPER_3(vfp_toshd, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tosld, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tosqd, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_touhd, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_tould, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_touqd, i64, f64, i32, fpst) -DEF_HELPER_3(vfp_shtos, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_sltos, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_sqtos, f32, i64, i32, fpst) -DEF_HELPER_3(vfp_uhtos, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_ultos, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_uqtos, f32, i64, i32, fpst) -DEF_HELPER_3(vfp_shtod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_sltod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_sqtod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_uhtod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_ultod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_uqtod, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_shtoh, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_uhtoh, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_sltoh, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_ultoh, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_sqtoh, f16, i64, i32, fpst) -DEF_HELPER_3(vfp_uqtoh, f16, i64, i32, fpst) - -DEF_HELPER_3(vfp_shtos_round_to_nearest, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_sltos_round_to_nearest, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_uhtos_round_to_nearest, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_ultos_round_to_nearest, f32, i32, i32, fpst) -DEF_HELPER_3(vfp_shtod_round_to_nearest, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_sltod_round_to_nearest, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_uhtod_round_to_nearest, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_ultod_round_to_nearest, f64, i64, i32, fpst) -DEF_HELPER_3(vfp_shtoh_round_to_nearest, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_uhtoh_round_to_nearest, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_sltoh_round_to_nearest, f16, i32, i32, fpst) -DEF_HELPER_3(vfp_ultoh_round_to_nearest, f16, i32, i32, fpst) - -DEF_HELPER_FLAGS_2(set_rmode, TCG_CALL_NO_RWG, i32, i32, fpst) - -DEF_HELPER_FLAGS_3(vfp_fcvt_f16_to_f32, TCG_CALL_NO_RWG, f32, f16, fpst, i32) -DEF_HELPER_FLAGS_3(vfp_fcvt_f32_to_f16, TCG_CALL_NO_RWG, f16, f32, fpst, i32) -DEF_HELPER_FLAGS_3(vfp_fcvt_f16_to_f64, TCG_CALL_NO_RWG, f64, f16, fpst, i32) -DEF_HELPER_FLAGS_3(vfp_fcvt_f64_to_f16, TCG_CALL_NO_RWG, f16, f64, fpst, i32) - -DEF_HELPER_4(vfp_muladdd, f64, f64, f64, f64, fpst) -DEF_HELPER_4(vfp_muladds, f32, f32, f32, f32, fpst) -DEF_HELPER_4(vfp_muladdh, f16, f16, f16, f16, fpst) - -DEF_HELPER_FLAGS_2(recpe_f16, TCG_CALL_NO_RWG, f16, f16, fpst) -DEF_HELPER_FLAGS_2(recpe_f32, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(recpe_rpres_f32, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(recpe_f64, TCG_CALL_NO_RWG, f64, f64, fpst) -DEF_HELPER_FLAGS_2(rsqrte_f16, TCG_CALL_NO_RWG, f16, f16, fpst) -DEF_HELPER_FLAGS_2(rsqrte_f32, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(rsqrte_rpres_f32, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(rsqrte_f64, TCG_CALL_NO_RWG, f64, f64, fpst) -DEF_HELPER_FLAGS_1(recpe_u32, TCG_CALL_NO_RWG, i32, i32) -DEF_HELPER_FLAGS_1(rsqrte_u32, TCG_CALL_NO_RWG, i32, i32) -DEF_HELPER_FLAGS_4(neon_tbl, TCG_CALL_NO_RWG, i64, env, i32, i64, i64) - -DEF_HELPER_3(shl_cc, i32, env, i32, i32) -DEF_HELPER_3(shr_cc, i32, env, i32, i32) -DEF_HELPER_3(sar_cc, i32, env, i32, i32) -DEF_HELPER_3(ror_cc, i32, env, i32, i32) - -DEF_HELPER_FLAGS_2(rinth_exact, TCG_CALL_NO_RWG, f16, f16, fpst) -DEF_HELPER_FLAGS_2(rints_exact, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(rintd_exact, TCG_CALL_NO_RWG, f64, f64, fpst) -DEF_HELPER_FLAGS_2(rinth, TCG_CALL_NO_RWG, f16, f16, fpst) -DEF_HELPER_FLAGS_2(rints, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(rintd, TCG_CALL_NO_RWG, f64, f64, fpst) - -DEF_HELPER_FLAGS_2(vjcvt, TCG_CALL_NO_RWG, i32, f64, env) -DEF_HELPER_FLAGS_2(fjcvtzs, TCG_CALL_NO_RWG, i64, f64, fpst) - -DEF_HELPER_FLAGS_3(check_hcr_el2_trap, TCG_CALL_NO_WG, void, env, i32, i32) - -/* neon_helper.c */ -DEF_HELPER_2(neon_pmin_u8, i32, i32, i32) -DEF_HELPER_2(neon_pmin_s8, i32, i32, i32) -DEF_HELPER_2(neon_pmin_u16, i32, i32, i32) -DEF_HELPER_2(neon_pmin_s16, i32, i32, i32) -DEF_HELPER_2(neon_pmax_u8, i32, i32, i32) -DEF_HELPER_2(neon_pmax_s8, i32, i32, i32) -DEF_HELPER_2(neon_pmax_u16, i32, i32, i32) -DEF_HELPER_2(neon_pmax_s16, i32, i32, i32) - -DEF_HELPER_2(neon_shl_u16, i32, i32, i32) -DEF_HELPER_2(neon_shl_s16, i32, i32, i32) -DEF_HELPER_2(neon_rshl_u8, i32, i32, i32) -DEF_HELPER_2(neon_rshl_s8, i32, i32, i32) -DEF_HELPER_2(neon_rshl_u16, i32, i32, i32) -DEF_HELPER_2(neon_rshl_s16, i32, i32, i32) -DEF_HELPER_2(neon_rshl_u32, i32, i32, i32) -DEF_HELPER_2(neon_rshl_s32, i32, i32, i32) -DEF_HELPER_2(neon_rshl_u64, i64, i64, i64) -DEF_HELPER_2(neon_rshl_s64, i64, i64, i64) -DEF_HELPER_3(neon_qshl_u8, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_s8, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_u16, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_s16, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_u32, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_s32, i32, env, i32, i32) -DEF_HELPER_3(neon_qshl_u64, i64, env, i64, i64) -DEF_HELPER_3(neon_qshl_s64, i64, env, i64, i64) -DEF_HELPER_3(neon_qshlu_s8, i32, env, i32, i32) -DEF_HELPER_3(neon_qshlu_s16, i32, env, i32, i32) -DEF_HELPER_3(neon_qshlu_s32, i32, env, i32, i32) -DEF_HELPER_3(neon_qshlu_s64, i64, env, i64, i64) -DEF_HELPER_3(neon_qrshl_u8, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_s8, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_u16, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_s16, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_u32, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_s32, i32, env, i32, i32) -DEF_HELPER_3(neon_qrshl_u64, i64, env, i64, i64) -DEF_HELPER_3(neon_qrshl_s64, i64, env, i64, i64) -DEF_HELPER_FLAGS_5(neon_sqshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqrshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqrshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqrshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_sqrshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqrshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqrshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqrshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(neon_uqrshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshli_b, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshli_h, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshli_s, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshli_d, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_uqshli_b, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_uqshli_h, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_uqshli_s, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_uqshli_d, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshlui_b, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshlui_h, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshlui_s, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_4(neon_sqshlui_d, TCG_CALL_NO_RWG, void, ptr, ptr, env, i32) - -DEF_HELPER_FLAGS_4(gvec_srshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_srshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_srshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_srshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_urshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_urshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_urshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_urshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_2(neon_add_u8, i32, i32, i32) -DEF_HELPER_2(neon_add_u16, i32, i32, i32) -DEF_HELPER_2(neon_sub_u8, i32, i32, i32) -DEF_HELPER_2(neon_sub_u16, i32, i32, i32) -DEF_HELPER_2(neon_mul_u8, i32, i32, i32) -DEF_HELPER_2(neon_mul_u16, i32, i32, i32) - -DEF_HELPER_2(neon_tst_u8, i32, i32, i32) -DEF_HELPER_2(neon_tst_u16, i32, i32, i32) -DEF_HELPER_2(neon_tst_u32, i32, i32, i32) - -DEF_HELPER_1(neon_clz_u8, i32, i32) -DEF_HELPER_1(neon_clz_u16, i32, i32) -DEF_HELPER_1(neon_cls_s8, i32, i32) -DEF_HELPER_1(neon_cls_s16, i32, i32) -DEF_HELPER_1(neon_cls_s32, i32, i32) -DEF_HELPER_FLAGS_3(gvec_cnt_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_rbit_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_3(neon_qdmulh_s16, i32, env, i32, i32) -DEF_HELPER_3(neon_qrdmulh_s16, i32, env, i32, i32) -DEF_HELPER_4(neon_qrdmlah_s16, i32, env, i32, i32, i32) -DEF_HELPER_4(neon_qrdmlsh_s16, i32, env, i32, i32, i32) -DEF_HELPER_3(neon_qdmulh_s32, i32, env, i32, i32) -DEF_HELPER_3(neon_qrdmulh_s32, i32, env, i32, i32) -DEF_HELPER_4(neon_qrdmlah_s32, i32, env, s32, s32, s32) -DEF_HELPER_4(neon_qrdmlsh_s32, i32, env, s32, s32, s32) - -DEF_HELPER_1(neon_narrow_u8, i64, i64) -DEF_HELPER_1(neon_narrow_u16, i64, i64) -DEF_HELPER_2(neon_unarrow_sat8, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_u8, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_s8, i64, env, i64) -DEF_HELPER_2(neon_unarrow_sat16, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_u16, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_s16, i64, env, i64) -DEF_HELPER_2(neon_unarrow_sat32, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_u32, i64, env, i64) -DEF_HELPER_2(neon_narrow_sat_s32, i64, env, i64) -DEF_HELPER_1(neon_narrow_high_u8, i32, i64) -DEF_HELPER_1(neon_narrow_high_u16, i32, i64) -DEF_HELPER_1(neon_narrow_round_high_u8, i32, i64) -DEF_HELPER_1(neon_narrow_round_high_u16, i32, i64) -DEF_HELPER_1(neon_widen_u8, i64, i32) -DEF_HELPER_1(neon_widen_s8, i64, i32) -DEF_HELPER_1(neon_widen_u16, i64, i32) -DEF_HELPER_1(neon_widen_s16, i64, i32) - -DEF_HELPER_FLAGS_1(neon_addlp_s8, TCG_CALL_NO_RWG_SE, i64, i64) -DEF_HELPER_FLAGS_1(neon_addlp_s16, TCG_CALL_NO_RWG_SE, i64, i64) -DEF_HELPER_3(neon_addl_saturate_s32, i64, env, i64, i64) -DEF_HELPER_3(neon_addl_saturate_s64, i64, env, i64, i64) -DEF_HELPER_2(neon_abdl_u16, i64, i32, i32) -DEF_HELPER_2(neon_abdl_s16, i64, i32, i32) -DEF_HELPER_2(neon_abdl_u32, i64, i32, i32) -DEF_HELPER_2(neon_abdl_s32, i64, i32, i32) -DEF_HELPER_2(neon_abdl_u64, i64, i32, i32) -DEF_HELPER_2(neon_abdl_s64, i64, i32, i32) -DEF_HELPER_2(neon_mull_u8, i64, i32, i32) -DEF_HELPER_2(neon_mull_s8, i64, i32, i32) -DEF_HELPER_2(neon_mull_u16, i64, i32, i32) -DEF_HELPER_2(neon_mull_s16, i64, i32, i32) - -DEF_HELPER_1(neon_negl_u16, i64, i64) -DEF_HELPER_1(neon_negl_u32, i64, i64) - -DEF_HELPER_FLAGS_2(neon_qabs_s8, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qabs_s16, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qabs_s32, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qabs_s64, TCG_CALL_NO_RWG, i64, env, i64) -DEF_HELPER_FLAGS_2(neon_qneg_s8, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qneg_s16, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qneg_s32, TCG_CALL_NO_RWG, i32, env, i32) -DEF_HELPER_FLAGS_2(neon_qneg_s64, TCG_CALL_NO_RWG, i64, env, i64) - -DEF_HELPER_3(neon_ceq_f32, i32, i32, i32, fpst) -DEF_HELPER_3(neon_cge_f32, i32, i32, i32, fpst) -DEF_HELPER_3(neon_cgt_f32, i32, i32, i32, fpst) -DEF_HELPER_3(neon_acge_f32, i32, i32, i32, fpst) -DEF_HELPER_3(neon_acgt_f32, i32, i32, i32, fpst) -DEF_HELPER_3(neon_acge_f64, i64, i64, i64, fpst) -DEF_HELPER_3(neon_acgt_f64, i64, i64, i64, fpst) - -/* iwmmxt_helper.c */ -DEF_HELPER_2(iwmmxt_maddsq, i64, i64, i64) -DEF_HELPER_2(iwmmxt_madduq, i64, i64, i64) -DEF_HELPER_2(iwmmxt_sadb, i64, i64, i64) -DEF_HELPER_2(iwmmxt_sadw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_mulslw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_mulshw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_mululw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_muluhw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_macsw, i64, i64, i64) -DEF_HELPER_2(iwmmxt_macuw, i64, i64, i64) -DEF_HELPER_1(iwmmxt_setpsr_nz, i32, i64) - -#define DEF_IWMMXT_HELPER_SIZE_ENV(name) \ -DEF_HELPER_3(iwmmxt_##name##b, i64, env, i64, i64) \ -DEF_HELPER_3(iwmmxt_##name##w, i64, env, i64, i64) \ -DEF_HELPER_3(iwmmxt_##name##l, i64, env, i64, i64) \ - -DEF_IWMMXT_HELPER_SIZE_ENV(unpackl) -DEF_IWMMXT_HELPER_SIZE_ENV(unpackh) - -DEF_HELPER_2(iwmmxt_unpacklub, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackluw, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpacklul, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhub, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhuw, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhul, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpacklsb, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpacklsw, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpacklsl, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhsb, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhsw, i64, env, i64) -DEF_HELPER_2(iwmmxt_unpackhsl, i64, env, i64) - -DEF_IWMMXT_HELPER_SIZE_ENV(cmpeq) -DEF_IWMMXT_HELPER_SIZE_ENV(cmpgtu) -DEF_IWMMXT_HELPER_SIZE_ENV(cmpgts) - -DEF_IWMMXT_HELPER_SIZE_ENV(mins) -DEF_IWMMXT_HELPER_SIZE_ENV(minu) -DEF_IWMMXT_HELPER_SIZE_ENV(maxs) -DEF_IWMMXT_HELPER_SIZE_ENV(maxu) - -DEF_IWMMXT_HELPER_SIZE_ENV(subn) -DEF_IWMMXT_HELPER_SIZE_ENV(addn) -DEF_IWMMXT_HELPER_SIZE_ENV(subu) -DEF_IWMMXT_HELPER_SIZE_ENV(addu) -DEF_IWMMXT_HELPER_SIZE_ENV(subs) -DEF_IWMMXT_HELPER_SIZE_ENV(adds) - -DEF_HELPER_3(iwmmxt_avgb0, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_avgb1, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_avgw0, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_avgw1, i64, env, i64, i64) - -DEF_HELPER_3(iwmmxt_align, i64, i64, i64, i32) -DEF_HELPER_4(iwmmxt_insr, i64, i64, i32, i32, i32) - -DEF_HELPER_1(iwmmxt_bcstb, i64, i32) -DEF_HELPER_1(iwmmxt_bcstw, i64, i32) -DEF_HELPER_1(iwmmxt_bcstl, i64, i32) - -DEF_HELPER_1(iwmmxt_addcb, i64, i64) -DEF_HELPER_1(iwmmxt_addcw, i64, i64) -DEF_HELPER_1(iwmmxt_addcl, i64, i64) - -DEF_HELPER_1(iwmmxt_msbb, i32, i64) -DEF_HELPER_1(iwmmxt_msbw, i32, i64) -DEF_HELPER_1(iwmmxt_msbl, i32, i64) - -DEF_HELPER_3(iwmmxt_srlw, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_srll, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_srlq, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_sllw, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_slll, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_sllq, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_sraw, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_sral, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_sraq, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_rorw, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_rorl, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_rorq, i64, env, i64, i32) -DEF_HELPER_3(iwmmxt_shufh, i64, env, i64, i32) - -DEF_HELPER_3(iwmmxt_packuw, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_packul, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_packuq, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_packsw, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_packsl, i64, env, i64, i64) -DEF_HELPER_3(iwmmxt_packsq, i64, env, i64, i64) - -DEF_HELPER_3(iwmmxt_muladdsl, i64, i64, i32, i32) -DEF_HELPER_3(iwmmxt_muladdsw, i64, i64, i32, i32) -DEF_HELPER_3(iwmmxt_muladdswl, i64, i64, i32, i32) - -DEF_HELPER_FLAGS_2(neon_unzip8, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_unzip16, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qunzip8, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qunzip16, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qunzip32, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_zip8, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_zip16, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qzip8, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qzip16, TCG_CALL_NO_RWG, void, ptr, ptr) -DEF_HELPER_FLAGS_2(neon_qzip32, TCG_CALL_NO_RWG, void, ptr, ptr) - -DEF_HELPER_FLAGS_4(crypto_aese, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_aesd, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_aesmc, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_aesimc, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_sha1su0, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha1c, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha1p, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha1m, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_sha1h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_sha1su1, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_sha256h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha256h2, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_sha256su0, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha256su1, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_sha512h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha512h2, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(crypto_sha512su0, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sha512su1, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_sm3tt1a, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm3tt1b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm3tt2a, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm3tt2b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm3partw1, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm3partw2, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_sm4e, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(crypto_sm4ekey, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(crypto_rax1, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(crc32, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) -DEF_HELPER_FLAGS_3(crc32c, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32) - -DEF_HELPER_FLAGS_5(gvec_qrdmlah_s16, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_qrdmlsh_s16, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_qrdmlah_s32, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_qrdmlsh_s32, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(sve2_sqrdmlah_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlsh_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlah_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlsh_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlah_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlsh_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlah_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(sve2_sqrdmlsh_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_sdot_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_udot_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sdot_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_udot_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usdot_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_sdot_idx_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_udot_idx_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sdot_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_udot_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sudot_idx_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usdot_idx_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_fcaddh, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcadds, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcaddd, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_6(gvec_fcmlah, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fcmlah_idx, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fcmlas, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fcmlas_idx, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fcmlad, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_sstoh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_sitos, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_ustoh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_uitos, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_tosszh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_tosizs, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_touszh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_touizs, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vcvt_sf, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_uf, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_fs, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_fu, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vcvt_sh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_uh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_hs, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_hu, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vcvt_sd, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_ud, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_ds, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rz_du, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_sd, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_ud, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_ss, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_us, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_sh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vcvt_rm_uh, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vrint_rm_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vrint_rm_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_vrintx_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_vrintx_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_frecpe_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frecpe_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frecpe_rpres_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frecpe_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_frsqrte_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frsqrte_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frsqrte_rpres_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_frsqrte_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_fcgt0_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcgt0_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcgt0_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_fcge0_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcge0_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcge0_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_fceq0_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fceq0_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fceq0_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_fcle0_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcle0_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fcle0_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_fclt0_h, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fclt0_s, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_4(gvec_fclt0_d, TCG_CALL_NO_RWG, void, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fadd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fadd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fadd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fsub_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fsub_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fsub_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmul_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmul_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmul_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fabd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fabd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fabd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_ah_fabd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ah_fabd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ah_fabd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fceq_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fceq_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fceq_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fcge_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcge_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcge_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fcgt_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcgt_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fcgt_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_facge_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_facge_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_facge_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_facgt_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_facgt_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_facgt_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmax_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmax_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmax_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmin_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmin_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmin_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmaxnum_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxnum_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxnum_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fminnum_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminnum_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminnum_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_recps_nf_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_recps_nf_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_rsqrts_nf_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_rsqrts_nf_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmla_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmla_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmls_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmls_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_vfma_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_vfma_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_vfma_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_vfms_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_vfms_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_vfms_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_ah_vfms_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ah_vfms_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ah_vfms_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_ftsmul_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ftsmul_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_ftsmul_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmul_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmul_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmul_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmla_nf_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmla_nf_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmls_nf_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmls_nf_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_6(gvec_fmla_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fmla_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fmla_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_6(gvec_fmls_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fmls_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_fmls_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_6(gvec_ah_fmls_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_ah_fmls_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_ah_fmls_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_uqadd_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqadd_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqadd_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqadd_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqadd_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqadd_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqadd_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqadd_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqsub_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqsub_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqsub_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uqsub_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqsub_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqsub_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqsub_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sqsub_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usqadd_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usqadd_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usqadd_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usqadd_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_suqadd_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_suqadd_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_suqadd_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_suqadd_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_fmlal_a32, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(gvec_fmlal_a64, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(gvec_fmlal_idx_a32, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_5(gvec_fmlal_idx_a64, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, env, i32) - -DEF_HELPER_FLAGS_2(frint32_s, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(frint64_s, TCG_CALL_NO_RWG, f32, f32, fpst) -DEF_HELPER_FLAGS_2(frint32_d, TCG_CALL_NO_RWG, f64, f64, fpst) -DEF_HELPER_FLAGS_2(frint64_d, TCG_CALL_NO_RWG, f64, f64, fpst) - -DEF_HELPER_FLAGS_3(gvec_ceq0_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ceq0_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_clt0_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_clt0_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cle0_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cle0_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cgt0_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cgt0_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cge0_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_cge0_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_smulh_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_smulh_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_smulh_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_smulh_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_umulh_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_umulh_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_umulh_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_umulh_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_sshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_ushl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_ushl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_pmul_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_pmull_q, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(neon_pmull_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_ssra_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ssra_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ssra_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ssra_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_usra_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_usra_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_usra_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_usra_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_srshr_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srshr_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srshr_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srshr_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_urshr_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_urshr_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_urshr_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_urshr_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_srsra_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srsra_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srsra_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_srsra_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_ursra_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ursra_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ursra_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ursra_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_sri_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sri_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sri_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sri_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_sli_b, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sli_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sli_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_sli_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_sabd_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sabd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sabd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sabd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_uabd_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uabd_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uabd_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uabd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_saba_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_saba_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_saba_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_saba_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_uaba_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uaba_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uaba_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uaba_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_mul_idx_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_mul_idx_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_mul_idx_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_mla_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_mla_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_mla_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_mls_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_mls_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_mls_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqdmulh_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqdmulh_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqrdmulh_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqrdmulh_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqdmulh_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqdmulh_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqrdmulh_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqrdmulh_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqrdmlah_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqrdmlah_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(neon_sqrdmlsh_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(neon_sqrdmlsh_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(sve2_sqdmulh_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqdmulh_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqdmulh_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqdmulh_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(sve2_sqdmulh_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqdmulh_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqdmulh_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_idx_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_idx_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(sve2_sqrdmulh_idx_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_6(sve2_fmlal_zzzw_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_6(sve2_fmlal_zzxw_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, env, i32) - -DEF_HELPER_FLAGS_4(gvec_xar_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_smmla_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_ummla_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_usmmla_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_6(gvec_bfdot, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, env, i32) -DEF_HELPER_FLAGS_6(gvec_bfdot_idx, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, env, i32) - -DEF_HELPER_FLAGS_6(gvec_bfmmla, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, env, i32) - -DEF_HELPER_FLAGS_6(gvec_bfmlal, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_6(gvec_bfmlal_idx, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_sclamp_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sclamp_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sclamp_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_sclamp_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_uclamp_b, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uclamp_h, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uclamp_s, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_5(gvec_uclamp_d, TCG_CALL_NO_RWG, - void, ptr, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_5(gvec_faddp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_faddp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_faddp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmaxp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fminp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fmaxnump_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxnump_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fmaxnump_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_5(gvec_fminnump_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminnump_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) -DEF_HELPER_FLAGS_5(gvec_fminnump_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, fpst, i32) - -DEF_HELPER_FLAGS_4(gvec_addp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_addp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_addp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_addp_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_smaxp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_smaxp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_smaxp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_sminp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sminp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_sminp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_umaxp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_umaxp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_umaxp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_4(gvec_uminp_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uminp_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) -DEF_HELPER_FLAGS_4(gvec_uminp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) - -DEF_HELPER_FLAGS_3(gvec_urecpe_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) -DEF_HELPER_FLAGS_3(gvec_ursqrte_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) +#include "tcg/helper.h" #ifdef TARGET_AARCH64 #include "tcg/helper-a64.h" diff --git a/target/arm/helper.h b/target/arm/tcg/helper.h similarity index 99% copy from target/arm/helper.h copy to target/arm/tcg/helper.h index 0a4fc90fa8b..80db7c2c37a 100644 --- a/target/arm/helper.h +++ b/target/arm/tcg/helper.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32) DEF_HELPER_FLAGS_1(uxtb16, TCG_CALL_NO_RWG_SE, i32, i32) @@ -1149,11 +1151,3 @@ DEF_HELPER_FLAGS_4(gvec_uminp_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_3(gvec_urecpe_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(gvec_ursqrte_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) - -#ifdef TARGET_AARCH64 -#include "tcg/helper-a64.h" -#include "tcg/helper-sve.h" -#include "tcg/helper-sme.h" -#endif - -#include "tcg/helper-mve.h" From patchwork Thu May 15 10:25:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890199 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3069665wrr; Thu, 15 May 2025 03:59:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVYPIJHdKHcegZ8KRFBvJwRAlCKY9j74ITixrDriyTuBXumUso2BIQsOK1E+0EJw0Oo7MPZNg==@linaro.org X-Google-Smtp-Source: AGHT+IGB3Q3EMYST9MQoDSSqLrbX1fUXXWtwQQdnyo/mxn2aFyEQYTWMmBpvrhSH4NSABr/5qAI2 X-Received: by 2002:a05:622a:a0c:b0:476:7d74:dd10 with SMTP id d75a77b69052e-49495c70b95mr106287641cf.19.1747306757161; Thu, 15 May 2025 03:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306757; cv=none; d=google.com; s=arc-20240605; b=iAXU8boBezNVocur/y3eis6fgPqpzKmXKoJWKnIeKPRlIYqr+mhQlN/fNFMLqOhkFz NuCwVRIinQ+2aeL97OV4rnbYQ+peuS3YsCObOYLWBh4mM3IGzEqeSnhYv5lNdPLuvbXW 0pYhs9KQmjImGkWweCGO83JFpjm78eqKhCbBIvAKChLD2b/FCq5r5nOU+niUPohpFPHw 8A5nPDlAVMDjQSU871UTG87TjpK9GnSeilbHtJ3RZf0blR5tc8fHPvEZEbQbT4SuK/zg C8K8hAhwydUQCal2t3lmVY9RZEE+GsqMY/T81AlTC3eBXIdO7d9oTqAylMIhB85b3sjU Sm0A== 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:to:from :dkim-signature; bh=2TzAtDDzJpSwPwlAZbZ50asH3mlBjtiOUxLHKYs7gC0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=E1jkBbbiejts0yi0vE6Ap7MZOjiFeY+Wfh3DfmER0vvxURDQiwVwK3IFBvv0tlfLmj HVGavtqZRbnM7ldbgKlWodNAPGwQEwV3Sxo4tRPSS8JCq0eulCafPZoHTXyipYGCuqmy F0tYk1KhiP/FoA898OvidzFfTu2B54KnmFmr9CP0LC/DZMnl5PJckS+iTNK7k/jXFlYA niRTKkrhsOCuLYp+yk1y9d2yESpiDuOm8z3LsAHkkrFUpthcaplFFsIYNlOZvWlOM5y1 +seU/DGWsVNl0yZSlPj6t5W6X+K0Kp4tke/ulfbIk6l6bEWrru4rTgzaTePp0MZFedY6 EgTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l7dOSEqh; 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 d75a77b69052e-49452557f95si155819481cf.325.2025.05.15.03.59.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:59:17 -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=l7dOSEqh; 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 1uFVol-0007Ax-C6; Thu, 15 May 2025 06:27:59 -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 1uFVnG-0004xl-BD for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:26 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnE-0008CC-KK for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:26 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43ede096d73so5411785e9.2 for ; Thu, 15 May 2025 03:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304783; x=1747909583; darn=nongnu.org; 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=2TzAtDDzJpSwPwlAZbZ50asH3mlBjtiOUxLHKYs7gC0=; b=l7dOSEqhlvT5HnE1Z6ClcCQBfu+naD82QwfwDAhaaISAjBxDyi0eeqfYzCnFo2Ktlb S2+qcFl1JReGquxv9oK18K95jVh2rQJeTnV4AG343uSa/FpUjNMazS6mXUAurVHYrpps 7HfGk0tqHpj/dJhBg1XLztHdjT0Jbfe9iriIQ+wl8NbR4HZSLOZsyR3vSSmiMBqMdyZ3 ZakPS2igM3U5gyeBAOIjJym0fYjoAaoOcJOR8geX1NgeLyi7vQsJ7cg9IDdtgI3Unmco atfEJzKqeoqcT6qaHefrtGQOlL9tuelRTcezcgiUJcNe6O5S7MJd+EwYcQVSvDJR4yF4 f+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304783; x=1747909583; 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=2TzAtDDzJpSwPwlAZbZ50asH3mlBjtiOUxLHKYs7gC0=; b=JHYj87n2+QAMkPPlUG3c4bHUZXx0GKbfmMpTle+c3+yAI0YYJP9O7Rq5P230j9UKL1 o3VMpmZVZg1K8nJbP529q4GUZ2y1jvuCulgRAF80QvedydxYNloijWChAU7jD0/nb0w4 3ej2M1HE/kmu9E/pSWjVyh2tdtDvCZsgk92Ix2VF1C9NWaBtvDNdNpOQs77R/CafLZ/i l3GPFLjP9B8gxl8k8Lu5ZR/Q2VR/jZVqDhXD1piv0eAr7pBhPvCZLODRHVf9FvPbOTq7 L4zApNye3S4vd2g4zdrSQoMqVFpERDDKqaWtHDzpqOkNuRD5UqppCSGwz+b1sfhlWPK9 EMzQ== X-Gm-Message-State: AOJu0YzUR0GNNUXI3JYpvgXSUJJ7pD90MxK8SM9hO3jlnWHaNlIe8Uu8 02teKIfV8jhboHVorkHSLGYbHLCBFc1IKV7aRsUm/vEKu901850BQ4+tmyxRdtEHlJLegHd9bNA 0wIQ= X-Gm-Gg: ASbGncvAYCNJekeY18QAztCZiQPyrENmcvUItD8pI5GLM+h/OdJ/4N554oVcJVsbiEL b9H5KqKTnbvTmEUTj959mCQxvyCSkO1QOTeV9sHDneBrmUSw/Kn4BUZrLOOO8r7anzNlXt4FTeS oqDaNQrh7gqBPvT28mon0kM0ISRhdDfPslGNnfHZT3Msji2ZlHX0BoHpCaUVxvT1KRyjZNfo/XR vgoEcAKNZxCL7twWNgVTFzRsoQ5G968py/xQwa4DffJisFB++ysli2Rt5ZKJLtSK/gH5hUSuzGc ezhxSx9Qa/c+cX6ACCHGZ0LdJ1i2VPkNsirjKRja3ioiM8/6XtG5+k5+9Q== X-Received: by 2002:a05:600c:3c85:b0:442:e03b:589d with SMTP id 5b1f17b1804b1-442f21610b5mr63347045e9.24.1747304783048; Thu, 15 May 2025 03:26:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/58] target/arm/debug_helper: only include common helpers Date: Thu, 15 May 2025 11:25:14 +0100 Message-ID: <20250515102546.2149601-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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: Pierrick Bouvier Avoid pulling helper.h which contains TARGET_AARCH64. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-17-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/debug_helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index de7999f6a94..cad0a5db707 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -11,10 +11,12 @@ #include "internals.h" #include "cpu-features.h" #include "cpregs.h" -#include "exec/helper-proto.h" #include "exec/watchpoint.h" #include "system/tcg.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + #ifdef CONFIG_TCG /* Return the Exception Level targeted by debug exceptions. */ static int arm_debug_target_el(CPUARMState *env) From patchwork Thu May 15 10:25:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890163 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059391wrr; Thu, 15 May 2025 03:28:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbGKqWqxRZpdR0C+HIMV3uE7AWTMlkySP7ZQ1VqRqbKbVI6tWJiSGMSxtPt90NcK5e/4/htw==@linaro.org X-Google-Smtp-Source: AGHT+IFIOnCg0bD6kj+Wo4gvGnncFPQ5SBDM3MOX41bX/QJQpK081gBcE9goM9cpMTRMLiO3fmKU X-Received: by 2002:a05:620a:27d6:b0:7c5:56c0:a8 with SMTP id af79cd13be357-7cd3c652cf5mr287210485a.1.1747304923551; Thu, 15 May 2025 03:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304923; cv=none; d=google.com; s=arc-20240605; b=Zae+iTnBaRaaU3zuG3hS35ZlsTPqzf9p8wQaIJ5wyGu1y/kymqkuZuzwY8tP5wpBMe PEIGiakGgbk75cvilooqb6aGLC6KorgBCm/S7vVba9d++NZO0cGfv7pqNiGguTcRHfvB 3e5ys54hWnL3ep3p8LkyNKTZLri8Ys2UU2T3OQOIwQBBqzk4NviSVwpEQ/NmSU/Monkd G/LDmP4Ey4Xlinq1fptnAkoYFsab3RhFZfN4D0udWxX0qY8BTPk1AUinsZJl2jfG2lkE C6J1pI0ufjYfVVdADEMA8Cr9Z+XBuKKM6H2WOFRhKYDCTaTyvTx78D58+s4eLf+6djEF BFsw== 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:to:from :dkim-signature; bh=Byp0Y4O5zheOoMWAZrB5mhT0UXR53h/CRs+fbHyD9ww=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Xac95BsmQQSP5YsysoR5jD1/Ae6n5uaEFIIQpNpwhX5wiKl6if7+DgYP99V7CKIwdu 3mRDEprrVZ+HSHTH4hy6BfgRj0C/GVtFOCdUjroPHkx+LJUtr4BuVwNjGkemPhS1+XdK r/nb6mNRWOevcvkENWhrnrTdbroUUtOiEsAStmB/ue34EK5EGdjmGD+paZ/o9vVrpMP6 ZycFZYgy/Z/zrTFnH/piqA55S/UwW3uvEtwVv16CRjKFndsqUMVQylOzoatVbuznJPgP bCiPSjhwBc7anymU2Ot78EhF/+WDYF+tapNjpdfCmJtBvlQXXEgpuaUfEn61mKPa9D+5 vgCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B3YJmlhK; 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 af79cd13be357-7cd00f698f4si1578217785a.178.2025.05.15.03.28.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:43 -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=B3YJmlhK; 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 1uFVny-0005jU-Si; Thu, 15 May 2025 06:27:11 -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 1uFVnH-0004zQ-LX for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:29 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnF-0008CQ-NT for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:27 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a0b7fbdde7so669323f8f.2 for ; Thu, 15 May 2025 03:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304784; x=1747909584; darn=nongnu.org; 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=Byp0Y4O5zheOoMWAZrB5mhT0UXR53h/CRs+fbHyD9ww=; b=B3YJmlhK/5VBLFR9iG4Z+CTlhVK5dWidKr8KJAPrM5NYWfUR1VheQMlZBadiEOnWyD 8odR04SbDBaIadXMjeSyDKlJ/m+kCiTSEP6xnbHKfRTnTpPg1mBARAs5Sko5e8lX466j /mYfqbGXB1JgBhjd4+GgJ4Rf4LL5JyZK+qgtSAKQ+AMUWUJd2qHK1xk5KhnEq51y00Hc /zjPx6HiwGcVU+ovXIW5tS3Usv7eASwhQo4nN4gZvS/jT40e5o5zPON3PLjdDis1pGSq rKFon9xDUG8Ne4QvqJBBU/KQQTnwkS017jAbklDIsIsHSyGKNnI+osIpVBcfI6L3SZZB SYxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304784; x=1747909584; 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=Byp0Y4O5zheOoMWAZrB5mhT0UXR53h/CRs+fbHyD9ww=; b=jePOXKR6WnAAZnAREQnakjJoPGPjHcpdfkLC9LV4PnwYyHG0alUT02Z7e5/tu5uSA6 Jz9Clx1Z82UpWJGxf8YwIuwnvOmIYas5mDNcqM5gvZ5NZgXTvMe0S4HdWyGyttvhgpq+ /FJivJVqzdjp1h8SmcISbP4f5SQkH2YGWyeCARf1O8DxN8AD23KmYRWnXZyFH2LE/FrB 5m8NBVbyiWJrl3BaJLEJgcMyd8tP3x5ojiN2cHmSH/iha6o8C4vLpHTtkyafLnDYjzIr SGuDrRpheQXWO8Hy3Dixp97Dym4o9HkI+8q8oafeRWjwxDSkqolfw27EqsfMnkGJ9yL4 OLhA== X-Gm-Message-State: AOJu0Ywv5JC9o4A1xOrrESSOLXQnQcRsMa846H4PUEp8t2FdtlnwOqGE +JjIDsjO3Do3b3BsXpZ32a2N/+1lI95/m9fVYEMHUqCLFx7L80dPY5fr1r/oSTrBBS+Z/vVRKcE 0CZs= X-Gm-Gg: ASbGnctGlZ3cg3C7rbsX8i7IqHmD8D0E+RyZBIh6swPX4uunk5KNSGhdR4ji6so72/E vU75eAnjJwLw0WdGiolFUx/jvnK1TwvX7zXOIAdYeGeF8bqdIS9X5MOYjjBk5hFZsQGeqi9LPgX L5x7osV8R1RoByg7zaGLQA8aMdRsDvPWwqUI7L+kJ1taBu08Gma8rYHuz24OcLxGtYeVr9XXmfP kcbGRYKptyiGMtxqyEMcIzwOadURSAW5jJselUjS3zLsoUfKUjk6ySfspe9jCl8X3SG3XjzFRlr E82OhkKfG+lY9WX7mgkXBlUfI2T1FkgtQBYZS1e6e1c6tPwLb8hoY5NCMQ== X-Received: by 2002:a05:6000:40da:b0:3a3:4b95:aad6 with SMTP id ffacd0b85a97d-3a34b95ac81mr4625720f8f.19.1747304783975; Thu, 15 May 2025 03:26:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 27/58] target/arm/debug_helper: remove target_ulong Date: Thu, 15 May 2025 11:25:15 +0100 Message-ID: <20250515102546.2149601-28-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-18-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/debug_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index cad0a5db707..69fb1d0d9ff 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -380,7 +380,7 @@ bool arm_debug_check_breakpoint(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; - target_ulong pc; + vaddr pc; int n; /* From patchwork Thu May 15 10:25:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890200 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3070333wrr; Thu, 15 May 2025 04:00:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXV0y4KStRisdzt3YTDdBdoFxPsT3doYTildycT9KHaZJ/VFxjkI3xy/TD8gNUn6ZWltQ8knA==@linaro.org X-Google-Smtp-Source: AGHT+IHF292dhdW5JwSk5NzMjwk4c8X40YdUgfy0gK79ohTagimO9PT6YjSq5Tg9h5RIVrRw//5l X-Received: by 2002:a05:622a:4c06:b0:48a:1f89:f933 with SMTP id d75a77b69052e-49495cadee9mr107609261cf.8.1747306754387; Thu, 15 May 2025 03:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306754; cv=none; d=google.com; s=arc-20240605; b=VzEdgBKSpsL0FP8YPUq3zjN5Cp0tXQVycWSRNc8wPjq88lcwFYEaGLHcvaYomq3JJm r4PcQEIqxjzAMJhD+rfQrpp85SmmypsRcMSq1p5HS0RQCrqjevZPe2cAR97VJF5SAQFK DYn5CMOxkLNUh16zomOIICs+Z3IRJya16SW7jS2lqwLAlXy33w3YwFzQ/FGRKIguE78C SpCDnEnck6JE2HkNEQ9g1x7z9O6585lQDb+oGQA4QvZk1xqDIhOFK7TyfmelNnsZrC1t tFYgzYSa46KITPCYiF/NzFV3ucuRX162K6BRBWwDgLqNyrjs6nbCAzVR9K8u7p1QKWR4 aLoA== 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:to:from :dkim-signature; bh=8mOBWal8tapVRsN7QEnlZ5FeGan5WVEqLLtIcBB22dI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=d1m7svHuiH5UyaeZjW66mcELrc384n2AruOHCHSIyddJnA2GnwhNrIoY+mFkJUb0GW UDhXw8nEqeSLtCGsNFVk7GoIK89o3EkIBq+SuGVmjorODmTr4/0auIuwMR80RwN21XpP ob0n3WEGRfY5iZ5CvOoOCziL5vlavvWD9cVzag9RTBLLv/fJcBEFjNUTZ9F1QCEyDH7u Imcct96O/0H4itcA1fE6tmxC2swSmQsm6sUh0Jv/lR8RcW2ppVNHPLr7sFtRp+NKkFxR QCqoLLdJzOAphZJaQMRAdFhss+D0XKB44kGzUj0vuDO90Sc6Q3xdj9pB76KAHtlYkUPX Vfew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gpMkYvWP; 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 d75a77b69052e-49452479866si152401791cf.172.2025.05.15.03.59.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:59:14 -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=gpMkYvWP; 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 1uFVol-0007Ar-AC; Thu, 15 May 2025 06:27:59 -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 1uFVnI-0004zW-C9 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:29 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnG-0008CV-Jk for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:28 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43d0618746bso5768175e9.2 for ; Thu, 15 May 2025 03:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304785; x=1747909585; darn=nongnu.org; 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=8mOBWal8tapVRsN7QEnlZ5FeGan5WVEqLLtIcBB22dI=; b=gpMkYvWPY+PKu6gIV2ekHtOpll2kWSKxVOGk4GaocfQbqfPNpymaEInUqy2CwYZiS5 8Od473kF2RKGBikE4VmgY3RO6LVwkqhJa8OGCtyzAq0HXxIsK3gwsf5vuCyWHdfbjnvx 2MxnAKNXtUPJ0/zkAekg3MSIObuO7srYaRPryx52yM41+gL5Sanv6btQ8VVRnteDbuEd qlM7s2sON0IUu8764j0hxu2PGAtCQiyLJW5agHalgpGLhsv+teLKJFKXmxLGr6gUAyJi ETAKqPHMajVTRsA6qH2rssR5vIW/LkMi8kYHZKqsVRaZI1zRWNGpX7I4rDFjRt/HQoda TjBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304785; x=1747909585; 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=8mOBWal8tapVRsN7QEnlZ5FeGan5WVEqLLtIcBB22dI=; b=QDjj35sSqBWRgqWOnZwkmOlnmX5mBhLPJDux76rS8Xu0ttN7uzpHFv826kltJPMxHV vQGlfhen2uZKwE7Ii/6JLjm2M9jiKLVugN4bQ6zgPytCvYn54595v9ZUaBaU5vkWe2LP UARNZfKAhVV4MAYH1la9rLiPsOb9ElWJPB4fF72pvMf8bsAK7XnEfJXSP9kOylR2KEj5 /wxDe+ZL7O+U4k5gVgNGYBm6zO9xjwRPJhv1FbAZi3c8Lrw2ckGt+nzpYINWooT5dpbX DKvVOEgNEfEtX+wmanz784UjPDTh0fu8v0CXaDaZh9sLBpXP02ntqRZFlY/2bBgUXzGw BEmg== X-Gm-Message-State: AOJu0YwxfPvdqe1C3oyPI/Dq3Q29LA4gXy2UsoO/gcCntZMM4EJ8I1Qj lDB+oFX172hlRBSoUht+xki87ksj+LVQDpcZ4RHZeZhFWRzcvYhlqrUlUuNLx/ALiSwJgeKhF82 UzlQ= X-Gm-Gg: ASbGncuR7nQtncLViU99PBUxQOdMYHXu/j9L/u4DtvP9aLj9R0BWpUFuWLbgm6uJPw4 sRGgPF2dIgr16Wuxm54aASNkVnR+VnBFVz8wzWFpyCqHJx2SBeEqjSpfAERaMrVpSZmFBLUhvDb UKb/Dv0vrfxBuWJ3cEmDjYy+RnYXb63JVhCIXa8g/FUOjJS39SLRpoikEk43s25haoSFuYQGt26 KJX1g3K+aFZBdMksxkpv0hlFcqnoD1pvErfnhiBDeKgNN1WpkVksEdXHwaCqgn19I61+FDU4M5g fHJcryLoDJeVSefeIkJ/BZMfbHLwDp0Mm9bSi4D7t3e+XNR0HwG9iaZeAw== X-Received: by 2002:a05:600c:3c8f:b0:43d:8ea:8d80 with SMTP id 5b1f17b1804b1-442f96e5264mr18091015e9.5.1747304785062; Thu, 15 May 2025 03:26:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/58] target/arm/debug_helper: compile file twice (user, system) Date: Thu, 15 May 2025 11:25:16 +0100 Message-ID: <20250515102546.2149601-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-19-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index de214fe5d56..48a6bf59353 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -1,7 +1,6 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_ss.add(files( - 'debug_helper.c', 'gdbstub.c', 'helper.c', 'vfp_fpscr.c', @@ -29,11 +28,18 @@ arm_system_ss.add(files( arm_user_ss = ss.source_set() arm_user_ss.add(files('cpu.c')) arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( - 'cpu32-stubs.c')) + 'cpu32-stubs.c', +)) +arm_user_ss.add(files( + 'debug_helper.c', +)) arm_common_system_ss.add(files('cpu.c'), capstone) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) +arm_common_system_ss.add(files( + 'debug_helper.c', +)) subdir('hvf') From patchwork Thu May 15 10:25:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890175 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061503wrr; Thu, 15 May 2025 03:34:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWcZDqy+u6xKTcGA5+v6q2bop8/Ro5UVp8HpbBT2kr/G7Evem+IVlBFVgVkzX1CXUV4JSasg==@linaro.org X-Google-Smtp-Source: AGHT+IE2CKd8opLv51YBbZuHFqlCIwhiZjglhd6TdRLwIkgrKBiumZZMtL+zYxZYq44K0rVMnFsL X-Received: by 2002:a05:620a:3714:b0:7c5:642f:b22f with SMTP id af79cd13be357-7cd28818106mr1080449585a.18.1747305251212; Thu, 15 May 2025 03:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305251; cv=none; d=google.com; s=arc-20240605; b=XHdMnlm1D9bxoIa6Qnk5/dS8JWv+jEMHYahtVXbGjUSFNt50zdesjoHus7GW+WdVUq 1eU+3RpYfKUZg2K7cpatIS501sKaH6LAepqDsLYMUZrbGzeywFmBXjfiuwOnkPHLmBsu xbzyFqzJNRhqNx79foVFcjeLcsINdryEWMtCqioitlIrK2Rnil/HnF31vX7S9MpqPOzn ykczMs5pIKmSleMRsLOk+QBifMhP1ykMGbQOUBhjUUMXJE+zue7qTznpCBjwSyj0RlIb fHI3yi5RbfqRZL5fDVngcnHbyqPSZlQEHQ/BK1C2uhMfeHW1fgRXnatsEzU9OjxjAKgr B6lg== 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:to:from :dkim-signature; bh=nlujjlRo/q5Y9N/gIBpDx+M72CgU3ObhTfz9p9bVHTs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Oxr3rEQAkRc8kWcuADzhnMvtG4jDvWwaObM19haSlNuIUhRut74h14viLjpBB8DUS9 QmraMYEUPdK0piQa44UGN44/ZF0V5wFHVr32RgowwFHTuDK2ItBeJF1X41pIdI4z0zfm nO3RREeEvrZnhfMIKtTeHOYQ5cTLcw+AnZxTXgx7xKshg2i/5xVOEIc4iM3thiI+5Ns0 2yQDTOZypFkb9101xwiXcfoCwIa4kZtjx2C/wKx1IOmehpSdP3QLPKPHKyopRDEckqXQ ezoNgkyTzWtPIqTRm/JMqbJBXFZh8lzE6YNPik1ztDjyeOW78+yLdkrA1/wLA6961zDZ x3Ig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fg8GP+lU; 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 af79cd13be357-7cd00ff11cbsi1568578685a.589.2025.05.15.03.34.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:34:11 -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=Fg8GP+lU; 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 1uFVoi-0006ml-8t; Thu, 15 May 2025 06:27:56 -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 1uFVnK-00050M-Bz for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:30 -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 1uFVnI-0008Cj-Jr for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:30 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-442f9043f56so2963545e9.0 for ; Thu, 15 May 2025 03:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304787; x=1747909587; darn=nongnu.org; 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=nlujjlRo/q5Y9N/gIBpDx+M72CgU3ObhTfz9p9bVHTs=; b=Fg8GP+lUDCqtuwGwbOlvOT3s7xrAmzBV0XSPYucvgt42K2hz/OR23fa55HRjmSA0Pe 0H5enUlkOOZUtjpinbp5zp1+h1fcaR6qZnz42uD+YFoSiEJQnfPZYg5FWb8r5CTmrPYw CJZjHDmEl167GZdgCI1CtKAXdRdEh7N/hBALIQKNemhBn4Tv1qfofiGeXIed4FZW8Z/q /00uMUdjmE8cDr3xXfxREu2Cui+ZIcBo6uNBexd0Felqp4XOEGCABVhSmSrGNOpbYfhV DJqhIOLephxQ7MW6ha1uDv0vm9gMbN/4+xPezfjNDVLxSIS1xQAiKZDFwri+Pmk6Qc4A EZUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304787; x=1747909587; 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=nlujjlRo/q5Y9N/gIBpDx+M72CgU3ObhTfz9p9bVHTs=; b=tVjLnzCxdbB+LQChmKsI4Ym1MnFy/KXUWzUMo80i6g4JZe4DUlfQvnErz5/btNpSP/ dnC2CuyCgFzSrtL8QInbSbmWOu/MnxGodgZZPADVRj3rvOS+RnZZSxiEuDK4isUxBIwG 7z2AzmctBqlsT0CD4vuxr0agqf7LVmtaq1kk2pCnbZi8aYuzTEyF8NUspFzDr5hMc73U TBLailkGlOfoq6YSQczTA11Hb+QnyN1J1YEmdm/o0dKa28d4reyEWnooqGA0Ts/AHChm Y27AN3Kkz45jhM+qMbM2/MV2ABwMgAbidmOyYHp8nlRzvFYJQGXA283YZmeZ2MaafqAF PABQ== X-Gm-Message-State: AOJu0YziHBNB0AhevoE/GaFFyZloph/0Z4C7zHmxCTc7TK5ViZvym1kk BlAVotIPxFnWCGi/2UJwQs5wrd/UcnZ3z7/hgwPpF8Qk97AKhsdSZ+Bnb6nZ24VySlJPEY1PMRY nKds= X-Gm-Gg: ASbGnctPJ/XDl70Cnqkb70PpmRJgozMFoFOuMgmfSxXw9xMBaIxMCOxE0J47X5xwN9r Yaw9iWajhdmbnKy12hw+rarZU9V4aHvzHrUiHB4LmVUXnU1Sk/E9tVhs/m7kcXJmwPi3nm1MG13 DCBJ11uRlxFsLrwkjOSn7VAAa7DAveRvyFqqucgAIxhIBWHJYzQBSCFge9kebgjYn8fiS/f88yC /V7NsyAG+vBK0MoawyWArg+gD+opATuHiVOeHPnbGLDD+SnXMdReBcgLkwiSsGEMFBWB8mGZ4wj U1E4pkp+uU1FASOGmV2rapw3ESwl8px2WC1zqfC9EVwAY8M/EH+ga/dyZQ== X-Received: by 2002:a05:600c:1c2a:b0:43d:683:8caa with SMTP id 5b1f17b1804b1-442f20fc9b4mr65672835e9.15.1747304786780; Thu, 15 May 2025 03:26:26 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:25 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 29/58] target/arm/helper: restrict include to common helpers Date: Thu, 15 May 2025 11:25:17 +0100 Message-ID: <20250515102546.2149601-30-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@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=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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-20-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 4a2d1ecbfee..3795dccd16b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12,7 +12,6 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "exec/helper-proto.h" #include "exec/page-protection.h" #include "exec/mmap-lock.h" #include "qemu/main-loop.h" @@ -35,6 +34,9 @@ #include "cpregs.h" #include "target/arm/gtimer.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */ static void switch_mode(CPUARMState *env, int mode); From patchwork Thu May 15 10:25:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890155 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3058956wrr; Thu, 15 May 2025 03:27:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWmdMdVy7y/KCZOCqqbhNXkb/LJ8MmYm/JqNhJTC5XYU3uv8KB6On6oj4hUvgdmJOfrZbySCA==@linaro.org X-Google-Smtp-Source: AGHT+IHvblqYWcQEU9t+we6oUiKAS2zUyzZ+Zxz5GLiqWgknwyrYL9nDxh9JHLVjIoYlmKzxZ3Qc X-Received: by 2002:a05:6214:dad:b0:6ef:3de:5ff7 with SMTP id 6a1803df08f44-6f896e0e712mr106960696d6.15.1747304855092; Thu, 15 May 2025 03:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304855; cv=none; d=google.com; s=arc-20240605; b=ZBsddpOilim0Etb5hgb9k/QT611A6qwqiwHbajm1bJgDbG0/VhZo705to6nlORXMnJ 0cD4Crg+safxeIbNh4bYa+E/+jETR2SAByny3C+VyT9b6f+62aTZQFly8lLA40dEHBWo npJnoXw4Ukmo7Gk6DTiuKd0jWMni+hwcnjiDxYDkpoq8quCUWxG97v21EWAZvVkt+YyV v0EsDZuSq+csVTmUYtCENaM2KA3EMRrQwhFhypI2ijQ+y3VLY13LHhBo4V7LSxWB1IpU qByqSolE7UJR7XHnfFoH+196AfTBTFQKWA/088gseHkqsgKzxK5EOmErLvHqiEh23CAH 3zTg== 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:to:from :dkim-signature; bh=ScwW0ONtDLcy/cF9TCJ80LU8xn4rp8C/x9ucnaQhaXg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=OTzsYeLXiSIiu1vWs53ydtS7AQ1i2H50BThVTYkaxyTTe88cPcXFbfbczYfSr/f391 5oRU1DdZFbQDVu87F5tDh4aZSHZmE/UnyoLhhadXcFMfFUc/X7x93Gpcm2Q8kuWzb0Gg v1nAiV2BKiFUSCnADxL85TtY4M91ciJreIzjo6w5YSqgprFKRtUPvKSiQHUxelCi9A+r l/tYNgOHEaitNdzXykOQU+raBz7l5mT0T4XjxrOi70dVR/pymqjX1KQV/Q4V4MwF5myT jfKZbW9u1IOo09G2Eu7cGmoHVygx8/3WKalS1AA6A7nnc4DvNrRC36SxoUwkvQ8qomao mM0Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fovwpejc; 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-6f6e39f8377si162975786d6.166.2025.05.15.03.27.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:27:35 -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=Fovwpejc; 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 1uFVo9-00067W-To; Thu, 15 May 2025 06:27:22 -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 1uFVnL-000534-Mk for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:31 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnJ-0008Cz-97 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:30 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-440685d6afcso8445525e9.0 for ; Thu, 15 May 2025 03:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304788; x=1747909588; darn=nongnu.org; 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=ScwW0ONtDLcy/cF9TCJ80LU8xn4rp8C/x9ucnaQhaXg=; b=Fovwpejc05DAIDpvGZw38MGfA2QUnhFwnK5doZcfy7uWtX4424zZ1G5LQl3cqON3J2 BmP0Z0XstimJQ2nYAoG2yrGAQz6NO37s9Mz/Zn3RbQoxWON4mIxa6hJ4q7eanxcqPtYh 5Hbx5G6u83PZZi4xYq4EqJg0j2nV/64AnIcv5Dg2ttJOLUvbJvqmyQpwCqjyDPbtc7Hq uLbEzbImD1xcOyswalsX5Bbv/hY6Fty1hYFPIQ1wOiTe6vnv9a4HIgWeoZBiKShN4+n1 gLL6wMbSb23h0aTKf7Dwqt/glK/zEjceF+wDnIXB6XiVl/615kChUVh3UVGLa+zDQ3iM h4Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304788; x=1747909588; 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=ScwW0ONtDLcy/cF9TCJ80LU8xn4rp8C/x9ucnaQhaXg=; b=NwDJ2EP+JEim1hu1qjVPoOmMFdwqmBhDtN3h5TUl2FmlGD4jHeRZtxi0r/eYKoHXUI n3OfMqaZp+6rI1ZDwEWFBFUkVkzhATXDZ+oCxQjdm+1a5RY+CuZnlaghT46N+wwohcxH 6j8Bg5KkMICqJmYmGv7DyHvUVE843pN+wPk8i80O3h32PceECO08CTc4valOLTTFDJpY W/+1MAiuGn2nbyTJId4k4bRMnSyQeUHd7/UDeQ5OQ0DIOnKK8zxyrSLZ5CsKPhJVOMR9 oXtMcmzOsSo5FBFfKWNU0DdCcUwD1UXkfZE9wG3THkewgDpQf4g9NN3SaqD8K2fzzTwT o80Q== X-Gm-Message-State: AOJu0Yw/vvPIXJ2SURyO3Ox7g+S+oH4yL5ITvxRhNY6hXChXR/1gEwk2 v4CT9Pm/3wSUO7fg7uSj4sEOxJhx1z+KO2c14o+BvsQl5RgwMuFN6zXFHEdM+vEtUCTSNJcmQNR taos= X-Gm-Gg: ASbGnct+tVz+3Z8H9sORjpqbQtuFmJHqV5lU4MmmSAhI8yR5WULEqNCWZuQ3NHJOn56 UKfhG0zZIehAjmhwf5NLZ+GLUXNNH+K2WWtz/doXLZ6BLWqYY60w/dNMMQI6TwMg9R7Wego6u5h dJXCqQ3mquIBBdcoxNnaxxpUVbnileGP54x4NMhawmixmtLutB1wy8IpM8D9DFPpc4H4ioqu+K3 6cPqHl/3yKvsuJbZshVxPW58O6oQo9dcr/wIEs2AjIYcmKvlxKoCer+iGk2eElCVPrTOdlK5aTR 3aYMvpBBRLbCvsrJ4S9ewi/Vhw9CB9h9ZtjuzzumIgOhyVZ/yAWFWqTt7badgD3mf+S2 X-Received: by 2002:a5d:6d4a:0:b0:3a3:5568:b8ca with SMTP id ffacd0b85a97d-3a35568bac9mr1148951f8f.0.1747304787763; Thu, 15 May 2025 03:26:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/58] target/arm/helper: replace target_ulong by vaddr Date: Thu, 15 May 2025 11:25:18 +0100 Message-ID: <20250515102546.2149601-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-21-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 3795dccd16b..d2607107eb9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10621,7 +10621,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; unsigned int new_el = env->exception.target_el; - target_ulong addr = env->cp15.vbar_el[new_el]; + vaddr addr = env->cp15.vbar_el[new_el]; unsigned int new_mode = aarch64_pstate_mode(new_el, true); unsigned int old_mode; unsigned int cur_el = arm_current_el(env); From patchwork Thu May 15 10:25:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890192 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3067342wrr; Thu, 15 May 2025 03:52:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFCI2T3KwKzRx/d2FUtUuO2fWsPpgG5KU30GTcAv1FrLy2cwQTEbtfC0Mtfv/Gt1sC/qcINQ==@linaro.org X-Google-Smtp-Source: AGHT+IFc8r89D/fnj19uoNInDNX7++EmYu6Y9SVD15KSQzg9CnqD63vpZtzvSeXUvolzAmgKdkyx X-Received: by 2002:a05:6214:e83:b0:6f5:4711:289a with SMTP id 6a1803df08f44-6f896dfbe0emr100066746d6.6.1747306321013; Thu, 15 May 2025 03:52:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306321; cv=none; d=google.com; s=arc-20240605; b=ZX46zGcVTSXw6S2yI25u44os8C3F5lrKgjOxle2TLb1mDcvbhMS+ChYZYBvw3z3DRW QEEhFFb+2kTYZ6lAtUeQNqiOrl3RvHpPaLv+3NXYHBLC8+mt864rjjpON6TrlN6wR62x uiOh2J7UnvgEDUJylL+u/ZVd15B6H8R6hWJfBTO8WerZlOEzhmbWXfy/WMaJon6jwjIj M5XRopxaXegBflFd0qJ75tfKYdmqsqnWtTizQ8iCl+6Px2bHKiHzJjM0iu4UeKoKtDe7 trpkII1g8EEzsrHbBMpiZYtapJ5ghXP85cmOml8jiyoZFdHsUbDqyOzRofn56DNXlJY0 FVlw== 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:to:from :dkim-signature; bh=8OqIAv12cBzD5xPq0tKwoeVHDMUht+s84ge6JHo6zJM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=b5r342bpbTP7Il2Ncip0fITySEwCMq0X1NHxXwq5HvXE6aNAg2A6fAJSANXX1goSpz tJ94i+Bl2i2zo65O+9qDxpPvvArEUMDVnN6F7uhuTFMbYwEp6vxxWkwgrDzkwp8gQgRF b4EhcV15E65XQaFGeU2KQ+4xo8BNJ0P+WzEV5Gv8x04Gj3UBhtD3Cca6Yrj2WI//2dHF dSdH6nGdi9VprLVVMSFjXhrUSzL1o02tMrbUDZ0jGWLZv6meAMpn94nxi+gTvt2wqL4n qcrGmjyUiiGoAJqKeKU7/ZLPB7Afk9E/Ol89kytGfFmdysI1CgqK6RiI4axxwZS6lrzL JTzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GQLXccCA; 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-6f8adef1e57si3642606d6.377.2025.05.15.03.52.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:52:00 -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=GQLXccCA; 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 1uFVpK-0000s3-W7; Thu, 15 May 2025 06:28:35 -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 1uFVnT-0005HV-CR for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnL-0008D7-Jq for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:35 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-442e9c00bf4so5681825e9.3 for ; Thu, 15 May 2025 03:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304789; x=1747909589; darn=nongnu.org; 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=8OqIAv12cBzD5xPq0tKwoeVHDMUht+s84ge6JHo6zJM=; b=GQLXccCASQTBXz1236JTe38t4uPAcTU4hz3vnLZEWm5tbYDJaEzxstoS9v1CPl2M/h tIQ4wtHLAHkzPfZvVBn/rDAJAiJSUP//0gUidC/MzUM36SgFwwDlWZa3J4VMnW79RBCw GQR0c3T8vWR8o6DiPFAgyefUvlQ3nn0DwJyaxz+kCh+sd2vrGbgNGJyig4SPBp2YaLBc 5Pwf4JF/IPSAZ5RxndL0LwK7NyWE9DaVflVFmsO9vkrK8mgN12bSwqMuXfI7LXXgp0q6 0Bv7PNFBD9XHKITHDzWsrh+0nkRaoAnuObBhee9YMUa47X0ehOKzgEl//+4IitR+VhI5 Leag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304789; x=1747909589; 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=8OqIAv12cBzD5xPq0tKwoeVHDMUht+s84ge6JHo6zJM=; b=gEM9OOFKaQgCWlJGZK1PxzPGkGtiUDo/BNry8RK6kjEVao1LPPCzpyvWiVqN5soCgK Vjx1HCDk5FIBM7Kvnx2YqCcLtj1VEBW9RBQuHOEh9Oi8jqukR2c5jIYhcIHdA/V8kPCr tu+oxXGekm8fwSUokTvVuhVFPbOOa6ej4QgnF080bD7pAR3JbR1XQIY2Yi7poamZ92IG mweOoV6bZ1YNHs7xPqXNSnBAgFJM7VbTTf7NeplTzMTK88YHCSvJCMYM3LGDoVX424tk Z7mNIUMM51mmiF7t3put2MfV7ft+5DVdjxe+ECZTnI6XtbnBgsSxhw9LoU3o5LnA5Swx cscA== X-Gm-Message-State: AOJu0YwRUrHg+nIQprWfv/QZAxuoWiwPyZd5z5EDQCJZNBim+SqxH4HI rPFp8q8UBBOYsre83ESSGRQ2gSPx+aUj+MuD5R4EjOw5DmKomxxC8xUht2IhtCoYBENljp3v7m4 pYOU= X-Gm-Gg: ASbGnctezxD1A8Qh01ZDu9cU1KUUEQVCNyNCfStSDmZUgcGwnjX91FaPP01AFonWdKJ Sj/EwgykoLjelitwt95khlKp7XK3CJZThDXfQw39WKwjqo3H+oOBbSzULcwh9OUhkRGNiE+j2HQ kqrdvAupZ7rR3Xl09FohLeiP4iacFjl5QHLi01nGKBEfDLwtsNwqwcnb934anjhpxlyjrlP9qLg M7pGHMEla0YSYIgJ2rIX3T93EPq+FieRsf85Ft2D2AZKMoUEk+9yX7/vjd3EYqMRilY70k1WxfD Za4WPBjmZxxJXIyKFAMFmoqqhc8AjLv1W1vkoDbmSwrPtJpwcOe+t+9/EA== X-Received: by 2002:a05:600c:3f08:b0:43c:fd27:a216 with SMTP id 5b1f17b1804b1-442f970b20dmr15728895e9.23.1747304788800; Thu, 15 May 2025 03:26:28 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/58] target/arm/helper: expose aarch64 cpu registration Date: Thu, 15 May 2025 11:25:19 +0100 Message-ID: <20250515102546.2149601-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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: Pierrick Bouvier associated define_arm_cp_regs are guarded by "cpu_isar_feature(aa64_*)", so it's safe to expose that code for arm target (32 bit). Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-22-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index d2607107eb9..92a975bbf78 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6590,7 +6590,6 @@ static const ARMCPRegInfo zcr_reginfo[] = { .writefn = zcr_write, .raw_writefn = raw_write }, }; -#ifdef TARGET_AARCH64 static CPAccessResult access_tpidr2(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { @@ -6824,7 +6823,6 @@ static const ARMCPRegInfo nmi_reginfo[] = { .writefn = aa64_allint_write, .readfn = aa64_allint_read, .resetfn = arm_cp_reset_ignore }, }; -#endif /* TARGET_AARCH64 */ static void define_pmu_regs(ARMCPU *cpu) { @@ -7016,7 +7014,6 @@ static const ARMCPRegInfo lor_reginfo[] = { .type = ARM_CP_CONST, .resetvalue = 0 }, }; -#ifdef TARGET_AARCH64 static CPAccessResult access_pauth(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { @@ -7509,8 +7506,6 @@ static const ARMCPRegInfo nv2_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.vncr_el2) }, }; -#endif /* TARGET_AARCH64 */ - static CPAccessResult access_predinv(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { @@ -8951,7 +8946,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_one_arm_cp_reg(cpu, &hcrx_el2_reginfo); } -#ifdef TARGET_AARCH64 if (cpu_isar_feature(aa64_sme, cpu)) { define_arm_cp_regs(cpu, sme_reginfo); } @@ -9012,7 +9006,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (cpu_isar_feature(aa64_nmi, cpu)) { define_arm_cp_regs(cpu, nmi_reginfo); } -#endif if (cpu_isar_feature(any_predinv, cpu)) { define_arm_cp_regs(cpu, predinv_reginfo); From patchwork Thu May 15 10:25:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890210 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3082399wrr; Thu, 15 May 2025 04:26:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/oi9/pHAgArFeTsz1v0gzm0G2ojGkJWZka8VFrSxs2ITjkrRWunuPtqPKw2ebFgRNMNke6w==@linaro.org X-Google-Smtp-Source: AGHT+IESvGjSYV8xTeal7H21I+GLaX/opziGEZpH7mLkN1hK0uVP41NnVtgX+XjjMthRU1Zl64pz X-Received: by 2002:a05:6102:4bc3:b0:4cb:43d4:6926 with SMTP id ada2fe7eead31-4df7dcae6a4mr7643632137.7.1747308408558; Thu, 15 May 2025 04:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747308408; cv=none; d=google.com; s=arc-20240605; b=ESth5IktzBE+ACWdJHnBlDGfUYCRUzDtZGV9kICbOckIwSg+pnzP5YqSO4c3JvaRob ph9pnYfeQqn2mpuGsWNRoB2JB3j2mLcDKGPrSyrJuSX+BSmQlOQyFGW9PdtJoYPnV8h0 a/JDnWdzR9Vs7RBsT8PQkQp2nxPWHzYRo+Da3s2H6UdJrBcH0ohNKMY7NGUzoCcgHr5q ETN7Qz8AD/zjQbKknl06o4+cLkLf96vnqXHHn2NmFGHnGMk8zqkWdan8AAMw2w1HsoLo oGTkBlHtbu3EMxf0COB1toQEAsKygYY22Z5gMIfYGfW4g8PeoWc6iRdCXpX3wrm0Tx3S kfTg== 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:to:from :dkim-signature; bh=sFij1h3veGtKhSTyxyyf2bRq4SfQA6FXNfG9cnrUTkY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=CpySVRKDVswUVWuDYwgSGuVTBfqYi7b6PbfDgsBGIosIp2fD+8UpuwNyYxmTM9bVpd FG6LB906Dcf7hJ8pOEDpj6HNKo+p4hM27qJKuLVs3PTjGF917aAqWEUMDjTraPLL0PJl j5ZlFQIk9pwPvO2hGG+eg+F+VC1pTTOlktSZSvhehmZqO4C6+8EseZHQdPPFN1NF7pxV eNn4NSf/T4W0TL3ftdBTM2vxH3Kt3FutzIgO/fvDFe3FMMbpC9wc6z65gxpGIwPawaeY AL5a0vHo4hHyOQrnKcb9JUgmsXl7QxTPZBo7TyjGPVLsOm5kMBNzdQWk7p8jBXXYVRTC lCPw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K6+h+9Js; 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 a1e0cc1a2514c-879f61d4decsi5476422241.41.2025.05.15.04.26.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:26:48 -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=K6+h+9Js; 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 1uFVoO-0006QV-T9; Thu, 15 May 2025 06:27:37 -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 1uFVnT-0005HX-E0 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnN-0008DQ-CV for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:38 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a0b7fbdde7so669572f8f.2 for ; Thu, 15 May 2025 03:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304790; x=1747909590; darn=nongnu.org; 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=sFij1h3veGtKhSTyxyyf2bRq4SfQA6FXNfG9cnrUTkY=; b=K6+h+9Jskp2qOdvxZk97L7wBZB/LtXXZca0K84tqOYnsYbznuRFQFO8QYX2docrVaN ejl5DMVXgKSCMQ6Kdqc6f9IZ9P6O0JhJmmj9b1Fp0aovBu9eBS+GzqEII6159mThNZL4 DLfR1xGoNhmCHd53ggdcbvToDnC8ytK4rT2dX9ocSnZtvXmmDI12+K9Q4coGyo17DStN SxQ2FVzBdzu9YG5jb7+u5ifPVr+EukdqupNOpZOw+HS5mYBsfHGqvs0uK28s5eiHFm52 NrafIiNNIsrg9KmfjZ48JRay7okNnZ0h9UOsVlkqSvxc+BmQ9Up+a5iZCNrkCh/4ayGR 2BAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304790; x=1747909590; 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=sFij1h3veGtKhSTyxyyf2bRq4SfQA6FXNfG9cnrUTkY=; b=O3sQcU+cWojHgN8PUXCix13wb7vmGWlPnzV3BKf+E12Zs4bJdVhqEHGU5pKRUSZMho ItjD+aq3HaQCn5SGtaPLCBtJQAxKi65KfFpz7ykITcLn3yRpKci8lImwoDvU7GHcVp9y jXdYBcTxCV7lhVcWqcEdb987lsbCci+EefDbZ5kJWntERXuD0DGEoWXdc9DFL3jLXTPh ui5CWdgINe3d8yB15RvUNZR07DE4Z8yWyAz3OQHWRmqqhX8fn4+lmiWHXvuFoK4QV0P9 d1LSAJKyGIVnMKVnO6GRguYHKUD1NjVyMaYrgzTVE4wqcBXEQrX1jXj7DJest/NtFYkZ aKdg== X-Gm-Message-State: AOJu0YxBqIC7sZLOZRbs/FOCXDq2+7B4YKNJicJM8MPUrF+yogFSO6nk fWC3Dcsah0i+Nfuhj1N2OuxTAHB2tfExY16I5FFqkYhCTRWaZxTei2aLEfI8GiGeK8ixHTsI2xs soh8= X-Gm-Gg: ASbGncvH7gIdvjmz36zff8cCaB+1FubfRlHXAECmAadIIwT2Oe2q7hKRqa/E4ggERqK CY841x/te1tDsx41NoKdIgAhLSbh9novvhzXS2QmK88Bx4mtgfao6+BOZVnSMv4T9j8BBw5JG+l cVFztKGzmbGTGJfJq4SWBWBB8SoyHjgisafCy4xpMPV34V2E0/HV1mhy3or+Sh9F1cu0TBen04n 9IDBhU853v3tTlpTTOBxtibKH4gdhVDn3mmxYqZfr1mgnMFcOxSK99jT99xYgHCSr51D7x0iFNG B0IeeJE5Ydrh4Wuh6ENTZuEAsL6ZhGArwFhhMAnhU7tUUJz1PrkSKDoo4w== X-Received: by 2002:a05:6000:381:b0:3a2:229:2a4d with SMTP id ffacd0b85a97d-3a3496a49fdmr5513537f8f.22.1747304790042; Thu, 15 May 2025 03:26:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/58] target/arm/helper: remove remaining TARGET_AARCH64 Date: Thu, 15 May 2025 11:25:20 +0100 Message-ID: <20250515102546.2149601-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.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: Pierrick Bouvier They were hiding aarch64_sve_narrow_vq and aarch64_sve_change_el, which we can expose safely. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-23-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 92a975bbf78..aae8554e8f2 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -29,6 +29,7 @@ #include "qemu/guest-random.h" #ifdef CONFIG_TCG #include "accel/tcg/probe.h" +#include "accel/tcg/getpc.h" #include "semihosting/common-semi.h" #endif #include "cpregs.h" @@ -6565,9 +6566,7 @@ static void zcr_write(CPUARMState *env, const ARMCPRegInfo *ri, */ new_len = sve_vqm1_for_el(env, cur_el); if (new_len < old_len) { -#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); -#endif } } @@ -10625,9 +10624,7 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) * Note that new_el can never be 0. If cur_el is 0, then * el0_a64 is is_a64(), else el0_a64 is ignored. */ -#ifdef TARGET_AARCH64 aarch64_sve_change_el(env, cur_el, new_el, is_a64(env)); -#endif } if (cur_el < new_el) { @@ -11418,7 +11415,6 @@ ARMMMUIdx arm_mmu_idx(CPUARMState *env) return arm_mmu_idx_el(env, arm_current_el(env)); } -#ifdef TARGET_AARCH64 /* * The manual says that when SVE is enabled and VQ is widened the * implementation is allowed to zero the previously inaccessible @@ -11530,12 +11526,9 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el, /* When changing vector length, clear inaccessible state. */ if (new_len < old_len) { -#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); -#endif } } -#endif #ifndef CONFIG_USER_ONLY ARMSecuritySpace arm_security_space(CPUARMState *env) From patchwork Thu May 15 10:25:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890173 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061248wrr; Thu, 15 May 2025 03:33:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXquKRoXwt3Dk0JxfCBxdJbJTTJWp33LMYUIXa05hx+/dIe1xklQW4I+enfH5FWXN3YY7LsHA==@linaro.org X-Google-Smtp-Source: AGHT+IHh5RLQyuTdFZp9TGrK4udDrbpFVkfBMPgUHuteO0Yxy4RpQveB+5/UA3AbJw8j7htycMKI X-Received: by 2002:a05:620a:f07:b0:7c5:6396:f161 with SMTP id af79cd13be357-7cd3c82c2eemr277466885a.49.1747305211732; Thu, 15 May 2025 03:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305211; cv=none; d=google.com; s=arc-20240605; b=ArTriokC2QwLnBPeD93mV6MAhhhYU8Kr/uTf00tZIV/YYXmgk0uTKZ9/ZjowM54tqu 7Zn5LGcv/4ez4mM/ULrKGbyM+4qjTHs4BBs7lyn2vjdrUBgMVFRc87p5JUoLqkzUDOTk /H8gjvbrxzpJDdb6fsO3UjK13h+XnC51CZHkyjY676VxUy60wZa4CbIkn24/HgUXrwPO yzzm9H6Pu/o10gLqe84OGjkGGgFW/334cyKh8JxUtQoLsDUecpbC8CCQ3IOkcoCj1VWq EPn8DP82ym8XoKgjApNAVYNbfOcH5JxWtxyRep1rn5b6/4A/F6hGVOomC41k15WXmrmv tqzA== 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:to:from :dkim-signature; bh=rwfPuBQXcGtWoJn9msWHbhqRij5/5zipndMnWAXWLc4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=kLQ4hjevD9prLxcfRppi5sSBSgxKb4iFu41Kr4bf68C+LZHmdTRK/27lkot045ewgK X2/LTCVxGjft2KmCzVMkY63Ib4n/F27YlPVwSJi9HFsewDBPQzo92t6GH5x70f2zyIxl dfxPeYJc4y8WUk+ugiVffeBPV+PBac/LtIH3aKU/NRsQtHH9WeigJ9xW96mduf1S2nxC vVzc4CjzinXh94+GvohcTZ9bIaWB6oj69AtVYaO0CcwAsFU2DU1WLWTeKFuTOBmd5JRN miQcBgNEFdZ/MaWyn7Rm7h7yZNMi3PFbBgm/Je2MVppFM5PneA3gPw9zjA0hbe7Z7CWz bejA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YyD/oNac"; 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 af79cd13be357-7cd00fd4596si1512697085a.287.2025.05.15.03.33.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:33: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="YyD/oNac"; 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 1uFVoN-0006Mn-R7; Thu, 15 May 2025 06:27:36 -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 1uFVnT-0005Hg-Fc for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -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 1uFVnP-0008Dg-3l for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:38 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so5860955e9.1 for ; Thu, 15 May 2025 03:26:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304792; x=1747909592; darn=nongnu.org; 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=rwfPuBQXcGtWoJn9msWHbhqRij5/5zipndMnWAXWLc4=; b=YyD/oNacMDuPvqMAqJ6jlXT6yc/CvoidJjafXtn7Ho7a6+kOh2egUyN4KF6LzOaMmQ i4Q2eX4XtRzTo8ItKkk4xcuN9hTHL5ZhBM7kdVNOwFTI1xRJqUAbfs0Bh6sr0nfqAPhJ lvLDZia8U1M+xnfjhjRON4RkZNoITX/Kt4PlQe3+L7EnpDMUSmQLSo5EptF1jT3pFslr vttcLHIQXZ8FI1PHA3mNTH5cMnQRjzhdPdUgTSpvZ+pKifA04htPo8fvQSQn1uqv2qtx 98PAywuJWPF3FE8IO41qafQihKK2TdY5b2bhcdduDAB+n+ud160BwHQu8b6wrTnYf7fK wkcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304792; x=1747909592; 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=rwfPuBQXcGtWoJn9msWHbhqRij5/5zipndMnWAXWLc4=; b=ONxKDMx//RYdoZNeqOlAqtyuf1R0BsBihaXmrGaKErCi4y5CXEVlHSQj+535BzqAue YEP1ysIo+yzt9YOwrgZUGSZpV7dMnW6IL1VgVdISz3zm5unsKTjDSmtAB1Jz3k+fwBBm bephWNqaYm8NGjnVZumW/2QKJp16VkvYwDkgUvEGO0RzuFJB1TQfHEKgPDJV1lB398bE ybH+7a3oMbIURB/AAcPvVEJwifN4kMnmOkz4npYzPT37tEOihQp9G/38F8Y9fqEUOhYF NQWfLwRwvMz9X3+7DvE3jjRvUslxpN66od9hHs4Ex4pBdjRPcM+eGR7jyFrzSUH5Ll3z fiLQ== X-Gm-Message-State: AOJu0YwC3JB9PxTggBk+C00JO2pBcfAa618d4qL9QY3LDO/53oIZL5JS PmZANSd60uSb3/XEdXa1aUHqXxGdf//J+ZnEVms5cPPDxFxodKDvClnm7UAoy7TYdKtrf9tZa4t 5r3o= X-Gm-Gg: ASbGncuR0pzMTTesn0wnWdoa+gVXy5Lw4Ig7VDH1cQ3RoegkjAijrE6nLgScjKY4qX+ wr5pbC1Is2sMKyhKUnzGYuLasDreyQ6JbapZGdmrMpS6NZ3whoXpjTlFe5XrW6iSzCo/nlK3PBj Z2WLO3BZ5VzKLrCeHzVGQjOvuNg9cKybRZoSOFjeyFRLaXHkenetn7YSJYcC0FHy6qWxCToARA9 0e3z8xWq6rA04ABIHUCEOns/l5sWQFK+XCwtL+QHW9a83G0M5ex+kTOKlL44LtPlLt1rx3imRtd UfafRVjHRYqIwlaKR6d/nEp1Wc7wA59O/PYATMfVy0xSY+QD7nuzktF7Rg== X-Received: by 2002:a05:600c:609b:b0:43c:fceb:91a with SMTP id 5b1f17b1804b1-442f20e8c4fmr62358485e9.11.1747304791881; Thu, 15 May 2025 03:26:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/58] target/arm/helper: compile file twice (user, system) Date: Thu, 15 May 2025 11:25:21 +0100 Message-ID: <20250515102546.2149601-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-24-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 48a6bf59353..c8c80c3f969 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -2,7 +2,6 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_ss.add(files( 'gdbstub.c', - 'helper.c', 'vfp_fpscr.c', )) arm_ss.add(zlib) @@ -32,6 +31,7 @@ arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( )) arm_user_ss.add(files( 'debug_helper.c', + 'helper.c', )) arm_common_system_ss.add(files('cpu.c'), capstone) @@ -39,6 +39,7 @@ arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(files( 'debug_helper.c', + 'helper.c', )) subdir('hvf') From patchwork Thu May 15 10:25:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890198 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3069642wrr; Thu, 15 May 2025 03:59:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUv0SmVnSzT3DHOr5pXi1MqYRJc6oMwj5ofLromWJSRCVPYIRyeM25oohSdSr2GrrpjqEi7AQ==@linaro.org X-Google-Smtp-Source: AGHT+IEJYT0nFhBSCjZgTsPqjijl93myU7ciiQ4kHqV2oUJNC/Jey67w5q2i75bEZr/kgU5d8gZc X-Received: by 2002:a05:620a:4106:b0:7c5:4348:183e with SMTP id af79cd13be357-7cd2881b5cemr870447185a.20.1747306742282; Thu, 15 May 2025 03:59:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306742; cv=none; d=google.com; s=arc-20240605; b=c8Px+8dT175DoT3sKaPdX/gG+atGwZ3mXITq/Pxe3kBlGMTznDrEZ7SKQy1ZEOTi82 mgwuoYzRl19aXzWafR4Io7Nfrf8KK24U9KAd5vuFN70MJ1VFTgKVaHFwO32niMND2uGd Rm4Cqw+w1IK7OKKk1jUxY+76nmeODun1TsRBHIgHBagzGUtZDvCfCiwNl2XhP6mW71Zn /2khApR1YrvWJopGPXwPpjr2+kgAQp2RKB9yNYB314FFgD8M8JbXOt4A+G3gsnFWmi3R P4zxKnAZjDkTsnsb7H6lwuxt3NGi3eAl6PU4yWbDz0T2FgWi3WnCZv0JhXqyqSnRCKgp Dv0g== 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:to:from :dkim-signature; bh=vTExqP4h4Cvg1NtSNAreZAjgeupAmJ+GTzTCQP5jTDg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=FVyH6Yu/R5PilKQCDjjyCvauJ6y7rRK4HnguNu/6kcPsDMldBligY4VL3aeO6jGhOm Wk9VtoABq2CVDAlt+TZCX5W4RT5lahvnKK/A1oHOHyZEvj4SGanFMh6+UXwakX46V5qA WGxv9lF7t65E6/jQBDhY4AjphiPSVYeWmBMD1DB7cChKH73wUc8dTItOhDIt1LnYGNAV fn7IaSYjeuLbByioxEMRa24wU7aAht3JpZx8PqxnRHraGFVlw+8Qd7i/HOPL4nWPCo2Z LSEpPDSOSIH/wpxWd+79us/JktKnigztak0g0b2Uu+16awpndc/fVXfd9FFhVNccMVhS xd9A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PdwIMsZy; 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 af79cd13be357-7cd00f68a6bsi1498654785a.160.2025.05.15.03.59.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:59:02 -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=PdwIMsZy; 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 1uFVol-0007Bd-CK; Thu, 15 May 2025 06:27:59 -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 1uFVnT-0005HW-Cr for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnP-0008Dk-6g for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:38 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a0af41faa5so374083f8f.2 for ; Thu, 15 May 2025 03:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304793; x=1747909593; darn=nongnu.org; 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=vTExqP4h4Cvg1NtSNAreZAjgeupAmJ+GTzTCQP5jTDg=; b=PdwIMsZyA8ZBdZSJDTQVlP0TYEWUDoEfCWXPbpHBVHZmbfQB+ZdEFSr3KOlInn/pju Zx7VC1cMPW2L471jOKjnbeGvdSZL1YDabvDalXTF8yL4m+GmzfH+qISpBMiqVY45k53g JwcZyG4xGSad1QcDGAVED7R697d7VHgENTlTgoXAH/4+tRO3e4OPUTvMz5JnFM6BooR4 G+pDzNCij3KH93Mht1fmL4vUIHowJvGIKs7GRaJfAf9NtUqhSxNagPutxdhjiWi2z+lV Xbz4KyQ+NrpA29UC32aVOjJKwIozZSFaGfAf2eJcWSNAjwSXq+EULbpf8nzZB6UZLC48 GZGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304793; x=1747909593; 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=vTExqP4h4Cvg1NtSNAreZAjgeupAmJ+GTzTCQP5jTDg=; b=TST4lJrKIrxCpsgylr071givXAblo5dEdllcIZKyVWV4FyGRUI+3zgj6kVPct8x+8F ggQ7acLEERBTN+vi5Jr9WyyChHORYt3C31fAmcXWhLSGOHRRI28OS3pRk+b1WMlAbRvI A/awx+V8EqNQ6x6O0rNBOgYYEpstLBX5jZI1RT2OdCM7QcGxgW9c0ko4E77h8RIH9xwJ nqroIbRgEoiLFZ3esbWA1jahJLan1RaMt4VPtJ0KCdHgwo4wkhm51X1NT5Z2Ka/R3fxv b5cRfUExD3IWgHweeG+TXdtG7R+BNO7yxgK9DRHHJhpbKU8vPRYp1Sw/faLCd19vD2j6 GlSw== X-Gm-Message-State: AOJu0YyTSJrWxI9oszPBFIiV2P4p/NJs4+yE0bf0Obv47HvpUNigQ8Wh ATwbSPN2SbijgzIMrtY6sKso32CXB+yONYD97UGncr52J49f1qU+4UCasNr1vFqEMq/CCLba7UC Q5Ac= X-Gm-Gg: ASbGncsDIHBBm3keU2gAz9zFGY6SpRfy6ABlbP/MnO//LiFEZpPVov99uOUirX4BFMY onFOQGP2PQ62Y2afKMaB8+ICLeWzJkrsFOqdCvmLRMrrP/5gZpC4p2jTysxPNDZNynHyk7HPr+T NCqW4XlZPHzax09v6kF8mmQRPK3wgvYrYXoTRlVijBJkExJLn13oa682xols9y/9PkNDTKbX/FX UmGffKeTs/d1FreIw17g34erNmEboYkXONmsoqnz4oYgH41G4W9boZHo6zHIzhroAP63IpCVRpW u2fjaOWMb+55rMei2VjdpESAlIO+B1cIKmL9AOvFpmcqx14x1T7BURGbcA== X-Received: by 2002:a05:6000:2511:b0:3a0:b5db:559a with SMTP id ffacd0b85a97d-3a3537b3d4amr1958947f8f.59.1747304793004; Thu, 15 May 2025 03:26:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:32 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 34/58] target/arm/vfp_fpscr: compile file twice (user, system) Date: Thu, 15 May 2025 11:25:22 +0100 Message-ID: <20250515102546.2149601-35-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-25-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index c8c80c3f969..06d479570e2 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -2,7 +2,6 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_ss.add(files( 'gdbstub.c', - 'vfp_fpscr.c', )) arm_ss.add(zlib) @@ -32,6 +31,7 @@ arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( arm_user_ss.add(files( 'debug_helper.c', 'helper.c', + 'vfp_fpscr.c', )) arm_common_system_ss.add(files('cpu.c'), capstone) @@ -40,6 +40,7 @@ arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( arm_common_system_ss.add(files( 'debug_helper.c', 'helper.c', + 'vfp_fpscr.c', )) subdir('hvf') From patchwork Thu May 15 10:25:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890170 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060460wrr; Thu, 15 May 2025 03:31:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWX0i8wADmwUZZj/WzjfDwh+fBU0cfmUl+zj2ztpwmM6ax1BjjS4gwuM8zzKSVQGpu04oj8Lg==@linaro.org X-Google-Smtp-Source: AGHT+IFCzikSEuYVWKldaEwyQvpsuY6EmbmIlirVqI8AM1aNGU/OdUxEM8nOh2CGCf92sVvF50Yh X-Received: by 2002:a05:622a:5984:b0:47a:e616:cab2 with SMTP id d75a77b69052e-494a335a736mr35200931cf.15.1747305091073; Thu, 15 May 2025 03:31:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305091; cv=none; d=google.com; s=arc-20240605; b=eXdpwb5Uc7vqL+hnROcfD0y0vmxp/7n1wujIv1VGQ32AnL8gT7YlOZ8S3zvlqmdV3o xZyVvRei/bTEXUs4IuRCQ9Ru62iS+fRvsCbWDwpKjgjJnBFxZ6WV2ijWkPVbN344t9Ad tbzSoOZgnNJmTKMuuhn0t5MGLGFzeFcPeyE2cWJoZYlyKc74GXBD6w7mMtT/cz8Zs4d2 GeKKDEIfoRD5KJQbXEuAIKUPaAyqJ7/OPpN+oIOj6R+K9aVb4t9/7dh41ErUyqgvE+uO Ru83uvVy21ClRH8LjIanVslTT1xekAXYAl6EuAsbWkbcbKU3ef+M1XYZ3JI0Yn2Z38h4 EScQ== 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:to:from :dkim-signature; bh=X3sKaOriNp2h2IwJgF6fYokuc0VVHT+FQQSKLvZf+Go=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=V2EOAHBK1MWF/4rHwfK0SshpY9XYqflaAvrCvGwPH72WZH12/fwWodmDDoYmnVtSkf PY/h7pno5aEU/LVEl/3HDNofTbOEo577eKJ++/hWcOeoV3PDAezdkPwdb6bG1q+76PZA 2yQTs7CgDI9zUxi3EGxnhZsogwMz2ChgHohmAKZUMIh/RNesJNaSlrO3VEVrM2TKGL/8 OuxhbDWS/JdCClOA5PKNuoefB7eHeS7+BhxAY0EJBKM8Q3AP/sayOBKQYwBVAu9RRqs7 gby0o5L3R828pjNhAXSUhL1+Ojo4+GLDvXgUczJTxBIB4EBxulU+Med4kuAa/VHJ92Sd /fbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h94PPpNm; 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 d75a77b69052e-4945259b1b4si156570081cf.514.2025.05.15.03.31.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:31: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=h94PPpNm; 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 1uFVop-0007fl-M3; Thu, 15 May 2025 06:28: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 1uFVnV-0005Ie-78 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnS-0008Ee-3h for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:40 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-442ea95f738so5531175e9.3 for ; Thu, 15 May 2025 03:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304795; x=1747909595; darn=nongnu.org; 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=X3sKaOriNp2h2IwJgF6fYokuc0VVHT+FQQSKLvZf+Go=; b=h94PPpNmJgdLq6d8m3Irwdvo2W7PmxxhuE1EspynIBM86sylhckxLYAd5NbguyXH7p xnqA6Zsm3FmYYkWkrBb7ybFyCrxbVIXZUxhw9Lal4T9dWk138k5+f9UGwXnjMDS5B4l5 Qhz4gA+h8JPL4qevKebZXSE5Xi9F2ag3aUuuH/kwSqPtzqZe1WExfLyDRToPNbm6TKb0 OOZG96wYWqZtGj5+XOPRdUQKa8lyAQPBWkPCeHzKHAhwiSzC/Ho1oegh0YxffRqCLLkU Mtj+VZuvWx/rZD2FykoRttskKa0f0eOL2HINAs8ej7tbLgNEypGXfmvai4R6S4LJITJa gaVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304795; x=1747909595; 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=X3sKaOriNp2h2IwJgF6fYokuc0VVHT+FQQSKLvZf+Go=; b=hbksqzauFYy9ExSgc0TCmhoeFwyl4e/6vfY9C4zMGUTYMpfRXme3x6o4BnoHIXISX/ ypYFuzf3SUCLoyonvN2+HTDqlTEpujK67eQQyPQmxcaDrOENMv24HqnBXFKkelx5Q8nN VGkE3GpY5vgmrJKEHbbGMHnRcIL3ur1BGVYNTS3xg8SUV2nTUOsPA4SgA5IqBthjsr4L y6MV/HzUlqCrw1QyIgjlL3aBfkHI3Dyz10gg3aj7JIllw1DZr/Q1bIO2ZVYiwruwqInP hRIJFYXnegTWN7vxOX3ZpbIlg+BRWcZngXfVruq02G5oZKyV7/2BDv2XsdFOAyxt36Wn gAfA== X-Gm-Message-State: AOJu0YxA+1jRZGGlvmH/hMiL1yYV2btPin3mQucs7MIlC9j1L0xBdiHU 0STD36BNlCaEeKT5WIN20DPx9huuKADBsALDNSb45Ee/TYke208K243PqO60BOOakz2Dc0fXPQV NXEs= X-Gm-Gg: ASbGncssrepYLzbSwnxIY0NqxK5wr7Pivy3vkbJTcFjMErgaMfGTnW7zJvEZ6yLKwap iej/qao/79kILJUHg9paww3siefQXniyb4dd9DaLF+BO6JlMMqy4aTkbnPSVaPLhkrdfBCSatAy 8Is/zRuTTPfWVU4FAvL8kBbDIZHJcVxnQ3dJDSLwJEZn761Zzek9iF8crx0allKrrE9RRgoK8Ay fTfi/ZZ/T5MI8OiMD/MpE9Djp9AVytqMNie/gCsSQOaKl5Hl0wby8TRBCqxa7pChWTiznH66ip6 Vayaj/tksgaVoOGtZJ3F/9OS5GBc55ZrtFy7wbJ1Thjlxij8f2KZNqOj1g== X-Received: by 2002:a05:600c:1e84:b0:43d:2313:7b4a with SMTP id 5b1f17b1804b1-442f20b91cemr72082485e9.3.1747304794595; Thu, 15 May 2025 03:26:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 35/58] target/arm/arch_dump: remove TARGET_AARCH64 conditionals Date: Thu, 15 May 2025 11:25:23 +0100 Message-ID: <20250515102546.2149601-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Associated code is protected by cpu_isar_feature(aa64*) Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-26-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/arch_dump.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index c40df4e7fd7..1dd79849c13 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -143,7 +143,6 @@ static int aarch64_write_elf64_prfpreg(WriteCoreDumpFunction f, return 0; } -#ifdef TARGET_AARCH64 static off_t sve_zreg_offset(uint32_t vq, int n) { off_t off = sizeof(struct aarch64_user_sve_header); @@ -231,7 +230,6 @@ static int aarch64_write_elf64_sve(WriteCoreDumpFunction f, return 0; } -#endif int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, DumpState *s) @@ -273,11 +271,9 @@ int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, return ret; } -#ifdef TARGET_AARCH64 if (cpu_isar_feature(aa64_sve, cpu)) { ret = aarch64_write_elf64_sve(f, env, cpuid, s); } -#endif return ret; } @@ -451,11 +447,9 @@ ssize_t cpu_get_note_size(int class, int machine, int nr_cpus) if (class == ELFCLASS64) { note_size = AARCH64_PRSTATUS_NOTE_SIZE; note_size += AARCH64_PRFPREG_NOTE_SIZE; -#ifdef TARGET_AARCH64 if (cpu_isar_feature(aa64_sve, cpu)) { note_size += AARCH64_SVE_NOTE_SIZE(&cpu->env); } -#endif } else { note_size = ARM_PRSTATUS_NOTE_SIZE; if (cpu_isar_feature(aa32_vfp_simd, cpu)) { From patchwork Thu May 15 10:25:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890171 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060729wrr; Thu, 15 May 2025 03:32:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQLMWur6eENcNYBFogejFL1VTQWkk05S8erZDQcaK7i1fwFkgjfHBQoFr9F68FFIjfm+EEwg==@linaro.org X-Google-Smtp-Source: AGHT+IFQmzaMqYsqueiA5dBoS0dp1amzOKuf3GjNKskhxV1GB70OWYW/BWjWhsND9WIXEmm6i68j X-Received: by 2002:a05:622a:1a81:b0:494:7057:26b6 with SMTP id d75a77b69052e-494a0e2e354mr47216251cf.17.1747305128682; Thu, 15 May 2025 03:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305128; cv=none; d=google.com; s=arc-20240605; b=YzuXFyAsIk4BCZxpWk6FHMVasl/MJJMJtuiGOoA8472WXIQarlTdcidc5cMNtGOFBM e3nakZS+2BxHOWn86R60wSSLx+UQVyTES1nOYWMFJTPqklfF9xPUDY9Ooy1ENE9NAfLB R8coqsxz0h/lcLqNlmI8hsHn2kQfVmUFmOxbN1wUh2iyVE5LZ0Ak+AQM3oSYonAIt1PS yq4ZkNDeBN8KwhB5sXjZQ1lbZKNgiPJh1buIXHRdPIXkSVtG1GVWPb6210x3sdYmYgl2 ATi5QS/ljB3NVO2Pl2C5fhkeGLz7qdEMQOS55dh+6HYKl5yw5GXpRQ+T8t5UVtOSUYfB i1ew== 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:to:from :dkim-signature; bh=ADYZiGwQJaZdw9waRlCxaR1oZ/Aa3txDutMzuGy18wY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=cVcGBrkJJMNTRLGoeTdDLjfnTq5xaNaI8PYohS/R9xwjLFXaCHQiTNLfwAG3Zo3BNi id4RoLTTc1sPqrA1Lyyllsu7CvxCN/tqDmyP9CtdgWrbvMP7dgjjzPA+9wxUbqrrnAe9 lIy/+vetOAQ25hW5JjFzzOe/wiVj2lOrwJ97Wfrht41Qc04lqRkm9njmolDa51m9Zc23 B2R/47z2ZK+FU8jAbBYSsGqEkm2S045rEUIDQr+LO6z4sAsDWDRNrJ/ZSrE4Ny+SKSQA m0U/OCTX18Y7o8aNMbgPDtZ8l7lQtobLJNZXdZTwdFn+xfCEQtmyuNFTPdmAh2V91lYO NkUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ca0pqXKL; 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 d75a77b69052e-4948641dc3fsi68032601cf.1.2025.05.15.03.32.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:32:08 -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=ca0pqXKL; 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 1uFVop-0007eF-5K; Thu, 15 May 2025 06:28: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 1uFVnX-0005Jb-7D for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:46 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnT-0008Ep-7J for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:42 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-442e9c00bf4so5682645e9.3 for ; Thu, 15 May 2025 03:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304796; x=1747909596; darn=nongnu.org; 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=ADYZiGwQJaZdw9waRlCxaR1oZ/Aa3txDutMzuGy18wY=; b=ca0pqXKLGkhdmqUl/VedyRwVpiD5ZPIxY1nySP94v+RuxYMcPOTDwThPo9/R2vIo3c WkDOahaCaz9Z2a8vF+lKLerPBITlNJeXAcgXV/nbaqbNIPfjmAGx2BesZxkwTYJ7WGbH CGWGwWMKBy5VMxgLRLiKgB+Q3FagmmsTg97WItDpp3n2kqEKO3uKUI/YaFKkcqgHt9h0 rD4h5a6h4J+zBJLuu3arNybB0Olz+0mDvlO4A6Ixa3oFuAFx8R24/hYgFtK5djg7EFOE gTGIecUi6S+R81NR4SWQ1bH6BAdoQoMcA6C7z+gRDPg/YVPJ7VGHv8i79FPP31oqfl4x pyeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304796; x=1747909596; 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=ADYZiGwQJaZdw9waRlCxaR1oZ/Aa3txDutMzuGy18wY=; b=rM4Px1GZiHdjZTRvRXlRYAVAAtEw+CIMzpOQSj3gootqOa47KtDn3idQnYQ0Z76c4d wAAB+dHogAMnCQ/7aPCIhaueZgfK6AUNxR0SSOTyZH8joF8dNVLKLVJAqrjBLLFMWV4o 0hng7lZFs2Iwf0yHuykiA+5z4WorINj9O/VndpuS99QJa9d6XLIHFcUuMTLVJD3Ebub1 FC7/GrHGvD/odp7k38UWx90C46CmxDQDHZR/gopAJwOMJhtpYNqy6rkEiRkw7fNlqSnO 9U6rPuP1QeqVdScByLJfrV/kvGq+e8sowJJCbTRmCG74/Ua+1ZrBoa+p39SG7T/26sbZ fcLA== X-Gm-Message-State: AOJu0Yw1FWED2r/gERjJQvefEAPEfAi4kEfA5vHsIJ8xVymSgN1dRYxP gwruvOkVVuLxrmvGg8EbZyr8IphNNKQxa0vM5PPDXM8cpkzsTk6rWJl7heTXoiUgrPJed/xrg/t 56kM= X-Gm-Gg: ASbGncs+fS6KYMUbMFlVRSZRNH4EIMe319+LVKlyW0WuJHA55u1DoqeGhqEG++5FzJR jDRIChCjuFV0hIPLQSRnap6L698KlpK17Pn9TxTjhJrup9qxZk+4eZLwtIgwui7as7Nx5LT/lcI +6jhKmsYTCLlTbEmiWowslALxCSXhqAWQ44M794lnlO1ieoUuaD3KzeB8VZfJ3RF5PjNfpHGDp8 e2e4rFEIU2PeshobpNlkqy739Ljv1+FRWNLZhfH2PW2wpBJkR3IoFb/f7YOjxQUL+eFd/Mp95Hz O2R4lL1Vpc4FDovJYlJjWmfDRUZDL5fRVYY7hcoMKdAsdjSoUMtCS3JHXQ== X-Received: by 2002:a05:600c:3f08:b0:43c:fd27:a216 with SMTP id 5b1f17b1804b1-442f970b20dmr15732035e9.23.1747304795683; Thu, 15 May 2025 03:26:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 36/58] target/arm/arch_dump: compile file once (system) Date: Thu, 15 May 2025 11:25:24 +0100 Message-ID: <20250515102546.2149601-37-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-27-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 06d479570e2..95a2b077dd6 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -15,7 +15,6 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() arm_system_ss.add(files( - 'arch_dump.c', 'arm-powerctl.c', 'arm-qmp-cmds.c', 'cortex-regs.c', @@ -38,6 +37,7 @@ arm_common_system_ss.add(files('cpu.c'), capstone) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(files( + 'arch_dump.c', 'debug_helper.c', 'helper.c', 'vfp_fpscr.c', From patchwork Thu May 15 10:25:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890201 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3071286wrr; Thu, 15 May 2025 04:02:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXm1h5UCdLoqD9WErtS/CQrheDRo+ykb3SCJQ04sMxSH2b3YgFkAT43lX/pjint38B+L2cfjQ==@linaro.org X-Google-Smtp-Source: AGHT+IG10OXaBfi7R0eEleIP/ciIpEg35R+SA0XgvQpGiVsWGfruMoOr5S7WbPgBMDuLo3oU2pSO X-Received: by 2002:a05:6512:628a:b0:545:fc8:e155 with SMTP id 2adb3069b0e04-550d5fa2bd4mr2418069e87.20.1747306927160; Thu, 15 May 2025 04:02:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306927; cv=none; d=google.com; s=arc-20240605; b=U2j3aAMk1DOIFIuhj8VOZprsCqz8Gxno8FU2lhatcvuwW4KHZqAruiMjChxPUrSloC 8iZFsWg6QZlzLe1zG1AF/dTFEs9in4L4zLIesKPXt8Jf/BP13edoc+yc6m0zMTsw+127 RlJ04MatYPU5EudFX6Cr9C4cMehL7lR9MfllrZ34UiHWE6AQj5ADDtVwgmoHTTHeTmhu 4D9bSDbPN/FGAaTkbUwGvak0AwkdNl87fR7vnaC4xVA5rYRPDHT4zwq760vgVTl/GAxC QlxeRXtnut2wfXI7/ls6YaW9kzOXjsBRW18q7KpkgCRUVbMHXBvSUKCfBwNoFYx6zF5P ft6g== 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:to:from :dkim-signature; bh=B60awm+HLGNl5/+mKblvLLwTzjYJ+2PMTdxexiaHS08=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ACBSHs1EbxJ34vfDz9ZdB8D6MwsbvSyTCGjGbxLHF+u8mKTFlIzxnS2nbx/J6TRmo6 rYpklWz+whOAZwLWjbTKmrxF4i0G3Fx4W3ljBGPf3IK10TQQOFLxL5ZoFllh6pGjE/p1 MtJMapn68QKKXx0T0wZKaghevnK2mYTmbAYoVzjfraYwI+5nJpliGm6bHBkkk5tqAZSc c715uURGNLHJbULspC88HdVx6Cec+E6qjEola8LGTegeyT/f4CIssAn1y1N3vpfE9srt SLjitCom3dzPL3ycR6jGvxJ/7VL1wuqjMSFFFvmy1baRHLKJ1YuAuQt/Zb6ZLyhF7+e3 D2og==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C0SPTJb0; 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 2adb3069b0e04-54fc647bddfsi6663756e87.155.2025.05.15.04.02.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:02:06 -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=C0SPTJb0; 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 1uFVou-0008A9-Q1; Thu, 15 May 2025 06:28:09 -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 1uFVnX-0005Jd-7K for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:46 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnT-0008F3-7K for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:41 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cf848528aso6417805e9.2 for ; Thu, 15 May 2025 03:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304797; x=1747909597; darn=nongnu.org; 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=B60awm+HLGNl5/+mKblvLLwTzjYJ+2PMTdxexiaHS08=; b=C0SPTJb0n9q8gjZzHYjzI/JiqYLWuRUgilKKFSg5q/TCBSqvCPv4K6eEuOgKcTKQ0Z rPjGjeAFWnq5CS76hNAVEBtDZzNQ0ABvZ+bROVoFQU/ZiXbsZxmRyUZfwng2ErBsOqp/ wjKJ/LOSlatEiX3BKwZprXtETKcyqkTda1wYV8/X8/VpaRgi0hKv+OAF9lCv9dYW9g5q Ga2bVFpQiowLGKe0mY9bb1uOCh2nGHhJfNy6Pojv/5ozRnlStUgioxHAJJAcZlwLbJeq hbcffqqL3XVdoRfePRaVxST7UxXeGl9YDnGTedeLN/BirQE+RB+DT6B1H1i+Glf/ywcM otbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304797; x=1747909597; 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=B60awm+HLGNl5/+mKblvLLwTzjYJ+2PMTdxexiaHS08=; b=Yt1DtYbamwlIZBp8TgnVQyrKLT0HKBzoflBAHLfavciFgwQzu6MXe0d/Z69hVBRg0K a03/peYfuHRsNY4FXNtWuCv1kPbjOll8eEZXhko/9J9LZiiMUQXWB+eHzVmBdgJqaixJ FS7hOpJK2ziZeiNJTWv84ntGQ44d7G4/MvT0T9HIPn0So6XqDfpDRLPQLL5Paq6uwOvQ URhDzKFiblpzZJM3ol9N1YjkGPXFNPum6pI8IUJmvCTlBGA3hLBuuGM3P9iyIKDNbuFI zwhpFFaRKzW4rPBSCeTru1+wvKdkBztLEXAyUJgsIeFQywz51F5S0W+FaI2is3FrhzT6 nHAQ== X-Gm-Message-State: AOJu0YxeLqRQURp5fk3I0oJSRSnK1ETqIcwa6vhGlLkfXhb1yAJg/6EK 8QfMtROQKu57f6F7PASQPHaZy47iIW+8nQY73lES1rbFeJjCALff47VkSwT42uw4DLj0PxHPn0/ OJx4= X-Gm-Gg: ASbGncs2H2e1TzNLo2D/ohUQWzagBUh4Jy8M8tL4RUBFd8lSDzh4YvozH8B+lyfQf/d vUmqyuqVfNXe2+jupQ8Cmc9Ie5Jo4dI1EMN1MNjFKLkxLaSQPxqRz2LJDnDwICojC2tj9UoKK3g 00pvkR2xtg/1PQFb0QkAWUK4Lidr6jo0dgJpJy1XoLWqLz2zv1zT6H+Hzxf+SwLFk27rQnKq2z2 ArM+NRyhRaxj7xgCWozOuKblnnkq45Pxyf8vk2A7CnFww6OGJRAeVP+IpTeKS6+CHrDDrjqMy+A Q/hY5cYcfmoaWhYXzN4oSeckLV3DO1CGGZs9ZwO53vJqGchiTBtmXOmv3Q== X-Received: by 2002:a05:600d:1b:b0:43d:4686:5cfb with SMTP id 5b1f17b1804b1-442f4735a8bmr46573915e9.27.1747304796751; Thu, 15 May 2025 03:26:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:35 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 37/58] target/arm/arm-powerctl: compile file once (system) Date: Thu, 15 May 2025 11:25:25 +0100 Message-ID: <20250515102546.2149601-38-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-28-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 95a2b077dd6..7db573f4a97 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -15,7 +15,6 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() arm_system_ss.add(files( - 'arm-powerctl.c', 'arm-qmp-cmds.c', 'cortex-regs.c', 'machine.c', @@ -38,6 +37,7 @@ arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) arm_common_system_ss.add(files( 'arch_dump.c', + 'arm-powerctl.c', 'debug_helper.c', 'helper.c', 'vfp_fpscr.c', From patchwork Thu May 15 10:25:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890172 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060971wrr; Thu, 15 May 2025 03:32:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgf0LYRg+NtCeipta3713mYDlUfzJJ7eWhymdeE4noFEar9S+jmVkpw62xvHFzEgWe50oTiw==@linaro.org X-Google-Smtp-Source: AGHT+IFWyLvCfRAzYxPPb2od1Lsl5tKZG4PlaxXVRnLJ3E/PJ/c/KK9tV+CCTE444MwThZBbCw9J X-Received: by 2002:ac8:7441:0:b0:477:6f6d:607a with SMTP id d75a77b69052e-494a333ea97mr23084271cf.7.1747305168973; Thu, 15 May 2025 03:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305168; cv=none; d=google.com; s=arc-20240605; b=Y+tHYkwcltE17CvziAwj+rhvzEqi+TaCFfJ8wxn6AlaybdW5P+FlJZh1Bmv7xDr3Uu AVE2dQOqA4n6hB5/X0zVMoKCbTidOGapB+s5KIUIWypQQAR5UM+TfsQg9RhmDBL3mASb GQv5Ke4uI61YgjfPzfmOsQ9TZAHB4sAvAsOn/oeZ/HHpfsVQPt/QGWJr8SjCFT42yp+d uVR0gW5h5vmwLvaRbdNMenvanv8NTjcRmqgkTz+b5Hv3CsF6edxJB1MpeR3jeIUZ+sS/ VZ+RmupJGNC3yUSiDYEBdk9dKyjPCSvIU1rs0DwJKHoRdldglILKPJL2YfHHM8xpEDcm wunw== 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:to:from :dkim-signature; bh=L4y+E8AlUZJJawRvRasL16CerSr3cx6XgUGc/DdJyiA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Yf9s0QT4H3S9hos0ZrKZrYGDoaQa4IKPZYHF5uAPLUldu1JPGhyly2qBaa8rj9lqMN MF4rOmNQ8sbgpiS9DdPGlB+BpbCgjb7qZfaUcOXP5YWZlOmvBXiIF2mynlOAoNmDYqGj VJKGrSw7mo3abOaQ72lXCwr1hrs70MV6SskaEV+cubCTGMwLXs6I9AG4RWKENWIWqCQH InxXuTxDAZ5QddSq/mFiSY42zCWECql1CtiEv17S8TgHtmGuc+zQ/Evn9DtSbNpxZIsy H0Nur7ql7lItNP0ZlNV5/XGSOrxyYsykvEFsaOcXx/QLv/cxMoPts+Pxiw3L7s3hPr5b uxQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=REDDuoH3; 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 ESMTP id d75a77b69052e-494524794c7si167908831cf.169.2025.05.15.03.32.48 for ; Thu, 15 May 2025 03:32:48 -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=REDDuoH3; 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 1uFVoi-0006ys-9M; Thu, 15 May 2025 06:27:56 -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 1uFVnX-0005JX-7B for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:48 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnT-0008FC-F6 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:42 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so5643815e9.1 for ; Thu, 15 May 2025 03:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304798; x=1747909598; darn=nongnu.org; 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=L4y+E8AlUZJJawRvRasL16CerSr3cx6XgUGc/DdJyiA=; b=REDDuoH31kR8gyge4JYx0n31nrhrcScpBU7C8dOX/dDfIUR1xhEMT1kgxyBpOj5sBk vvt+54bfpdOfvR+ESxKfcHrrUejkk3n15v05igoqwGN24pwAK0q4nZqe1eaZpcCASWYe 1RP1aBco/LmgU0irppsIJCQxlpC3DFMuqD4AgEp1jxQAn3nUXyLDOmfE21tOLY1z8wEA uXwuFuQ2NcmQc6b5VsFdVmLLaJLusQLf3qdMEHs0GiQFjrkIhMlluyRtln5fBXR+5xGZ SX3FCdagEaTlyvsUvtE3Pn2k21AYDeJYImvfkWkz45R7akKjWUFqzcZHcG8yfHs07lG5 b9iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304798; x=1747909598; 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=L4y+E8AlUZJJawRvRasL16CerSr3cx6XgUGc/DdJyiA=; b=jNEo+RRl8v1fSjAZkO3TBYQDY2isGdRpnSBFdxu2RfgR6jrjz/fE7BUacVJdYWvU5G xyeIarj37iek7Bnw9bXBgvQYhxmpGPVij1zlYIsaT/LRW4RAPFJGsI8PeJmlEZ1WME12 pkAZ8gTwbTatPrC6C6419hPKIPJTF1Ijc5ZZN4TJsDFkj5zMo3Ze49d/T3bsH4F2n1L6 AK+rG1uPQse4mS7YVKYucMAfVuY0UhRJFoQVcegH+5+/nTWiTxV3h+vxPjtWnwl1i48x +za0w74xCoaIMG2l679v3ak8QNABMwe2FUTPrnRNrVGDFp7uAB8x7m/KkjU31tDcV7Fd JUXg== X-Gm-Message-State: AOJu0YzLSpLBc8RKKjsRPVq862JRpNyNcqdoKj0wVD+x4HstUeH9ZXqp MX7oI25taA70XuscPsTfVrgn75hLl9SEfFmZwCNxWByyrC9XpZ4v8WLWN5c4WX/wO0IMp9NMgQX qZxk= X-Gm-Gg: ASbGncskTwDg+PtxlASMNEmk2J9bk+Bmbeq2hPMduEvINd08W/aJIW58sHfyrNvGlnA 6D45BtCbWvcOTdKez/WwsLE5ay22fTUErr7UhzOsJklLN3nwYg8HW2un0kEMu46mPyGhQQ52NnL uALMCBgvUm6zUmW23SR6bdOcMACdNKrbFlJz5MSWtWrmDGVj7pK9cMh/doVPTFc2gtHlDc5gCRt DRrZEao44bAE0/9qS0cjdRc/Yqz9p9T+5yIqNtoFm4Y4TTc+KnvMeCPcoOB6nFWX2wWe34UlPzl S83oXRMGWK8ChE9XU/pr6x1VSLeopVrfl/pJlwJPiOcHvCPd/+Bf2jZqeN6hd6Fxq1dG X-Received: by 2002:a05:600d:1b:b0:442:f861:3536 with SMTP id 5b1f17b1804b1-442f8613581mr25387725e9.7.1747304797663; Thu, 15 May 2025 03:26:37 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:36 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 38/58] target/arm/cortex-regs: compile file once (system) Date: Thu, 15 May 2025 11:25:26 +0100 Message-ID: <20250515102546.2149601-39-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-29-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 7db573f4a97..6e0327b6f5b 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -16,7 +16,6 @@ arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arm-qmp-cmds.c', - 'cortex-regs.c', 'machine.c', 'ptw.c', )) @@ -38,6 +37,7 @@ arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( arm_common_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', + 'cortex-regs.c', 'debug_helper.c', 'helper.c', 'vfp_fpscr.c', From patchwork Thu May 15 10:25:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890167 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060228wrr; Thu, 15 May 2025 03:30:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVaLpvPd8eIlLZtpa9r8Jb+rgCjpqLthhPOPuwMzrA8FBzbcjOU7+DLrmUvhbo+Y8vy7UbSlg==@linaro.org X-Google-Smtp-Source: AGHT+IFxBeMQ2pioxNZ8bdjiNlhgibciz0H+EbLfvuXDbOzK69U3TghobcfCLZlutamPpz/Q7iKA X-Received: by 2002:a05:6102:3e19:b0:4de:ed21:4812 with SMTP id ada2fe7eead31-4df9568c2cdmr1256554137.22.1747305059365; Thu, 15 May 2025 03:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305059; cv=none; d=google.com; s=arc-20240605; b=foyH8bygjqeVnHc6v5F5Wo1Ua4ZDxtmPhO/t1KIYbr2J14+k07IDqCYb178JvUSdrN iqdn7mGl+j/MJ+sGxcTx1lKvjmBgI5eI0hq3GhqK5XiMaLYpH+CxkLZswzXtW7TwVGcz XM2Fna0jVtr0sPMhyzuS5Cr1lu7EkvFlJt9lS9ICaw8O89wiNRWLlZf1xX5BIywfos5B HhqO+DXu+tTCHn11rnmhit1OTAibOtQd6g1rRru/6IjpZ5udddBsAQl/S1fTzB9DHPeH 655xLQWV76o0jO00FdoEcW+Vfq8P/6N7AKpBCmhdfBMVu9dArl0ehOJHjKVwWNgRv40X NSoA== 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:to:from :dkim-signature; bh=VzUYeVehWBpH/+74MDsuZXiS92S2Pkyo2cNDX9duuiI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=GXyVxjco4vkOBPC4cx5pmvfAR09thDHBPcuJlgVY9up81gq16813o8jOf9wTCboVR3 mTl/kGDFbwJKQFR6ShfVkQ9yQ9shQHmupBBZSkPhp+YMDx8hJdISgyrb6kapXFtlxg4Q xsPVqRtPNKE0B14n/5tkDhuAMCLS285sjXfr6P3mLwzc+ZRw5WIKRMgKNG5/bBl1kJ7d vLWfn5DWBb7XuqyK7M0nun4VayavObJtuq7wqzIT+mdCCjmX3IyjcUQ6YFYkwC13iTQT jv3rk20qlZhwAPwODsnuJuAnInOnX7/dyYkO19J63rwkfrvGmX+3x/3X3V9dkgpHVJTm TtJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J6qYBCN2; 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 ada2fe7eead31-4deb200f174si5672160137.444.2025.05.15.03.30.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:30:59 -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=J6qYBCN2; 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 1uFVop-0007kv-UH; Thu, 15 May 2025 06:28:04 -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 1uFVnc-0005Oa-Qy for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:49 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnV-0008FV-2N for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-442eb5d143eso7720095e9.0 for ; Thu, 15 May 2025 03:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304799; x=1747909599; darn=nongnu.org; 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=VzUYeVehWBpH/+74MDsuZXiS92S2Pkyo2cNDX9duuiI=; b=J6qYBCN2jpHNjf6A2qYlIowzteap/W8apVEM02YKaAA6beXwlV8CXBbJS8GcWi8IuD xY3Tyz/s0nVz6YZlHL0TlFmXNgPYfd5fPCQmkBYIf2JI+rMWIT9uvo4bF3weu6NcHK9+ EY5XA8SkUZFMDJ0fjYVBK51j4rMREl7Ln2Z4rVIAOqRJaSO0Ej/6DqZ5NBJz3uLomXRW JN4yBtGYKDg5DE5kRElFZ5CAwk9nnkB0quA2twSWNLtG2nEli3UkTBjHI9Pts1zTPaW2 2Ia52GzOZVmjELnL5ofGA5ZCKi1ZcAqYB+BU5F9JQ8A0Y6NsMdG0G4T7/zeQKZ4ks92o 6lOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304799; x=1747909599; 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=VzUYeVehWBpH/+74MDsuZXiS92S2Pkyo2cNDX9duuiI=; b=cqRZ+Ti6IRD5Sf69XIcDJ/MC1usjzdIOts0HISnTuxncD9sIvATBmcfygPT4y4Xfze 40GWBA61+OgY9ED73hcnzEEZnO6fpzTtOjwoDM9F3EXSZXlox+z+X2Z9rvIpyy1YSzps AXalFwcIKmjFFx4a+WkwczDIrQeWbAM8mD97KykY94QxaNuglK3TtxSIgPZl7btIBPTC cHWwRf9NtVSOQFFQX3PN/3adNLJCkWc3SIbZpskyg2OQIp5rygWeSxTolxbp1LscuQtn Li3M8ZUIz8ah2MDFsYaLgjCQy7jQjiLyuSM+n3znAku7sG6KP1wl61v6ctcGJd5aev2J luTw== X-Gm-Message-State: AOJu0Yzhl2EOen4JCYOLJvyDwWa7hv5swqBa1MJUsI4vqjdjsWvXS7lt aT2ZpdDqo4bukjLkoFU1YNEhoBlJec2I1txh3y8zY0O7hOD26mT4euXw1dATyCkFQ72RR1snt79 7w98= X-Gm-Gg: ASbGncs924lGvKxd2NKNLQoe/jgaLNBBoccuhDFnFHEvDN+75qZJ5slwHysssM9kIWL QvRfpbMTxJx5FHSCMuste9ow2eLdJ16bzIHsMtm2ETUyaII5xk1axKJGy3WDGr4kREK54gkRq/w hvNq7m/tML58X8TN9kEa7Y48bsGrY5HZA2PU85ug95NcckVv5u6Myw8fim9SNFcMKZ2BUTigtsZ M9HXSuGh+Zj80InF3OE1LFaaH2GUY1qJDo8W9bpfmfDPz/YaAf1rd4Wc9exgTsSgpQ7+7d8QwnK LDsTJipvkac7cuLRn5x5mDrVArxMB0Vz+0KDyek47rEAaXhTa2JhVCLxkw== X-Received: by 2002:a05:600c:8411:b0:43c:ef55:f1e8 with SMTP id 5b1f17b1804b1-442f20e93eemr68286735e9.13.1747304798681; Thu, 15 May 2025 03:26:38 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 39/58] target/arm/ptw: replace target_ulong with int64_t Date: Thu, 15 May 2025 11:25:27 +0100 Message-ID: <20250515102546.2149601-40-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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: Pierrick Bouvier sextract64 returns a signed value. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-30-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 89979c07e5a..68ec3f5e755 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1660,7 +1660,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, uint64_t ttbr; hwaddr descaddr, indexmask, indexmask_grainsize; uint32_t tableattrs; - target_ulong page_size; + uint64_t page_size; uint64_t attrs; int32_t stride; int addrsize, inputsize, outputsize; @@ -1733,7 +1733,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, * validation to do here. */ if (inputsize < addrsize) { - target_ulong top_bits = sextract64(address, inputsize, + uint64_t top_bits = sextract64(address, inputsize, addrsize - inputsize); if (-top_bits != param.select) { /* The gap between the two regions is a Translation fault */ From patchwork Thu May 15 10:25:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890187 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062203wrr; Thu, 15 May 2025 03:36:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUL3QnpX170X1XZck9gpbjk2g16DC95Lo4+cIylEnlK1HpfymAAY2JofYh7ciB89cGklElPEA==@linaro.org X-Google-Smtp-Source: AGHT+IHAwLDPUOPvk2PKClmrumPe+bSy8+M4amvK7QwbPi9cQCgfFaPTEv72ZYpzJeC3pM9u34R0 X-Received: by 2002:a05:620a:4147:b0:7c5:3da2:fc75 with SMTP id af79cd13be357-7cd287e19f4mr714897885a.24.1747305364709; Thu, 15 May 2025 03:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305364; cv=none; d=google.com; s=arc-20240605; b=WOhQwNl6L04tJAPASdGCVa8qs/rH2jX6eB1gkORRXujmN64V/KX1BV2qGuyJ+3kANr hFKhe85o4u5rt6cTxnd70LtmsEJtza0MaYgU8GMLysb2Hh8WBpMOLg1Ue/aYiparTnrm vOuxoaHU7fLgUga1TtzHqzY2iTlK340kJg2CFJUrXIsHVjKwP6FbtgaL6RpGVJTYGxdI vJJN+0nv1H0ib2KqplqQJipmOvk04mLFbGtr0DxJI1RFkbSAL++RqQsHNGBR+O0tkcIf CZT5s0HORX8y+p0nl9VEEymufPuqkGkd/EY3pMEPxKhiS0kisxDWj36wZYjvmzpL+jvo t3vg== 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:to:from :dkim-signature; bh=M4wis+oyI42kUUV62F9CkVaRrtKVkEpqI4xQo+H0IZg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Ef7/5w5vaivyTG0WvO5PGnOH4fIWCmj/9IKLXqCj3OE1CsrezbkNVNe9F5v/VWbRDW 9KXDVyMzmj9GS3h5kPgs9cIrRkvPbn7UaQ4qL8yjp9mHwDjT1yvmm3d/WiC+81h4l0De CnPPx5llNWu/UkSoSvlAzXHRVwGe7f8OhkDrWP0wiOE+3ZDUIrUn29SArivRR4EsRWUC 4JAhRMMSf6VCSGrAaNG4tLIsC5/8Q4d2CPJv73ob9pTvuY+echClSxQNy6BZi/iTMSVk hOlbfMS2+1cKeVeNTrO3LBW3okq1Wqrtr9VgofL7qQtRvhyI3Up9/fiLb/7ApTG4C2ny AhYg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tnHJQNA1; 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 af79cd13be357-7cd00fe2780si1675625785a.449.2025.05.15.03.36.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:36:04 -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=tnHJQNA1; 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 1uFVoO-0006NR-CQ; Thu, 15 May 2025 06:27:37 -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 1uFVnc-0005NJ-DV for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:49 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnV-0008Fl-9d for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:44 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso7149225e9.2 for ; Thu, 15 May 2025 03:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304800; x=1747909600; darn=nongnu.org; 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=M4wis+oyI42kUUV62F9CkVaRrtKVkEpqI4xQo+H0IZg=; b=tnHJQNA1GFqHW6c5plNcxqIZGLgppruWW5wt+JWdI95RrebGnV24LGqrw4PY87Fl7z i87J0O0iwfzNZkmarl3U6sDqmx803CVBqpoD/XO1bp2BAQKW0Kl+B3CTvDIJqMHs0Bd8 2FC46hSsiWfFbv4tHDvxGzmHNUBr/FATwvQQYkv84p0irFTasw14cgdGELAfNrZwnzlu V2K09ZSl6Y3Spo+VQwm6lmMKoRJA/R+Aj9Gy1o2v/qYEIoNXK+d54J5vtSm2wRHbA0iR 6HV7nF4EVb6R7N4iCoUSLg11syN0AAn/wNf6pLCuczjRMYnDHKkcDppLKEPlzm5f7c/r jN0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304800; x=1747909600; 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=M4wis+oyI42kUUV62F9CkVaRrtKVkEpqI4xQo+H0IZg=; b=l7Yfl350sf/63PHKn/cIciPtW7K8RPKv7n8oSpCHXuT3cvShKuy9nryY83YdGFwLEO 1EiohXrNKfy5fAS94NUsebzKmuJyIhWD/PFgz/POQI6pNRj5b7/m238kkMleXH/NIPgR oRTfEigujAY/sROOIXvWfDBlh37GtQyGGs7crHwhwqODMuIr4woUC6mD27tRUICM/TB6 +wfidRfc7NRXRTjc88dpdnmXutNOWs5dqtk7dnBAkb+jAUJyzgejxC28P/k49MNY4rwg I6R+xTmVqMJQ8nyKcFFWgp0xLstSTQDxwdybs+CFzJ5gTjPQnAeZAL9RbaGqTeROXf0m hp7g== X-Gm-Message-State: AOJu0Yz9Nr874oY0wSHhZnM6OYHUdGbABtD2gPO45aTlpaV25yuYTJ2u +ncNSDnjen1I/esqf2AIUQEtcWXgIencCml4g9pjVXIampJNHQQjbTwQ6S4A0MFgD7XfgN6n6/5 anJE= X-Gm-Gg: ASbGnctMjpuozQgcQzmRFAKNdLZDBNIYqj7geMLjg16JTuU/EXw5oXCvvje/gzZNL1V Hi5jBotlb2IbdOcf958/bqkH5jRDqRon3c6aM412a16qcG7kbwKi5Hys7oK9c+wTAX+jA5U1saH LS9fPyiWkW1pM5d1Xz4/Enzev60NTRa8FyZemH2TVuSbDr9urrLwkgvPWwhNzpyB60OJ+rk+WuI EIQoj4lycsxA2KjywWtFlsckUCv8nZmyjwRDuxYdohQq6642qe5kc34UL7oVP8gZ+32/g+k/jZa dIUsgA8HFahkadrH7iH3+VnGmGVSdZ8ZeGqZgYFz42CIHc1dhW7fHwUOLQ== X-Received: by 2002:a05:600c:4e09:b0:43d:1b74:e89a with SMTP id 5b1f17b1804b1-442f96e8949mr19607585e9.9.1747304799641; Thu, 15 May 2025 03:26:39 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:38 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 40/58] target/arm/ptw: replace TARGET_AARCH64 by CONFIG_ATOMIC64 from arm_casq_ptw Date: Thu, 15 May 2025 11:25:28 +0100 Message-ID: <20250515102546.2149601-41-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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: Pierrick Bouvier This function needs 64 bit compare exchange, so we hide implementation for hosts not supporting it (some 32 bit target, which don't run 64 bit guests anyway). Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-31-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 68ec3f5e755..44170d831cc 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -737,7 +737,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, uint64_t new_val, S1Translate *ptw, ARMMMUFaultInfo *fi) { -#if defined(TARGET_AARCH64) && defined(CONFIG_TCG) +#if defined(CONFIG_ATOMIC64) && defined(CONFIG_TCG) uint64_t cur_val; void *host = ptw->out_host; From patchwork Thu May 15 10:25:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890193 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3068135wrr; Thu, 15 May 2025 03:54:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsFq4k23NpZ1KSKIErSKvx+ht6zylZxQKa9fUceLaKV+wZtdZxpxSBbSwjTpAuk26I83UVmw==@linaro.org X-Google-Smtp-Source: AGHT+IElcYqBr0PujPTrBEn77lqgkyICh0CBPx5Ky4zI8+qWcdWhayL5DXhKU3o8Xkkpktm5arMr X-Received: by 2002:a05:620a:3902:b0:7c5:94e0:cafb with SMTP id af79cd13be357-7cd2885ce98mr1113239485a.48.1747306470965; Thu, 15 May 2025 03:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306470; cv=none; d=google.com; s=arc-20240605; b=R9Cehr0cCs/d38cvT31x0rhf4cBhFE9OLH8ygK4RoHiL3UgWHeC7bQaQcI5WJ6zVEb Q9vy2l+kRBLqpncF4B7Gl3/LXVFtWtWp5yJ1RWuHT+yCoMFkJzxImx0FvJj+hX9VTL+m 8qusNO/Nq7lbskl44O/svG4rK2Q7OmpBcZi/v+O0iNPWBTq7Vk2xCXWHG0/6WJHjccqQ jruZ8hhEuYOC5VK4rv+PMq/x+AChwPgFJIAvaYQSKIEumrkTJEJNTAm2KSEnnsc8hTm9 BJ6rWTkeEjaQGLoNHgtRCgJCO9H+OzA0d5jd1lTIDayOR4Lw8f2GZKoJcdEP+EblrIz4 VmNQ== 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:to:from :dkim-signature; bh=Ab5pp6BZoHOVPbJgDowtlvgwNNGVrCIgmepaEE9nqb0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=iLsoRPTyDGb9r1YOqI1t5JDWtA/dHIGL4GXAnf87wIwUpE6fCiQNLV4FW8+SOhLdB6 bYjpKsKmftb+7rcT4n9Hz/+H0W0h3PyJK1UHr5vX98JulTw0WTqt3jkQ2Do1WXfJrCQo nUQhwynL2Rimf5D5JOa56W6zYuiOHxAE8RGA+e/2oi+rD4BYogxNl/Z1IPQBeWDPX+As T3O349YbtGVLohaqxSp7uG075NwSgDCC2rR67Cr20lfiRXifLoi4kEyUJLWLkDoOXbYO 3Ks9+2PrrGMxmrcVeXz5DH9NZFANnVFM2bu2I3IXIkXpp3WKC/zZ0jX5La17mBIFdSS1 8j1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xlIFU9Kt; 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 af79cd13be357-7cd00f51d3esi1498620785a.22.2025.05.15.03.54.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:54: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=xlIFU9Kt; 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 1uFVq6-00026s-1f; Thu, 15 May 2025 06:29:22 -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 1uFVne-0005PF-Eb for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:50 -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 1uFVnW-0008Fy-Uy for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:45 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43d0618746bso5770015e9.2 for ; Thu, 15 May 2025 03:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304801; x=1747909601; darn=nongnu.org; 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=Ab5pp6BZoHOVPbJgDowtlvgwNNGVrCIgmepaEE9nqb0=; b=xlIFU9Kt+QFf1AHQ5HmOT0dPbicVtkJHjl5UZlf27lVo1az3jSP7cKMeKbokqVAbFb n55VRhWD+hRRXLefB3/s4FYxXGAgQXqh+nDBupaIDHzad+WTBQQN5C1r/LCcXVNj/9eX Zxc6XHZmHcLSxFZfrfSuPU+lxsAnECnouvWJfNZg44TKKCkkZb56HbgeaBqgU3yTQxml OLiKmWJZYM4b70ReBdwGcgrjCyoej7n8i5HMTMD22CBJOWAWQR+unhR74XI3sx7CdRkb rlRiL3fvg4SqcQsOcBZF5NjG9uasM/+2ov84/ZQN03WPAXYn/fLRSZ5NqwyggpRwIcUp yCzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304801; x=1747909601; 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=Ab5pp6BZoHOVPbJgDowtlvgwNNGVrCIgmepaEE9nqb0=; b=uJdvLfbL2Pyo9ej6+Wtmo3RHECieYJOMFttkURo8HS72pIWWgsBaT/fkIvdjMjuyl7 cZDmLQUQyfDg85Lnn9QqiP6eYD7QBaYodn0KlhPxbczcKAsCWqWFaKxNrclVfvn1eNN2 ydvf872llW7iZK7oczMsmr6yaWivCOrHia8jtCGD5WRxhldqce/wCeTUNP2fePkrtR99 ac9DM2yOSggjGq+Is1024moN4ilK+gBaPU+zktiLfFd8jhFBatJfA8cM2+fbWAgkT+Ve HKlVHwKZ9CTtPDPvgvKM++U0gZ8t2inZvI99bXOcZVFzd2UIEotOtuboFkrlpzUxv+mR 1yhg== X-Gm-Message-State: AOJu0Yx0m4FoBvbe8mratK6GQhbXDtKVWjjts2in+MSCN5xv3n/6wpFN ATQqF6xdL9oeKojekqcFS9XXLYHhtLAL8u6g/tM+WBpTvh01vne1ATAPttJ9lkzb9bPnbxfi0DA Jt3E= X-Gm-Gg: ASbGncuv6JHa60kCX04bUXzAwRhrBg1NZaelD9gE4L+DWXOwa5QXwffVWIKoqdVhUGP q+459SHuwgL9fZRx4M7Z1pTrSlagrF3LJCswl9WQ9jqXwcm7ClEfIjApsmsxmDLpFwV7sMNOKT8 KBqKLwwUXWY0R9pQ3IeNKv6M6xuNefuWQjQjrvDKVw6qOVQLwhrF+54ZfRSqzcGD3WimONJwiBN cDrGkE/vDu9JL8GZ8RuyFUtn30/A50VWizVUuTCU0sLX1yu+Dlv8YwXVo6+aL8f+NPboLy13S6k sw/Dab2EHEl0IA4Vh9SyH9erMoC8n2rO/MZ7jScZOl7F+e6YcVaW4xShNQ== X-Received: by 2002:a05:600c:3b8d:b0:43d:fa5d:9314 with SMTP id 5b1f17b1804b1-442f971a49bmr17727825e9.32.1747304800683; Thu, 15 May 2025 03:26:40 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 41/58] target/arm/ptw: compile file once (system) Date: Thu, 15 May 2025 11:25:29 +0100 Message-ID: <20250515102546.2149601-42-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@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=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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-32-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 6e0327b6f5b..151184da71c 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -17,7 +17,6 @@ arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arm-qmp-cmds.c', 'machine.c', - 'ptw.c', )) arm_user_ss = ss.source_set() @@ -40,6 +39,7 @@ arm_common_system_ss.add(files( 'cortex-regs.c', 'debug_helper.c', 'helper.c', + 'ptw.c', 'vfp_fpscr.c', )) From patchwork Thu May 15 10:25:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890189 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062266wrr; Thu, 15 May 2025 03:36:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4H4DhVfFMkhqH6aV5HKRD8f3mWs3xsUA+HUIeWM5/N6y83P9raUuDOR4pJx1rohUH7Do1WA==@linaro.org X-Google-Smtp-Source: AGHT+IH7XlepXhF1sUx30mb6UNEWMfwyOZyLVhBX6ceuHDoA4GmoCt+6IfuMosTTMu6xoj57oT6E X-Received: by 2002:a05:620a:2552:b0:7c9:2787:7a75 with SMTP id af79cd13be357-7cd3c69d659mr243737185a.30.1747305373884; Thu, 15 May 2025 03:36:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305373; cv=none; d=google.com; s=arc-20240605; b=h6y+SzrJfIsxK8stI+eEDULMIMT+RJRShiy9lDRsDme8lZZmiJDTDbbPFKfdlsh/A0 RIy3GAdEJWVtMsaMqgOjzjdCs23TzBsAtGhrDhJN5Q1oX09M1T15sSrluI4iCk5ww9cF bfWegJa6qkdcsme/3DgewEU8WAgXLdZxvIQMeKqZ9Aj0cg9cUpga1euqIMYCSN8xkX3T J+Iv5R+8n/crJ5ryOxP+WxDSZc7eakGX6M/91s2YtCzqhM0L2WcnLunCAtrDQFmHazMN nccqp072vSu+BlbYUjF325sQVmcORbI7t6fnerpFEOYEoIfI77AgShswWNLAtOZpMn/U i/uQ== 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:to:from :dkim-signature; bh=j2FeuUXXVncNRr45/ixdgoWwzsnoHydOQLE8nm4vHw8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PE/2y+95OEbYtu2ajBiwEq3kGjfdHnoGPolBw3hbCJw+tCYLzXmQlfHIZKConHQ9ag ZnHuyw7EynlWjh0S3UXvcVfUXtt+gPDpzyINC1EnJTbfTY9wSt8ULUnZE4UfNPGSpb6a lcQiiK4RSTkMYC7R/NURUNmzdOgQwOgmLwNimP6kt55ifJE0yok7J7Tcnw3rCSVn1oSV GQ8DPbv+wh2aCSaOF+oC4qlon5KDtp+KUi/pt5NytpcBJehtwgRqZ3nKMSE1bD6WtSsk RsbDiQ0NsAtr7pK5uvAMpItYM7kAGQfjJG9bog5xOJzbiPdVN/NY6LJe0CJVqZRCl7DE dhaA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tHKDd36n; 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 af79cd13be357-7cd00f519f6si636826585a.82.2025.05.15.03.36.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:36:13 -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=tHKDd36n; 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 1uFVou-0008AO-Ph; Thu, 15 May 2025 06:28:09 -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 1uFVne-0005QS-Or for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:51 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnX-0008GC-TT for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:47 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3a1b8e8b2b2so447851f8f.2 for ; Thu, 15 May 2025 03:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304802; x=1747909602; darn=nongnu.org; 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=j2FeuUXXVncNRr45/ixdgoWwzsnoHydOQLE8nm4vHw8=; b=tHKDd36nSf3RAT7wiFhFgiNx0FGyLhNqCYlDjQ+x/K43xzv085Oq+ETke8r+aCgWsU tNv4Be0a8IdUZ6xanewWZJFXIavBtlzkPAZHAsCqg3F6cxXuYRa2HmYHW/DjCYkVKGum KNlQYjdmxlOzUVyUz0Nx1sCRfGNOGJsXqDd4Q98M0vSf8Wj+y+XdHHZnvyBf5Qo5OCX5 h9Nb7E1XBDSAN5g1pSAt73j1wu7LJ78UA1Y+kt/qwvPNZfQjboZ6ieZlSGlNLsV+rSiP 8HHyPzt8quymg8oJ4W/PaKk0dBODIcnlNJA8pvsnC8fMMkgMVsI9uh4LCFumh00e6Tfj 2CQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304802; x=1747909602; 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=j2FeuUXXVncNRr45/ixdgoWwzsnoHydOQLE8nm4vHw8=; b=fLfafE/V/GmZX70YjykRDHHTxwXeJBq1TQ/y+VFIp4iKQBy5Izfj876DC8iQL2taSk I9d4nfrVyPyYkSRe1hj+t2sTaxj0lx3nP3pPByq0eUnKzL3Qt6pUMLqCNN9C459LjqQF ZLZrNcYR+khwoPTnnVk7DdhYAKonTDaHiEKb9ZvmGkhJpoyq5itfk77O2J+yzCCForvZ SUT7Trc7R485Q6OHnRv95vMY7JcWbdsStb+iVjcif/DvxGc0CXCNBjXtD6CvJioLBVXG DOF9B3Ap7ceL7fSQEn3wru26FBSOGu+x6w1wuwSVEYk3Dr3uNJ4JkkIvUZR9F7IIXk55 qusw== X-Gm-Message-State: AOJu0YwlaomlXMFDCu39awGChxIh5R2kFy5fRTWo9IqdUYRillEEggND 18mxfK35R/LzgD6H+L1gHcVHI1j07aHrJTBmEHLCQW+Hd+oIHf6xBO7VVfEYpoUbc2zMeHCp1by O3NI= X-Gm-Gg: ASbGncsZQw6mZV+vdvbhWq8zGAd/AnPWsSVstsG6yEYm3w9EggisN7oBGK9vMSF16o9 MOOTfpQmbEKIA1J3ZmXMJz2qMsCFyiI3XqNanJpm7++/N42Ujib5DbjbsmhHiKTMbZDrVY7f+G9 wLaC6fQqYU0kD34HzGc+2Y44XF9cpmSVFTXw+KD1EV3IUNRFgaL2LvhaRV7ANwdY+K1BLLzrjyY +aGnGwhG/NhYDUXfm9EIK+OYoG4BKkkeqCREiGTWnuuNxy8Z7ZRSVWccAGQOdUBvirmEj3eynj5 7D4xJRPmfb/i4q/gkSrvX8ee1MX70AeWZR53VLQqJoH/dERVDoz5Yc2tbA== X-Received: by 2002:a05:6000:1f10:b0:3a3:55ea:c6f8 with SMTP id ffacd0b85a97d-3a355eac818mr903350f8f.49.1747304801613; Thu, 15 May 2025 03:26:41 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 42/58] target/arm/meson: accelerator files are not needed in user mode Date: Thu, 15 May 2025 11:25:30 +0100 Message-ID: <20250515102546.2149601-43-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-33-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 151184da71c..29a36fb3c5e 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -5,9 +5,6 @@ arm_ss.add(files( )) arm_ss.add(zlib) -arm_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) -arm_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) - arm_ss.add(when: 'TARGET_AARCH64', if_true: files( 'cpu64.c', 'gdbstub64.c')) @@ -18,6 +15,8 @@ arm_system_ss.add(files( 'arm-qmp-cmds.c', 'machine.c', )) +arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) +arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) arm_user_ss = ss.source_set() arm_user_ss.add(files('cpu.c')) From patchwork Thu May 15 10:25:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890162 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3059383wrr; Thu, 15 May 2025 03:28:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbnghYilLb2ft4exySLhZzFp7V97qTsLB5PLFAR+cL6Rs4shlEQptfbaFsTrIxw5xvRj9zJQ==@linaro.org X-Google-Smtp-Source: AGHT+IFA32mj6RHoVK3cZIY+wK+4RgfBvO9YAUeHEmqrSvy5LJWapZwLmj9ocivWOewnisKjpuWs X-Received: by 2002:a05:620a:3185:b0:7c7:bb3f:fd40 with SMTP id af79cd13be357-7cd3c652d16mr236794585a.5.1747304922830; Thu, 15 May 2025 03:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747304922; cv=none; d=google.com; s=arc-20240605; b=Lt2tfl0dUaANYiXUVcgyfpjYjZJU/H850F55agUkX9Sv94L13lHpcH2ZfgNCucNWeC Wt+Af3icVXuqau51kQ2I+MHGGRp8jtbRg0M1bzqBjFFFbmuGHEzqyd1ANAs3n9EWeD45 27xQnyo4kQVlX55frxxsRhN+g45g9n6FGvjkz55B9MyDC+Ao7SDMWcdgV6vbMV+7CnCS WBIDXl7o/tN3XU0cjydzd++3yeqY6ccizjN5ELOL3zAeZXV4jfnbUQJAv2DGC+KN5A5r FGu2O9hdyEkc3OrbSZEAxAaBALPFOy1tUo+0sIUpcNMKzkinz2PqwybKY75PODwttzER CHEg== 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:to:from :dkim-signature; bh=3wG4zSFwi1rArYil5Li1hl8FAwjHT+ODNe0per2Kq84=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=DbQpN/gmH0No1c3qvSkSDOiTNDaj37ue2gB/5+kLDqV/MAPVOMxAlhaeM+NSMHPmyw i69eerDxscKKzB/rJ1AFZRBaL2WRyE5riylznLHOpYMB7Y19GiwJnKUn9LhSaQbyDI2z djgnVx7CpeDKnVS2doOvQsvN+rdKHdMRqKa38ZuQukzBetjS+kKG3c26gUh6qe+VOTLE +hEnTmzYe3KcJYGsJgNZUq/m070AUj7F5GmJ5WjT3Dn4ZrfYO7mmU5Up5hTl+x2vOO20 AUVaMx1h0mL3DOm9YF/3ppref3JyzWRBYQVLV6YfePEUuc+Gg0vg15MXr6//2YikSdz+ nvnA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l7eleCc8; 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 af79cd13be357-7cd00fed8c6si1541641185a.499.2025.05.15.03.28.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:28:42 -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=l7eleCc8; 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 1uFVp0-0000MJ-94; Thu, 15 May 2025 06:28:14 -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 1uFVne-0005Qr-Q6 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:51 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnZ-0008GR-Rk for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:49 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so6075925e9.0 for ; Thu, 15 May 2025 03:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304802; x=1747909602; darn=nongnu.org; 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=3wG4zSFwi1rArYil5Li1hl8FAwjHT+ODNe0per2Kq84=; b=l7eleCc8Ttms/mi9j8gDXVgWOzFMurYcGGgy0Kt6rw584cR1PVtDT4Fxn3MsheF0ve p4Ay1wAiroB4Oa/QbImWGP0UVa1OAxlM36QBNiyiOfn00Bm0K1QqAh7vVxO5dpbHGiTE 2tPCNhL0SSWX9YR9C4iRYuCoWBTEV5LNNG3a7sImKMO5x7xXQ0DVUTrh2esHsvwF0Bfi 62Eo88Khq7tThCB68OscxWx6DAdMNZECqdvbUYpX0VOkYV3KlXCYu5k5stAkZxRiXuc1 fOkT7jIyH0mLH/BQgi3c2GDa1rCKgX9N5JmHL/I7MHWteOpoPsbytdQwZ91f2+ti5v1V 9JLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304802; x=1747909602; 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=3wG4zSFwi1rArYil5Li1hl8FAwjHT+ODNe0per2Kq84=; b=vX08+bLggyaIU1jYVwxFTrRTf9xoEiXNCWW2vEE7SMz9urc6poIfUBVpyFS/ZW7k5V sf32WO1k/AfAgdLDWwXtlDxfGm2O0mS+ZuRnzjFRL6Rb4E1CwV7dWvb9gg9OkdWL15wG YjwXZM/oEhccSzxjTMWg1qz7ww53fwyObeyGN+phH4LmjuFyzYVSVTf9wt0fLojqjEH6 bjP3jLUWUVcYodt0hWBIJmgI+Jh7P3RK1w0w/TAXkuwXcQ/pU+PfN/Y301q2Sm7LRIAh 4WzaoXfWo+BtkwNRlbIhR7+IWDK3EpKFWR8f8UtDA9ncFhrM+S/qOuKWu/9iQX34ZFeO JU4Q== X-Gm-Message-State: AOJu0YyMhTWZCSGXIMmO5iCHEImYUSL+PXD4QfeGK5V6dIiLfAR1vm0u tuKYSrgcZTZjzz9DNdafP1UQe9LtC21/PJGXO2bjr1vuduKnpKRvA2vllLrqow3pT28+insHsqo SNow= X-Gm-Gg: ASbGnct3rL/FxmGxMoVZQWui3UpjBkGYxo/ZGmYmzVNnW8YiLdzXOBrirvl2iUZ7J4u rCvo592iimEawAkmcnxPPV7OUfEHNQ3GOSRTJ3YmQmjfr2TA3WR5+umk84d3AvtxSINxWWf5ay9 mGcIsYpgJlATijTQZy/cvokQG04NsTxVh67gfWwLee6/DlZUZdCjQQ7ZtF0gGjGlvBT9zViC+yu Q3CbOQaQQ+ARBVRLk1KJekts6kIhsINt6TWbzNTF3kgjnuUDe2rPc3uIzHBv5fvxti88rx88M13 1aSA9Aib9PgX0sqzkvMP0cUX56avlUU5GAQEMtwTOCYteLZzNVQwx8H/WQ== X-Received: by 2002:a05:600c:34c7:b0:43d:563:6fef with SMTP id 5b1f17b1804b1-442f97063f7mr16670715e9.21.1747304802498; Thu, 15 May 2025 03:26:42 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:41 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 43/58] target/arm/kvm-stub: compile file once (system) Date: Thu, 15 May 2025 11:25:31 +0100 Message-ID: <20250515102546.2149601-44-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-34-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 29a36fb3c5e..bb1c09676d5 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -15,7 +15,7 @@ arm_system_ss.add(files( 'arm-qmp-cmds.c', 'machine.c', )) -arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c'), if_false: files('kvm-stub.c')) +arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) arm_user_ss = ss.source_set() @@ -32,6 +32,7 @@ arm_user_ss.add(files( arm_common_system_ss.add(files('cpu.c'), capstone) arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( 'cpu32-stubs.c')) +arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) arm_common_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', From patchwork Thu May 15 10:25:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890186 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062148wrr; Thu, 15 May 2025 03:35:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/JfPbsyg357NuoDOY605zhnuX4YE+rOGpKN7/FEvdpgl2xXiHDuMFsl+xGUQnOui6d+MvfA==@linaro.org X-Google-Smtp-Source: AGHT+IG0kQguIizCskZ7G/u/wZUu6154uJg2OvHg3VPj88UMHkQYSNLhtwSQQrhaIALz0ntbyGPw X-Received: by 2002:a05:622a:4c8c:b0:477:41e5:cb8d with SMTP id d75a77b69052e-494a3440d25mr37622451cf.44.1747305356588; Thu, 15 May 2025 03:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305356; cv=none; d=google.com; s=arc-20240605; b=N8Go3+RAsZRqMfWPLqlemaZDcCkLfPq02Ab7GchVrN2iG+Ig1Hn9mkuahKUH6um/Fl JPM+9dmfSEzv+WFftjoH0d1C1TVg9IlKZQgivq3wOSTBEdfteP59XdU+vrMpmvWuBv/e QHS6hxyOKhuOzxo/dxylFqBxWdOkqvjYVECNGwHZhrRnqwuWRKaWlGfPLkfFO6mmq7x/ moS3iKZrnzsfCgwUxs/p9nOt4rscWNoopVyLtAySgtIon2W8GqsKD43NablXcNQCOM0t zYARfsvQFokNfXsAqd81gRHtXaoPEgSSDZf4nqbinlSiNmjtSCp2CqbL2YJkF4jNJVHq EWKA== 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:to:from :dkim-signature; bh=8z7jucKXgGdp5W+emuDqDob6i60dnbQ608/2CuYQdU0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=etl3aW8dnKZGAk72crTGcS12P2GCYnWXKgNxzHlQd5AxZT7lOquQUlgl+FgqxPhO5P nXTKICvYdCOhgFrToFmpr0VdrFQFVecn962YGujKCflSfKG2CFNIUwZf/liagZtD48+B TlWTD4TMIhJIPdawsRgg+dia9jAxNbYY9rMu8t6tRGiXwZCZPnyOt8RhdkhuqTscfY+f d6B8vyYuJ2BETfMvZfCE+gNUKzjjVvJQvJKf55BJMuC8PZW9icu4J3laBlF3BZKwlFyU pQ4bYa4WpInVwlCt2hiEYBBL0wzWRDR5GBZONZdzp/J0WNv1tevHVzKP9yJLdH/OAWMN HlFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bYaLmkyx; 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 d75a77b69052e-4945258206asi159973261cf.431.2025.05.15.03.35.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:56 -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=bYaLmkyx; 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 1uFVov-0008CK-4h; Thu, 15 May 2025 06:28:09 -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 1uFVnf-0005R2-6U for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:51 -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 1uFVna-0008GY-Ry for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:50 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so6076055e9.0 for ; Thu, 15 May 2025 03:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304803; x=1747909603; darn=nongnu.org; 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=8z7jucKXgGdp5W+emuDqDob6i60dnbQ608/2CuYQdU0=; b=bYaLmkyxcwwI0W8DNiwcXrzgMKCOeMW/DGX1h/o9P8VlgN6wqx9KMZ+plTQTH5tp2M dPKFXxJbFAR7g7cTn92IWxexo2LK/T0pEkvR3m3C8ce2J+F6GHYBc2kWlk9u6rpmRUtp Nq2nUUBQNSgdH7hB0sjgls52xTK1ZLsV82P0LpPpo5grsa0EXGaUVOhZ1zo3UFjoWn46 Oi64uQSc6HMOUu4G45V6wfumpVSfuymlrQhdyQdfjMO5macB5UwZC5A7H+MMZElNIF+s EO8knZ0f2E4ssVwKb3uQmTvfEc2GtSt768GhIi4uS1z9mo2SQnraqxsg8ZlpUMIyBJPc w0Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304803; x=1747909603; 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=8z7jucKXgGdp5W+emuDqDob6i60dnbQ608/2CuYQdU0=; b=ezUEhnlPoFr+GGIr1vd4BA8SzS98hjIoN5LjLuJyLhUzvBs9mDa6f6dpkzzMXmMN0H fsd27ziJ59MBZOvPMhlpPNf2IZVB1Dns0LIN2CWkVujIiLGsKD00GEOK8KVP0JvdycyC BVDI3JjG+H0R1ReeM07jA7S4b+9gu6vWVoNyX2DE14nbxqLfZzcrFjpS8iDynz7mxxSt 2/qksoISYtOL7j1mZVwMnE113dfyhkP4MQPyRaKzfMlJVWVJ5Jf7DhD3n3c+IMzxIidB NS7kwchk89vkyLR386DA8o4sQIStIxP1fRPkBcV4ZDUf+esJwTgtrV089eVAIwT4XLRd zceA== X-Gm-Message-State: AOJu0YzgWExoDhrisMC7xnSxOooWh5En2XRI/V4YrR/TTMWK+IeLRUuz Ps5QzhEBV1hefingLMxxy5gWVJ7WaLEF1GrxH8loAYDjL0j8RKPOCghL5B3WQYKgxK2mwpyJvjo hoJI= X-Gm-Gg: ASbGncvjQWAcfn+2ygiIIjYjtH7Iv0duP+avUYeF9+OdwpNo+702tPM/kMwaoOL1Fur EsyvhIzlh6WPWyTuvZyfKPLNwEwAFS3vXdTlayqbfszlowJP/CggP/QC/UKudjT/sbHNJuqmi1T 5rqYlhen/V64yeyTHp5L4s8xlqPt4WLjrCBuZchW20EGyLE3qhctvvXF/b5Pypv7Mbh8mCzkHp4 etjAEhEjIS2Mp9JS8ZLIZZUdBZBEdShQDnEwiNsq79FTsn0I0Mamk+AOhgdsV57EOi//NY4R8xO weK4HnMlu8i4jo6Cduw6kCVI207Udtx6n3VPBawDqKNJlOi/wrzhXHZYrw== X-Received: by 2002:a05:600c:c87:b0:43d:934:ea97 with SMTP id 5b1f17b1804b1-442f9714ba1mr15179315e9.27.1747304803439; Thu, 15 May 2025 03:26:43 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 44/58] target/arm/machine: reduce migration include to avoid target specific definitions Date: Thu, 15 May 2025 11:25:32 +0100 Message-ID: <20250515102546.2149601-45-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-35-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/machine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index 978249fb71b..f7956898fa1 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -6,7 +6,8 @@ #include "kvm_arm.h" #include "internals.h" #include "cpu-features.h" -#include "migration/cpu.h" +#include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "target/arm/gtimer.h" static bool vfp_needed(void *opaque) From patchwork Thu May 15 10:25:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890190 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3062278wrr; Thu, 15 May 2025 03:36:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWT2vHYUHykQyBVd/vyLGKCxd/SM+OlsPjfcXawXMPir1F6mqM+7me0uhAYQhrDwG5dy9bcOw==@linaro.org X-Google-Smtp-Source: AGHT+IHNoCMg/0ljSgg+XcMkkeAfGLf7Z3Bnypa4P8KCiu7jOSc2QovMM/eSpwDUu/Rjt5Q3EaJ1 X-Received: by 2002:a05:622a:5a0f:b0:476:9483:feaf with SMTP id d75a77b69052e-49495c76a0fmr116877081cf.19.1747305376202; Thu, 15 May 2025 03:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305376; cv=none; d=google.com; s=arc-20240605; b=JuaDSWz4xbUykUqitU35edZ3Yukrl03e4nRgFRHAQvGDRABu5vs3qImtDupEHqOILy JN3vvE4ttGijA5LU7mJEm1qOXKn6/BvQ3iZJfEZfz8FlZp0RvntJYJnk0kjSl8aa8W/z 9HrG9uL8771o7buqxMcCNOVQVpfmvhhMgg3/+2iH2g+de5e1pxhfqYGwq3Pumq1MXDkp p8EHo2nCjHjWhHvwULc1GwJSaRVhHt3w0Qx9aaSJWRyHU5WzWHUWZaItc61QP3nMcnhu GVeOHytN+ID++QdAcbwaflfif/dVmD/9IofEfkRlcXQnFKcolvI1SjjfycZ+8hw8ubnb 9QZQ== 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:to:from :dkim-signature; bh=DMmPrEBzw/pNSwsYU/O6mEpqFCBPIG8Om9+uShyE0Pg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=RwoXS5cGYSDROoxYlFrWrU0gGPK6A188Fu2bbiWtC96T2V7dRuPkBhHzQ4bJaJptun n2hFVkiKEOeoA/JkmPb+sxGmD9DCRo13N0XSB7WY/zUehvcj7FMTBhMLncQAKASmfzE2 lyX5sYa5TiwQGMdrYT9HJFXtUv2tua6rI3PL+YaOAOFNNlxtFA4KPe8qQsa74STA/qO6 PLOITbzJTDOQce7+9yJ7zDj0iurwj8ECIz78/ExZGpCW1BQHRFBkkFRIufDVD/qEyjNi Vj6JZgiMqEitQCQhXPcGQ3zLQfJQfbe7mGKLvF46Hnv3cPYwmclLt+LLiHvU+aq/ZUpw mXAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SEkh6iQ5; 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 d75a77b69052e-4945257e542si158753761cf.351.2025.05.15.03.36.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:36:16 -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=SEkh6iQ5; 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 1uFVpK-0000rW-T0; Thu, 15 May 2025 06:28:35 -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 1uFVnh-0005VN-5K for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:53 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnc-0008Gh-Oi for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:52 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-442ea341570so4862945e9.1 for ; Thu, 15 May 2025 03:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304804; x=1747909604; darn=nongnu.org; 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=DMmPrEBzw/pNSwsYU/O6mEpqFCBPIG8Om9+uShyE0Pg=; b=SEkh6iQ5GCvPSEjRi+F31miNfrNTXZ4ivcEK+IfwWUDPf6BOOVO5X1ar+31vkPSVUb Wr7rL/iPAkNU46k+WtmkYU0xTDTLyEQ0NEK/K5L6wWC9If/aZAOtScdTO8LSOfkwB9NG hmRtVDAM/fRbyAvyIeFzISGkYUdctGU/Mu+JUf9WYB4SB9N+LDrjh83bdq7yMPNVTUz7 T0Yw8KL0tkZDn3EQ3f8UyJXLPwex9Fra19yhf3xzPMUB/1qGaAy4MFECcEjsrB9NsOMy s5Y6Y0EvOr20x7kQ24zgV9MPuFyoAFjxdFuLws5ltvWfnYrKRzydMk6eUbnLbQuqDDK7 CNhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304804; x=1747909604; 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=DMmPrEBzw/pNSwsYU/O6mEpqFCBPIG8Om9+uShyE0Pg=; b=qq00hjWbyVOALTNWTSCx611cMHQ85gLlIWRTkK/wue3dCJD+rNsEQW5Qrcky80aUHs ou9fwTfymW9+linBOgTSQxUANc8rDEIeg8ZshDG8bbePrf+AHh4v7XtxTZQNXpOus2lh 8/e5JA9PONHdp0Vpu04IcYpgbLatQnf+r3oj/G1h7Q5nA2dYGOLEKN6XlSfSyW8HRZ1H jTeVXVdSk3cTNGLUgwEUqjeThWCwhW2i5P7WoRokDT8utJ0eXtJhArwjKgD58OY09TAO 9EvwxOT2k4vi5zNljS1s756XzfCfsVl+n7XEAGPbvuLxrhoRKzYtMWpCqrPm/2ZrhI7N Bb5A== X-Gm-Message-State: AOJu0Yw9CZ0UAmXUeW0D752THQnx4/7JPWxeL/QT0aFFM0Ixz3SGf37A UrS8YTwZ1yE6+nZAs3f3UrZQ0SO6gl7dZH+WgW/w2V/v1DrYjUJ3+2mLxkrQZ1Ov68VDThQ+rpC wxoc= X-Gm-Gg: ASbGncsZk6igvdQLZzFaeLVfM0CAJYo2+/XWuxj3aGrdEGi+/BZGO24t5FYxovqq9Nt ABtDr9TmA5y17D/tjqIFWsqMIZaeduOnp1IrQYGKN4G3+IhBKkqoYoZU8v7qCpNF/ZU2xl5Wnr3 14Ej27HX5NP/uqVICkCnk2B3mbkMmvGCrXX1Ctq9HXGQa8AE1VJm+EXqOTj588LdCJ8MCCHEupo a+QHZEqpN61xrZKHTYUsxzzIW7IG2fkFDZ/TzxBknC3FkTqEp479ZmbKdZpUPtdmEc11HFpbg2P 2IXG+WTRxDgdZU8KiFAGGaMKXdAVeSt6DLq/cviS/UkwMysuFuKVjSLlNA== X-Received: by 2002:a05:600c:3e86:b0:43c:eeee:b706 with SMTP id 5b1f17b1804b1-442f9706006mr18251145e9.24.1747304804361; Thu, 15 May 2025 03:26:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 45/58] target/arm/machine: remove TARGET_AARCH64 from migration state Date: Thu, 15 May 2025 11:25:33 +0100 Message-ID: <20250515102546.2149601-46-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier This exposes two new subsections for arm: vmstate_sve and vmstate_za. Those sections have a ".needed" callback, which already allow to skip them when not needed. vmstate_sve .needed is checking cpu_isar_feature(aa64_sve, cpu). vmstate_za .needed is checking ZA flag in cpu->env.svcr. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-36-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/machine.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/arm/machine.c b/target/arm/machine.c index f7956898fa1..868246a98c0 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -241,7 +241,6 @@ static const VMStateDescription vmstate_iwmmxt = { } }; -#ifdef TARGET_AARCH64 /* The expression ARM_MAX_VQ - 2 is 0 for pure AArch32 build, * and ARMPredicateReg is actively empty. This triggers errors * in the expansion of the VMSTATE macros. @@ -321,7 +320,6 @@ static const VMStateDescription vmstate_za = { VMSTATE_END_OF_LIST() } }; -#endif /* AARCH64 */ static bool serror_needed(void *opaque) { @@ -1102,10 +1100,8 @@ const VMStateDescription vmstate_arm_cpu = { &vmstate_pmsav7, &vmstate_pmsav8, &vmstate_m_security, -#ifdef TARGET_AARCH64 &vmstate_sve, &vmstate_za, -#endif &vmstate_serror, &vmstate_irq_line_state, &vmstate_wfxt_timer, From patchwork Thu May 15 10:25:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890177 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061835wrr; Thu, 15 May 2025 03:35:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBC2yq9rgj2sIgNsCJjQ8+BMk/DbG4+pfBE9fg3DwIXdz4K0ZQYTdFw68L58TRb/fYZ4C8iw==@linaro.org X-Google-Smtp-Source: AGHT+IFv12kwLO1DrQkh8/yHaB8LCN9+O6ciUyGRcXQ8Rc60xaYLNcOKfjBn8lz7CEHxS255MBTp X-Received: by 2002:a05:6214:5189:b0:6f6:e701:9612 with SMTP id 6a1803df08f44-6f8a4c269e1mr40274286d6.34.1747305302816; Thu, 15 May 2025 03:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305302; cv=none; d=google.com; s=arc-20240605; b=iuXsilFqdPHy08PZdHNoci9mqYyuoW753AO5osVHVqRPx9quniNBnhJuYwso9p6/wj qmDR0g1h+1/TRk9IOLGA7++Iq883vbq3ORLqJv/lvPxyaKgPfMQ29nR0Ma1aaWSYc8mJ lDm6b+wu8lYEnh9vc1b9iMHoi7CiHRH2riOR6ZMufZ/2pNTzD9HS7Z4FfxXfF8054xZh qq8/bx/jFOBR5VNevd1H5KE77pDWvyBkiKI+iPWBQcfj3wF7wMGyPVYbjJUV+XqID4mH 8sEcBBpQOL8ChPi+l96eHurt4zYgXn9k/7GkcwXXKa/0SJNxkNSv/9H/9B0Gnt+AO9lf zyMg== 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:to:from :dkim-signature; bh=JgvcooGso6hgHoCAG9dIwH2FprpPy71bhrSzgHgqriY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=a/8/jSt+PPNXNSbJXM5SJMYHCxFRpRv89sNfIIAumFEQ72yrWEHYoznTxZi3GAveCj jQJDyZcLpo+JLdEsg4gke3oopkYk5uwnpAzUoquBlCLf6tSpz+3kSq/W4c7gsZ1gIRBr CB3iYpZ+DxmomA1/+QuWNQtnd2U3svfYI9P4MwNEC5dzAyHmEFOHDZmnVZcmPUjdlG6D 3FXDO0cPZg+QnISbOLw/btzWbs8oot6YD5JJJmP5D/4J4mzaCvGCCfb6Z6EWO7cwG/xz DuKryy5VcUAYRtqJNW4Z6Bi5Vudso4tT2KQnwGgey4paETcO3+HUHdsW48ToutjcUN1c vStw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zLMEjU8G; 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-6f6e3a59741si159027916d6.445.2025.05.15.03.35.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:02 -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=zLMEjU8G; 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 1uFVp0-0000Nf-HA; Thu, 15 May 2025 06:28:15 -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 1uFVnh-0005Va-5Q for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:53 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVne-0008Gl-Ao for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:52 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-440685d6afcso8448285e9.0 for ; Thu, 15 May 2025 03:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304805; x=1747909605; darn=nongnu.org; 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=JgvcooGso6hgHoCAG9dIwH2FprpPy71bhrSzgHgqriY=; b=zLMEjU8G1LwbGK5+eE7v2w1Hq9NZGNxG4XfB3zHdZw2/pgcQwkNYD6roWylVn+/5bE Ahi9hI+E90LVIihm8Z3zbxX3SA6hN6TmMKhf/vQM/Ous9ndNH9RLc9oln/b4N0rYpUe/ A4GJjkGWq71nfsuO/cl3kv850N0TOm0y6tr7P4/6rhBMI1kKeP2984I2e8lmgcTfx2Rt 4YWMhPu/Al66QJi4jwovE0g72cXHBhD8LoopYj9/VQk/bweBZX4ycwH99fMmdPrCpom0 3112TZwOPBu22saArPzutPSAtUwkaoDtngB/ulSfpNZRLPTg5GG3LkuVPQvPCHI18FI8 Xd8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304805; x=1747909605; 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=JgvcooGso6hgHoCAG9dIwH2FprpPy71bhrSzgHgqriY=; b=PA12P6BQoV/NcKSTpIJix7mDjTE6UJ1CkQty99DOBrb98j9poVIjkJOSUDIye2CRpe wvyapMIRngi03kR5lejOQhxGJgmZI6mbJbVXJG/lsM9MlYgEBH5tewA9zytAMz2m2VP/ lvgmVu02N1AuORqYfpcYQtv4dJUZgcnP0Cl7n8HWNBi8J25piBBc6p7N1cotrtdsjLMU x4rctBRMaXiO0OUuxinOkduklrNtbr0Go6WBYZGAaz93lOKqPs7XGl8i+oV2bOwR44LX h/WVlj8kwVPgh7FlhrSJDNh0UaO3sndlMqXDei+M6uOcnGBY2y1aLj8UujkuX70WcmKp 0q5A== X-Gm-Message-State: AOJu0YyS7Bay1PfJEWXVQF9TUm8V7hrqHdDhLdktJ3GEkpm60J3gpl9M p4J0dK9k6lG3EReEMJToWeMxZc/Spvc5dHvO/KeglyhLQ4UX1l5hxgyTQgb6U/huj+fpt4cC0sn ghWU= X-Gm-Gg: ASbGncud7tKBvKQzg/j2th5KbuF0m2T2ZJ8tVE1pNJ/fvL6Fp7k7lNnXyZxb39ozyUH ll4V85U23cM0J6JO3a7Y8klyWuh+npqwLfGI6k2bj6QJyWWCP2uTPq0rLPlfmOLNzygWMwvA05i JR4saUo3dKGcCuRgtffvqZym2HZcmI2jDpfKhBTurPZwiK9m6kPELrIgrxPxkFfdD5cLkKMZpk0 6aAD1PmewNOFU5JKAIXcbJYmZe9kHfbJodcz1PIRYiXNXl4fvrb9QaO752nEEsIevrbpZHhpmvu LQ3Ukn2W7rGg0sinGcjdu0W5KKzOSt9pHqXDvc28NGyNLtv5V1TcDNrP8A== X-Received: by 2002:a05:600c:3e12:b0:442:dcdc:41c8 with SMTP id 5b1f17b1804b1-442f96ecf1amr16276215e9.19.1747304805302; Thu, 15 May 2025 03:26:45 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 46/58] target/arm/machine: move cpu_post_load kvm bits to kvm_arm_cpu_post_load function Date: Thu, 15 May 2025 11:25:34 +0100 Message-ID: <20250515102546.2149601-47-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-37-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 4 +++- target/arm/kvm.c | 13 ++++++++++++- target/arm/machine.c | 8 +------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index b638e09a687..c4178d1327c 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -83,8 +83,10 @@ void kvm_arm_cpu_pre_save(ARMCPU *cpu); * @cpu: ARMCPU * * Called from cpu_post_load() to update KVM CPU state from the cpreg list. + * + * Returns: true on success, or false if write_list_to_kvmstate failed. */ -void kvm_arm_cpu_post_load(ARMCPU *cpu); +bool kvm_arm_cpu_post_load(ARMCPU *cpu); /** * kvm_arm_reset_vcpu: diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 82668d64385..a2791aa866f 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -938,13 +938,24 @@ void kvm_arm_cpu_pre_save(ARMCPU *cpu) } } -void kvm_arm_cpu_post_load(ARMCPU *cpu) +bool kvm_arm_cpu_post_load(ARMCPU *cpu) { + if (!write_list_to_kvmstate(cpu, KVM_PUT_FULL_STATE)) { + return false; + } + /* Note that it's OK for the TCG side not to know about + * every register in the list; KVM is authoritative if + * we're using it. + */ + write_list_to_cpustate(cpu); + /* KVM virtual time adjustment */ if (cpu->kvm_adjvtime) { cpu->kvm_vtime = *kvm_arm_get_cpreg_ptr(cpu, KVM_REG_ARM_TIMER_CNT); cpu->kvm_vtime_dirty = true; } + + return true; } void kvm_arm_reset_vcpu(ARMCPU *cpu) diff --git a/target/arm/machine.c b/target/arm/machine.c index 868246a98c0..e442d485241 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -976,15 +976,9 @@ static int cpu_post_load(void *opaque, int version_id) } if (kvm_enabled()) { - if (!write_list_to_kvmstate(cpu, KVM_PUT_FULL_STATE)) { + if (!kvm_arm_cpu_post_load(cpu)) { return -1; } - /* Note that it's OK for the TCG side not to know about - * every register in the list; KVM is authoritative if - * we're using it. - */ - write_list_to_cpustate(cpu); - kvm_arm_cpu_post_load(cpu); } else { if (!write_list_to_cpustate(cpu)) { return -1; From patchwork Thu May 15 10:25:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890207 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3077312wrr; Thu, 15 May 2025 04:14:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhw993NUsbPohye9yeW85h4IeCoszilt+Ok77junvnz7kSc9mhhfYM0EMn0OkgDyDjUKT1Bg==@linaro.org X-Google-Smtp-Source: AGHT+IE3QodqPeP6auMbHZvBFp1IcLbhuy/V5zxVW1tG3pI1k44Fcy+mhhFvZI5wHL8ohCGpWwVO X-Received: by 2002:a05:620a:1993:b0:7c7:a604:d28e with SMTP id af79cd13be357-7cd28836dd2mr890287285a.33.1747307641899; Thu, 15 May 2025 04:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747307641; cv=none; d=google.com; s=arc-20240605; b=crDntqkj5wIGQMv/NVc1ZTCQesVvnH1GGhJffmTswtnCWtP43QsifBeSFzPmn9Rcpt 6xGkpKNrqTZGvJYIaJRLiTsPc4eiqgZrhRRgN9zlQGelZwi0kDEMF0L/mmQzOgpX8LxN YqdGdITl86p08IUUrBDSDIKN1iIbeJclLgNZl3xShiVhRqHecT9EYAtpBqtmqIVY0OKQ 61ZYMnim44qLJMbj7shOH7YqzUpniSErSFqHnJPUjPr99ewE3k3j7VqPFJypyeIFtPcf 1/bKg1WkGxfeQeHTx/N3vDmkWh9iPQI+T9BrMaHK+ChXQs7uIlkC6xtK7P8vdxljyKqc 5+ig== 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:to:from :dkim-signature; bh=wVaw38IJB5ualjLwd7Gyd/Z0jgsIF8bEQZE81xv9lGk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=TbQwZkkACtJA6j4FXIBeBIvwaNXzIc7Ty8OzgO8fn1vTX+bbrpJvfjO+Cf8ENLfHPD zjuCXt9NDtp/8J+TtAyaGDbNyMSTc8Kw7gENW0bbQtSgpU7MsUqd3kVKi6SwVyX3qhDD dcJh9jbOpkxFZ36vS1lLYnTx03XrI4Es6PJUUKJB3km1Femw6GLn3RFNdKjiz6Td1H2H +Pr2UGbt5zY6L1IEm/ubKKeYiBE7y+L2tE0Y9Zm3w01tZsq8X+kY9F26gSsNCoUWXuLw HO+NvLbOzF/J81Vy5Dct7O6eKMMPw0H1WKVbi0yWQ/iN0m1dtz9MHEyJpnyxgq6iiF63 s6HA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wIedFG8F; 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 af79cd13be357-7cd00fedbe0si1669136185a.519.2025.05.15.04.14.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:14:01 -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=wIedFG8F; 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 1uFVpP-0001Np-Ca; Thu, 15 May 2025 06:28:40 -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 1uFVnk-0005Ym-Ci for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:00 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVne-0008Gq-JA for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:56 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso5035925e9.3 for ; Thu, 15 May 2025 03:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304806; x=1747909606; darn=nongnu.org; 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=wVaw38IJB5ualjLwd7Gyd/Z0jgsIF8bEQZE81xv9lGk=; b=wIedFG8FnRpySf74J+7lZkgwsH3sg407tKaUpBKQZiOysBsgzlpOZMTZnJZu0lMVRY y1oeut6FJNfskC+slw/mZ8V+0N3U/sQoCVlLCvptGAn7RBEqIpSn6OBSBikx4d6ivEXB +LQvuUiGlwpd7iQn8A5ogE74We75o5ngp6iHZ2Oy4u2y1q7C6+fABKh3XZbAfc4RWepV N9RJQM1ALIBIqPOhAP+HfqK5DCUewEucM6YiKoT2bgtopiIMhsJdT0loL2g0EeZLvqDm vwHSqYVpMq2siMUiFXbygfSnkIkHPXNpM8GHTN/AJ6VF4aVRGIVJp1tb+xExQeMAfTv1 bwyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304806; x=1747909606; 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=wVaw38IJB5ualjLwd7Gyd/Z0jgsIF8bEQZE81xv9lGk=; b=bB1gzBqdQR2xrIlBpe37xkXEtnnn3ZV+yWb7z4MEGIdYEiUBHD2p1705i+ijuLnQ1f gfIwEGrMiaFbytcl/qn9D9DBO7Iqy1FlvoDhiGZF76KgUoWZ33P8/ZO9GBfr7Q4t/Ku7 iqdDMjdcHzQJn/GtB3a8AZC2fBD1houlb9HY4xLz6F5F//iDdNG/K2MeumQHGOjEgPHo Je77LZ+nWI/if/zO51rZF0Xb4iFnsyrGf0qvEp8yT9iD2fIDyF5Zj5wQkRO+xBN/mtnJ +lcXzSQ+uTop8ug7GDMSIIiQ7zV/qLozXSjKt7q0PSDPwd6V0+klwjdgKFycaXkb6a1w pCLQ== X-Gm-Message-State: AOJu0YxDSJFbzAaf7VnLq7CMVf5J7/9iYAo/ZPI2yEgYCEpFqe4ZrOmd keC0wPDGWQzX3sm2VZBeVZPA+/MT7fEZ7YtVO50EteMZGq2IHSLlkkpsiD2ljG0KYFaARtDqxnm J5rE= X-Gm-Gg: ASbGncslff9yRHyjKkwky1tClIr/UtwHLJ5cFODkqZmV/FKufIsT75y1ZoJrF+eR0h2 0LHzv6UMq0hZqAP8nykwdxlU1bR80xRuwkAh7cXli7n1eRMjF2i+ADXzRXJa/bf/khGaY3YY2km BqrpoZHYcBEnF9fo4xcrb7Hytdm8y/7vUIpWW7Ymv5j3MEdWJhuIOzYNL7rB+S267O49vFxIL5y vWCFyjRR6VFbfP+tAmk2uwG+OJp/OoQfMUVqZNi8eP887PHkv2swUryOUmrL212Phbx6x4Hamd/ lKPks7N/SG+BDejP3hifLTxOWxvescAY5u1ti4Kzz6dYenfIAyOZHuHa1A== X-Received: by 2002:a05:600c:5286:b0:43d:5ec:b2f4 with SMTP id 5b1f17b1804b1-442f20e9008mr82841465e9.10.1747304806229; Thu, 15 May 2025 03:26:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:45 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 47/58] target/arm/kvm-stub: add missing stubs Date: Thu, 15 May 2025 11:25:35 +0100 Message-ID: <20250515102546.2149601-48-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Pierrick Bouvier Those become needed once kvm_enabled can't be known at compile time. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-38-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm-stub.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 4806365cdc5..34e57fab011 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -109,3 +109,13 @@ void arm_cpu_kvm_set_irq(void *arm_cpu, int irq, int level) { g_assert_not_reached(); } + +void kvm_arm_cpu_pre_save(ARMCPU *cpu) +{ + g_assert_not_reached(); +} + +bool kvm_arm_cpu_post_load(ARMCPU *cpu) +{ + g_assert_not_reached(); +} From patchwork Thu May 15 10:25:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890197 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3069380wrr; Thu, 15 May 2025 03:58:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDauBzGgk7fGNxdANhr4b2I4+WdLkPRpI5Vyuv81lfJjmVEh2sEMaLyLkbej9mfnFxEVzSaw==@linaro.org X-Google-Smtp-Source: AGHT+IERWI8AQyoz0m7x9CEf/pT2EMB8+M6jncaFZQTS+B8rdHAMQQZacnlR0iKgpZv6sonJj0EC X-Received: by 2002:a05:620a:394b:b0:7c5:5d4b:e62a with SMTP id af79cd13be357-7cd2885d2aemr1252162685a.54.1747306715855; Thu, 15 May 2025 03:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306715; cv=none; d=google.com; s=arc-20240605; b=TJdNkusnTXI/UNGrmWKofw279mq0PCOPBw5xmy+OB94+BJkB9sTkwfXUlc79Ammn6R fSdo5c86bckxUp4QJN4utNAPvfBmDT4r2fUVkwu7fQt0y+AqYKfhIt//wv6UJth/kiKu xFmsq2eI130KZ3swyXg7fvWz8gwKA649/J2Z9wavYQO4fpBD8xrVGD5c65mxqIVk8lLz iEkh05mIvibgInVA37dh5PqZCti5XUT8YdXIhwEGd+9XMMuPILHV5p8ZnEpWIxFkfgHJ Rc9qlY1RyIhTjGhWxqCyLdNls5N0PODwwaYJEcyABkUUsMR24DCK280Xv2Z0BFqqKtrQ pSYQ== 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:to:from :dkim-signature; bh=/5UHyMTmrHQ5mwQcvuo9BiQqIMdODzOxHwcQCEhq1rs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XGUe/LP9LtjXKvdVgGa6jLmheQXA8x+Z8qyZSDimVgphfDMTMMPrHAsT0Mvz1d+Nmr lYnlDyGQMVsh3yOQN4R6q+fxSpQKiuLOoA+ISFVHUWrDt081ymHpeIQDtiTY5/DIwRVB uDaRVjyZlVrjqyX8wkddS3/bUtYN9WdP6dRQZogk7ugmbtY2QC3DlyM8lyQ0Tew9lpRZ z80TbGILNpJ9Q929mPtUyq1rpW5G9EA0orp0lI2v7GgYQQMei53zBtUldOf9K2gcmiC0 xx23NvcKko1DXEeaGvBF5HIX+6XLWRocvjJAl2tcCcOhuGpV43X3UaORtEczJ6u+mM0/ FRzA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n2JhF6fh; 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 af79cd13be357-7cd00fd463asi1617404785a.243.2025.05.15.03.58.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:58:35 -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=n2JhF6fh; 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 1uFVp1-0000OL-59; Thu, 15 May 2025 06:28:15 -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 1uFVnk-0005Yn-Du for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:00 -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 1uFVne-0008H2-Jc for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:56 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so8059485e9.2 for ; Thu, 15 May 2025 03:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304807; x=1747909607; darn=nongnu.org; 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=/5UHyMTmrHQ5mwQcvuo9BiQqIMdODzOxHwcQCEhq1rs=; b=n2JhF6fhi+TbjQ7iV0dWvfCz3Y5oJfSTR3ZViNOrqhT6n9pxUHMz1ri1IahLT2pGIF wn3QTstsubEUc1fyl/jZxceFt+NVAZ+ONUeG98ToocWkv7OKpP0sNTzalmBWSw/E9p1Q xXGSsPAYAbeYDddfd/qCSCkKp7Xlig1yWpX1YGK7ge4Xz4fd54xYCEHtE3kcanL7mw6Y NLtyHVUci3h6zZfKhjKWjlmzpogBnjWB8PmYgJ8i8IAf5OA1wDQh5Kpmnq00hzB0+IoF ZjfmX6JqMhXB59/xbAr6tT5uHl4ve1OUSZKXYwBa+lG0MDcUR6qc2wBZxZ10lqPRieP1 iPqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304807; x=1747909607; 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=/5UHyMTmrHQ5mwQcvuo9BiQqIMdODzOxHwcQCEhq1rs=; b=gpBVQkWDp/LFshHTutwhSyxxf4oLA/rCGz1w9vq93D0ng53d8MBOffKtbrNskj8kdE WG4JBthyvVtfFLc5nvco7C5yWwnAlQk355VleBvYJAHj+9HR3aJI2JJnh80kOoXgoqBE Z7MLGlZsqk77907H2mXF4CY6lID42m9GWfsTXTQWl+5lGbAkfoT8HEkkxZvLtoykVCrY AdnFgNlCIEyoW4Q/xnptZ5eKUTmJV+DhgLyMHi9as4oN0MNZVZEigIIeUIsXmquKGGhL 5AxCrzQa1w+H1rLlWHxNynniMSVsr/8RWcMNqVE/SMl3Ll/6/A866pMPw9ik92e5Gl2I cWcw== X-Gm-Message-State: AOJu0Yww1chtIy+6WKlVtuG1I8uAchDjEBuTEUmFCBFPXnJTRlOnAe/Z TwgHTq+McFZqFfC9HuI7WBK+ewi4msl50hA4hHCheBlyGZbia/1irqRRdrsU+SYFz5BuFavo5l4 KGkQ= X-Gm-Gg: ASbGncsgpEe/WN28cCygZNFKkenibo2JWCwnMVgY4E5hV2vOJe9vZ6LnYw6UwOLfqZy xh7d5JFN7sSWeutQ92V1x5Grfn47jFHPsRk2ICVnIL1rLU0W2G+6qboi7GdW3KXEz/MQDh7KYZI kVOgGQN7tfpGV16/XlNKr7fNObrDN6FJJLBxyh7wMLdiFHPOyuKHWO4dvs9urrjrM5dcZSVBuar Ls/f14y2DFzckVQR1mTPN+ScMREelbQoo8GUcu71ngLtdro8JYnRCd3OpT72O3Y8wDqn4sVtY8W Jou5S80lFKSTmQsN0YyWGmVmOeBFxBoXQ6A10ADOECUsb+NKUKv0tToVLg== X-Received: by 2002:a05:600c:a42:b0:442:f4d4:522 with SMTP id 5b1f17b1804b1-442f4d44013mr49324945e9.5.1747304807223; Thu, 15 May 2025 03:26:47 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 48/58] target/arm/machine: compile file once (system) Date: Thu, 15 May 2025 11:25:36 +0100 Message-ID: <20250515102546.2149601-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-39-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index bb1c09676d5..b404fa54863 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -13,7 +13,6 @@ arm_system_ss = ss.source_set() arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arm-qmp-cmds.c', - 'machine.c', )) arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) @@ -39,6 +38,7 @@ arm_common_system_ss.add(files( 'cortex-regs.c', 'debug_helper.c', 'helper.c', + 'machine.c', 'ptw.c', 'vfp_fpscr.c', )) From patchwork Thu May 15 10:25:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890209 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3080588wrr; Thu, 15 May 2025 04:22:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4OYTmHvYM+6w7lJVZd5uxkV0e26jVvkYSqtd6SVlwuTPyCwKgLHhJzWyzmndWpwbkPobrgg==@linaro.org X-Google-Smtp-Source: AGHT+IGIwPkXq2Ht1j3wOOIl+Nhrpn2jcnbWLa+8BTAYL8oEGnIehPpknXMw3Nv4xGN0rTRieBGq X-Received: by 2002:a05:620a:3943:b0:7c5:9fd3:a90b with SMTP id af79cd13be357-7cd3c82c808mr327996185a.47.1747308111542; Thu, 15 May 2025 04:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747308111; cv=none; d=google.com; s=arc-20240605; b=VVzF/NN/lljdT1kdpgTV6IFRTifIdKHFVReSQLgqP2nx8LbwwtVqdlqpMfYzVUHHU8 vrOxnFCnkDmzs5AN50PuqUhrrOlAA3F/pgCDdDu1rYDAuEpDWOVwK71tZcL4Vq9YjXfz k2eUpn2TdhplZ3ZkWtea8FNDAzgQ9yAzN0s09hqkiyjcDiSN8UBL+0J29nTxSZ+WAYzF LKw64PJnZGZdC3S3VuugN9BS81u2kz7EDM7PIPH4aTnntV+7vzjAiabNacb8zaMSK7k7 ksnrfGtz7SiXzGxjqgSm1kxUMzQRKK+ir8OI7R+dSNh7OknHxBF/bGhp4T+kG9Vr13c3 rx7Q== 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:to:from :dkim-signature; bh=jw/rhXzTJkD4qjTI9+CXYnTXfSZ81oHFEWVxFDqeKqA=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=e3hPJfcsw5XHIhMtO/rvlu2/sfU0/odMv2s7H6Rt7xLOlIjMQL3OoIx2qybR/MxmEl DWMvUmRM2UMmpJLoZptyf3Cgh78zFzwmrmw49bm2qpak2bbyScLK6buTWPkUreq+b+fq 9ym4pB9NqnwTMAL2h/RV57FfE1yHrd3xn/uz8Jo7JSF/b+V9xn2WUVOuefInb7iIQ+xt kDxIc0OsH1hbAiiNKKo9EuAxVup3adC8mdDNdFUupCIuElyiPk4m4wP3OwHTtai1UZYp jCxciOfK3pCcbXQBfoBZ9ZgQmn+kBhSkKuOmfnWzpdsYQUjjfOyqCBoZn1tov8Nr220t TUOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wmmiv0tt; 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 af79cd13be357-7cd01731f7asi1539031085a.271.2025.05.15.04.21.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:21:51 -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=wmmiv0tt; 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 1uFVqj-0002YM-44; Thu, 15 May 2025 06:30:01 -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 1uFVnh-0005VU-4y for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:53 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVne-0008HI-J3 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:52 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so6076625e9.0 for ; Thu, 15 May 2025 03:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304808; x=1747909608; darn=nongnu.org; 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=jw/rhXzTJkD4qjTI9+CXYnTXfSZ81oHFEWVxFDqeKqA=; b=wmmiv0ttPIWJTZCoZ1kVHiqu7aC8eyrzou7pnio1zlJZwwC8U+nI2JjWm+atMtuopj Gxn5A1LTngdCpN0ROG/VVTvk6va2Q/pAtUz519uwdGnRnPrI11KMhlsciS9J0Ja5bKdF obvlsGAaFafu1k6kYmqK/R+efCZJ3VESd2FsNAYXHNDNTa9mdhpnq52wHmxUw8tp3Ze7 Im5fR8NyI0424iqiwmQaAi2OBE19FjFpWbDgUxjPWN7a9Rb5iC/b9glRaQZukrdCDVN+ oDPZCRiuzsZaGG6Gw7dbgBEHIwOp8crj2cCFM5N3E9DI9Ws6fGneVXDothjpz3f2QDUF 2sAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304808; x=1747909608; 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=jw/rhXzTJkD4qjTI9+CXYnTXfSZ81oHFEWVxFDqeKqA=; b=K0pj8dnKFR6bHOqajtl8VCbFcMADg5Sx/w3L0XdTo+Z9xWgAelRZBXSSyvqhQa1H4G NtG6UIRmo08aNx/1Mhg3bBcddJspoBfOm8NeMRWA9aJT0sAZd+LMXNEx1vCqmCoNdPjR ZWnmrMQDc3lgMp4oTUex0L8w+tHNuOhAAKfsRjbIKzz63pfjTUBmwVyZeeM06umrnVo/ 7JtrzqimXhtAZNWx5Po0sKk+4yXEGJ1B//Drv5YC6L7eeKqyZCZjpbtZBzmOIQrnbMEl 8YVjs0ZCMLAAp3TNgeibgBh7tMfTOMv0BtygapKYmS4tyx71NB27JX8qP6TJudaYLuTQ pyIw== X-Gm-Message-State: AOJu0YxJpEwHQ5XqdSP+s/YINVO9/svh+zY4OHsKxPsSqeJ3XjQQALwV 7Y/C9ZiCpnizrQY1A+QTAdqAjxGhErvYUn61mia/rifS7wA3s1sJ0pksC1QlAeQv8XNi9YRaHhP UsVA= X-Gm-Gg: ASbGncs59WddTrSnn+IFcV3lIuIAGXwrVqoXVbVQ7z+/+i8wkq6uXi9/0wQbauCZYqb LYODvw6jNMe+ZKPsFC+ats2/l5LJM9dirlB5SN52eb5Do7QsUDIeToyrmqMcJ/XNYnXa43lv0mw DLggkv+H0gt4MzXXk30lsmllSwQwZ7hP5sa9xgwHohKJGIkSWWeWaRt9m9FdCd0/xsLx0l5DyvP bmrMLbsOcfFRvbFc35zpLF3FdqtncA/uBYwI3+m15oVC4vlKjlZF676up6D6SlVUHSbIGQgTg+K RBLa/9wzGeDYPQinPsQl/YZ4U/l7DlWi2SQDGIaBOvuLgPTH/NHfilZn3Gx1lRZt8RTr X-Received: by 2002:a05:600c:154a:b0:440:54ef:dfdc with SMTP id 5b1f17b1804b1-442f96e671dmr15109755e9.8.1747304808611; Thu, 15 May 2025 03:26:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:47 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 49/58] target/arm/tcg/vec_internal: use forward declaration for CPUARMState Date: Thu, 15 May 2025 11:25:37 +0100 Message-ID: <20250515102546.2149601-50-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: Pierrick Bouvier Needed so this header can be included without requiring cpu.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-40-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/vec_internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/arm/tcg/vec_internal.h b/target/arm/tcg/vec_internal.h index 6b93b5aeb94..c02f9c37f83 100644 --- a/target/arm/tcg/vec_internal.h +++ b/target/arm/tcg/vec_internal.h @@ -22,6 +22,8 @@ #include "fpu/softfloat.h" +typedef struct CPUArchState CPUARMState; + /* * Note that vector data is stored in host-endian 64-bit chunks, * so addressing units smaller than that needs a host-endian fixup. From patchwork Thu May 15 10:25:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890206 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3077282wrr; Thu, 15 May 2025 04:14:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0d5/FWd8GvAJx6nZJXVT0ba/irSMlx5e2Oabh7/t91QMo4oCuAkGFZYLOQFaiArcWZZphzA==@linaro.org X-Google-Smtp-Source: AGHT+IH3dE1pMkeTYCziV0ozmsCelTu6EL/Ogq3sWEMKaXEMkR/k/huGSO6+ihTu43IHwip8WQEV X-Received: by 2002:a05:620a:2596:b0:7c5:e226:9da2 with SMTP id af79cd13be357-7cd2888e3b3mr1156759485a.47.1747307648687; Thu, 15 May 2025 04:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747307648; cv=none; d=google.com; s=arc-20240605; b=YlnKdJluwnk94tIPvEQFvf73foXEEy0PO8s/D/aTwII9ULg3Rj9PIjFR6JUihOJkqd uiDGmOUWPk7cFlji7xkKttfHDpQ2I+3B3cwjWz6oqcYAhHMFgvjEuMAvBhQp/1WnkVOK XHCojFdJwp6YWg3BaEp8SsErBAOwmOHHF0FGPoNf6mz3JQOpPumw3IlTCHXpHZ/SiYjw 2uR9Je5cXhAlZwUhr1eG22vCs4H/Oyv0kwkZ//mg12UXCQ2xoJzjUSPZom4B0f+IQ1eF l+AHYxBAOBONnovC26RmgkDDqf8jBX4i1uZ0NdCbSvhphCSgJCyM3FxgeCL5gxYQaVwu Q0yA== 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:to:from :dkim-signature; bh=LWZityl3Dx64taRs5l4r1AoYIXbjRwWByF1wfRUq6sU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=h9TpmeoHn6BbWGUPopwCQHZHZtEvmVO/NfnXje28qECx9Z20e8/NUsuiMyJp+bMjHJ Hx2rNTeHeIkJpMwsjL6cvn2L/w2XdifMu0K74wXsmk0xTaNKnAb2WZgFN+M+wLihr1cR qV8YTS2Y0sIQxAY3+R+/Q+Fc1lMrmwCglNWsuUYKxkE2QdgkOLkGiiAu8eXIreyda+/+ 8UMHUQ/1MLo+/hEmQBAakBpvJiJ2TIr/p3vC6iSo4woyvBbCK5ST9J+Sdxr8ZViYSqqX U7e7qKLZkzxhoE6qZm9LMZZtITgVKq0SQvsD7mibYg50h1pGzeoeYLZbMIaAL0IO8LlL x6Ow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pcyi6fZ0; 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 af79cd13be357-7cd00f6806csi1529500285a.152.2025.05.15.04.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:14:08 -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=pcyi6fZ0; 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 1uFVpP-0001Ma-A7; Thu, 15 May 2025 06:28:40 -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 1uFVnh-0005X7-SO for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:54 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnf-0008HN-4w for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:53 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-442f5b3c710so6071725e9.1 for ; Thu, 15 May 2025 03:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304809; x=1747909609; darn=nongnu.org; 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=LWZityl3Dx64taRs5l4r1AoYIXbjRwWByF1wfRUq6sU=; b=pcyi6fZ0R0tnQ0VIEYMyIzCEj+miK2Ko5iuePALpg10NRyzL6NtPH9eG/ku/X/jA/D vJ0RXaXrJpmgB/jcoIpTbdnDBUuEldmcN5+hF/52O+tsd+2oLo2lNbrZAUAq11SeSigA PGhhwk7DksrlFJCSy1EgaoBujm+nWdk56WxPeh5ldp4z0+p0aRBTWaXS84f1HxRv1nn1 hSDwtqAsdV75p/lfYE+IJqq4TfER109WSxrdAWkNNBuGdP1uomuExI4RVmA4/ur8Sq0B jF42VFvBlJEBVO2WY6QBZmWm6cBo7hTUJ2kETvwQmLOl+kPiFWTeI6WZ/w7QhKJ0cZ6M gvQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304809; x=1747909609; 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=LWZityl3Dx64taRs5l4r1AoYIXbjRwWByF1wfRUq6sU=; b=EvuMfOy1ABuyPFp+GqXtEnhhxMwshiA8dt+KETyRC3cv49vFzJBj+xPCbz54iB2Djl BPrQJv6M+O4bdvLxJPf+Qdj670IqO0dg3G8ZGI0WWIjETc6MNAzVIwakQDw792FYE6HJ n+FqrkGGRLkkhctqca3gj35OQOYx3akJTJ8CFyVh5ZGw9spL+GN8lOzWP2Kcvuwuc3Dv S8e81rjM8wnB/57bxO6aZmK9q846BZVTuAmKWXaPsfeiYg49YtNuKtc/zt7I7jq7LQfC l4IkSrRPCcT3VfSFPsRrRIeDZaVQYes4Ro772TVyYhyEjqDGlPHj2OMmLuFeY/3fQW+7 gPjQ== X-Gm-Message-State: AOJu0Yx8LaUWP7ORyBMN0M911CjznTH54dfmJjheND9H1yk0zONRYnuA lgIPHGFGo73AVMuJpT30uz7bIwup8fpYsjHF9I2lXPiefvvs49vQ4sNlcy0FBPYUyQ+GF0SmIWG Anmw= X-Gm-Gg: ASbGnctXzk4xL7kZSLFYkzp3rvQtYZcvKUFRCbOwHwAZjZbk5p22p0qeURxS/EK4BBP FRnp/45Sy0lJ6nE7AEyaUwlKxSYkbgSlxfEDz4FE3Z6tR/cEvAQ1nlrXwzGbsOqwtYculaULjoJ l3hwPIvMJYNTMhKE2aXHrbjqHpPoQmC1WWDwBd82vYobRwkPuEFr37mObavXQq/gLU7VbKUb6lT isiY0wtkPoTYiB2f9sAdeSzPEbJfuOufhrOTmypvtKjg/0K1MS6gI5lXB1PCkSvy0pFZ+3puHS9 aQie0o+l2EaTyK4X+dByIkX6w/b7hheYJTummSMHoT7IZWsRsvcl+xphHw== X-Received: by 2002:a5d:5f8e:0:b0:3a3:5bf8:36f6 with SMTP id ffacd0b85a97d-3a35bf838cemr224114f8f.55.1747304809514; Thu, 15 May 2025 03:26:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:48 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 50/58] target/arm/tcg/crypto_helper: compile file once Date: Thu, 15 May 2025 11:25:38 +0100 Message-ID: <20250515102546.2149601-51-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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, TVD_SPACE_RATIO=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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-41-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/crypto_helper.c | 6 ++++-- target/arm/tcg/meson.build | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c index 7cadd61e124..3428bd1bf0b 100644 --- a/target/arm/tcg/crypto_helper.c +++ b/target/arm/tcg/crypto_helper.c @@ -10,14 +10,16 @@ */ #include "qemu/osdep.h" +#include "qemu/bitops.h" -#include "cpu.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "crypto/aes-round.h" #include "crypto/sm4.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + union CRYPTO_STATE { uint8_t bytes[16]; uint32_t words[4]; diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index dd12ccedb18..2f73eefe383 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -30,7 +30,6 @@ arm_ss.add(files( 'translate-mve.c', 'translate-neon.c', 'translate-vfp.c', - 'crypto_helper.c', 'hflags.c', 'iwmmxt_helper.c', 'm_helper.c', @@ -63,3 +62,7 @@ arm_system_ss.add(files( arm_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c')) arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) + +arm_common_ss.add(files( + 'crypto_helper.c', +)) From patchwork Thu May 15 10:25:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890195 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3069037wrr; Thu, 15 May 2025 03:57:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTJcQNxP18peGB1dHYUi3Ml969+w+5Z/CaYK6im9L9CU0VCcF4JXRi2/Ba/4aU9ZH0fxwJYw==@linaro.org X-Google-Smtp-Source: AGHT+IEyuUMOlhymX82sQD+Jzt1Jmv94VVPdhWDx/6AO5yaWAqfM3b4+F0LL32tyG5a1T75bN5Ma X-Received: by 2002:a05:6214:dcf:b0:6e8:9a55:824f with SMTP id 6a1803df08f44-6f896dfc34dmr91266836d6.6.1747306660835; Thu, 15 May 2025 03:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306660; cv=none; d=google.com; s=arc-20240605; b=Le30k6LAXOE810jKJAfKLPaTor7PU3Z2dglysUWWj0NziYS6rmqLWd8j6oojaK2vPV emeWj2EhYE6y41CiQy22ibe/xJ1cMhrm+q9fFCIVC/hy0mOnWmmbbZC4pmBMIOFR+lCj FJ4gBzoM3ljDHLqHkfBvyCXz7pN/x2HFun1q2eB/AugXEjD/kzSXmfcFBdlWFxp5bDy2 5Vyn2/c1CKtYuXupmz/2vL+vIFE+85lfwPclNH4h0tRDnG5HJQCkT38UZTzb46rDe/yL /5dv4Tx/3y7iNzmi0L+CumB2GIZmGdqcFZ5tUQ6scGlrsTJGLomfz6uTvhYoE3iA9zFe fhqA== 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:to:from :dkim-signature; bh=0T18u5dfvkN8bXblBycY0dLZlOVP/4FWka2uqgCFYHo=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Y4zUBjZ1fVaFVWjU2WwzSXf3Xs4N34aqlmcOCs0hr+PvmX5Cm808mLMNV0WdSkDAqR h7Z23o9CuaBXCi+94/56pw6n6dSbxz3SFF/KP3Tr8nrEwU8NPo+YSILitOt3HfHpeSge Im7jft1cjy+mvlqpLddNjhPVzN4YDdI4mzhLBD7Mc/y10K5NIyLVP4pBe5ZXPSXMsgqp kZxULgpxpzw7LX75lC+ClEnpc0WN/9Qos7QDR8rUi5hjfnLxP9ycgFvDy8anQUubbrWO HaAN9TlPZMs0/S89+lOacZjRDP1l/i+UFJYeVVHmo21ETDPX8NpHYMmNv7oShf9N/SCi a3Xg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y4Fzh5Uo; 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-6f6e3a426e3si156735606d6.251.2025.05.15.03.57.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:57:40 -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=Y4Fzh5Uo; 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 1uFVq5-00026g-I3; Thu, 15 May 2025 06:29:21 -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 1uFVni-0005YS-PI for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:59 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVng-0008Hw-RQ for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:54 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cf848528aso6419485e9.2 for ; Thu, 15 May 2025 03:26:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304811; x=1747909611; darn=nongnu.org; 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=0T18u5dfvkN8bXblBycY0dLZlOVP/4FWka2uqgCFYHo=; b=Y4Fzh5UofR8Pca559WSCb15rTSfo9wgCM5AG98cmNeYD14dVSdz0m7MnFek2WOqpLd EWxZS5lHam0N3Tr6pe+mxjYBAe7mTM4zRwc5bEOGe2zi+JvbJKDKvsNAiPoPGSxlbcNQ BgldFjlPBMlcEQM3Swjv4yTdfQ67gf0ZwIEtaic1uZtuvCeQ/Gmae21tfNRxHoLxca7z pTcrZJI+mx6g42AcDkT3kfoa9GPTdiuiWw7yTDhp+RV5VzF5nZpuma2WgXHCa2LxAEnZ W0KitsLX93Cs4N5y6k0qzAMyYOMshwOAaCEhSbv03R58jheL3hdKv1tbDA8bNfSkIeQ/ sINQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304811; x=1747909611; 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=0T18u5dfvkN8bXblBycY0dLZlOVP/4FWka2uqgCFYHo=; b=gbQXkfKpbV0bFB4+FnNnReUuTj40rNPbW01m7Xe81n5xfJDHz51xJ64+VMZg0M9xYy 7leHIqj+r6W3WPydLwyFHsz+DPmFrUqAovOi9Oza5ChKzCcwbEaOjumfawB0iuF5Pb1D pley8MgbQA3+HB+KdKnWdfyROwlYKDMRFPmMluS/Vb9bm/GlxCJ99J1H1htxigS0QSfk h/MHuJpR6BuGeJ4zTMljJDykS+RYlzXA7Whykoo0jMakmjEIjO5eDSosqL8/Ot0t/Kq5 3eBwxAxFJWaTrsMu4n0cw+Reo/4uOEh8lY4xlQVFnptTEmNUIIsRliMA7nM6vzBaYzOc t/Lg== X-Gm-Message-State: AOJu0YwqoFWUXaB8yI2Rxub0sMzrR0SMrNG2Yt58V2KGhV7rxev7cACd uVVWsGDamYCY9Tm/0niYGjJP1yleW/iPIuRQUSmLpJjfQWV/IQ60ky0aiOVVrcIXuoOPCCjojNc 93u0= X-Gm-Gg: ASbGncsoqA8qbLJdvvWlNzdF6ofJbKjpMKHAFiPH9JltcPs1tJYs/4d5DukijMe1KuE sAUTEWG5D0UbMIi0fS1m+EN22Sd1IypDgV1sPYGXX4LcKDDU2rmiQATI+tr682nwv/UXpgPMkWG /vlyp1tX2ricEsqTvMvvS4o+BZUt3luUQDwWF3sMC9gzrkXOTTk1D0axy/1Lun3ll7ahiKIGseR FSZu3pHN/kE8GVsd1j0WaXjAuvli3zpsFj+o5BM4iFXoPCDg7QfnR6iiF7gk+2qgNAuP80IJoTI Tpi8YrCRWGbbqDtQ+96Xk6bHcLK+PP1yBmMBbOb+cb7T4U+UzmokCWOprw== X-Received: by 2002:a05:600c:c0c3:10b0:43d:300f:fa1d with SMTP id 5b1f17b1804b1-442f217983bmr47233855e9.31.1747304810748; Thu, 15 May 2025 03:26:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:49 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 51/58] target/arm/tcg/hflags: compile file twice (system, user) Date: Thu, 15 May 2025 11:25:39 +0100 Message-ID: <20250515102546.2149601-52-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-42-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/hflags.c | 4 +++- target/arm/tcg/meson.build | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index fd407a7b28e..1ccec63bbd4 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -9,11 +9,13 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "exec/helper-proto.h" #include "exec/translation-block.h" #include "accel/tcg/cpu-ops.h" #include "cpregs.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + static inline bool fgt_svc(CPUARMState *env, int el) { /* diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 2f73eefe383..cee00b24cda 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -30,7 +30,6 @@ arm_ss.add(files( 'translate-mve.c', 'translate-neon.c', 'translate-vfp.c', - 'hflags.c', 'iwmmxt_helper.c', 'm_helper.c', 'mve_helper.c', @@ -66,3 +65,10 @@ arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) arm_common_ss.add(files( 'crypto_helper.c', )) + +arm_common_system_ss.add(files( + 'hflags.c', +)) +arm_user_ss.add(files( + 'hflags.c', +)) From patchwork Thu May 15 10:25:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890181 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061971wrr; Thu, 15 May 2025 03:35:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXybA2GPoET4nby8vOkryaJ5jySkWiBawgYbX4VURkg6HqJPWc2ZPo/AVtdnOxphNFbfNeS+Q==@linaro.org X-Google-Smtp-Source: AGHT+IH5FlW5Nv4g09RPCoqgtQ4HOdv/d4G7VDdtGv7U3Jq4EycFlHD3IvOwsRL+JvYJCGgz3Cda X-Received: by 2002:a05:622a:4d8f:b0:48c:3fc2:e055 with SMTP id d75a77b69052e-49495cb1d00mr125123321cf.2.1747305324633; Thu, 15 May 2025 03:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305324; cv=none; d=google.com; s=arc-20240605; b=THLDMI4dY5f+jVvEf1IK7a2zumvdO7+E4juQ3XqgXNEFziS2lp7SyGgGtj55kTy6A/ 3G68mx4PnwZJ73tqoXyLHks5h/sGvY9Q6EPtmlozKlCCT7fdZgcKnJ4RZXyQ5M0sk0d2 r7w+IDyxmCT/rPONPinlMuzeIhQ0qKEe909Kyue8BWVWDocgLHzagKQ03/zKgbPzJoEQ X7eTxIF5miMCYVlH3bbdbR1xOpsIKOlbImyCLcDE3+3oC3UcKEAzmbRrGoqjH40ypsa/ zJW8i99yteHpkq0XtHzISEZ42Cf0sO6gaEvsou/MX8GxRttA4wXTMXZb961ZM/ABwlc+ w3FQ== 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:to:from :dkim-signature; bh=JIJ68JD30MH+HTSlMGv4lj+b/tYOhGflwYgAmJjygGk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=IW4PmeEPpaaQIbeANheOumxzD1Gq6lITaZhxdSexetVAp8dgtzanGnoOE4sA9d799A 5mX/wTjEwt3Ro+F4YqeCAP5ceI0FS2bPqtQlONUsM5R5pEcV1bR93AETLwbSvETHYI8P ICjVY0RPVxJNmau4kFivrEuvpHHLQAptCaDMDcPfW8dGR3yYaB1k6bcnCNFlggT3i29P 00Xp6VU7lWrlhb+DOM8MUc6x8gPO2l0o/l73Nm5KO+7RQw0bQ+JB8yAg0Zs81AE1QGke ZeeZZueob2K6DJwh4rRMJbVLr3tcxhz1fivygAiIuEqGCqaW2Qux6uA28O67izlNbQAj xnQw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SORyhL88; 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-6f6e3a4b7a4si155373136d6.297.2025.05.15.03.35.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:24 -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=SORyhL88; 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 1uFVpk-0001xX-SM; Thu, 15 May 2025 06:29:02 -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 1uFVnj-0005Yf-Bv for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:59 -0400 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 1uFVnh-0008I6-Gl for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:55 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so8375115e9.3 for ; Thu, 15 May 2025 03:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304812; x=1747909612; darn=nongnu.org; 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=JIJ68JD30MH+HTSlMGv4lj+b/tYOhGflwYgAmJjygGk=; b=SORyhL88O8zkaGfW9yqK/cALn9uEfxuS2ErkfgBV+199FJDqSFhGzrDZwjUYYaQ5r0 YAYc7pgxU59/+kXpopPu5cuHQpZlo6xe/PNwBOac7VoJj2VYw1hjfPAxNxOo6DWDByav hzmsq9J8t1ufTQm8jxecjPYJrifGPVr9plI0fAjLV3zbVHfYhvnPzlgzJ/vIKtx3aqCH bX0ylXfMNgtkzXmxR7j/DdEOjITToZgx6u0BFeBO/5R1W6VPo/3gENAWiHXkcsreh407 lRTlr92ab0paNhrs1l2TkRPhZhg5w13x6rJWESinmilo5zGigi4nji5MrkcbUdw796cu KB4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304812; x=1747909612; 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=JIJ68JD30MH+HTSlMGv4lj+b/tYOhGflwYgAmJjygGk=; b=vRheP40YS6G/kwvasOVzND5KICxZ/P8R/NxmuraF4H592zWJT1vdEreah8BQw+Vl7r z8ryg9u+p7UV5D0PUQRSKZlYIvZVdg0EOXguMhSNrNtmbbJuEaDwUjaNxLUJvSaXOGkt 9OsZYybj/gFPae6hrEE2t0jOVuOVXkwRgeeusMP1LMlYx+gM9I1TKkCYicyBV+T0ZV2G rOPNifsWBxyk4Bt9pdrMtXMSgyg9WvTNG5YIo9MJyIUREWJkzkU4UotQsUbEj5HqWFmp 8ve/tN56AqoQri3dPHvKsTeWv22UPkKYxX9vOmYZMHqK6AUKpiSAuC022rQBCZBoGD+S HBsA== X-Gm-Message-State: AOJu0YyLpjv9OUAGO9dh0mboEtumnUAHKIgFYTDFKu3st4C6UDTip4Ru Y/1GbvZl8VtGedPMecsSw+CRjGv5ezGPQSonFH9uNxORndqjp0dj0YTgthOwzkzTByoj41W3n4j x96c= X-Gm-Gg: ASbGncv3Y7yjEQliUl6m/ILWAptzpq60CWal7wDhgon+93mNL+/LsPAtCIkSTy+0MVV vxgNZgFzCctpY8TgSUK9np5EQp0K1AzT3uih6/rNgN+2iiExcw3UwlBRqCHq08cQzTr+8UQ76rN bdEtyT23PoiBHtANZzKZ0BBki8IfEMft65TagSMvNHzow3Nu31zSsT8dBBKj7hX2Mu42n+nLx6O 2F/xZO2XwWmn7YM7i4kV1FKNsW8a5MOKLod9t6W5wjy8ZijUE+IXyvUgzuAJAdZUttL4h5LEifU XkpF9mJxIBO/8BWJBcHfet1Ak0u9a5pibYFrh4g67LxBYwE5XHqAAXOmz6aQTVha2wy5 X-Received: by 2002:a05:600c:190d:b0:440:68db:a013 with SMTP id 5b1f17b1804b1-442f970aa3cmr17178395e9.25.1747304811919; Thu, 15 May 2025 03:26:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 52/58] target/arm/tcg/iwmmxt_helper: compile file twice (system, user) Date: Thu, 15 May 2025 11:25:40 +0100 Message-ID: <20250515102546.2149601-53-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-43-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/iwmmxt_helper.c | 4 +++- target/arm/tcg/meson.build | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/iwmmxt_helper.c b/target/arm/tcg/iwmmxt_helper.c index 610b1b2103e..ba054b6b4db 100644 --- a/target/arm/tcg/iwmmxt_helper.c +++ b/target/arm/tcg/iwmmxt_helper.c @@ -22,7 +22,9 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" + +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" /* iwMMXt macros extracted from GNU gdb. */ diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index cee00b24cda..02dfe768c5d 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -30,7 +30,6 @@ arm_ss.add(files( 'translate-mve.c', 'translate-neon.c', 'translate-vfp.c', - 'iwmmxt_helper.c', 'm_helper.c', 'mve_helper.c', 'neon_helper.c', @@ -68,7 +67,9 @@ arm_common_ss.add(files( arm_common_system_ss.add(files( 'hflags.c', + 'iwmmxt_helper.c', )) arm_user_ss.add(files( 'hflags.c', + 'iwmmxt_helper.c', )) From patchwork Thu May 15 10:25:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890205 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3076697wrr; Thu, 15 May 2025 04:12:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrgMUp+nc1kMBJcrZ17X54zRE0COA7XuBex3om2FpQPRX/LMCVyftpUCZZZiGu0aA35sHwVw==@linaro.org X-Google-Smtp-Source: AGHT+IEYQcVuvjW9vdvzeFYzVbzQsswP0Z/z6SewTvulgZL2IhYbcfQbEqUdGNuhlBTK8npgowOD X-Received: by 2002:a05:620a:f02:b0:7ca:d9e8:d722 with SMTP id af79cd13be357-7cd287e1865mr899544985a.17.1747307555474; Thu, 15 May 2025 04:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747307555; cv=none; d=google.com; s=arc-20240605; b=aiCDVI99gx5xGMxkYy2Z8kOXA+xfEBOMstyyK67GLs4qAMdKbDvBKIQAUNd/L5dK/h Tvy+RWksu093/AoPXlY1SE9G4nyirf3nXZVuE4NY2GGvc8nUv4gX3j8wVcwzkhj+UQUk Kynx5y4NZrZuJC9TIjRcy43+YyomJfvoLaBhJP4AIf1hLLEqtX+dE/hmBBFnlqzlI+j3 D7UdBPPPsK4c5Yikxb3j0adWgnKaU7JhbSM8m6ePqhWw7CncCZBeXa6kyytCtTw398jd x6XvQpPzdf6T3ZSGVe/s8Scdour/VwZL4NIh+y84CGXIt/Ijqw4q4LbFpvpyZfXux71n 3YYg== 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:to:from :dkim-signature; bh=13/BUoafMVf2hXB1lodB0NtYzojM6Xz4vl88q8j35NI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PE7+yVN/v1UZLAEhvTgVD/QYdwA9gxomRfApJnMF+ZCPJs93uOmKVlmVJmOnTHE+Ni Mi4WmY3111rARMS4qzoLysHXLI3jtuvRpMSSH4k/uxAv6kfNT2RvN6ZBzjTdR2yTWY8D rEsMOBCURbYm9YU/P340aIhWSqhRktp5Abw6iCli0mtg9aLnAV+pCLjlNJgI1diC2Psc JqBqrU/ppX8itAHuIk/pziTsRK6T0NMQ3kYfsXsvFPy91uaojriSlYMdl/1asc+QDnyq 9xyp3nJKQBnXYEEy0QWEGVbf9vs8ZJS9VlljLevIvvDZSv8PWiKrdYlkFFAirolO+a8D XYiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uyxjCxQi; 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 af79cd13be357-7cd00fd3e34si1611881485a.248.2025.05.15.04.12.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:12:35 -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=uyxjCxQi; 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 1uFVpm-0001xL-Po; Thu, 15 May 2025 06:29: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 1uFVnk-0005ZV-RS for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:00 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVni-0008IR-G3 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:56 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43ede096d73so5415035e9.2 for ; Thu, 15 May 2025 03:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304813; x=1747909613; darn=nongnu.org; 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=13/BUoafMVf2hXB1lodB0NtYzojM6Xz4vl88q8j35NI=; b=uyxjCxQiaKwNiUnmFVLxKc+YEsArTjPNsXl9Pbrqx20jaMWhCakFVQ8JIix2IOcOEe qxv2sqBQQ2cvMkvvh/BK1HN4nJ/NHzGgFQ8nP38BMy5dyKc43mclTgYUlto+mOPBU1Tc MZ+0LJCazUKMXNkCZHQURqG4yOFUBbc3dzxCVdDvVD7EhLhPMiKLJBIrJrehnq0iRsqX lJBuxjKvs1QxZ0gHjYLS/YdR6cPmEqlE5NEBMDjX/iM7ol7j4WipyMOJDH6nJgP+59sT INo2qjEN70hplIxsxEAQfC4l7JydLjFRI63aITB4Mtqqt7VCBTbTeda1ayYCroi8hy05 2ygg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304813; x=1747909613; 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=13/BUoafMVf2hXB1lodB0NtYzojM6Xz4vl88q8j35NI=; b=SInJkE1fNartVCy0VHQh6S+nKt3BgdvVQ019m1n5jsDckMltgGXYuKzv4H1qIeTKtf aCwRVTUycnAZfH1BnvNMjkZfPaAcxYUcQKKHN33ivBI/Aa2OZh3MhCt9MEco5ImuJ6XL 9koY13pGQg3ztRLWI2j7EUc/MEx609Kygcq1L0JIkPwdMI3yo8QBsRz625gS2h8AMjst CXK/8eMajSnuraigp+CqVWnBbAeGz6d0GR/hLB2RLpKd2NWl47QySo9KClk8UQye4InH rT19v8iT2arYZODKI3sVAPcZraiRXQmCgzx26WxI/sKAsKbJ9q2QMZsQxRLyhV+ksXV2 Qrjg== X-Gm-Message-State: AOJu0YzyV4LzlD3lWuXFBmnCxPMbt/chgem/6tZmk52jibpp27P/kj3n kIvZUCuSnTtg6xC+imtsIhXFqdCuS4U7NKbQWfgMSFtXZMW/qC3iLvWgz34iLkGn1vwFSXqaAbX mvR0= X-Gm-Gg: ASbGncuNqu5dcHqmpFphY4VDpLQwd9ETTPeiFf2yj1U6NCgnxkCec7ooqUErrtDv5Xw ebRlIIfOMGF4kr30QR5UPNGkBm5h7XJ2p899jMrLNVNViqCDtEIE+1bOLRG2UcMQYL1OkL8gNoC iskgmPBoBBx0flNKQBjB9ncRVCfHd3L/swbLnLrjI2WhgeYfR1Lxd8P9P2xXzXlq1hwRuOxIdGw 1C7K57EMT8CD0CBCI3QpgEs3uyUiU8QGYEceadBjwsKVwbzumfiXjkGG8v0O3v0KZoXvq4c0lwI ++lqhpXYquGcIzMOCfGbMltTrzsR7XzAiymi70GRWNb921UXc22yi27/kw== X-Received: by 2002:a05:600c:3d06:b0:43d:585f:ebf5 with SMTP id 5b1f17b1804b1-442f20b90ddmr49362915e9.1.1747304812790; Thu, 15 May 2025 03:26:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 53/58] target/arm/tcg/neon_helper: compile file twice (system, user) Date: Thu, 15 May 2025 11:25:41 +0100 Message-ID: <20250515102546.2149601-54-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-44-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/neon_helper.c | 4 +++- target/arm/tcg/meson.build | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c index e2cc7cf4ee6..2cc8241f1e4 100644 --- a/target/arm/tcg/neon_helper.c +++ b/target/arm/tcg/neon_helper.c @@ -9,11 +9,13 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "vec_internal.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + #define SIGNBIT (uint32_t)0x80000000 #define SIGNBIT64 ((uint64_t)1 << 63) diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 02dfe768c5d..af786196d2f 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -32,7 +32,6 @@ arm_ss.add(files( 'translate-vfp.c', 'm_helper.c', 'mve_helper.c', - 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', 'vec_helper.c', @@ -68,8 +67,10 @@ arm_common_ss.add(files( arm_common_system_ss.add(files( 'hflags.c', 'iwmmxt_helper.c', + 'neon_helper.c', )) arm_user_ss.add(files( 'hflags.c', 'iwmmxt_helper.c', + 'neon_helper.c', )) From patchwork Thu May 15 10:25:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890194 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3068445wrr; Thu, 15 May 2025 03:55:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlw//Pv2N0KiPaUqe0XmRBN5LCQ8PwNSXbOolWX7FwoZI1S/YphZjStvJOEGlLRbfRUhnEAg==@linaro.org X-Google-Smtp-Source: AGHT+IG0nICp72E606X0zmoDtiN7iF/RXQaqoS4Dksg7eBPBfnfAqy8a72p4DA4HxrsU406NqghY X-Received: by 2002:a05:622a:2585:b0:477:6f28:8c16 with SMTP id d75a77b69052e-494a333ea26mr39042151cf.6.1747306544373; Thu, 15 May 2025 03:55:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306544; cv=none; d=google.com; s=arc-20240605; b=cqPMfvaDgmFUSmb1SKLJ53nLAoTpB8b3LZLB9ALBsFQh2nI90cjnLZwxQCtsou/vp1 GEnuS8N4DQdl0FOmHlzye9MmPpLdolXOLPk0N1rqr1coJd1Ayy54IGsotTx85NTnWgZ5 IC0jNUSTcn3Bk/GMg1xQj+wFTaVEBEiiirwzXjDdE0cxHi72ioyn2ryPAdk6nKsBpgwH A+MGMdByKK/j+rQfVLiachJOLAfwUxl036zDk8Rlm0CIGb28qnRUqft+w6b6G2VJvoRv /ZO/NuvvMYExcJ6ggJ/Ck0BTIgu/Zc1Ittad6QqTTAbiY5mZuQrHWVYhIi2oqaK6qolA maMA== 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:to:from :dkim-signature; bh=phLDyRC8qvkN+cc3d8vZoLY4/awZtK5egXloQpIKBz8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=bJdtBPOrEMYhVLnhPYOXOyIjP2wwn1P1jDjGdcLjh4J1YCU3woBLnDMduIJpInWPsw BbxpYrX6NnAh/poWBSLeab1gsNdFNTzIMEKijSjxGQHQv1U5tFH5P/P/nGRoHjoTZwso HLpw9CeR1JUPdYtwMU+88HFmTBxSCPWxA2fMS0//IZ0MythffN3uUoeS+/1nzm8clWSB f3wAXpiZq876UxAAHf5+tENQD5wsJB2UcqTKi6YAG+/zZrFT7jw5+Io12EwR7WqWJt8L tkeTTCr7t6qbN1Yj0RYZcCeG9lcjJZgqHu9Vkz1iznVeR3vk8sJ0KmLe89gLp7JQusga 7LIQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sUmv7rV7; 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 d75a77b69052e-49452555725si160983041cf.249.2025.05.15.03.55.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:55:44 -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=sUmv7rV7; 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 1uFVpL-0000s2-09; Thu, 15 May 2025 06:28:35 -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 1uFVnr-0005hU-B3 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:05 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnk-0008Id-2f for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:57 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so6077265e9.0 for ; Thu, 15 May 2025 03:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304814; x=1747909614; darn=nongnu.org; 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=phLDyRC8qvkN+cc3d8vZoLY4/awZtK5egXloQpIKBz8=; b=sUmv7rV7iLhX0uQD4hpo8A6U9m4LgIFLqGCuV0tpod9mqNV30p4KAJCWHbA+cHwBed +Qkjt/wMkauDj+rQDQN0UD7MqR3ImE8exyG4BmmkVpsfQZ/2Gk3wXX2fUzGv7N7ewfGu 1hDlAGkH3rvYWyvOjvpozeq0AuagxwW+V6vuaU4TwrNB27eEy2+x4Ipx9LPuJHcVLVjH K6bNehZA+a/9URR2ElsZWnCVLpVLVfZGZ7Zy0jgKZq8vWnUqec1SJvcWydIaDoU3hW3/ kseznz2hXoRZ87WtOfTrU+Fx6GfNZtEpYko161jfZTaPrJ0veAL6Qv6GuiMbnBIi3mDS WeFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304814; x=1747909614; 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=phLDyRC8qvkN+cc3d8vZoLY4/awZtK5egXloQpIKBz8=; b=wRZ6lPMqzBhlsdXqp8xKRFO20SBqZRt0GnTWwQujXoemY6YkSuWv0GS0K0yDwHdfGx 74672dm7cege+0PLUu35vtyEcVD5zhzUTeulci5hPBpj3qLuNXWRHFe0OSGAgDjBnGM6 MPkTcDaH0kXrfqrsCpJTMnX17s025DFZh7ooq9NSBnLR6408hv1Lpqjii8kCfjB5PJbZ ImTiydxwuLFQTPT9lFau6OIpfmtlewhKOm/was4TVFTqCEcZ7pfJGzGWNQIXk9QADi0y 1ozV99XoOudfrQWxDUaurRNVCANZkUoSAJceDMd858Z+72Fvv1JPA7BNIP9pECjMXVqK Wdig== X-Gm-Message-State: AOJu0Yx2JZo923FsKF0cdoKOwLKs2giWBdw9Toob5sReU9Ie/tjR8ZCq Iebzjs8PNbKhS92dkduBuT/cARGuyQzJ3cKAbyorss7i5FwDlHEPGB2gMK0gedeyN+KtFrw/iHk q6oU= X-Gm-Gg: ASbGncv/HehnrX4HBuZ/WaEPdqHIOqEUEtRBpHP/LiDRZU4/PjTFIfvQjJczszxXboE beH2nv5BX7m5L5xbJZRV/DD/RZLMw46K7554kDcCC/Eklzko5/oNpiARn33Ohh2n4h9YiuQOOor jRgdhEyOOmk1TfmupRqRyxb3Wh455nxZWFSxz3RCIiCWOyaSdAGKuJgZFAkaAL1Jue4y2ei8Z6I BCLKqusDz9tk5aLZphjhtefRkM/Th7oEU7du29Y41itZnap1cpBhkmDwCqpxmD3N5CvZbyj18R7 nFi+AVvHtG59glVv9qTRhiVZ+EdsJ/jlItyYgEsTn0cV1y5ktOqdcNihgQ== X-Received: by 2002:a05:600c:8711:b0:43d:53c:1ad6 with SMTP id 5b1f17b1804b1-442f9705f7dmr17113385e9.26.1747304813816; Thu, 15 May 2025 03:26:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 54/58] target/arm/tcg/tlb_helper: compile file twice (system, user) Date: Thu, 15 May 2025 11:25:42 +0100 Message-ID: <20250515102546.2149601-55-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-45-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/tlb_helper.c | 3 ++- target/arm/tcg/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index d9e6c827d43..23c72a99f5c 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -9,8 +9,9 @@ #include "cpu.h" #include "internals.h" #include "cpu-features.h" -#include "exec/helper-proto.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" /* * Returns true if the stage 1 translation regime is using LPAE format page diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index af786196d2f..49c8f4390a1 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -33,7 +33,6 @@ arm_ss.add(files( 'm_helper.c', 'mve_helper.c', 'op_helper.c', - 'tlb_helper.c', 'vec_helper.c', 'tlb-insns.c', 'arith_helper.c', @@ -68,9 +67,11 @@ arm_common_system_ss.add(files( 'hflags.c', 'iwmmxt_helper.c', 'neon_helper.c', + 'tlb_helper.c', )) arm_user_ss.add(files( 'hflags.c', 'iwmmxt_helper.c', 'neon_helper.c', + 'tlb_helper.c', )) From patchwork Thu May 15 10:25:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890166 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3060223wrr; Thu, 15 May 2025 03:30:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVDBNkoEJ6EpE6nnOn4oTvURi5pCw9agjoAR9T3/bqRNZ059BUowB6jEigMvPvJn3KjvFn0w==@linaro.org X-Google-Smtp-Source: AGHT+IFpOs83CaqW+hAs+ZITaGV2Wwc50VBeRQirO4D7zlFUXL/RcNcoAxNODyaJrV6qWg38ThId X-Received: by 2002:ad4:5c42:0:b0:6f8:997d:fc6e with SMTP id 6a1803df08f44-6f8a4b842a2mr32808136d6.9.1747305059075; Thu, 15 May 2025 03:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305059; cv=none; d=google.com; s=arc-20240605; b=GsgpNTCKSF3H5onX1QhlwYAFyu41syvL93Q/mRSOapRFbjS4LHkemNpyD1u6i+0JMg FXtiUGNYP3Vxm4uu9M1JL70jxsRpmB2TKb1Qm/ONfReQCtv43aW6BtC0ia5feOvwmuTV Q0eFTtUZ1T8fDkwZdXnoEX+Zg/bTa/jzwEV+g12jDWjp3KkqScUrn8N1S05hRlFTFCjd FvObXfiv2x6FxMMJun1yRt6VkZ9uu2lCKquVXOSCOa4AFfyBEAFRN1xNZ2fW2jVaKnGP XK3cjJjCqRwDhK05Oldgh3evwn3bP2UwgszX/4nrF7cbhr9KnLb7z3wy+mYDifQxfYvk +j7w== 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:to:from :dkim-signature; bh=oDX/L4H6LWozpQuVjGq8Fpv0Kh4dC814yG6ylUtKBIs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=dGivixQDG+SZ0f8RQq3H1Pin0ek1hEjK7676ps2EMn3WWhNavzdyEDyaTZzFLx9BBQ S3mCnMILBerZqA1gb/T3nrnHE5yT3dNpV4Db4LWO6Rh+3Aw6dIgEkYYYg1d177cxajUP OfP+GidCL14pa+5ic64bXzDcPqW1ziPGhMJ1Sw0dlNoD9xmnOnm4dnpKJBuAQaaidTGm j7PR/POb1Wif/JkxMpwrGpJnhIcj/D6uZSwJIYKHo1mTGkhOR+z+Mr7Rh5t1essDMjmv rYywyKoG61hkex1PZrgaVoOpwZ1lduaFKoPi8xsbT/ndaIszkU1cg1lbCOnbN3hiSCU6 tuCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FO/RMRwk"; 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-6f6e3a42759si159357246d6.247.2025.05.15.03.30.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:30:59 -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="FO/RMRwk"; 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 1uFVqF-00028h-I7; Thu, 15 May 2025 06:29:31 -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 1uFVnr-0005hW-As for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:05 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnk-0008Iy-Jx for qemu-devel@nongnu.org; Thu, 15 May 2025 06:26:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso7151615e9.2 for ; Thu, 15 May 2025 03:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304815; x=1747909615; darn=nongnu.org; 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=oDX/L4H6LWozpQuVjGq8Fpv0Kh4dC814yG6ylUtKBIs=; b=FO/RMRwkmWYAIBMyTBz1HVHgAjRZ7HjN2Q6IYjoEin7T12oj5fs0P2EVLwcA7uKyE0 LKJBc9591ScqmjkH+sna6bIiXAoNdRBzmpFeTMbgfOtU2unj4M/E2yodb0C22WyD0a0R omntObEVL57PEo/mWcGzIcV5TkCFgReGW0rE7IfIOvYsklQiBu+97fjPdkuQW0Sk3Ww7 wADIkj7Fq8MTHBQsZO9zHN3RxyBADd5kxLA1sepgqZcXO/p0MSaXFf9bIbn95j+tlL6M sblNuUvOmTDGzJuYR8/Pgx94+dVWNoR0xnl/fG5GJpVNYf3hQuYYv4zXE2B5PMQN5Cyq x4zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304815; x=1747909615; 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=oDX/L4H6LWozpQuVjGq8Fpv0Kh4dC814yG6ylUtKBIs=; b=gIW2Bsldw/AqXDoK6fKXsICq2XB5RMcZsIguO4NSIj37mIRSCBlwn8X44d9cKK/82N lDYLGwVX10HL6xhAvqnYKwAFmN5OYHn5GeKDfwk/3pa10L4SvC64g6j2CckQMKuhVZVi cxmfVRbSLfRUEvQs8L5RrbjKkBNz5J12eqNC04njB00ADn/zy4saLRubUe4waG5DkFyH xLOSRQXr1MvdMwbo2THUWiIlLrhrhkzXHoJrA0HM7tNF7i8R7LcK4K2aZhs2Zzo458bF 8EUiWg4BiD+08phz7TFMCB2TAZ7kW24M2BViLdKF4eszAUVqF2IUQn9PqGo2vpeG4J3Z oecA== X-Gm-Message-State: AOJu0YyMO1dgYkfFsm545GuMKl46ba3cNIwclP/B/miJT3wXTW0jvKP9 NdHpjnl2OY6yb9giraAPzZ5JLBPMfL9xHub+axG5Kjwb9+Qu+T2Y8Zvb7xv9jjqSGrAIbboOGX7 FGIY= X-Gm-Gg: ASbGncu+KSa5A8Esg2y4DbtlfXPCaAI+EjmVaPY2uW2KF1TA32p3kWxAWc+0ozXCUza 5uI7HbVXMmczKu505rl7+NA9Nml1SCpR6yV+1tcaPOtHpT669OeZVZKK6P4Z1UaG51QrcwA3u7p PwTLzApGiAqkIlgRn4y0bxYcYh3M/Nss98fftestut3a5ax6KZw1EY6zPqWQ8UEm+Qy4SvJAnHL gEQTIfNyj9pkqV4UCLYhlRYrI3mlFGJ1vX1Mt+jRLd2qHdt9x46anlyh83Gs8qVh2ZwosUzLY+i fkPjJagDwhDAbJBrOBu/d7++M6z7G3o7/vJWCnY4JJ1FXOO1cB1mU07Stw== X-Received: by 2002:a05:600c:8414:b0:441:b3eb:574e with SMTP id 5b1f17b1804b1-442f96e497amr20146555e9.5.1747304814868; Thu, 15 May 2025 03:26:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 55/58] target/arm/helper: restrict define_tlb_insn_regs to system target Date: Thu, 15 May 2025 11:25:43 +0100 Message-ID: <20250515102546.2149601-56-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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: Pierrick Bouvier Allows to include target/arm/tcg/tlb-insns.c only for system targets. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-46-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index aae8554e8f2..76312102879 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7764,7 +7764,9 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, not_v8_cp_reginfo); } +#ifndef CONFIG_USER_ONLY define_tlb_insn_regs(cpu); +#endif if (arm_feature(env, ARM_FEATURE_V6)) { /* The ID registers all have impdef reset values */ From patchwork Thu May 15 10:25:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890208 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3077394wrr; Thu, 15 May 2025 04:14:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgeYPHapJvV9Sob7m2cwWeXX1XXxVve5wQN6cLoPb+hmg+u22nLE82AkcUYoeu6W+kgGUwUg==@linaro.org X-Google-Smtp-Source: AGHT+IHnymOS2QTsod2oVxXIxTGJ3C1tenPgefl545WzMXNlwu++joF0rvv8mcoqP9UgeR0cdp5g X-Received: by 2002:a05:622a:1b15:b0:477:1f2f:1717 with SMTP id d75a77b69052e-49495cb1e93mr109601991cf.20.1747307652070; Thu, 15 May 2025 04:14:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747307652; cv=none; d=google.com; s=arc-20240605; b=QPwf7uUIqFltHrkx7VbdaT8DqwdsxmK/9l7XLFeVp2DPuqMC3DPdC8PAQKp9e/tDyj EZYBFUdE0cTPn4rXJLqZYkQAz4m726iMpzDmukED7ej/G98tp0Wpf0v1B9qNeNgKi7Iu GArtfqerm/stYj171Bi9DB6k0PD5CY4tbbWJfTMS1I6GqKKgZdNJKnOQD3yHxbCQ/k+T P3pgu5Iid/Xli2tQgK3peG4DKsLbD6VSvd0sVuBe4i1B/TaOdqRLHHnYeUjz5mMnnxrt Z6eA1n6Dd+Y5RU/M3C1a5x0ScnKKjP8YGxQrxzkwoJNFZiJitsRiGNm+vPHirvGHnrpx SwGg== 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:to:from :dkim-signature; bh=uHg4ycwbPf3C1Edy5OlGts+9E0FlfMfrBWAhEu26MCU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Yn2VIan7+NEMA/Xkvf5n7iKGCADysSbCZ2LPxT+QjU6qU6AN6upNgVl+y8Yiacii9K NmvAfxJZ7BkvR+42dMer8N1PHC1Z3KZnvQXcVkdUD3mLtow5rCLC27kjM7zn/CqWkUtk DmdcvZotjM4v4szMYxHEHVQe7UEI4NdYOteml7fUf0ihxF8SjKKFFoxRi+zdEoyJMRL5 GYvZcHUd1ejl9grQnZTpIZZnolEpPsKjy6PbEjvLUkXwvu8v3u0rvZkmsyJ/eeJyNuWB lKHMAwJKvsKh+0lioFCzJscueDaag1OwOr133RU7+bJwtjry0oSmXW000Lc0T2pqDgXW Z+3g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wRWdeD4y; 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 d75a77b69052e-494525b3790si154809101cf.661.2025.05.15.04.14.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 04:14:12 -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=wRWdeD4y; 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 1uFVqP-0002BB-EG; Thu, 15 May 2025 06:29:41 -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 1uFVns-0005i3-Ua for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:06 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnr-0008JC-2D for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:04 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-442ec3ce724so6131835e9.0 for ; Thu, 15 May 2025 03:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304816; x=1747909616; darn=nongnu.org; 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=uHg4ycwbPf3C1Edy5OlGts+9E0FlfMfrBWAhEu26MCU=; b=wRWdeD4yrNAZm409NdYr9UHWwVR9LbyZ5UpcpNSW/naqeQ8l7SlmhkOiok5d+oGi5R K1F6E37pDfbX1s/Nb97dWrUgbnnsY6RK+suk/U8pSEdD82YT98I7gMJ2uzG8nUFPf0rl R/62kzoXlhFwv5G/Dw2c3kNndj8BAQ97xri7qlQ/oGjkHCD6nf6K8ak9pimkmCpeVezP 0Rfh08LK3H7MYxS3gfwh6nNxjW95Yf7XVvwU/LzIglDI5Ppsom0oNX8CkUNoFEX2aPbq PEcDPp9QamATMpg55+/HOSxTG1U0gVXyUvoN5zjcTzdn5UsS0LGBBxuiibl4kuhJOllb rNCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304816; x=1747909616; 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=uHg4ycwbPf3C1Edy5OlGts+9E0FlfMfrBWAhEu26MCU=; b=e+rZSmGitVRoOs6JUCh+uGQ5eiGTQT2WebvTtFARUnxNNbXPkw7Tjd+cIO5dYSQMJn ixeacJMw4AN4ihvihDKsP2YfKxwsPvb0MfQeWhxpaOZQ6WBTEdszofO/Fbt40Nhi2vou d6DAgosIYg+lsWT3vrujxujSSFjCJckMF8J1GbXZPy2wJh9dn1Ww+ut+/TFfdSxW6VYD W7h79ROeCi5X5ceTgi+pXRtlo8seqdyjahPJWkT8E98IguBGnbFKmJQT+ELoSTEzOrlj /hDVtjwF5DJoWDK6/fVOlTdDlprwBrD6K/eRzeNhP5Csjc47sfvOaAd+uiMQdVJIIJyX F6nQ== X-Gm-Message-State: AOJu0YyL1txJzk+gt5Q0q6jCf/gC2OgyeVIuwggHGBxIc/GSoPIZN/EQ Lu2ZluFmwulVyr2t7zofNHUWmfCDnlzhoD33goBGjYekv/7CAwBLufguAcD2ZYDTOTbBxzjyo2E zn8g= X-Gm-Gg: ASbGncsJI10ANkaD2zKl6u4+s6p01RqQnofqfa10ivJltMq5PGr+QAWbmKlDFbD0fiq /fmn727wl5n1X/mBKrJ9FpPXm9CrbPU+1YSwLgnt2RNekAGN7XohhsOABXvqOFdyMZtAXWfo+3d J30AZ+l9S27j3bPc4H7uZLIGT0RaNc1Gpm1ji+1ttnZgg3Y52xX3omhwe0WX4jQt6TZKdCWgig4 9qB9go08f9lLcx7Ls9E607rh6NqpZNVOD307mOePDxHCnIEH7kO63V1BNqYaBk19BlkAaEeexnc eTcjHtTYdYmXEjYzcXi/XEU0lnjinstbC5uTwBDUn7LgETyjIFlEQgBy+g== X-Received: by 2002:a05:600c:c1c8:10b0:442:f989:3dfb with SMTP id 5b1f17b1804b1-442f9893f2dmr7997995e9.1.1747304815772; Thu, 15 May 2025 03:26:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 56/58] target/arm/tcg/tlb-insns: compile file once (system) Date: Thu, 15 May 2025 11:25:44 +0100 Message-ID: <20250515102546.2149601-57-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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: Pierrick Bouvier aarch64 specific code is guarded by cpu_isar_feature(aa64*), so it's safe to expose it. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250512180502.2395029-47-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/tlb-insns.c | 7 ------- target/arm/tcg/meson.build | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/target/arm/tcg/tlb-insns.c b/target/arm/tcg/tlb-insns.c index 0407ad5542d..95c26c6d463 100644 --- a/target/arm/tcg/tlb-insns.c +++ b/target/arm/tcg/tlb-insns.c @@ -35,7 +35,6 @@ static CPAccessResult access_ttlbis(CPUARMState *env, const ARMCPRegInfo *ri, return CP_ACCESS_OK; } -#ifdef TARGET_AARCH64 /* Check for traps from EL1 due to HCR_EL2.TTLB or TTLBOS. */ static CPAccessResult access_ttlbos(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) @@ -46,7 +45,6 @@ static CPAccessResult access_ttlbos(CPUARMState *env, const ARMCPRegInfo *ri, } return CP_ACCESS_OK; } -#endif /* IS variants of TLB operations must affect all cores */ static void tlbiall_is_write(CPUARMState *env, const ARMCPRegInfo *ri, @@ -802,7 +800,6 @@ static const ARMCPRegInfo tlbi_el3_cp_reginfo[] = { .writefn = tlbi_aa64_vae3_write }, }; -#ifdef TARGET_AARCH64 typedef struct { uint64_t base; uint64_t length; @@ -1270,8 +1267,6 @@ static const ARMCPRegInfo tlbi_rme_reginfo[] = { .writefn = tlbi_aa64_paallos_write }, }; -#endif - void define_tlb_insn_regs(ARMCPU *cpu) { CPUARMState *env = &cpu->env; @@ -1299,7 +1294,6 @@ void define_tlb_insn_regs(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_EL3)) { define_arm_cp_regs(cpu, tlbi_el3_cp_reginfo); } -#ifdef TARGET_AARCH64 if (cpu_isar_feature(aa64_tlbirange, cpu)) { define_arm_cp_regs(cpu, tlbirange_reginfo); } @@ -1309,5 +1303,4 @@ void define_tlb_insn_regs(ARMCPU *cpu) if (cpu_isar_feature(aa64_rme, cpu)) { define_arm_cp_regs(cpu, tlbi_rme_reginfo); } -#endif } diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 49c8f4390a1..5d326585401 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -34,7 +34,6 @@ arm_ss.add(files( 'mve_helper.c', 'op_helper.c', 'vec_helper.c', - 'tlb-insns.c', 'arith_helper.c', 'vfp_helper.c', )) @@ -68,6 +67,7 @@ arm_common_system_ss.add(files( 'iwmmxt_helper.c', 'neon_helper.c', 'tlb_helper.c', + 'tlb-insns.c', )) arm_user_ss.add(files( 'hflags.c', From patchwork Thu May 15 10:25:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890179 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3061934wrr; Thu, 15 May 2025 03:35:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWba+J3Mp9uWJ+XAGjLj61rSjLd2fOMLedywptjOyT/krNthJkVAD7q9pWMMV4B3DK5jjquaw==@linaro.org X-Google-Smtp-Source: AGHT+IFE5VOTg19w6pKKwwJy7N+sAOZYP77N9mOhQXWKLK+mVUGLTI4cDLlvF8jDQOZaeswcPEhA X-Received: by 2002:a05:620a:460a:b0:7ca:dac1:a2d9 with SMTP id af79cd13be357-7cd3c69d2bbmr200979885a.28.1747305319781; Thu, 15 May 2025 03:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747305319; cv=none; d=google.com; s=arc-20240605; b=Gmv/aIdhyuDwp9eQ8D3Sr1YlsxTNTM4Dcfwd9lPCeNUo82CqMt+n5dzKUtftcoWbt5 7AaZnaNmev9AhEIaXtAJn0tT5/TtiAZWP06IolKkVeUQbIBU3W61WqY4wecx7/w85TJb yodN6gUfs2+kty6lh+syG4SB/T1/nffwBRKDlwkGhRvjPhLnqlKq9BF9G8O86bSGagwC 7pGZGga7X14Vr7ywuehgF8tth2dU4XQXUipghs0WpJPHg5Q0VTBKFNED1Ls66CjyfQk/ WpFVSjEQS97JzHvYwYBznyYPSP+92K67sTqGbVshlMTmIYqdmShE9BqUK4WFm8aqdbna DV6Q== 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:to:from :dkim-signature; bh=97ZZBvdmNF0X3lx5ZR5EO55LMqvaqGIqAUiNymsGAhM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=hQ+tAk/xWH2rKjCG+KzJIdFrdicuKhWkSYem7WMuHj6Jm7k6Hw/yYn9oM57aLR4Bv+ uVfrdMQPT7eap0+c5H80vlEN+PUzrnTN2Pq7ij5saFwfSlMgVvbprbV7f3jsaJ7ImVHA qLbo39iy26YkOjlxzOiIBfdB3pdYoD/lKFxmPnb7SCxav9aY2VbL3daesOuNR6DGPWyg 8fjCFReZiHnh6LIsytPsT7T2F5ckSAsr639/XaNP37bNmRfhszW7/VKbZei/nFIzZ0p8 z14uECMXmEiXsmYT3H9yGUCcwlLC8QbQ0tDbwu/TRFZqGhNs4rJhYDZCvuzLnmf2QFPW vxvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="huGK8PV/"; 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 af79cd13be357-7cd00fd4d7esi1609032585a.284.2025.05.15.03.35.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:35:19 -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="huGK8PV/"; 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 1uFVoi-0006yr-Ge; Thu, 15 May 2025 06:27:56 -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 1uFVns-0005hn-SN for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:05 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnr-0008JM-1v for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:04 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a1f5d2d91eso427581f8f.1 for ; Thu, 15 May 2025 03:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304817; x=1747909617; darn=nongnu.org; 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=97ZZBvdmNF0X3lx5ZR5EO55LMqvaqGIqAUiNymsGAhM=; b=huGK8PV/zX+/eL+mAatduOl88RQCK/wH65GEOTJ5QU8Ynb0iUhb8mkfBt6QZMpkFcx s2d2dVyYVE/n3M6lffVvY1fiRf/Gnv5nRx65Ie5rrnVseNa1kt2LkaphcO4BQnLF1VTz rhrOvR99g5t2Lmb6QP8Ssl+LohegTHFKYRGYMi0n480Whm9WoNESGoz058j2if4M1R7w zqNyo02Te9DMsPdhGKaPAHVQGsPWpMZCKUXGtOPPFCrEPI5ZO0JvaoCOJYGr9CJq21Cs EQNfxWDp0aYJz56VEjrlNtR/audtUqLH23e+i8p+3eA5kuA8u1xEDnOEE1xzF13i6pXG ZZ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304817; x=1747909617; 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=97ZZBvdmNF0X3lx5ZR5EO55LMqvaqGIqAUiNymsGAhM=; b=Z7rOae9LhgFxXSA/TGGGuo/hI4Lw0QB75xdQL3A7P3+nhLTgvae2UKfJN2q7xRZ7wF 2BjnUree23z2FTBaRdZUPvl3gwPTfNfmIuL5q/qxZ2V/X8xpRLIybRfet+q1USrTVPl1 umgYhoabhQq+2gxIEzHymj8ds4tO5FnhFO/WaYyUdpxLsmIJTnh/KB0TMQybUpwm4zWe loD4Vbdtplhth1lrIuIu4I9Douc9b3IdGY2EQD3R5DuAFpjg8e8WKW6iB5encoJYRsA6 +CcZxpxg6ni0THaNg++HHpmqS8mYwzTNZSOPMrpGqJOTlsyxkkU10Q4gDPh9P21jDiPD alrQ== X-Gm-Message-State: AOJu0YyFTEXjtpDwpRd/wiDPIXm0U5S6dZgIhjwdePRrHbLnzhMeTzx8 MnI79XdX+VJGRkNUU+mHQYQ6yfBqbPIRqrGqWs7QEDGOsR3ZpzV6ibwRzUKnpB/7pPQOMgQMssh MzE0= X-Gm-Gg: ASbGncvcUJwXB0ba5qoU10xDuPjMBRF/cHhUYNg2B3Y29CMdJInTPaSzEV9TcvjacT7 nq7zMj1312A/+pe7ZPna0wsCbqjuBiC7QRZrwgErM5zEUZ2bNbWQ/lBnLaRIXImEKanl4bB2RmN bFIrSiUBi4k79eAPYm/1A1TSplWZ/tMnzglGEWDrzQKqwowCNcNy2t8F480rdWiSHh/8nau5oZh IJcR1XsR1zmQXDQVic7ORcfNCPnoADobEsDvoCN1YJNVuYqeeKSFOFpvumtn05o8qeLLVISuIi/ dmwo0OvQtsZ2HfZrLnDtJma3n/mfjOCymZrGjjfyzdlbl+474Uh+b+YGog== X-Received: by 2002:a05:6000:1864:b0:391:4873:7940 with SMTP id ffacd0b85a97d-3a34994d99amr5866627f8f.54.1747304816781; Thu, 15 May 2025 03:26:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:56 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 57/58] target/arm/tcg/arith_helper: compile file once Date: Thu, 15 May 2025 11:25:45 +0100 Message-ID: <20250515102546.2149601-58-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-48-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/arith_helper.c | 5 +++-- target/arm/tcg/meson.build | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/arith_helper.c b/target/arm/tcg/arith_helper.c index 9a555c7966c..670139819df 100644 --- a/target/arm/tcg/arith_helper.c +++ b/target/arm/tcg/arith_helper.c @@ -6,11 +6,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "cpu.h" -#include "exec/helper-proto.h" #include "qemu/crc32c.h" #include /* for crc32 */ +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + /* * Note that signed overflow is undefined in C. The following routines are * careful to use unsigned types where modulo arithmetic is required. diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 5d326585401..7502c5cded6 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -34,7 +34,6 @@ arm_ss.add(files( 'mve_helper.c', 'op_helper.c', 'vec_helper.c', - 'arith_helper.c', 'vfp_helper.c', )) @@ -59,6 +58,7 @@ arm_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c')) arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) arm_common_ss.add(files( + 'arith_helper.c', 'crypto_helper.c', )) From patchwork Thu May 15 10:25:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 890196 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3069240wrr; Thu, 15 May 2025 03:58:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXS/TSfW3DJSBETRxWUa8G66x/+uHutt9RqMHb6Lff7AkBhATlKjOFLh1dfkf8G6CaZwzJDQ==@linaro.org X-Google-Smtp-Source: AGHT+IFfQnR/Vue1FOAnd2WUOjHrvxynVGZIPlBu/UDMLhs4azwnhxDULRzSY87yQLdltmnpaKIR X-Received: by 2002:a05:620a:2955:b0:7c7:a543:dcfe with SMTP id af79cd13be357-7cd28810ffemr1150368185a.32.1747306697339; Thu, 15 May 2025 03:58:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747306697; cv=none; d=google.com; s=arc-20240605; b=fAbMULRAsKaZsZTzrW3tvIcfvKzgniP4BlBS81K0L/sziKQzbna4Nyr+pAGJXmYRol Oc5NRodzUVGL7CSjtcNcJt6JV3HzToiJFOeYjqqjJTlWHGhlMbtuUjfSnJzeMmsI+dBM HKyVq7sEdv10swf9NI7lxP3NSXIxZ6iKLEbxlj+WH2EphvYN8zUFamh2k0PQ3EawW0Py SD+FkiVBnJQHbrrwGuQRp1RIgxp9wu6xG0r4f70FOohjA02Ly8kXg912qbL2Sv4dQSn/ KWF5UYZJzmenLhQtcmvsOdE+y2e88rPe2KIEc20CUqGAHl1Yfyb/Xw73Vi3gwGJqDbNr wFVQ== 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:to:from :dkim-signature; bh=xSiXRwtDMWDeTq5UrKQY9rIDpqHmH/9swQvH3M4K+Hg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=BCOcj6IcEi8AdWjzfWvq6QIYxoMmBGDjWUfBWFuDHWgRu69CHgm24RiijXkBcB4Oor yP5llnXi75+TzlXEyqZJaMremZe2DLsvz2Zrn5lvWvfY8+ZIXZ9yqpVqo/g80kqjIRFi 5XiUtnpAznw1b/U4eS5PrG+3kV0si8YxcVvWKLbnD9TdG70kUNwBB+RQA7fC3PRBJSQA icIjwRk8FCFh9iBMWCb78WmRZ9WuzwVncsEohDJaA1DlFnrWJxFSea9LcrreWfoLmUHi f+wkK2yHgiltp54ip1xEgDNkRQgdQpCE+TTY2xBV3Z/vUSqyvony91XpzyS8IVDA7Ct/ rOpg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oIqNc3nt; 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 af79cd13be357-7cd00f69d3asi1555185985a.182.2025.05.15.03.58.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 03:58:17 -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=oIqNc3nt; 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 1uFVqW-0002JH-1S; Thu, 15 May 2025 06:29:48 -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 1uFVnu-0005k3-Q8 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:09 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFVnr-0008JS-38 for qemu-devel@nongnu.org; Thu, 15 May 2025 06:27:06 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so5935915e9.1 for ; Thu, 15 May 2025 03:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747304818; x=1747909618; darn=nongnu.org; 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=xSiXRwtDMWDeTq5UrKQY9rIDpqHmH/9swQvH3M4K+Hg=; b=oIqNc3ntlA88EkycPWvU9272DyoYFXz76+xdYwNszKgbbqPz7wnNwYfk/6NakgxRnG RxM0b0z61do6qf7yhYTbHUp9pX3+ahgzFb4Wjn4FN81mdGUIUP3A79CS7o/yYhNWBe4W 4bdXzRfJgXjfkY1umMJlqUsQGNhc92HrufhnCZYUTsYuP3RFjJEIZKV0iu7/7siRCbmU kViC7rwaXaZon3v0KJ7IHGAocPI1M0rwsTGPvEQRd+dFLl4OzqXmRmOBneGZggzOweRw 96ijYEOCWM2CodJcnvQrQd6IDnWPMo980SIaTtKPpwNSRki1SOZHc1o6I1YkfgqUKBu+ oxrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747304818; x=1747909618; 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=xSiXRwtDMWDeTq5UrKQY9rIDpqHmH/9swQvH3M4K+Hg=; b=qnsFsur/7kIwHg24AJPbP6dBv+4qvNQJJl6jvk1BGzCPg3K7ksmEf/SggX9w99SS+E Lz6M+LNYICir5LyRkHEF6+e9kSyBdPMwfKdCFAm3rg2owTxeDiYa7mzZ0d7ol0hLJKhM hYbOdTpL6Eq8tEliPy3h/uhEp7mcMOYx/5ua9v8ujW7FMltVdkXxJUDh02KEDLZcyko2 9y/FEWzjHW2SfypK5n0Em1R6fg2lzppzRuML2ESO1oSdslUVTw+CQeBbbNhhwdhjoAJl hTwq/h9z5/rWQheLoymnHR5pg95730DfQS5jGmla07O/gZivtD0lfVleXqBvxbvDqrIS sC8Q== X-Gm-Message-State: AOJu0YwMf2jRyN0Q9jhup2KCTIANYXHV+NZiE/WMMHWOh6UHtQz8ye9m BZgHeebolWnmJwWO+bfjJwyfmSrNDG+K8i4SxSmAWUHT5A9CjeJGePWF9Fvl4uExb6chrWdRiOd SoSs= X-Gm-Gg: ASbGncuUgH6Z5M0UUxvdtzRnNIyRDwaWQxylXlvfCIT+OCObh5aC/VgiO3WFfZQWmfn 5ObdhZKwBTOzae7RmdN/Q8bWJ1htwrZWDdEge9BRhT/QBr4bG4BPu6apgiMp1uVnw3HTEGn67Ck ZB9i0bEOaApJ3/dXnFjhw3nlF56HlQ4Aj2SNoj5H9LVFna+vER8Ah4hD1Q5dPt4AqAYeDDAnIpk U+Fm0zE4bvcmw3U9k3hEmAj3a0bYQnJDf1k5c+vYVVjiOntTXkMWU6Clv6cEU7wsqkmPe9jAnLC ubLfOB5Lt7TzD9pFORKLxbvw7z4gjYa6mGnf7b539wJUnWMelsXSz2IdUg== X-Received: by 2002:a05:600c:1e84:b0:43d:2313:7b4a with SMTP id 5b1f17b1804b1-442f20b91cemr72098175e9.3.1747304817730; Thu, 15 May 2025 03:26:57 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442f396c3a4sm65657855e9.26.2025.05.15.03.26.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 03:26:57 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 58/58] target/arm/tcg/vfp_helper: compile file twice (system, user) Date: Thu, 15 May 2025 11:25:46 +0100 Message-ID: <20250515102546.2149601-59-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515102546.2149601-1-peter.maydell@linaro.org> References: <20250515102546.2149601-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250512180502.2395029-49-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/tcg/vfp_helper.c | 4 +++- target/arm/tcg/meson.build | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/vfp_helper.c b/target/arm/tcg/vfp_helper.c index b32e2f4e27c..b1324c5c0a6 100644 --- a/target/arm/tcg/vfp_helper.c +++ b/target/arm/tcg/vfp_helper.c @@ -19,12 +19,14 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/helper-proto.h" #include "internals.h" #include "cpu-features.h" #include "fpu/softfloat.h" #include "qemu/log.h" +#define HELPER_H "tcg/helper.h" +#include "exec/helper-proto.h.inc" + /* * Set the float_status behaviour to match the Arm defaults: * * tininess-before-rounding diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 7502c5cded6..2d1502ba882 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -34,7 +34,6 @@ arm_ss.add(files( 'mve_helper.c', 'op_helper.c', 'vec_helper.c', - 'vfp_helper.c', )) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( @@ -68,10 +67,12 @@ arm_common_system_ss.add(files( 'neon_helper.c', 'tlb_helper.c', 'tlb-insns.c', + 'vfp_helper.c', )) arm_user_ss.add(files( 'hflags.c', 'iwmmxt_helper.c', 'neon_helper.c', 'tlb_helper.c', + 'vfp_helper.c', ))