From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607297999; cv=none; d=zohomail.com; s=zohoarc; b=FHjCC8zR7p1kGmy70UJxC57nscm1jUA/lS0oqPSsXc5AuMinzd5MwoedkNOuvJMqi90cE0cmYJxGQonpYHUG4ob5CXE2KXK0LLZfWrIACwlo9YDz9mzUpSte+znuU2jf94HCna+XBhtM91OHk29rmlRkVo86NrzKH+fOQaIUpFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607297999; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k2eeYOSwnhkGWaF7Gqxwyv5DCY5GnWH/sPRKUd7DVSw=; b=NJmNAkXfEwZmekE0Uc9U3XF8ZAt38D6FaQEjzWzajAtiTIAHmKrKJ/Nv9CanNd8Cnt8m9HxD+lBsnrFgpMUqdl+3Uq+DQqNOYeEieGCB82crqI5Amv3gK7YDh0qjlVzzLjqNqz3TEAhFRhZqGRfZogtm9Kkt5QgOK/aJzsz57Fs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 160729799938718.79859402106763; Sun, 6 Dec 2020 15:39:59 -0800 (PST) Received: by mail-wm1-f68.google.com with SMTP id g185so12067872wmf.3 for ; Sun, 06 Dec 2020 15:39:58 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id n17sm3479198wmc.33.2020.12.06.15.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k2eeYOSwnhkGWaF7Gqxwyv5DCY5GnWH/sPRKUd7DVSw=; b=lCV2tVlTBuYcB4tKKpyVcUZy/dLgDw+fUlNSeB8cvB+ESWGUKwbBTmkJ9hSkZxaaLj gzZNP95EGEBFqJtamjQICHTD7pQe6Brz85Df8Miuns1r2Qmua1gMgWA7Dxfn8LAHXzwI 7SkpOkiwubtSKtkoqhR4BBr5TSsCjl5kPaq7g7M7wyQ8UjYtS1uw3SsWfMr/AhL+FrlG YA49GUPLOV2H3wYgykcJcK28LQcDJhoItqoP2Wi2HiAgfvpUjw7EFMpZ6/B46cxfQE0W 629C1e2wy/sm6XEp9hrkrAv3qTp7Ye5JCxZUxOwTRL869MEaf/eeiJPwjSVcl840NXGm zwew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=k2eeYOSwnhkGWaF7Gqxwyv5DCY5GnWH/sPRKUd7DVSw=; b=E2r5frXp8+UNQe3iBPu/EYn2Aa9xgHs77k7CnfNgRw5cmNDLhmkpZWHFzFTZRKHtJ1 rznSpWxGhIAE2yUV/ttzPyytNvIbQMlNopu2/YkvfyzBMA+L1Xw2d5wiCbL+x64yXmfx W+l8gqCYvTa3+UPmhz3ivAC7sXynJyYAiabnHrpQxa7tpgjp/nJqzEgeufMliCafEwW9 50UbVhWdZfhcfUdk55UxG62IJgUf2/ZPSfpXpJDhzrAaXO/i/LJySdXnQITEqZ+QZ/0O 2HIxoowc7/aUaCw62CpSiaXd3M/gq3hjVqyWSju9xRvZr8r0sudtl1VGcBST4RhPHLA/ CKDA== X-Gm-Message-State: AOAM5311lQdOc8NHQAkVHDFDH+zEZmRDpsoCnd3MJxMMZ2iLlee8RVGD VJ4fEjTXfLv3ds/0ucYfRlc= X-Google-Smtp-Source: ABdhPJy3xT0vKlHKdf2n/udhIrOm526CJP1KpDJx6fJG7TXfFZ2bHXieBHHTpA97RbYwzkbqLswFEQ== X-Received: by 2002:a1c:2b05:: with SMTP id r5mr15395706wmr.179.1607297997495; Sun, 06 Dec 2020 15:39:57 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 01/19] hw/mips: Move address translation helpers to target/mips/ Date: Mon, 7 Dec 2020 00:39:31 +0100 Message-Id: <20201206233949.3783184-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Address translation is an architectural thing (not hardware related). Move the helpers from hw/ to target/. As physical address and KVM are specific to system mode emulation, restrict this file to softmmu, so it doesn't get compiled for user-mode emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/mips/cpudevs.h | 7 ------- target/mips/cpu.h | 8 ++++++++ hw/mips/boston.c | 1 - {hw =3D> target}/mips/addr.c | 2 +- target/mips/translate.c | 2 -- hw/mips/meson.build | 2 +- target/mips/meson.build | 1 + 7 files changed, 11 insertions(+), 12 deletions(-) rename {hw =3D> target}/mips/addr.c (98%) diff --git a/include/hw/mips/cpudevs.h b/include/hw/mips/cpudevs.h index 291f59281a0..f7c9728fa9f 100644 --- a/include/hw/mips/cpudevs.h +++ b/include/hw/mips/cpudevs.h @@ -5,13 +5,6 @@ =20 /* Definitions for MIPS CPU internal devices. */ =20 -/* addr.c */ -uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr); -uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr); -uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr); -bool mips_um_ksegs_enabled(void); -void mips_um_ksegs_enable(void); - /* mips_int.c */ void cpu_mips_irq_init_cpu(MIPSCPU *cpu); =20 diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 23f8c6f96cd..313e3252cbb 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1290,6 +1290,14 @@ bool cpu_supports_cps_smp(const char *cpu_type); bool cpu_supports_isa(const char *cpu_type, uint64_t isa); void cpu_set_exception_base(int vp_index, target_ulong address); =20 +/* addr.c */ +uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr); +uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr); + +uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr); +bool mips_um_ksegs_enabled(void); +void mips_um_ksegs_enable(void); + /* mips_int.c */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); =20 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 3d40867dc4c..91183363ff3 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -28,7 +28,6 @@ #include "hw/loader.h" #include "hw/loader-fit.h" #include "hw/mips/cps.h" -#include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/mips/addr.c b/target/mips/addr.c similarity index 98% rename from hw/mips/addr.c rename to target/mips/addr.c index 2f138fe1ea8..27a6036c451 100644 --- a/hw/mips/addr.c +++ b/target/mips/addr.c @@ -21,7 +21,7 @@ */ =20 #include "qemu/osdep.h" -#include "hw/mips/cpudevs.h" +#include "cpu.h" =20 static int mips_um_ksegs; =20 diff --git a/target/mips/translate.c b/target/mips/translate.c index c64a1bc42e1..87dc38c0683 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28,8 +28,6 @@ #include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" -#include "hw/mips/cpudevs.h" - #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "hw/semihosting/semihost.h" diff --git a/hw/mips/meson.build b/hw/mips/meson.build index bcdf96be69f..77b4d8f365e 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,5 +1,5 @@ mips_ss =3D ss.source_set() -mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(files('mips_int.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c= ')) diff --git a/target/mips/meson.build b/target/mips/meson.build index fa1f024e782..d980240f9e3 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -15,6 +15,7 @@ =20 mips_softmmu_ss =3D ss.source_set() mips_softmmu_ss.add(files( + 'addr.c', 'cp0_timer.c', 'machine.c', 'mips-semi.c', --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298004; cv=none; d=zohomail.com; s=zohoarc; b=ftN+kZOnll5S5MHRgD2uUOdE5CD0QbYhy1TC2l8UlvcQaSxELX5k86tq7bZ8VxKwGTPNxTAgGJ8XTNlMwi3QrVqw9wafA8Zpq0uOMkvaZjq2CiRZ4kWYU1ODhkeCEALjfD1Jqucp1WuyDV/E2jsTxcweaPpURn8pvsXKQE+jdew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298004; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DEaTvj3VcNVgO4De83R7lmbSE3LG2HSypVjtVT7iMo8=; b=F1HXxrnIwNB2X+zH1ZVHtITxzuRfY/qUYfANRb42RqI0956/ruK5j7WsG9x/NxpmQtd3N4j/ktHK3Lc1c91cIn/YLFTJKm4FgPUQW5r0+w4W/akoINIVw95+XIs6gkcMHjsKSyOVlcSSFZbdAnJr+wtZUHdFJbqXcJm2zfN2DPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1607298004425170.1287015041769; Sun, 6 Dec 2020 15:40:04 -0800 (PST) Received: by mail-wr1-f65.google.com with SMTP id a12so4230249wrv.8 for ; Sun, 06 Dec 2020 15:40:03 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id n126sm12302988wmn.21.2020.12.06.15.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DEaTvj3VcNVgO4De83R7lmbSE3LG2HSypVjtVT7iMo8=; b=mt0wPXSaue0XcM4NwtYAtuHUaaMWvyXCJ9I38kK0npE2Urhbpu7ArEUijYEMpLXq87 9/skJR5oZDZbsF55iCgxIUUB+WnXRSJil0LQ72VcLroRWzoVf7t8621ItqDdCvsCvDNn CPeRNjP1w8gxvjJrq5yz13E+7nQKxEJudCV5Q6makxw9SVMUeIcZT7iq3+Ke1ICoWvdW gYSWUur6AP610nzZa54XyAt/hWSdCyNAWOt9iGlOZqjqX3Fgfh4q/+FngKPFupbL/eef nObIJFG2MMzRgpO5Jzda3jbCcHx+J8dHkx3sDPMt0V6amiFX2lcOrm6rFQ1yYl7CLqKx DkXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DEaTvj3VcNVgO4De83R7lmbSE3LG2HSypVjtVT7iMo8=; b=ZTHsxphmzvsDGuSZ/HkRGheq0L91gEFuaobNsRTjGwgAKoj9wVtcIkcmCzzQvag4Q6 cVGtlt7W7cAVFgU4J6eGI3BI6pDvFwmLaU6xLT+nyEeCRcb8zbKet4RbHgWQauJzODhP iDPi1V19voxno48+6WzmUSPwWUR+W1U62/egpq8LS0apf+dwmGErA5yCOpaPyqD+XjDo 5md2BO2qiYvzIBMpJW4BF2Qa8lMzkcAeTJYz5hKnIuf9dB+p2nWvG4LIlZasWpC+Ikq2 AMpPNSSRZmTx3baCcUrLl5RE6jw/4iCwIYV6feXlDX78U2wnYucQwoRKZGDlqJL7pO4w Ca9w== X-Gm-Message-State: AOAM532R72pUSg1kvaxZlA6kWHJ0YF9avdFqDtn7w/vYUipSq3REpzH9 3wnHU5y2PnF4lh7FHZQOjUQ= X-Google-Smtp-Source: ABdhPJwA7CyhC0yC4B3t0LydZBABnTbwqeTRjimAiaidZNwnn2wU7OPS3BL/6Y/lQ7edj6etF4Gu4Q== X-Received: by 2002:a5d:654a:: with SMTP id z10mr16447548wrv.285.1607298002625; Sun, 06 Dec 2020 15:40:02 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 02/19] target/mips: Remove unused headers from translate.c Date: Mon, 7 Dec 2020 00:39:32 +0100 Message-Id: <20201206233949.3783184-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/translate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 87dc38c0683..346635370c4 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -24,8 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internal.h" -#include "disas/disas.h" -#include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298009; cv=none; d=zohomail.com; s=zohoarc; b=QlCXIE84vDha4Yj1E+kkW2FN22I9ww2SxZG6Nb0/hH6b7o69PCBp7tDI+BqF2qVyL1FU1iL3sZMvUNoLBCxbHBim3cT2GSIyjnFJ1V09dy1KhxTWw3wKDhAKqO67+QABtJe+u+yHarz+0XYd4Ez8CUhD/PE8O+l/Vsce/dd0pZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298009; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XM32sGEjA2NXWYAKzKhgTdbipbFOwi76R5qWtxt4kUc=; b=glojtlSSwA7CXKpFqnQEYGtSHN7le8DXTCSxPbmWMTAQAfl8hKig5+9Zbj/5eilgI6fkvlHBeLTHEBOOCCfzokDhXj66Fud050xS7OH0aFLyhkZuvN0pwOd0pk/q7FjDCrrfYIWTBANvfDOylWWQy0XIHCuRUolvgZg3X2eK7Ns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1607298009363125.08321898505017; Sun, 6 Dec 2020 15:40:09 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id a3so12052746wmb.5 for ; Sun, 06 Dec 2020 15:40:08 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id 64sm11892213wmd.12.2020.12.06.15.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XM32sGEjA2NXWYAKzKhgTdbipbFOwi76R5qWtxt4kUc=; b=Ncs0+H+gQE1fr7o37GxbbjzKAZ+KHNVELm8jGKBgLMS+T/eVT5HpkqSY3FCkmUAwnt VZXhyiZBQqwAByA1gEh9z5JxlveDyWZhhx1CYEAbGocruA52FLckPeYZe5+lidCB9L/d ztwDbNjqxhB0/xUuyb5MDVTp5Opjg6Gq6aJL1sG21723zjoXQQdpu0yu2x153r2Fc9NM U4j37LoiN9DzIwlIbY5QrdEO6U6pqLpnVaKZhcZwm9NwIBMsNR8rbPdLZ6ETAtC6pDh/ 8QfoR59ntau1MwlvfkhXk42Z/vZRCzRQXPSol/45BGTF9jneakXaZEcL/s8pc4gyWzK9 CvoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XM32sGEjA2NXWYAKzKhgTdbipbFOwi76R5qWtxt4kUc=; b=caIQKF/yirxu1ysG3H6XAoWVH+FbMq1qlct88AwGJEuHXgUUZhEV8b7WIh4Amv7fu0 kQz6Qp87auLFU4w3haZx15ZViLbeQ/ib1Yu3T/FTaD4FLzj/QgBBsdMVa/rqbWYXlwac S6AvyUGBjmqij2YZMrD3TqjDr+RYDWHLmITAkxXa9iOPbiJWvkMpAftDSkwz6u2Ydabz TUKKMFMN59oJPKw4LYXfuNwpzj9c6/81dB+LFGhCh6dMAgnKzfXsw2ajZhheU8zbVCG9 bUUU3K2tqdwu4x6ukeNls1+IQyQsP2dWe/r5WqitULjya7rNjH5RsWviF8s9W4B43eXr ae5A== X-Gm-Message-State: AOAM533W4XWKGCQMIHPRsp7JFhW/4539oBwqL3z1JtRedfiyW0lk66tA 6q48kFRQRKi2YQnNB22S8GQ= X-Google-Smtp-Source: ABdhPJxlh5IC/oOpnriO1JnFl0cFXBOn29HlgUnDWDg1BSvBhFrPq93YsA0bYQ3pF4kE7N3nTcYigg== X-Received: by 2002:a7b:cd91:: with SMTP id y17mr15169430wmj.171.1607298007613; Sun, 06 Dec 2020 15:40:07 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 03/19] target/mips: Remove unused headers from fpu_helper.c Date: Mon, 7 Dec 2020 00:39:33 +0100 Message-Id: <20201206233949.3783184-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/fpu_helper.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/mips/fpu_helper.c b/target/mips/fpu_helper.c index 020b768e87b..956e3417d0f 100644 --- a/target/mips/fpu_helper.c +++ b/target/mips/fpu_helper.c @@ -21,15 +21,11 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" -#include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" -#include "exec/memop.h" -#include "sysemu/kvm.h" #include "fpu/softfloat.h" =20 =20 --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298014; cv=none; d=zohomail.com; s=zohoarc; b=RMJNaceLAxXIilzVnqM2kEcHG5ptHHlbYctidRBTwuUZ29goaqye2/19JAxV+VEgtQbp/9AXhDobt6UE11mKTtPW2/sRwD0iQKtruh6Hr+2nzzp2TXVfLAktOqAIl1q13iLlRwu+DeywGPaQO4qdHZ982lMkpkQLTMSM6FqW0U4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Huxnn0HKIdijL4gbDxvVYsr519/EqwJmDm79CM0bGZ0=; b=Zsq1x0LbzUg3szG0f9VoWrbzmMHBmXkFTkGjBZsCLkDNjhugcuwqEhRFcx7yy+MKZpiNLpVCCw01bQ80gXvrPTB7knBUGvPcVLzW1AiljN7fGtpOVfSNuLkB4po4HLGY2tVvdKJHKBwZytzod46d27zcz49cSdH0qwAxMgshn0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1607298014367656.9405814293874; Sun, 6 Dec 2020 15:40:14 -0800 (PST) Received: by mail-wr1-f68.google.com with SMTP id m5so1401790wrx.9 for ; Sun, 06 Dec 2020 15:40:13 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id y130sm12336620wmc.22.2020.12.06.15.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Huxnn0HKIdijL4gbDxvVYsr519/EqwJmDm79CM0bGZ0=; b=uVdfWSV6oUgZ0RiBN0VekDdzex+vaiVx3ppBSPyv8R4HRoXN21n157Z2WSmR4CJMKk fUz87yDqjpCG/qH9w8yUaCetBRGhe0xzl3F5Xd3pklPupaMHTSm6M7ET/yssBcOYdpGN 2uRgK1t4dwtBQjw6zdunVOzomlQ2YacmUjTzTvri/2781e2tucLYNBD/gPWtB2TkdXs6 CTaUmyNyHwzcHhAlEWPmkytqph/KxajjPNDXWXDaHM3+u8n4Q08nnih5MyRcn15evzpj 26EfgVj1L6Z/9WkC72aFaU2xjXyPITodgdhCAKDZvllotVcqaV82URkQnStqKtZ/f+gH mT6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Huxnn0HKIdijL4gbDxvVYsr519/EqwJmDm79CM0bGZ0=; b=d1ZfhcIo9jx/MfE1oWTRzAtAJippjF8HP2RVfbBHPpSDO3vWVdNtTuTqkVAz4zm5FK 4UhdpAa7W9RiLP5rA5wzidcWQ7T6jPNWiSl3W+Qhx9IfHBmfbr2Ir2vEny+Qt7BW+LhM KSUYzeZ8UmQ3ip8lzkzqDdRHljunTbnYnCkaczXTdCSoPThmAxKDkxLkdZ50N4tp+yAH 6MxAY4phugW4M8o7uUUBzWo/gx4nkn05gKV8fKU/X3kogYIktsag/phkEvZEv8cibfrv rkcOJAq6USw02/TjMBxF+voxHMbjySbAwDLgBnawGMxpgQftcrPngbuFLCOhcxrl/ljp D+9A== X-Gm-Message-State: AOAM532j2QNayeU2RYLNr5LjorxknOSsPOMkW0DMYhvbvQm9VE1jDE5e 2NVdARyrb/MdcIz/eWYXtn0= X-Google-Smtp-Source: ABdhPJzYcEqcflYGeZNH2yRDKKaaaIcgG6lb7OML9NbCgUdNxk0iaBY70qO18HQkTUwOQy8wR+faaQ== X-Received: by 2002:adf:db45:: with SMTP id f5mr7587571wrj.153.1607298012630; Sun, 06 Dec 2020 15:40:12 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 04/19] target/mips: Remove unused headers from cp0_helper.c Date: Mon, 7 Dec 2020 00:39:34 +0100 Message-Id: <20201206233949.3783184-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Remove unused headers and add missing "qemu/log.h" since qemu_log() is called. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cp0_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c index a1b5140ccaf..d8749658945 100644 --- a/target/mips/cp0_helper.c +++ b/target/mips/cp0_helper.c @@ -21,15 +21,13 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" -#include "exec/memop.h" -#include "sysemu/kvm.h" =20 =20 #ifndef CONFIG_USER_ONLY --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298019; cv=none; d=zohomail.com; s=zohoarc; b=NVfOtBRY5Xls+RZrQevbYeDQaKbY0UUCFoWKBTiw9Ul0eG4A87oDBGUOB2i9WwxLDgonfyPb9xhG7GuWIsadQJt/X5P2NuAD3tOphVvCK4CMRQ5kloO5uICvGMGmolSg0CAkGKO2Anb/ajKmBDoZfBX2oob2BCZfQjdBXjhonmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wgUivnHTiFsBsZUJynu5sdeZ+qIl0Vpz/g/o+OzVfXc=; b=H8ry0/UseXidTg4slbRDbI8uftX6nZaMdFxu9e6IfYGiKSkfOVl7IEja+YLmN0Nhv/qpEIAYRVUtGRxDfMTubtMHr34rTXIZFdE/3gbG2N3BxO02zHpVU2bZMxuk7Cadk9E5xDVzkm3Kr+VBbhbOVxki8ox2bZqzMlCFavgJU4s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1607298019442709.2654549718453; Sun, 6 Dec 2020 15:40:19 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id x22so9989320wmc.5 for ; Sun, 06 Dec 2020 15:40:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id o203sm12394160wmb.0.2020.12.06.15.40.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wgUivnHTiFsBsZUJynu5sdeZ+qIl0Vpz/g/o+OzVfXc=; b=E/w6I/YA1QBm/TJRhjJKH6UCcB0vEAmhPTcnvK9MTghg2gfjSoujrDqduMv9seuqeQ vwzngALnI38rHHDk/z6aPvSXmgAIICymbKJoWZ4aaTDbSICad7V+kstgPc8wIs8BZH8M evZ6S0kfYSiEMF1QCXoRCBZNScSp2fkR4k3GEBL1vJjmMuZ6JSZQKl0RT5Ztm2yM73fv VcoczWisynMrLtCBosob12MrLxCZwNz35lJU1p91FHy0ePl8G68zg9Pce1+qt15sH+tF UHK7tDRu+L6oCSIRI0kI6hy5jyg0Ux5mG5dJMTBGwDn9k6BqNACTUgdCwCxY6ViIhoeK zjAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wgUivnHTiFsBsZUJynu5sdeZ+qIl0Vpz/g/o+OzVfXc=; b=b7nbcF3dJwZUmkp4qXarwdHpIdYbOdSR9dvebfh+XeJoe8iqhDhYtY+/WslhZbN/um n2dmzNHo7MZN+ztKJrrE0aXoQdYLul5NeFYH1GRoFABVW/wR/O/yb9G4tDtbKZXIq/Do OdT5vJNohqOxRuFPGv1UhJTQA/9GHFcIdNlv3+kp4r3St5OYO3CC9+dKappzw/zw/ITv YgxVY97kjzzrrNWXD6HOrN3gaL8qpMGQhQ/yvuJYfdGyqwbRgANmh0GcRWjSdiN4aw7t f/U7B1h/noAv0LjgyjLGUmq5Z+HJ+MOUYD/V15Bnr7grEjoaJfdVdwf9b8sN3gRqBs36 nTxw== X-Gm-Message-State: AOAM530X8PPP+nK8BbvBS8knPrH81djrNfn5GpsxwF4zTUXzdzcjkj40 sNGMRD/JVigQi/HrvDUnTnM= X-Google-Smtp-Source: ABdhPJyn3aNUhSifbgw9ga7ggzYpifzBJNJITGXqPHS89nq/anekJvKjvBXt16wY19n9bHCAzW5XYQ== X-Received: by 2002:a1c:e309:: with SMTP id a9mr15672224wmh.172.1607298017714; Sun, 06 Dec 2020 15:40:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 05/19] target/mips: Remove unused headers from op_helper.c Date: Mon, 7 Dec 2020 00:39:35 +0100 Message-Id: <20201206233949.3783184-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/op_helper.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 5184a1838be..5aa97902e98 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -19,15 +19,11 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" -#include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/exec-all.h" -#include "exec/cpu_ldst.h" #include "exec/memop.h" -#include "sysemu/kvm.h" =20 =20 /*************************************************************************= ****/ --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298024; cv=none; d=zohomail.com; s=zohoarc; b=K+sA1Is3FPVo0yvIGnyKDbuzwvxJPttpUhkBpi10RZ+57pfKOfeR4JvNGZ4YflW11hGJmPLcHVjAqOrNQF77eZKjTuNi7wRaL6KsdhvJz1qNJ/YLE+LK/lvQ4DkPPCCfQat2t11v1pXoN0S6xhz3kh6a2c+pqZ6bK03LE4bL7DY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298024; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LGB1WfqGgk+E2BwfN1znIYNM8Z3EDS1Ck0ntTTU7ae8=; b=gskeoUJDjQrnGBKVh2Zj77Fu2K4WtHlhZjlB7FYRNfRJMmQ3ffomb5mamP0cqTzXbjziPYMnVbCrmDqT5KFHjnTjf9MvBcRJoEM4JW6G3aujNolSvjR176WyOsOxezkhLgddUEAL9akJZEjI3sXGbrRUt6vz0EuSyiPr5qiP9sk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1607298024682894.4358180799707; Sun, 6 Dec 2020 15:40:24 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id z7so11045247wrn.3 for ; Sun, 06 Dec 2020 15:40:24 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id 125sm12128389wmc.27.2020.12.06.15.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LGB1WfqGgk+E2BwfN1znIYNM8Z3EDS1Ck0ntTTU7ae8=; b=BjYNpSuhMXRN3yzz7v8F0ddsWC0Dvd7e9EXTpN8f3LCl6fgx4hk8n+tmByOePqfT6S XfaNjCg5xXOg8+uwLVvYX+zXVIX/t2N0WAXA8sP1Jbc8xhghOg7Vm0mGuK93ye8H/hkC b+u3WSZBJZcjSc9M01II3aRCYoJSnNHw7s+2vUdsr+rTiy/LGwy7YujgIws3OhDDRweH HOh9PKLKPbtO4TVkaL8vOxQPgPygx0uhcpkLLJOFU5tD8vtHJpQk9jN1wFX2Fhgg1hYV WRm2JD7yO+uNSaaxeQhf+L/EqUlVwVaos4WJAC1uUydp9X6iP+m0P0BPosgXhb5mAcI+ WJFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LGB1WfqGgk+E2BwfN1znIYNM8Z3EDS1Ck0ntTTU7ae8=; b=YUGwa3NRRMnia2I+oIwu7eHAeUOrgJp3bsZndf0qHXYtuwRX6UO1xBitX1hRfU1iqe FTkQYBChNsHm4Y4fQ5jLj/+4PiGWOabDAMLLj+zsKzVWz36tRbx/gbPdyg2hrWlzVP7i PjIoOedP28q51zURE/qpAJIG643h0NtQo6Ssleyc7Quevwyxm7zsdYYgckmNFAFtlZJI SphXJw1Y9kl7s7/IjHIaS+EGTFolwIDigUNKUzhSKTyRk1wyhBo+nUKN1t+WIZ5NwZ5B WDOqDlt1sFje5Fw+ZJqO7g4nBbG9QLf574RSzQlUJOp9/3t28egRiew8yxW0HgSunw2G OAPA== X-Gm-Message-State: AOAM531YonQIA4c/a0jjHc5xW4hAdeL6qgFxuFD7mgAapmlA6dzOP3mN 7aFiwbbbHE1oLb4xzfpxPNs= X-Google-Smtp-Source: ABdhPJysqiCEfdLErNwAUUYoVp5/a3euOcrunaaXOC5+fFMPXtLaIPATX703omSt4u8PEH29fpe5vQ== X-Received: by 2002:a5d:6191:: with SMTP id j17mr16516791wru.299.1607298022902; Sun, 06 Dec 2020 15:40:22 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 06/19] target/mips: Remove unused headers from kvm.c Date: Mon, 7 Dec 2020 00:39:36 +0100 Message-Id: <20201206233949.3783184-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/kvm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 72637a1e021..b3f193f7764 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -19,11 +19,9 @@ #include "internal.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "qemu/timer.h" #include "sysemu/kvm.h" #include "sysemu/kvm_int.h" #include "sysemu/runstate.h" -#include "sysemu/cpus.h" #include "kvm_mips.h" #include "exec/memattrs.h" #include "hw/boards.h" --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298029; cv=none; d=zohomail.com; s=zohoarc; b=Lpku0If4lP5KJkjZ/S1Q3vs8UbPEkEewZ4YoZwgRjzgsmnJPgsqpsslnTPj+qWGkcMZw8LZZsWhB6FZjRBDCnVcI1oX7EmgRgNZFRhiN+63kLqkGrPkifVKNwTG1ywUMn95IxorYCcTrTSi14ucvIPUuqDimswi0RZc89RA0k44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298029; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nvvnuVAXyMXpDzWyrVINIXmEpj3Xa1vtGYGPNmttFgg=; b=TiQ8/GVe9OSYpNm9/qejmCFhfSxVNXrhX/gLnG4+76ZJXbYZiwGYrc8VxL7BGMUTbbnjxiiHJUYIQNwOQh2uPlzbvkIg9OhNf/JDzmFudYFpdGUqIAezDm9fssCgH/ZEdIKPMQ+BqGPjL8ogDbnItTtKTnPR8JmzEXaAe/49RCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1607298029729223.1523433353891; Sun, 6 Dec 2020 15:40:29 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id h21so12089433wmb.2 for ; Sun, 06 Dec 2020 15:40:29 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id c4sm13758103wrw.72.2020.12.06.15.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nvvnuVAXyMXpDzWyrVINIXmEpj3Xa1vtGYGPNmttFgg=; b=n88N84E/kJAVo0Mxv3CD6rucxKCZvjzDLCaLmUaDQq7FtRotXM5HNe+7mTUSvR0xw2 e+nh5+7e7RxkOcIpAN2a2l2lagy9R6AgbXqmKb3gjMtVS1rHZ24aRbBB8lKg3Dfwhrdt m/uqQbHQE3GChYP9x8yxehO52L680Z91+AKqEpWZungeZHoMVteAU9JqSw2NQ3oGmo4Z yamgUSSLJVXaHyJxIoLCczu+vMChZUaLx/8CqTsxii9Oql71csY140FfWl1VDk1vysui PgDlYmZUw/2UQRF8XdM7RZsCY9HV3vf9kq8vGtuHY8TV0g2w3o7Yh33h2p0uYQN7chvi cmpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nvvnuVAXyMXpDzWyrVINIXmEpj3Xa1vtGYGPNmttFgg=; b=sIfxY3G47PtF3je+g3JDDj5qSc0EAflGpIQW4iSL4DRWBW+GdCJPYvL/9ZzJnNiOJz 9lZHoynF1ZX17+N9i8769OTPiuORvD9QL4NsYkOwxkZP4XAmLIdb7o14yUsHwrlAuOmH LMFyXrXcOLagFACC+Y3TcFrX0ilyFLIK0+NVwJBVJfMPfmaQmHVRS+MjcEYOAs/mMdEm RGCHUxDbiXJBqh7a/IsDxtY3qkMZbuCZWRlvkR7wz9lINeGmQpq1DUBb3ByvYemszztO 6YQ2IIwYxPkDPjxIpYV3quiJuenRY5Qjli7CmGICpO9NUvYf8eV2BIt2U2KHSNWECZZW fsvw== X-Gm-Message-State: AOAM530ql5QZvbe6vysJ+WCsTvEvCiSQ/5q7wHNVMpRmsB6dajQVz5DJ FrMawJbxoJ2w0Y1ZzmSTRilGg1CBjtU= X-Google-Smtp-Source: ABdhPJw3Z/Cg8aKrlfWwSiz6cd42kt3hOEz7TpaPUsuc69JEMA3JkZ1sJCT+n/WH6cgUMPmM3FmWTw== X-Received: by 2002:a1c:5f54:: with SMTP id t81mr15343246wmb.77.1607298027981; Sun, 06 Dec 2020 15:40:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 07/19] target/mips: Include "exec/memattrs.h" in 'internal.h' Date: Mon, 7 Dec 2020 00:39:37 +0100 Message-Id: <20201206233949.3783184-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) mips_cpu_do_transaction_failed() requires MemTxAttrs and MemTxResult declarations. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 1 + target/mips/kvm.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index dd8a7809b64..76b7a85cbb3 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -8,6 +8,7 @@ #ifndef MIPS_INTERNAL_H #define MIPS_INTERNAL_H =20 +#include "exec/memattrs.h" #include "fpu/softfloat-helpers.h" =20 /* diff --git a/target/mips/kvm.c b/target/mips/kvm.c index b3f193f7764..7a6ea5299fb 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -23,7 +23,6 @@ #include "sysemu/kvm_int.h" #include "sysemu/runstate.h" #include "kvm_mips.h" -#include "exec/memattrs.h" #include "hw/boards.h" =20 #define DEBUG_KVM 0 --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298034; cv=none; d=zohomail.com; s=zohoarc; b=bwBOOp6lUPnOi96qdgajoL043f4EsHXFTZMSmn/l65sz+eUU1zgsT5C6ALocr3V0e9cOHa60DP+o/Ttw8QNXnYj2heZaFY+pIHh5uhxMFY//YaxbTE3KB2cEeEietCQaLfXOV/pl8zsD7GxKgQSe2XbVrZ0bg9bYm2EvE4ifQKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298034; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Aknicxq69ir15ZLnRnKAAOwqB9N6TW01pMwQWojqcCI=; b=TdpL/35AdHH1S/lXkNqK+1FI0dDYH7vtnhxQAEWiZ/2/zmvg0RgAdrehKu117/zbRSvQj76TmjXQW6PmJi3fdnx1h+iv060p8tPzdJW+AJHpPuYGKpfti9X2gKtP4gNM918fhtmtEUzRWNe5ip6UAZtsQu77fvTfrhYpNBt7FSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1607298034854823.0880156663783; Sun, 6 Dec 2020 15:40:34 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id e7so11027657wrv.6 for ; Sun, 06 Dec 2020 15:40:34 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id a12sm12721260wrq.58.2020.12.06.15.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Aknicxq69ir15ZLnRnKAAOwqB9N6TW01pMwQWojqcCI=; b=SMcwF9Y38HdM3cHw+XUBTdWjcIxdXMevhr+d3RMSQzJm7SV4btb/jzsKL6dyAT8J4N RF/q0qOF69NuRBYtyjFNGzlvDciWaIjIoQVXTlKFg3tNb+UMTvzOHNi8cTjrAvr38IOB 7gxFGtyOi+UX+l/vxT+ZZYH98m14+QNyVTZyi5LpzA4E9c7w2hx1RKB5VHo0meETNuh6 5BvCm5p+lwkR3annd+3tgsEfLQdKYojvFNrou4sqlExf9n+yKPonUV1PUUHYd51z2D8V fre8cnC9LZsoexMnX6V4/ERaQtZ9XG4ZVXhtBJRs6VxhywP0thKFBNq8kwz6b45vW5Qn b69g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Aknicxq69ir15ZLnRnKAAOwqB9N6TW01pMwQWojqcCI=; b=OpropbitBejbcQ2kKP0vtNXpom0iyZHy4SA7BchGol11OltU+l8qwnJ335TALq03M0 LfLyWnfWFXxzWst2U7MjVZYCrEu62tRLXFP96yAdlFZoCtcL/PYsKxbyvEG+JAjILrr7 FN2gWz2kQOtf2M8QFcHLbgIdOYOM52WgRexiX4rPWQ4lAQCtaC8XJpbzoLHq84CMR0Se /ZMUUpOao7Thsa6OY/EzDh1ebyPN28S5jVs0KWdOA7mZE0NgMaqnbUwz5LepVnvAgYRP sMJ3gnRC9YvnUK5x5/o/hqlDBvtUXQ861YFx+qgmo4D9GcmEIbOd98evY6TjI6JA5Y5H h9Sg== X-Gm-Message-State: AOAM533YQnMwt3d3ck7Dewn/otwPqMKqQcMc4P0KEYt+ggjIbBRPhkKl q+ddTE4IzbUuzPyNotxZMZOrUKHWhyc= X-Google-Smtp-Source: ABdhPJxxew9ajV5OxcxEX4k8jrJziKOpQJ8c03uGsdsLbbr/Q/8/WsepohI0sQWMGW6MqgyNb1BSYA== X-Received: by 2002:adf:f48c:: with SMTP id l12mr16503466wro.280.1607298032990; Sun, 06 Dec 2020 15:40:32 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 08/19] target/mips: Extract cpu_supports*/cpu_set* translate.c Date: Mon, 7 Dec 2020 00:39:38 +0100 Message-Id: <20201206233949.3783184-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Move cpu_supports*() and cpu_set_exception_base() from translate.c to cpu.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cpu.c | 18 ++++++++++++++++++ target/mips/translate.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 76d50b00b42..8d9ef139f07 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -310,3 +310,21 @@ MIPSCPU *mips_cpu_create_with_clock(const char *cpu_ty= pe, Clock *cpu_refclk) =20 return MIPS_CPU(cpu); } + +bool cpu_supports_cps_smp(const char *cpu_type) +{ + const MIPSCPUClass *mcc =3D MIPS_CPU_CLASS(object_class_by_name(cpu_ty= pe)); + return (mcc->cpu_def->CP0_Config3 & (1 << CP0C3_CMGCR)) !=3D 0; +} + +bool cpu_supports_isa(const char *cpu_type, uint64_t isa) +{ + const MIPSCPUClass *mcc =3D MIPS_CPU_CLASS(object_class_by_name(cpu_ty= pe)); + return (mcc->cpu_def->insn_flags & isa) !=3D 0; +} + +void cpu_set_exception_base(int vp_index, target_ulong address) +{ + MIPSCPU *vp =3D MIPS_CPU(qemu_get_cpu(vp_index)); + vp->env.exception_base =3D address; +} diff --git a/target/mips/translate.c b/target/mips/translate.c index 346635370c4..dbb71fdaa5d 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -31766,24 +31766,6 @@ void cpu_mips_realize_env(CPUMIPSState *env) mvp_init(env, env->cpu_model); } =20 -bool cpu_supports_cps_smp(const char *cpu_type) -{ - const MIPSCPUClass *mcc =3D MIPS_CPU_CLASS(object_class_by_name(cpu_ty= pe)); - return (mcc->cpu_def->CP0_Config3 & (1 << CP0C3_CMGCR)) !=3D 0; -} - -bool cpu_supports_isa(const char *cpu_type, uint64_t isa) -{ - const MIPSCPUClass *mcc =3D MIPS_CPU_CLASS(object_class_by_name(cpu_ty= pe)); - return (mcc->cpu_def->insn_flags & isa) !=3D 0; -} - -void cpu_set_exception_base(int vp_index, target_ulong address) -{ - MIPSCPU *vp =3D MIPS_CPU(qemu_get_cpu(vp_index)); - vp->env.exception_base =3D address; -} - void cpu_state_reset(CPUMIPSState *env) { CPUState *cs =3D env_cpu(env); --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298039; cv=none; d=zohomail.com; s=zohoarc; b=g+azotExrKXzoFYtsGiGNN9QBPvJqF8PISsuzugCDa7H37C0MOApYpA1cPxX3lP+ASNmIfuhW4VH2qgqbrClyQQlKVUzcgcQ/X/yCd40ZLLlN5XMGzb6CD2OuSmQeVrwfxXmHn7XqsKJNOh77D6+UtqAaFmj9X+9uXnNnw3HkC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298039; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m3yW7Q/kZO8O6aW6XbRUlcf0EmcrkqsX0rg11stnjUs=; b=nFfvI95u8m/xV8zk+EJz9wBBFBXGlvJKvVwyL96hhsKmQMQQcNZKdp1n9rH8e5s17kzyRwxicfyk8yWGx0I7ManN9ODiMM5cXwioSqC2rIzPu5n5Y4qZ/78KG9xhIDJ8K9kKZP6n3iuypgLKW2ozR8uhaDal/fJmTcEwg94K3rU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1607298039847337.79920066711327; Sun, 6 Dec 2020 15:40:39 -0800 (PST) Received: by mail-wr1-f53.google.com with SMTP id r3so11038262wrt.2 for ; Sun, 06 Dec 2020 15:40:39 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id 94sm3638043wrq.22.2020.12.06.15.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m3yW7Q/kZO8O6aW6XbRUlcf0EmcrkqsX0rg11stnjUs=; b=q2xge+aIvR1sBZv4AWVUi6UC4i1ICC7CvStloK6ObHRbBh/Xhnh3/ZQ8/gaPbj/imf J1yZ0a82F0Hh75erzBJDt3bQ231e6t50hzFZre7FvGxZseLzrOtZIBQYRk96/9GT6s7v cjrdZBpvMKAjMoH9jPG9HOJM72zVHuGnEMN1UBtdciWNQRdvFMoJE0PE8UMLXXu7WaCX gaLrNNDJhQe5Nj6xlgfMov6atxHx3ShKd7NMlCfIz/1hjXQudQsgisrmluQvmocmvgG0 RO6RA9qBs0DPcPUtOHQl7ZqzDBYwlKDtYpppa3KD/r85zxnFz4wdat6OW5kOR0RnnVWX ZyfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m3yW7Q/kZO8O6aW6XbRUlcf0EmcrkqsX0rg11stnjUs=; b=ILSRPCs1pMg+nKA+WTdYpI9JJhMhMUwGhGJpvu08yZJxLpFtKhnpRC+v17bn/8gegr Vfs+89e3PSBDEp3XUH3x3z54vtiGjlGg/QH+b1rFlxM8kVvmrVXTaKJ5HQLELPIajr+x dx9QzLwHSw05XiGUdODsjO54FZzVv3A9PDzjMjywHhUVgzbo38OzXms5EjfTNEv2j7il ObbvwfDSsLZsSeZZ44I0S24JLcyUmHW2t/8lfrqIgj3CTcPMI3BvwcCge5DhyOTeNUL8 TtZHIvDhE+otd1z0zEspydIHlD/xtqOANHFOVjy1UPxzi49YwtBC8BE/WDp4bGtYVVyx zjbw== X-Gm-Message-State: AOAM533VhyldfHoHu41MH0aV1zmZ9NT1AhC1+7SgEBVvJ8+30K3C6iGa 9q1a8k3iDzqujkRfRaZvnqE= X-Google-Smtp-Source: ABdhPJwFcv3NFWbse7VYk8f1/MogekTdhhYhfUCC6z6eGhN/SHrc0wkos4mLTsztd6KyNRJ5ZrurGA== X-Received: by 2002:adf:b194:: with SMTP id q20mr5061839wra.199.1607298038017; Sun, 06 Dec 2020 15:40:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 09/19] target/mips: Move mips_cpu_add_definition() from helper.c to cpu.c Date: Mon, 7 Dec 2020 00:39:39 +0100 Message-Id: <20201206233949.3783184-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cpu.c | 33 +++++++++++++++++++++++++++++++++ target/mips/helper.c | 33 --------------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 8d9ef139f07..e612a7ac41a 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -30,6 +30,7 @@ #include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" +#include "qapi/qapi-commands-machine-target.h" =20 static void mips_cpu_set_pc(CPUState *cs, vaddr value) { @@ -299,6 +300,38 @@ static void mips_cpu_register_types(void) =20 type_init(mips_cpu_register_types) =20 +static void mips_cpu_add_definition(gpointer data, gpointer user_data) +{ + ObjectClass *oc =3D data; + CpuDefinitionInfoList **cpu_list =3D user_data; + CpuDefinitionInfoList *entry; + CpuDefinitionInfo *info; + const char *typename; + + typename =3D object_class_get_name(oc); + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strndup(typename, + strlen(typename) - strlen("-" TYPE_MIPS_CPU)); + info->q_typename =3D g_strdup(typename); + + entry =3D g_malloc0(sizeof(*entry)); + entry->value =3D info; + entry->next =3D *cpu_list; + *cpu_list =3D entry; +} + +CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) +{ + CpuDefinitionInfoList *cpu_list =3D NULL; + GSList *list; + + list =3D object_class_get_list(TYPE_MIPS_CPU, false); + g_slist_foreach(list, mips_cpu_add_definition, &cpu_list); + g_slist_free(list); + + return cpu_list; +} + /* Could be used by generic CPU object */ MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refcl= k) { diff --git a/target/mips/helper.c b/target/mips/helper.c index 063b65c0528..bb962a3e8cc 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -24,7 +24,6 @@ #include "exec/cpu_ldst.h" #include "exec/log.h" #include "hw/mips/cpudevs.h" -#include "qapi/qapi-commands-machine-target.h" =20 enum { TLBRET_XI =3D -6, @@ -1497,35 +1496,3 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSSta= te *env, =20 cpu_loop_exit_restore(cs, pc); } - -static void mips_cpu_add_definition(gpointer data, gpointer user_data) -{ - ObjectClass *oc =3D data; - CpuDefinitionInfoList **cpu_list =3D user_data; - CpuDefinitionInfoList *entry; - CpuDefinitionInfo *info; - const char *typename; - - typename =3D object_class_get_name(oc); - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strndup(typename, - strlen(typename) - strlen("-" TYPE_MIPS_CPU)); - info->q_typename =3D g_strdup(typename); - - entry =3D g_malloc0(sizeof(*entry)); - entry->value =3D info; - entry->next =3D *cpu_list; - *cpu_list =3D entry; -} - -CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) -{ - CpuDefinitionInfoList *cpu_list =3D NULL; - GSList *list; - - list =3D object_class_get_list(TYPE_MIPS_CPU, false); - g_slist_foreach(list, mips_cpu_add_definition, &cpu_list); - g_slist_free(list); - - return cpu_list; -} --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607298044; cv=none; d=zohomail.com; s=zohoarc; b=Xg0USSwMpnV39dbtg0aesPbN8ah6zXh5WhdOCTtgBWfC43yde+jRfVie89WJMLZh9jxS2X++cLNAcWW5YGdqzWEFmIv+qmwXvbdhLfHzQ46l8V3ZO9h2IJtYRNisL3rjGykkPd70NzAx5vCeBWuaMs2iHDNp+5KQqNarsmTqHJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298044; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=SryKR7RosS184nt44uG2EZRAyIWmJpUQjJPtVKJnfeD5IpuQ5abp4YKK6b3S/0VIyCIswiht8jNmRHUQeD+5FncqmdtuVPA5K50ltg+XDB9MIGXAuQ7646vjCheueCxeVuG7cLs+p0Vnt4OD8dVRpNGiwEHfKYCaCAWf8EprcMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1607298044817843.3193970353323; Sun, 6 Dec 2020 15:40:44 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id y17so1609194wrr.10 for ; Sun, 06 Dec 2020 15:40:44 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id n10sm12603481wrv.77.2020.12.06.15.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=m4z3WWoyk+Rg3BjX02RHRMctF6LXJkoNf3ztaE25+iOXC9vzlk5ns3EEXqsXAFIleR HcOahTgCJFR6V6F0LhW7mG9nwgsYYPBcwgHruLbE4h0Om005WfLjbM54R8ntvbLJfxep oJb2JFQMDn607DTV0uDAvPe7H8A74HIiBu7XZxsxYfTDQbB7DtY7I1hKezTnb7qnoFY5 GyB36yDYuaP1V5BhCwU2rGqWKD10FlXUoyu54XfXWWeXiuYIjhWb7TrvK6VFWqz6DPih YiHl66Z2/hp9/Z8bM18m8sNGbJB377p6Ek3mwICiNHoarz/Pqa9UvHACAuTO2988L0uQ M/uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=B/NrR5V+/HZCdWuAnYAqhfTZDaNUhGvFBTcglSmrBsA=; b=ImR7GEJTZDvGscB2+9F9xSr0FcOYcQLfrhj23GU8b2Ee1e95eci7gTeKX3/gtn9f/k c3h4FFuLj3j9QmqZIKKGi1i6+0AWX9V/JSrGAwBZxZyuJUgAd3cJwdCzc9rNj7EOqXux w11CPKVpB2Wmwt2O5I3WkakCzjGCDRg4gvdFI6hGJ/Fko3s9glERVH0V85/MQmRfzxbg N+QsiXvGMNKmukKTAcCbclGQIXsSWRgQoD9hefdS4dh517mk2cwoR2zywcxVIMOsqBRD tt/SNVZmXn5azpm8IPDwmqq/qVvTfOdjYnzytV0Y3uTcDG8yqkAoLGn6WawgPxKKyHjO fEHg== X-Gm-Message-State: AOAM533Zvo2/odmdTFurNBXMkkxW/p+ROrgNRbOYKCvUJcD4SD0fOpvC zu7GyTXVAUoWYDNXAAbJh/Y= X-Google-Smtp-Source: ABdhPJwmEAy9N8jHYAPoMpDouYPkT9Pj6b8gyMnw9VTr/7xAEcomMuXXl66GctcoGDdBkCySGNDXGQ== X-Received: by 2002:adf:b74d:: with SMTP id n13mr16913334wre.101.1607298043036; Sun, 06 Dec 2020 15:40:43 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 10/19] target/mips: Add !CONFIG_USER_ONLY comment after #endif Date: Mon, 7 Dec 2020 00:39:40 +0100 Message-Id: <20201206233949.3783184-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To help understand ifdef'ry, add comment after #endif. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/helper.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index bb962a3e8cc..6d33809fb8b 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -455,7 +455,8 @@ void cpu_mips_store_cause(CPUMIPSState *env, target_ulo= ng val) } } } -#endif + +#endif /* !CONFIG_USER_ONLY */ =20 static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, int rw, int tlb_error) @@ -537,6 +538,7 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, } =20 #if !defined(CONFIG_USER_ONLY) + hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { MIPSCPU *cpu =3D MIPS_CPU(cs); @@ -550,9 +552,7 @@ hwaddr mips_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) } return phys_addr; } -#endif =20 -#if !defined(CONFIG_USER_ONLY) #if !defined(TARGET_MIPS64) =20 /* @@ -886,7 +886,7 @@ refill: return true; } #endif -#endif +#endif /* !CONFIG_USER_ONLY */ =20 bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, @@ -1017,7 +1017,7 @@ static const char * const excp_names[EXCP_LAST + 1] = =3D { [EXCP_MSADIS] =3D "MSA disabled", [EXCP_MSAFPE] =3D "MSA floating point", }; -#endif +#endif /* !CONFIG_USER_ONLY */ =20 target_ulong exception_resume_pc(CPUMIPSState *env) { @@ -1080,7 +1080,8 @@ static inline void set_badinstr_registers(CPUMIPSStat= e *env) env->CP0_BadInstrP =3D cpu_ldl_code(env, env->active_tc.PC - 4); } } -#endif + +#endif /* !CONFIG_USER_ONLY */ =20 void mips_cpu_do_interrupt(CPUState *cs) { @@ -1480,7 +1481,7 @@ void r4k_invalidate_tlb(CPUMIPSState *env, int idx, i= nt use_extra) } } } -#endif +#endif /* !CONFIG_USER_ONLY */ =20 void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, uint32_t exception, --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298049; cv=none; d=zohomail.com; s=zohoarc; b=Oue5vWzZ4PfCjBGNQBYjVkHayx3ANnjrPGC+VpmaWJ7v5oZPKsQb+IcFMCfpsi6VfyWm004sBrUa2IRHA9jnN8z+4UvyzlW/iXPGST2ClpCXGpr2wKn45RmXZ0YfU1fQ9Ucb3c4qtGXCxeiQPNg9eGA4VqPYuKEOFeDRuYKmeDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298049; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ln1ozzZklmmKqm+Rb52d2EFhNZPiZM6Mxpme95/5JJU=; b=XLRfhjfAWbTnGTvrWriY8r22X9gNoZE3KBt5BknChSp7/BRykRTZ2YEuB86fbNkkzhZiWveUVLro1lh7j6nWaJH0Yl2VySgXZtUDlY91gTaDDH/1isKq9Xcat+8WwFwllYjUEznoJuBkkeDaTFCzviSjB5kCFpMYnZURQrSiOTs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 160729804989587.89489336681243; Sun, 6 Dec 2020 15:40:49 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id w206so8473447wma.0 for ; Sun, 06 Dec 2020 15:40:49 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id c1sm11434357wml.8.2020.12.06.15.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ln1ozzZklmmKqm+Rb52d2EFhNZPiZM6Mxpme95/5JJU=; b=jQk92dIVwrdkVPtmX1jJV1rSEKaDAqDXYlCaqujyjc2bEr3l4vFm5AMH5/P7rp1nJ3 8ZPwZCiovi85lM4lJCqIZoKGzh/uFSOAyFMZ0v1lqw9ceWjKRSJJx/MLuPklrcXaVoe9 zs4HMyMBdlQnLCvQg8luWTcyLkkVQtePXq32efmFuF2LYf4RO9MMoJakwHP3u/hzAzZ6 4epyymBDU59e0AD8ZAI56Ilex/yh3WfIS/poeFpjJ9SdbCsyLBi0R1jSTd9vV8s5kZ55 F2idkqYOzfWmL/BJJ88CSc4DjWSESNPjgQaTPtYWaDavZ/nIhyouy02wpAzHdj5MOgzJ 6oOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ln1ozzZklmmKqm+Rb52d2EFhNZPiZM6Mxpme95/5JJU=; b=Pum38WHo2hN22GyvlxIMLyAMIn9U98OmFH1W0ehfgbQkqchBQ+MQ7om0mohuHlkCZ6 KuRITdbp4LZRCFfZ2URT4VSIlZB4Cd0GpJt4BtSjLJ4RuWVfuDEfwvg5H02XeF9Nx9SV aWRD06AXQYgFFtgC6Bmxv/cJXbDYz2YK03pOaHiQ2dVY/TnC9b0bejU3AcndB5n8RwFM zpsebjMkEqcHEUtBjp8O2mvd/Tgfy5tLCbAIq3RYK2vXqVAyBWFhzD+LgRT+OxdiIXvD SXglD5yFdryedqtTuqHAEGLITR2bz02QPzCUXyrVOvPU7xZPHbIdILn4mIOQwE7RKcPM bFZQ== X-Gm-Message-State: AOAM530u5ELJpYUe4q3P5lxK8IaRs2MeNSLIxdTbQJ+bP4tVR/GHmDRH ByV0wfeTs8FQUfX1Vanqv4U= X-Google-Smtp-Source: ABdhPJyLat0nr9LEAy8mnYK9IXYkcFeq8U2izbHXCuIH5Za9odYVdvWamOlM+ykRnsHXCvQZjFx/kg== X-Received: by 2002:a1c:35c2:: with SMTP id c185mr15673774wma.74.1607298047959; Sun, 06 Dec 2020 15:40:47 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 11/19] target/mips: Extract common helpers from helper.c to common_helper.c Date: Mon, 7 Dec 2020 00:39:41 +0100 Message-Id: <20201206233949.3783184-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The rest of helper.c is TLB related. Extract the non TLB specific functions to a new file, so we can rename helper.c as tlb_helper.c in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Any better name? xxx_helper.c are usually TCG helpers. --- target/mips/common_helper.c | 178 ++++++++++++++++++++++++++++++++++++ target/mips/helper.c | 152 ------------------------------ target/mips/meson.build | 1 + 3 files changed, 179 insertions(+), 152 deletions(-) create mode 100644 target/mips/common_helper.c diff --git a/target/mips/common_helper.c b/target/mips/common_helper.c new file mode 100644 index 00000000000..07c947ecc55 --- /dev/null +++ b/target/mips/common_helper.c @@ -0,0 +1,178 @@ +/* + * MIPS emulation helpers for qemu. + * + * Copyright (c) 2004-2005 Jocelyn Mayer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ +#include "qemu/osdep.h" + +#include "cpu.h" +#include "internal.h" +#include "exec/exec-all.h" +#include "exec/log.h" + +#if !defined(CONFIG_USER_ONLY) + +/* Called for updates to CP0_Status. */ +void sync_c0_status(CPUMIPSState *env, CPUMIPSState *cpu, int tc) +{ + int32_t tcstatus, *tcst; + uint32_t v =3D cpu->CP0_Status; + uint32_t cu, mx, asid, ksu; + uint32_t mask =3D ((1 << CP0TCSt_TCU3) + | (1 << CP0TCSt_TCU2) + | (1 << CP0TCSt_TCU1) + | (1 << CP0TCSt_TCU0) + | (1 << CP0TCSt_TMX) + | (3 << CP0TCSt_TKSU) + | (0xff << CP0TCSt_TASID)); + + cu =3D (v >> CP0St_CU0) & 0xf; + mx =3D (v >> CP0St_MX) & 0x1; + ksu =3D (v >> CP0St_KSU) & 0x3; + asid =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; + + tcstatus =3D cu << CP0TCSt_TCU0; + tcstatus |=3D mx << CP0TCSt_TMX; + tcstatus |=3D ksu << CP0TCSt_TKSU; + tcstatus |=3D asid; + + if (tc =3D=3D cpu->current_tc) { + tcst =3D &cpu->active_tc.CP0_TCStatus; + } else { + tcst =3D &cpu->tcs[tc].CP0_TCStatus; + } + + *tcst &=3D ~mask; + *tcst |=3D tcstatus; + compute_hflags(cpu); +} + +void cpu_mips_store_status(CPUMIPSState *env, target_ulong val) +{ + uint32_t mask =3D env->CP0_Status_rw_bitmask; + target_ulong old =3D env->CP0_Status; + + if (env->insn_flags & ISA_MIPS32R6) { + bool has_supervisor =3D extract32(mask, CP0St_KSU, 2) =3D=3D 0x3; +#if defined(TARGET_MIPS64) + uint32_t ksux =3D (1 << CP0St_KX) & val; + ksux |=3D (ksux >> 1) & val; /* KX =3D 0 forces SX to be 0 */ + ksux |=3D (ksux >> 1) & val; /* SX =3D 0 forces UX to be 0 */ + val =3D (val & ~(7 << CP0St_UX)) | ksux; +#endif + if (has_supervisor && extract32(val, CP0St_KSU, 2) =3D=3D 0x3) { + mask &=3D ~(3 << CP0St_KSU); + } + mask &=3D ~(((1 << CP0St_SR) | (1 << CP0St_NMI)) & val); + } + + env->CP0_Status =3D (old & ~mask) | (val & mask); +#if defined(TARGET_MIPS64) + if ((env->CP0_Status ^ old) & (old & (7 << CP0St_UX))) { + /* Access to at least one of the 64-bit segments has been disabled= */ + tlb_flush(env_cpu(env)); + } +#endif + if (env->CP0_Config3 & (1 << CP0C3_MT)) { + sync_c0_status(env, env, env->current_tc); + } else { + compute_hflags(env); + } +} + +void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val) +{ + uint32_t mask =3D 0x00C00300; + uint32_t old =3D env->CP0_Cause; + int i; + + if (env->insn_flags & ISA_MIPS32R2) { + mask |=3D 1 << CP0Ca_DC; + } + if (env->insn_flags & ISA_MIPS32R6) { + mask &=3D ~((1 << CP0Ca_WP) & val); + } + + env->CP0_Cause =3D (env->CP0_Cause & ~mask) | (val & mask); + + if ((old ^ env->CP0_Cause) & (1 << CP0Ca_DC)) { + if (env->CP0_Cause & (1 << CP0Ca_DC)) { + cpu_mips_stop_count(env); + } else { + cpu_mips_start_count(env); + } + } + + /* Set/reset software interrupts */ + for (i =3D 0 ; i < 2 ; i++) { + if ((old ^ env->CP0_Cause) & (1 << (CP0Ca_IP + i))) { + cpu_mips_soft_irq(env, i, env->CP0_Cause & (1 << (CP0Ca_IP + i= ))); + } + } +} + +#endif /* !CONFIG_USER_ONLY */ + +target_ulong exception_resume_pc(CPUMIPSState *env) +{ + target_ulong bad_pc; + target_ulong isa_mode; + + isa_mode =3D !!(env->hflags & MIPS_HFLAG_M16); + bad_pc =3D env->active_tc.PC | isa_mode; + if (env->hflags & MIPS_HFLAG_BMASK) { + /* + * If the exception was raised from a delay slot, come back to + * the jump. + */ + bad_pc -=3D (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); + } + + return bad_pc; +} + +bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request) +{ + if (interrupt_request & CPU_INTERRUPT_HARD) { + MIPSCPU *cpu =3D MIPS_CPU(cs); + CPUMIPSState *env =3D &cpu->env; + + if (cpu_mips_hw_interrupts_enabled(env) && + cpu_mips_hw_interrupts_pending(env)) { + /* Raise it */ + cs->exception_index =3D EXCP_EXT_INTERRUPT; + env->error_code =3D 0; + mips_cpu_do_interrupt(cs); + return true; + } + } + return false; +} + +void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, + uint32_t exception, + int error_code, + uintptr_t pc) +{ + CPUState *cs =3D env_cpu(env); + + qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n", + __func__, exception, error_code); + cs->exception_index =3D exception; + env->error_code =3D error_code; + + cpu_loop_exit_restore(cs, pc); +} diff --git a/target/mips/helper.c b/target/mips/helper.c index 6d33809fb8b..5db7e80e22b 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -357,105 +357,6 @@ void cpu_mips_tlb_flush(CPUMIPSState *env) env->tlb->tlb_in_use =3D env->tlb->nb_tlb; } =20 -/* Called for updates to CP0_Status. */ -void sync_c0_status(CPUMIPSState *env, CPUMIPSState *cpu, int tc) -{ - int32_t tcstatus, *tcst; - uint32_t v =3D cpu->CP0_Status; - uint32_t cu, mx, asid, ksu; - uint32_t mask =3D ((1 << CP0TCSt_TCU3) - | (1 << CP0TCSt_TCU2) - | (1 << CP0TCSt_TCU1) - | (1 << CP0TCSt_TCU0) - | (1 << CP0TCSt_TMX) - | (3 << CP0TCSt_TKSU) - | (0xff << CP0TCSt_TASID)); - - cu =3D (v >> CP0St_CU0) & 0xf; - mx =3D (v >> CP0St_MX) & 0x1; - ksu =3D (v >> CP0St_KSU) & 0x3; - asid =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; - - tcstatus =3D cu << CP0TCSt_TCU0; - tcstatus |=3D mx << CP0TCSt_TMX; - tcstatus |=3D ksu << CP0TCSt_TKSU; - tcstatus |=3D asid; - - if (tc =3D=3D cpu->current_tc) { - tcst =3D &cpu->active_tc.CP0_TCStatus; - } else { - tcst =3D &cpu->tcs[tc].CP0_TCStatus; - } - - *tcst &=3D ~mask; - *tcst |=3D tcstatus; - compute_hflags(cpu); -} - -void cpu_mips_store_status(CPUMIPSState *env, target_ulong val) -{ - uint32_t mask =3D env->CP0_Status_rw_bitmask; - target_ulong old =3D env->CP0_Status; - - if (env->insn_flags & ISA_MIPS32R6) { - bool has_supervisor =3D extract32(mask, CP0St_KSU, 2) =3D=3D 0x3; -#if defined(TARGET_MIPS64) - uint32_t ksux =3D (1 << CP0St_KX) & val; - ksux |=3D (ksux >> 1) & val; /* KX =3D 0 forces SX to be 0 */ - ksux |=3D (ksux >> 1) & val; /* SX =3D 0 forces UX to be 0 */ - val =3D (val & ~(7 << CP0St_UX)) | ksux; -#endif - if (has_supervisor && extract32(val, CP0St_KSU, 2) =3D=3D 0x3) { - mask &=3D ~(3 << CP0St_KSU); - } - mask &=3D ~(((1 << CP0St_SR) | (1 << CP0St_NMI)) & val); - } - - env->CP0_Status =3D (old & ~mask) | (val & mask); -#if defined(TARGET_MIPS64) - if ((env->CP0_Status ^ old) & (old & (7 << CP0St_UX))) { - /* Access to at least one of the 64-bit segments has been disabled= */ - tlb_flush(env_cpu(env)); - } -#endif - if (env->CP0_Config3 & (1 << CP0C3_MT)) { - sync_c0_status(env, env, env->current_tc); - } else { - compute_hflags(env); - } -} - -void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val) -{ - uint32_t mask =3D 0x00C00300; - uint32_t old =3D env->CP0_Cause; - int i; - - if (env->insn_flags & ISA_MIPS32R2) { - mask |=3D 1 << CP0Ca_DC; - } - if (env->insn_flags & ISA_MIPS32R6) { - mask &=3D ~((1 << CP0Ca_WP) & val); - } - - env->CP0_Cause =3D (env->CP0_Cause & ~mask) | (val & mask); - - if ((old ^ env->CP0_Cause) & (1 << CP0Ca_DC)) { - if (env->CP0_Cause & (1 << CP0Ca_DC)) { - cpu_mips_stop_count(env); - } else { - cpu_mips_start_count(env); - } - } - - /* Set/reset software interrupts */ - for (i =3D 0 ; i < 2 ; i++) { - if ((old ^ env->CP0_Cause) & (1 << (CP0Ca_IP + i))) { - cpu_mips_soft_irq(env, i, env->CP0_Cause & (1 << (CP0Ca_IP + i= ))); - } - } -} - #endif /* !CONFIG_USER_ONLY */ =20 static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, @@ -1017,27 +918,7 @@ static const char * const excp_names[EXCP_LAST + 1] = =3D { [EXCP_MSADIS] =3D "MSA disabled", [EXCP_MSAFPE] =3D "MSA floating point", }; -#endif /* !CONFIG_USER_ONLY */ =20 -target_ulong exception_resume_pc(CPUMIPSState *env) -{ - target_ulong bad_pc; - target_ulong isa_mode; - - isa_mode =3D !!(env->hflags & MIPS_HFLAG_M16); - bad_pc =3D env->active_tc.PC | isa_mode; - if (env->hflags & MIPS_HFLAG_BMASK) { - /* - * If the exception was raised from a delay slot, come back to - * the jump. - */ - bad_pc -=3D (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); - } - - return bad_pc; -} - -#if !defined(CONFIG_USER_ONLY) static void set_hflags_for_handler(CPUMIPSState *env) { /* Exception handlers are entered in 32-bit mode. */ @@ -1398,24 +1279,6 @@ void mips_cpu_do_interrupt(CPUState *cs) cs->exception_index =3D EXCP_NONE; } =20 -bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request) -{ - if (interrupt_request & CPU_INTERRUPT_HARD) { - MIPSCPU *cpu =3D MIPS_CPU(cs); - CPUMIPSState *env =3D &cpu->env; - - if (cpu_mips_hw_interrupts_enabled(env) && - cpu_mips_hw_interrupts_pending(env)) { - /* Raise it */ - cs->exception_index =3D EXCP_EXT_INTERRUPT; - env->error_code =3D 0; - mips_cpu_do_interrupt(cs); - return true; - } - } - return false; -} - #if !defined(CONFIG_USER_ONLY) void r4k_invalidate_tlb(CPUMIPSState *env, int idx, int use_extra) { @@ -1482,18 +1345,3 @@ void r4k_invalidate_tlb(CPUMIPSState *env, int idx, = int use_extra) } } #endif /* !CONFIG_USER_ONLY */ - -void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, - uint32_t exception, - int error_code, - uintptr_t pc) -{ - CPUState *cs =3D env_cpu(env); - - qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n", - __func__, exception, error_code); - cs->exception_index =3D exception; - env->error_code =3D error_code; - - cpu_loop_exit_restore(cs, pc); -} diff --git a/target/mips/meson.build b/target/mips/meson.build index d980240f9e3..4858bf86ad6 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -1,5 +1,6 @@ mips_ss =3D ss.source_set() mips_ss.add(files( + 'common_helper.c', 'cp0_helper.c', 'cpu.c', 'dsp_helper.c', --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298054; cv=none; d=zohomail.com; s=zohoarc; b=Ex4UFTlSNIN4Oim0NvU3nsK6QWXzeEBRNp5PIvcwOePPlxbBwiAHtU5oMIL+df5AOUd2WU9DNd2Moh/L9bedQhfyAyTVxz3gO+YBEEjHTy1hBm0fRxMR+If/lZ8kFUSAc3pPRq7yeiBQMqnqyqmM0Ri+ebZiDtXc3434ktJuRdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298054; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dkeHRiNqYRfILITll5iC1CRHmgrIelrL5ahd1h8p/CA=; b=mNj6fNL3uv/217YIupMD/qCz2OuqS5GIQ7hbyQZt0xRDDTBhUv5fUEd1U3sF8d+JOiGbTVqWacwgZwUkhUmedZ91zWl+8p48aPIlLQby5aAh320UHQnOVNHKsGdXd/cRCa87JcnuldTzJwNqNwE9+m3yqRxU9yertRkYBHGFfW4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1607298054762295.23022844581806; Sun, 6 Dec 2020 15:40:54 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id h21so12089917wmb.2 for ; Sun, 06 Dec 2020 15:40:54 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id a9sm12901278wrp.21.2020.12.06.15.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dkeHRiNqYRfILITll5iC1CRHmgrIelrL5ahd1h8p/CA=; b=AJCAf6tBfcDaLHenkAJcWO8awSPcD6OV0VbmqjcQG8YLcoPHOBX9/zrsfUtNVfpmcP nIiZKqXotBUNxCRuPgt5jlY9J+OmF0W/JRNLxzmga4dPH9o6OjFFAvwGFFet9aapdvQj 4OhagE7WsNKL70LrawKpoX3U5So49v1TraNAHhsokMcGAZgM1ZCnqC4yyvRqs39x/TbY N5UMqqtUfCM3amuvAeTqwaJ44Yc09OO6rP8Wd5M1gDiZNFIutZ8C6OLPOykS5/ywo3T2 xNxVSkbiwCbPmm1cwlK6ZEIrga3rfqeagoYvTmpGjkqsuoRdZxKM29h+CQlW5mkWJQ4y EGww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dkeHRiNqYRfILITll5iC1CRHmgrIelrL5ahd1h8p/CA=; b=XiXwr/Z1REHdgQr86Y1KcEW7An9Eb2lrQftaE09DIocBaXXDn9G/yBc17tlMbvXA/P cXnnadeP5Yvk6QQkbdkPDtVel25fBz3PIyk/0B0cip5Y7bnmSlUcaHBDY9EZe3ntB0bs XSTsNO+wV77J6arrH3LCpsMWci+c5liTif4cFqRtoIGCctrfFqxUboPdnW2g8KNHqH6n iNJP794kP4+aNHZhnxOamv/xYB04/vMwaylk/qWFruF4aYYpd0P1ev7Y+ptszCTAYNhL RsT3OeEVCon8aAxNESIEDYRvlX6Vaih/SBMmQGgH2nzxhADc7goGjf/tXtUvD/WezAW/ 5iCA== X-Gm-Message-State: AOAM533tQRsdYsvDRgWqC3FsmCTm8nYEHfKX5akLQUYuqT/r+7+xwPwe qy/YTJr36KkioEzmWaqzq6M= X-Google-Smtp-Source: ABdhPJz3cUW+H59OJ3Lwu1sxBPsBIrKMW2o+PML6fhNgBmnIF9weKVx8bfaabn+wJQrAekiecwHQeg== X-Received: by 2002:a05:600c:208:: with SMTP id 8mr15652630wmi.146.1607298052994; Sun, 06 Dec 2020 15:40:52 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 12/19] target/mips: Rename helper.c as tlb_helper.c Date: Mon, 7 Dec 2020 00:39:42 +0100 Message-Id: <20201206233949.3783184-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This file contains functions related to TLB management, rename it as 'tlb_helper.c'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- Maybe I missed some functions not TLB specific... --- target/mips/{helper.c =3D> tlb_helper.c} | 2 +- target/mips/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename target/mips/{helper.c =3D> tlb_helper.c} (99%) diff --git a/target/mips/helper.c b/target/mips/tlb_helper.c similarity index 99% rename from target/mips/helper.c rename to target/mips/tlb_helper.c index 5db7e80e22b..7022be13ae4 100644 --- a/target/mips/helper.c +++ b/target/mips/tlb_helper.c @@ -1,5 +1,5 @@ /* - * MIPS emulation helpers for qemu. + * MIPS TLB (Translation lookaside buffer) helpers. * * Copyright (c) 2004-2005 Jocelyn Mayer * diff --git a/target/mips/meson.build b/target/mips/meson.build index 4858bf86ad6..c685f03fb28 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -6,10 +6,10 @@ 'dsp_helper.c', 'fpu_helper.c', 'gdbstub.c', - 'helper.c', 'lmmi_helper.c', 'msa_helper.c', 'op_helper.c', + 'tlb_helper.c', 'translate.c', )) mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c')) --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607298060; cv=none; d=zohomail.com; s=zohoarc; b=n2TQCJmPrQiEoDziksDmEJmZ5SJ5gBy5/kt7wKOmpUz8ZAjA6bbZ0aOyNtgoPZ9+ASOK04oR+LgGtifsanJiXfhg0QCeDKF27Dwt2FAhEiR/+INwJd4iagU88QyVHdS0ixOZN8HMaOh7e6i9o3EbSmAUe0aS4zzXOBJToXjcP08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298060; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T3FlFk78pLMkupK1YI/tjtH+Hq+IGEC+koiKdnLg6D4=; b=ZkGPY9ZlHlcHuvVJkCcuhsl7QUsw0NmH0p0z6HnV58WE02MJCkced5YWW0jI1Uk3o2+L0/2Kc7bGNjSFXI25BV5dQR9dGuVQeniYZeKjhHOG4XOZcxdZDh5BBMa9jHxUJuKD95FTY9yrc3V0r3Y8u/veyrwWMnf3FSQGw7AwMBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1607298060685800.747393855762; Sun, 6 Dec 2020 15:41:00 -0800 (PST) Received: by mail-wr1-f66.google.com with SMTP id x6so7098775wro.11 for ; Sun, 06 Dec 2020 15:41:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id v64sm12121580wme.25.2020.12.06.15.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T3FlFk78pLMkupK1YI/tjtH+Hq+IGEC+koiKdnLg6D4=; b=Nd40X/OAaFHU7qiOSgMuQvCbYgV4L46HRjBTenvdE6K7BjJktwpHXWNVaawkhTZbhQ f1XDpTbKYfXjgWpc7PVXdXJcmdYjn1hMiVuHUtsfsFC65VKnFs6+HEpRYrSn9o65epuS 5lgBLiZgQz8UrVk5IAkyx1imzjlUXcmBxmReRL8UIury8SpVuEoBWJF+SZTJmZ9U7HVI AlZq61DO68FzIZgkldq06THajtSF5NmsGFoDIjYw/0xsm87uVB5OezgFTXZrItwUvXYZ 2WshCAmKuvvR9dfxG092CZwgXaPEVskHC3S/ioc07+Hob0/TSzoAcpYt7ZLuiEX7P6F9 vFVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=T3FlFk78pLMkupK1YI/tjtH+Hq+IGEC+koiKdnLg6D4=; b=MJcZyk42OGDn1t6CGy5nDxCH9I+tWr7jo4/uTO2DVwaWAMjqCUI9KkrCG2knMCszes c+lm8tU/+UL3/f4RS1MwUJ1jnYr3nz1b9WLaQVlsBQM5eEJdknlFUnTJPIigiXIDeyZ7 erFD/Ki89x8Q8y0NYxjrh01BLEm20GLm2Qg9zCcd/uUUdM+dZj/03+D/L6VussNyP8Vm HPrJLaN588azP4OoJ6JAoo9jseJG0nCAljBpHUFE95XGQ1UkXFQBdGvA9BpRgvCPaK2d lrtGB53/lO4K4gyskEy7NjU4Z7J1k0j+M+Ycj0wltmRyZHmeTHdT2RZI056WFlFu5OMx SwIQ== X-Gm-Message-State: AOAM532w/NCEIFKE5QXUrDQrXnHexqwk607lCUFP9rIPNxrxQl1JUNbX vXqDIhyUe2Lqvz90WSHUYCE= X-Google-Smtp-Source: ABdhPJw8IuYkegnv9iK+VaKUkUOm0Qb6xkjQ5rtQTFv+GuhbUTLtX2B/74LwkiAvEJAHYh99X9An8g== X-Received: by 2002:a05:6000:187:: with SMTP id p7mr16728218wrx.240.1607298058923; Sun, 06 Dec 2020 15:40:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 13/19] target/mips: Fix code style for checkpatch.pl Date: Mon, 7 Dec 2020 00:39:43 +0100 Message-Id: <20201206233949.3783184-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/translate_init.c.inc | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index ea85d5c6a79..535b52b5444 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -932,19 +932,19 @@ void mips_cpu_list(void) } =20 #ifndef CONFIG_USER_ONLY -static void no_mmu_init (CPUMIPSState *env, const mips_def_t *def) +static void no_mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb->nb_tlb =3D 1; env->tlb->map_address =3D &no_mmu_map_address; } =20 -static void fixed_mmu_init (CPUMIPSState *env, const mips_def_t *def) +static void fixed_mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb->nb_tlb =3D 1; env->tlb->map_address =3D &fixed_mmu_map_address; } =20 -static void r4k_mmu_init (CPUMIPSState *env, const mips_def_t *def) +static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb->nb_tlb =3D 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); env->tlb->map_address =3D &r4k_map_address; @@ -956,25 +956,25 @@ static void r4k_mmu_init (CPUMIPSState *env, const mi= ps_def_t *def) env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; } =20 -static void mmu_init (CPUMIPSState *env, const mips_def_t *def) +static void mmu_init(CPUMIPSState *env, const mips_def_t *def) { env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); =20 switch (def->mmu_type) { - case MMU_TYPE_NONE: - no_mmu_init(env, def); - break; - case MMU_TYPE_R4000: - r4k_mmu_init(env, def); - break; - case MMU_TYPE_FMT: - fixed_mmu_init(env, def); - break; - case MMU_TYPE_R3000: - case MMU_TYPE_R6000: - case MMU_TYPE_R8000: - default: - cpu_abort(env_cpu(env), "MMU type not supported\n"); + case MMU_TYPE_NONE: + no_mmu_init(env, def); + break; + case MMU_TYPE_R4000: + r4k_mmu_init(env, def); + break; + case MMU_TYPE_FMT: + fixed_mmu_init(env, def); + break; + case MMU_TYPE_R3000: + case MMU_TYPE_R6000: + case MMU_TYPE_R8000: + default: + cpu_abort(env_cpu(env), "MMU type not supported\n"); } } #endif /* CONFIG_USER_ONLY */ --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298065; cv=none; d=zohomail.com; s=zohoarc; b=KBMnMGkVSr7zwmLwKoq97O77i6rRaR4kyfw1zOBPJJUFzTR9+5+uOlcnnWwwB2diGy+NC+D6Rh8hTZSvSeej8oHuhjmec0t7ncusnR7o4Dgf686gwDxax43HZ4qbwrKJK3lzMNe7PpCa2BV/mQGDEBcBfkfXf4Cl5O8vq1gFOZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298065; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9BTcPOXtMinT5k5T7nbhCeBg4W/whtqBwxpgGRzVoyY=; b=Sc2Vw1UyaArarBwYcupflEKUPEvDDa69FI3+qfmAvasFLT1HkYjh+uIqp4J4FpaV1iRvkp6UgJAJNaoI6ZKZxScQ5DPbEIE2+seMlqFeSzb+t45qmQjpnrXINaRJpP1Mh2UW/rpIVJAJwh4LG3pb06bk319LVremPuI/2Q+j3Uk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1607298065726181.52801187190607; Sun, 6 Dec 2020 15:41:05 -0800 (PST) Received: by mail-wm1-f66.google.com with SMTP id d3so10003751wmb.4 for ; Sun, 06 Dec 2020 15:41:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id z64sm8420316wme.10.2020.12.06.15.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9BTcPOXtMinT5k5T7nbhCeBg4W/whtqBwxpgGRzVoyY=; b=p1ImZNoX4v6fBw9lo2pGVP8nMu+w46ELoCV73YAIp/1d9sIVbh1woMrH1j3snMxYEA wy0gU0kXFYAdYRyTIKgugP2PLQPbtwznDcum4hVGcexRqYkHTz93hfKB3CveJeUwSq7R tZGFvjompEjCuuRkBug4qH0MUMqZYwozVdTNnf9SDNgPQHXKz0TN2XbnfrcEjpemBsmg jAF4toEcpyobeg7ideT76ByL6fNJWs1HCPhgRrtJmd2aVf28aftuEqBKCGoFkfrQf9GV xOOEa3yct3SlohOo70dj3INCCbJknj5kl0dy2U+XtMqQZcrP6C1PMRpiHgJLc+T9xIgg MPxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9BTcPOXtMinT5k5T7nbhCeBg4W/whtqBwxpgGRzVoyY=; b=dikSUePDcGZL/Tr7Kq8se4TxhNYTBqKga7oAJTSwEJkaV92XZ8E3HkOMsli0Vp1+Fh gVQKbUj5WdWBsQ08c5tVQv6a1cKvw1/f4jwwG8ky/5Vbu5MkbNynDnW6UwLLbJAMHXTC il8xNAM4MS3Ush3iO4TVLEP44g7Lbfj0dtc0WXmz+5GRNuB9Ih0hLq3ODoR3ESx1teaN AdGo5D/Olbw0kqk+gf/fs6PCdNF8CWZVAEL//d8UI8jp6XBptZ6j0JwnHMWGuENDCm3j fivVTZlfUuNmqzT4M11fMU9Swr1hWyNvUWXXMxCj3CGWNo4rVKxBvfDLaTLppvuOiZTz GBEA== X-Gm-Message-State: AOAM530NTo3tO1oLsXs6CyJAOQBHcazu0f1HDCuwr9hKF/5DkZasfDWZ Bx9NtJr7CVPKdDkuU15hqGM= X-Google-Smtp-Source: ABdhPJyVKaO41xs/ZdGIjNsXWgL4LX7SEpCdFwq82VDdLgPrMv5YbGnDkrWWhrqsb65YgsYipg8XQw== X-Received: by 2002:a1c:43c6:: with SMTP id q189mr15741827wma.7.1607298063900; Sun, 06 Dec 2020 15:41:03 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 14/19] target/mips: Move mmu_init() functions to tlb_helper.c Date: Mon, 7 Dec 2020 00:39:44 +0100 Message-Id: <20201206233949.3783184-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 1 + target/mips/tlb_helper.c | 46 ++++++++++++++++++++++++++++++ target/mips/translate_init.c.inc | 48 -------------------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 76b7a85cbb3..142fa3e5007 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -218,6 +218,7 @@ void cpu_mips_start_count(CPUMIPSState *env); void cpu_mips_stop_count(CPUMIPSState *env); =20 /* helper.c */ +void mmu_init(CPUMIPSState *env, const mips_def_t *def); bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 7022be13ae4..366cc526a14 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -120,6 +120,52 @@ int r4k_map_address(CPUMIPSState *env, hwaddr *physica= l, int *prot, return TLBRET_NOMATCH; } =20 +static void no_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1; + env->tlb->map_address =3D &no_mmu_map_address; +} + +static void fixed_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1; + env->tlb->map_address =3D &fixed_mmu_map_address; +} + +static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); + env->tlb->map_address =3D &r4k_map_address; + env->tlb->helper_tlbwi =3D r4k_helper_tlbwi; + env->tlb->helper_tlbwr =3D r4k_helper_tlbwr; + env->tlb->helper_tlbp =3D r4k_helper_tlbp; + env->tlb->helper_tlbr =3D r4k_helper_tlbr; + env->tlb->helper_tlbinv =3D r4k_helper_tlbinv; + env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; +} + +void mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); + + switch (def->mmu_type) { + case MMU_TYPE_NONE: + no_mmu_init(env, def); + break; + case MMU_TYPE_R4000: + r4k_mmu_init(env, def); + break; + case MMU_TYPE_FMT: + fixed_mmu_init(env, def); + break; + case MMU_TYPE_R3000: + case MMU_TYPE_R6000: + case MMU_TYPE_R8000: + default: + cpu_abort(env_cpu(env), "MMU type not supported\n"); + } +} + static int is_seg_am_mapped(unsigned int am, bool eu, int mmu_idx) { /* diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index 535b52b5444..f3daf451a63 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -931,54 +931,6 @@ void mips_cpu_list(void) } } =20 -#ifndef CONFIG_USER_ONLY -static void no_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1; - env->tlb->map_address =3D &no_mmu_map_address; -} - -static void fixed_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1; - env->tlb->map_address =3D &fixed_mmu_map_address; -} - -static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); - env->tlb->map_address =3D &r4k_map_address; - env->tlb->helper_tlbwi =3D r4k_helper_tlbwi; - env->tlb->helper_tlbwr =3D r4k_helper_tlbwr; - env->tlb->helper_tlbp =3D r4k_helper_tlbp; - env->tlb->helper_tlbr =3D r4k_helper_tlbr; - env->tlb->helper_tlbinv =3D r4k_helper_tlbinv; - env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; -} - -static void mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); - - switch (def->mmu_type) { - case MMU_TYPE_NONE: - no_mmu_init(env, def); - break; - case MMU_TYPE_R4000: - r4k_mmu_init(env, def); - break; - case MMU_TYPE_FMT: - fixed_mmu_init(env, def); - break; - case MMU_TYPE_R3000: - case MMU_TYPE_R6000: - case MMU_TYPE_R8000: - default: - cpu_abort(env_cpu(env), "MMU type not supported\n"); - } -} -#endif /* CONFIG_USER_ONLY */ - static void fpu_init (CPUMIPSState *env, const mips_def_t *def) { int i; --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607298071; cv=none; d=zohomail.com; s=zohoarc; b=K1eISnRkJHlLypya6tsTijPjqGiqa0NO5ePhHea4wHIby0AhnVMaz4lQAI02RQp/9nIHcKlkC1uuPfQhrS3Rum4sTt7jP38z+w7CJLhYyxbfFvh8t4wR3vvTK4/Gp3SyZqI8xlsIT2aO3QY8pySK3eYzdOAwRzhTYmbCvR+2jDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298071; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oMJ3CHYmdiF3SH3YLY7STen4nzOmxM4U+l65pSG8kU0=; b=GDYj8QOpC76CXMVw2ioyUSK8hLiwB/G5uhM71pSfsIkHPWaF27+lMsLG981eYidQdE/hz2vdTtCEhq/kBVUfReweevIBjyGe37/fXhDYceUVQOKL69FrXYxX9Er8E+6XK+nWTFCjbPyqPl0fzW2VBxbpqpwHkFjTFUph9hkrRDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1607298071253424.8720436728196; Sun, 6 Dec 2020 15:41:11 -0800 (PST) Received: by mail-wr1-f67.google.com with SMTP id i2so11043369wrs.4 for ; Sun, 06 Dec 2020 15:41:10 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id w17sm11457014wmk.12.2020.12.06.15.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oMJ3CHYmdiF3SH3YLY7STen4nzOmxM4U+l65pSG8kU0=; b=vS4iZ1+5iQaHzdLRscDtM09kEnVJWxDVtiN6AsPNzGfDBObOO0HceT70veLsnMnMuQ xdJqfOr4Nn847YDbzAcK5gZVZYrRHP51CQagz3lv8ofzPE4eyNihn6dxxXBQhmBaEPqn uAYIGzGyHVHQUKzGHr/Taw0yFohrwgiZuxfD8hae0Jbd8Oy1ZgE4AOR1ppdTEGT7Oqgs DaYXcmF8nSOgOyrJ5q1mtNvRscelCNoKMoHtVXBg7Yns0gKV1dBmZjFZ+NLGGZl5pmIZ N49xbh5NpF1ctH0zKz7+2lh2jlQYXvpObZKHQtRJiYaxIC5whgNmV/hN/lri7e66ZfW5 ciKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oMJ3CHYmdiF3SH3YLY7STen4nzOmxM4U+l65pSG8kU0=; b=N2GD3kBt1ts6qBpuwwVGBx+lD4rSdjyYkw0nOw27oITu3CENavsvJJQeznz2mRvI0S w9f3aaoPX2xDJAbb9CEZc55mXlWwcvZCYI+JwRTRqKFi79zw0Jw79v7mRyWW3Hft5l79 sCG5ERNtXmB0QgPp3WQkLRhc8hsqhojWsMWNsqOnTvU0F9m8BpxtxmiQbxf+rTe78m2x suxUV0CIg0qk2RJ0dEQv6mYq1DwSzfYvyLOLfth1JoO7a6H3ZP+kWt0vIS9kYmJcqYwT wg0nFwpMCV7+f3t5LXeL9kv2yAt+28OdCcAQxUxThfg4r4rrl3WDYDYwVHCnvvVJ+xPF 25ag== X-Gm-Message-State: AOAM532k2DPnJo9CgwxVnqnADWCE+9ySBEtI/gNY7nI67sO9+fw3kF05 QUeOlecV7TMHNX27rgdHcXs= X-Google-Smtp-Source: ABdhPJzqmO5YQqVjCPfHYhTyMWNiBq2E/nt77u9/9WwTDddOafY9gnuEMo3FDe1BafdkqxRQub1rxQ== X-Received: by 2002:adf:ecc9:: with SMTP id s9mr16846362wro.246.1607298069163; Sun, 06 Dec 2020 15:41:09 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 15/19] target/mips: Move cpu definitions, reset() and realize() to cpu.c Date: Mon, 7 Dec 2020 00:39:45 +0100 Message-Id: <20201206233949.3783184-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Nothing TCG specific there, move to common cpu code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 4 - target/mips/cpu.c | 243 ++++++++++++++++++++++++++++++++++++++++ target/mips/translate.c | 240 --------------------------------------- 3 files changed, 243 insertions(+), 244 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 142fa3e5007..fcd5e8335ec 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -206,10 +206,6 @@ static inline bool cpu_mips_hw_interrupts_pending(CPUM= IPSState *env) =20 void mips_tcg_init(void); =20 -/* TODO QOM'ify CPU reset and remove */ -void cpu_state_reset(CPUMIPSState *s); -void cpu_mips_realize_env(CPUMIPSState *env); - /* cp0_timer.c */ uint32_t cpu_mips_get_count(CPUMIPSState *env); void cpu_mips_store_count(CPUMIPSState *env, uint32_t value); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index e612a7ac41a..1073db7f257 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -20,6 +20,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/qemu-print.h" #include "qapi/error.h" #include "cpu.h" #include "internal.h" @@ -30,6 +31,7 @@ #include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" +#include "hw/semihosting/semihost.h" #include "qapi/qapi-commands-machine-target.h" =20 static void mips_cpu_set_pc(CPUState *cs, vaddr value) @@ -100,6 +102,247 @@ static bool mips_cpu_has_work(CPUState *cs) return has_work; } =20 +#include "translate_init.c.inc" + +static void cpu_mips_realize_env(CPUMIPSState *env) +{ + env->exception_base =3D (int32_t)0xBFC00000; + +#ifndef CONFIG_USER_ONLY + mmu_init(env, env->cpu_model); +#endif + fpu_init(env, env->cpu_model); + mvp_init(env, env->cpu_model); +} + +/* TODO QOM'ify CPU reset and remove */ +static void cpu_state_reset(CPUMIPSState *env) +{ + CPUState *cs =3D env_cpu(env); + + /* Reset registers to their default values */ + env->CP0_PRid =3D env->cpu_model->CP0_PRid; + env->CP0_Config0 =3D env->cpu_model->CP0_Config0; +#ifdef TARGET_WORDS_BIGENDIAN + env->CP0_Config0 |=3D (1 << CP0C0_BE); +#endif + env->CP0_Config1 =3D env->cpu_model->CP0_Config1; + env->CP0_Config2 =3D env->cpu_model->CP0_Config2; + env->CP0_Config3 =3D env->cpu_model->CP0_Config3; + env->CP0_Config4 =3D env->cpu_model->CP0_Config4; + env->CP0_Config4_rw_bitmask =3D env->cpu_model->CP0_Config4_rw_bitmask; + env->CP0_Config5 =3D env->cpu_model->CP0_Config5; + env->CP0_Config5_rw_bitmask =3D env->cpu_model->CP0_Config5_rw_bitmask; + env->CP0_Config6 =3D env->cpu_model->CP0_Config6; + env->CP0_Config6_rw_bitmask =3D env->cpu_model->CP0_Config6_rw_bitmask; + env->CP0_Config7 =3D env->cpu_model->CP0_Config7; + env->CP0_Config7_rw_bitmask =3D env->cpu_model->CP0_Config7_rw_bitmask; + env->CP0_LLAddr_rw_bitmask =3D env->cpu_model->CP0_LLAddr_rw_bitmask + << env->cpu_model->CP0_LLAddr_shift; + env->CP0_LLAddr_shift =3D env->cpu_model->CP0_LLAddr_shift; + env->SYNCI_Step =3D env->cpu_model->SYNCI_Step; + env->CCRes =3D env->cpu_model->CCRes; + env->CP0_Status_rw_bitmask =3D env->cpu_model->CP0_Status_rw_bitmask; + env->CP0_TCStatus_rw_bitmask =3D env->cpu_model->CP0_TCStatus_rw_bitma= sk; + env->CP0_SRSCtl =3D env->cpu_model->CP0_SRSCtl; + env->current_tc =3D 0; + env->SEGBITS =3D env->cpu_model->SEGBITS; + env->SEGMask =3D (target_ulong)((1ULL << env->cpu_model->SEGBITS) - 1); +#if defined(TARGET_MIPS64) + if (env->cpu_model->insn_flags & ISA_MIPS3) { + env->SEGMask |=3D 3ULL << 62; + } +#endif + env->PABITS =3D env->cpu_model->PABITS; + env->CP0_SRSConf0_rw_bitmask =3D env->cpu_model->CP0_SRSConf0_rw_bitma= sk; + env->CP0_SRSConf0 =3D env->cpu_model->CP0_SRSConf0; + env->CP0_SRSConf1_rw_bitmask =3D env->cpu_model->CP0_SRSConf1_rw_bitma= sk; + env->CP0_SRSConf1 =3D env->cpu_model->CP0_SRSConf1; + env->CP0_SRSConf2_rw_bitmask =3D env->cpu_model->CP0_SRSConf2_rw_bitma= sk; + env->CP0_SRSConf2 =3D env->cpu_model->CP0_SRSConf2; + env->CP0_SRSConf3_rw_bitmask =3D env->cpu_model->CP0_SRSConf3_rw_bitma= sk; + env->CP0_SRSConf3 =3D env->cpu_model->CP0_SRSConf3; + env->CP0_SRSConf4_rw_bitmask =3D env->cpu_model->CP0_SRSConf4_rw_bitma= sk; + env->CP0_SRSConf4 =3D env->cpu_model->CP0_SRSConf4; + env->CP0_PageGrain_rw_bitmask =3D env->cpu_model->CP0_PageGrain_rw_bit= mask; + env->CP0_PageGrain =3D env->cpu_model->CP0_PageGrain; + env->CP0_EBaseWG_rw_bitmask =3D env->cpu_model->CP0_EBaseWG_rw_bitmask; + env->active_fpu.fcr0 =3D env->cpu_model->CP1_fcr0; + env->active_fpu.fcr31_rw_bitmask =3D env->cpu_model->CP1_fcr31_rw_bitm= ask; + env->active_fpu.fcr31 =3D env->cpu_model->CP1_fcr31; + env->msair =3D env->cpu_model->MSAIR; + env->insn_flags =3D env->cpu_model->insn_flags; + +#if defined(CONFIG_USER_ONLY) + env->CP0_Status =3D (MIPS_HFLAG_UM << CP0St_KSU); +# ifdef TARGET_MIPS64 + /* Enable 64-bit register mode. */ + env->CP0_Status |=3D (1 << CP0St_PX); +# endif +# ifdef TARGET_ABI_MIPSN64 + /* Enable 64-bit address mode. */ + env->CP0_Status |=3D (1 << CP0St_UX); +# endif + /* + * Enable access to the CPUNum, SYNCI_Step, CC, and CCRes RDHWR + * hardware registers. + */ + env->CP0_HWREna |=3D 0x0000000F; + if (env->CP0_Config1 & (1 << CP0C1_FP)) { + env->CP0_Status |=3D (1 << CP0St_CU1); + } + if (env->CP0_Config3 & (1 << CP0C3_DSPP)) { + env->CP0_Status |=3D (1 << CP0St_MX); + } +# if defined(TARGET_MIPS64) + /* For MIPS64, init FR bit to 1 if FPU unit is there and bit is writab= le. */ + if ((env->CP0_Config1 & (1 << CP0C1_FP)) && + (env->CP0_Status_rw_bitmask & (1 << CP0St_FR))) { + env->CP0_Status |=3D (1 << CP0St_FR); + } +# endif +#else + if (env->hflags & MIPS_HFLAG_BMASK) { + /* + * If the exception was raised from a delay slot, + * come back to the jump. + */ + env->CP0_ErrorEPC =3D (env->active_tc.PC + - (env->hflags & MIPS_HFLAG_B16 ? 2 : 4)); + } else { + env->CP0_ErrorEPC =3D env->active_tc.PC; + } + env->active_tc.PC =3D env->exception_base; + env->CP0_Random =3D env->tlb->nb_tlb - 1; + env->tlb->tlb_in_use =3D env->tlb->nb_tlb; + env->CP0_Wired =3D 0; + env->CP0_GlobalNumber =3D (cs->cpu_index & 0xFF) << CP0GN_VPId; + env->CP0_EBase =3D (cs->cpu_index & 0x3FF); + if (mips_um_ksegs_enabled()) { + env->CP0_EBase |=3D 0x40000000; + } else { + env->CP0_EBase |=3D (int32_t)0x80000000; + } + if (env->CP0_Config3 & (1 << CP0C3_CMGCR)) { + env->CP0_CMGCRBase =3D 0x1fbf8000 >> 4; + } + env->CP0_EntryHi_ASID_mask =3D (env->CP0_Config5 & (1 << CP0C5_MI)) ? + 0x0 : (env->CP0_Config4 & (1 << CP0C4_AE)) ? 0x3ff : 0xff; + env->CP0_Status =3D (1 << CP0St_BEV) | (1 << CP0St_ERL); + /* + * Vectored interrupts not implemented, timer on int 7, + * no performance counters. + */ + env->CP0_IntCtl =3D 0xe0000000; + { + int i; + + for (i =3D 0; i < 7; i++) { + env->CP0_WatchLo[i] =3D 0; + env->CP0_WatchHi[i] =3D 0x80000000; + } + env->CP0_WatchLo[7] =3D 0; + env->CP0_WatchHi[7] =3D 0; + } + /* Count register increments in debug mode, EJTAG version 1 */ + env->CP0_Debug =3D (1 << CP0DB_CNT) | (0x1 << CP0DB_VER); + + cpu_mips_store_count(env, 1); + + if (env->CP0_Config3 & (1 << CP0C3_MT)) { + int i; + + /* Only TC0 on VPE 0 starts as active. */ + for (i =3D 0; i < ARRAY_SIZE(env->tcs); i++) { + env->tcs[i].CP0_TCBind =3D cs->cpu_index << CP0TCBd_CurVPE; + env->tcs[i].CP0_TCHalt =3D 1; + } + env->active_tc.CP0_TCHalt =3D 1; + cs->halted =3D 1; + + if (cs->cpu_index =3D=3D 0) { + /* VPE0 starts up enabled. */ + env->mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP); + env->CP0_VPEConf0 |=3D (1 << CP0VPEC0_MVP) | (1 << CP0VPEC0_VP= A); + + /* TC0 starts up unhalted. */ + cs->halted =3D 0; + env->active_tc.CP0_TCHalt =3D 0; + env->tcs[0].CP0_TCHalt =3D 0; + /* With thread 0 active. */ + env->active_tc.CP0_TCStatus =3D (1 << CP0TCSt_A); + env->tcs[0].CP0_TCStatus =3D (1 << CP0TCSt_A); + } + } + + /* + * Configure default legacy segmentation control. We use this regardle= ss of + * whether segmentation control is presented to the guest. + */ + /* KSeg3 (seg0 0xE0000000..0xFFFFFFFF) */ + env->CP0_SegCtl0 =3D (CP0SC_AM_MK << CP0SC_AM); + /* KSeg2 (seg1 0xC0000000..0xDFFFFFFF) */ + env->CP0_SegCtl0 |=3D ((CP0SC_AM_MSK << CP0SC_AM)) << 16; + /* KSeg1 (seg2 0xA0000000..0x9FFFFFFF) */ + env->CP0_SegCtl1 =3D (0 << CP0SC_PA) | (CP0SC_AM_UK << CP0SC_AM) | + (2 << CP0SC_C); + /* KSeg0 (seg3 0x80000000..0x9FFFFFFF) */ + env->CP0_SegCtl1 |=3D ((0 << CP0SC_PA) | (CP0SC_AM_UK << CP0SC_AM) | + (3 << CP0SC_C)) << 16; + /* USeg (seg4 0x40000000..0x7FFFFFFF) */ + env->CP0_SegCtl2 =3D (2 << CP0SC_PA) | (CP0SC_AM_MUSK << CP0SC_AM) | + (1 << CP0SC_EU) | (2 << CP0SC_C); + /* USeg (seg5 0x00000000..0x3FFFFFFF) */ + env->CP0_SegCtl2 |=3D ((0 << CP0SC_PA) | (CP0SC_AM_MUSK << CP0SC_AM) | + (1 << CP0SC_EU) | (2 << CP0SC_C)) << 16; + /* XKPhys (note, SegCtl2.XR =3D 0, so XAM won't be used) */ + env->CP0_SegCtl1 |=3D (CP0SC_AM_UK << CP0SC1_XAM); +#endif + if ((env->insn_flags & ISA_MIPS32R6) && + (env->active_fpu.fcr0 & (1 << FCR0_F64))) { + /* Status.FR =3D 0 mode in 64-bit FPU not allowed in R6 */ + env->CP0_Status |=3D (1 << CP0St_FR); + } + + if (env->insn_flags & ISA_MIPS32R6) { + /* PTW =3D 1 */ + env->CP0_PWSize =3D 0x40; + /* GDI =3D 12 */ + /* UDI =3D 12 */ + /* MDI =3D 12 */ + /* PRI =3D 12 */ + /* PTEI =3D 2 */ + env->CP0_PWField =3D 0x0C30C302; + } else { + /* GDI =3D 0 */ + /* UDI =3D 0 */ + /* MDI =3D 0 */ + /* PRI =3D 0 */ + /* PTEI =3D 2 */ + env->CP0_PWField =3D 0x02; + } + + if (env->CP0_Config3 & (1 << CP0C3_ISA) & (1 << (CP0C3_ISA + 1))) { + /* microMIPS on reset when Config3.ISA is 3 */ + env->hflags |=3D MIPS_HFLAG_M16; + } + + /* MSA */ + if (env->CP0_Config3 & (1 << CP0C3_MSAP)) { + msa_reset(env); + } + + compute_hflags(env); + restore_fp_status(env); + restore_pamask(env); + cs->exception_index =3D EXCP_NONE; + + if (semihosting_get_argc()) { + /* UHI interface can be used to obtain argc and argv */ + env->active_tc.gpr[4] =3D -1; + } +} + static void mips_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); diff --git a/target/mips/translate.c b/target/mips/translate.c index dbb71fdaa5d..19933b7868c 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -31753,246 +31753,6 @@ void mips_tcg_init(void) #endif } =20 -#include "translate_init.c.inc" - -void cpu_mips_realize_env(CPUMIPSState *env) -{ - env->exception_base =3D (int32_t)0xBFC00000; - -#ifndef CONFIG_USER_ONLY - mmu_init(env, env->cpu_model); -#endif - fpu_init(env, env->cpu_model); - mvp_init(env, env->cpu_model); -} - -void cpu_state_reset(CPUMIPSState *env) -{ - CPUState *cs =3D env_cpu(env); - - /* Reset registers to their default values */ - env->CP0_PRid =3D env->cpu_model->CP0_PRid; - env->CP0_Config0 =3D env->cpu_model->CP0_Config0; -#ifdef TARGET_WORDS_BIGENDIAN - env->CP0_Config0 |=3D (1 << CP0C0_BE); -#endif - env->CP0_Config1 =3D env->cpu_model->CP0_Config1; - env->CP0_Config2 =3D env->cpu_model->CP0_Config2; - env->CP0_Config3 =3D env->cpu_model->CP0_Config3; - env->CP0_Config4 =3D env->cpu_model->CP0_Config4; - env->CP0_Config4_rw_bitmask =3D env->cpu_model->CP0_Config4_rw_bitmask; - env->CP0_Config5 =3D env->cpu_model->CP0_Config5; - env->CP0_Config5_rw_bitmask =3D env->cpu_model->CP0_Config5_rw_bitmask; - env->CP0_Config6 =3D env->cpu_model->CP0_Config6; - env->CP0_Config6_rw_bitmask =3D env->cpu_model->CP0_Config6_rw_bitmask; - env->CP0_Config7 =3D env->cpu_model->CP0_Config7; - env->CP0_Config7_rw_bitmask =3D env->cpu_model->CP0_Config7_rw_bitmask; - env->CP0_LLAddr_rw_bitmask =3D env->cpu_model->CP0_LLAddr_rw_bitmask - << env->cpu_model->CP0_LLAddr_shift; - env->CP0_LLAddr_shift =3D env->cpu_model->CP0_LLAddr_shift; - env->SYNCI_Step =3D env->cpu_model->SYNCI_Step; - env->CCRes =3D env->cpu_model->CCRes; - env->CP0_Status_rw_bitmask =3D env->cpu_model->CP0_Status_rw_bitmask; - env->CP0_TCStatus_rw_bitmask =3D env->cpu_model->CP0_TCStatus_rw_bitma= sk; - env->CP0_SRSCtl =3D env->cpu_model->CP0_SRSCtl; - env->current_tc =3D 0; - env->SEGBITS =3D env->cpu_model->SEGBITS; - env->SEGMask =3D (target_ulong)((1ULL << env->cpu_model->SEGBITS) - 1); -#if defined(TARGET_MIPS64) - if (env->cpu_model->insn_flags & ISA_MIPS3) { - env->SEGMask |=3D 3ULL << 62; - } -#endif - env->PABITS =3D env->cpu_model->PABITS; - env->CP0_SRSConf0_rw_bitmask =3D env->cpu_model->CP0_SRSConf0_rw_bitma= sk; - env->CP0_SRSConf0 =3D env->cpu_model->CP0_SRSConf0; - env->CP0_SRSConf1_rw_bitmask =3D env->cpu_model->CP0_SRSConf1_rw_bitma= sk; - env->CP0_SRSConf1 =3D env->cpu_model->CP0_SRSConf1; - env->CP0_SRSConf2_rw_bitmask =3D env->cpu_model->CP0_SRSConf2_rw_bitma= sk; - env->CP0_SRSConf2 =3D env->cpu_model->CP0_SRSConf2; - env->CP0_SRSConf3_rw_bitmask =3D env->cpu_model->CP0_SRSConf3_rw_bitma= sk; - env->CP0_SRSConf3 =3D env->cpu_model->CP0_SRSConf3; - env->CP0_SRSConf4_rw_bitmask =3D env->cpu_model->CP0_SRSConf4_rw_bitma= sk; - env->CP0_SRSConf4 =3D env->cpu_model->CP0_SRSConf4; - env->CP0_PageGrain_rw_bitmask =3D env->cpu_model->CP0_PageGrain_rw_bit= mask; - env->CP0_PageGrain =3D env->cpu_model->CP0_PageGrain; - env->CP0_EBaseWG_rw_bitmask =3D env->cpu_model->CP0_EBaseWG_rw_bitmask; - env->active_fpu.fcr0 =3D env->cpu_model->CP1_fcr0; - env->active_fpu.fcr31_rw_bitmask =3D env->cpu_model->CP1_fcr31_rw_bitm= ask; - env->active_fpu.fcr31 =3D env->cpu_model->CP1_fcr31; - env->msair =3D env->cpu_model->MSAIR; - env->insn_flags =3D env->cpu_model->insn_flags; - -#if defined(CONFIG_USER_ONLY) - env->CP0_Status =3D (MIPS_HFLAG_UM << CP0St_KSU); -# ifdef TARGET_MIPS64 - /* Enable 64-bit register mode. */ - env->CP0_Status |=3D (1 << CP0St_PX); -# endif -# ifdef TARGET_ABI_MIPSN64 - /* Enable 64-bit address mode. */ - env->CP0_Status |=3D (1 << CP0St_UX); -# endif - /* - * Enable access to the CPUNum, SYNCI_Step, CC, and CCRes RDHWR - * hardware registers. - */ - env->CP0_HWREna |=3D 0x0000000F; - if (env->CP0_Config1 & (1 << CP0C1_FP)) { - env->CP0_Status |=3D (1 << CP0St_CU1); - } - if (env->CP0_Config3 & (1 << CP0C3_DSPP)) { - env->CP0_Status |=3D (1 << CP0St_MX); - } -# if defined(TARGET_MIPS64) - /* For MIPS64, init FR bit to 1 if FPU unit is there and bit is writab= le. */ - if ((env->CP0_Config1 & (1 << CP0C1_FP)) && - (env->CP0_Status_rw_bitmask & (1 << CP0St_FR))) { - env->CP0_Status |=3D (1 << CP0St_FR); - } -# endif -#else - if (env->hflags & MIPS_HFLAG_BMASK) { - /* - * If the exception was raised from a delay slot, - * come back to the jump. - */ - env->CP0_ErrorEPC =3D (env->active_tc.PC - - (env->hflags & MIPS_HFLAG_B16 ? 2 : 4)); - } else { - env->CP0_ErrorEPC =3D env->active_tc.PC; - } - env->active_tc.PC =3D env->exception_base; - env->CP0_Random =3D env->tlb->nb_tlb - 1; - env->tlb->tlb_in_use =3D env->tlb->nb_tlb; - env->CP0_Wired =3D 0; - env->CP0_GlobalNumber =3D (cs->cpu_index & 0xFF) << CP0GN_VPId; - env->CP0_EBase =3D (cs->cpu_index & 0x3FF); - if (mips_um_ksegs_enabled()) { - env->CP0_EBase |=3D 0x40000000; - } else { - env->CP0_EBase |=3D (int32_t)0x80000000; - } - if (env->CP0_Config3 & (1 << CP0C3_CMGCR)) { - env->CP0_CMGCRBase =3D 0x1fbf8000 >> 4; - } - env->CP0_EntryHi_ASID_mask =3D (env->CP0_Config5 & (1 << CP0C5_MI)) ? - 0x0 : (env->CP0_Config4 & (1 << CP0C4_AE)) ? 0x3ff : 0xff; - env->CP0_Status =3D (1 << CP0St_BEV) | (1 << CP0St_ERL); - /* - * Vectored interrupts not implemented, timer on int 7, - * no performance counters. - */ - env->CP0_IntCtl =3D 0xe0000000; - { - int i; - - for (i =3D 0; i < 7; i++) { - env->CP0_WatchLo[i] =3D 0; - env->CP0_WatchHi[i] =3D 0x80000000; - } - env->CP0_WatchLo[7] =3D 0; - env->CP0_WatchHi[7] =3D 0; - } - /* Count register increments in debug mode, EJTAG version 1 */ - env->CP0_Debug =3D (1 << CP0DB_CNT) | (0x1 << CP0DB_VER); - - cpu_mips_store_count(env, 1); - - if (env->CP0_Config3 & (1 << CP0C3_MT)) { - int i; - - /* Only TC0 on VPE 0 starts as active. */ - for (i =3D 0; i < ARRAY_SIZE(env->tcs); i++) { - env->tcs[i].CP0_TCBind =3D cs->cpu_index << CP0TCBd_CurVPE; - env->tcs[i].CP0_TCHalt =3D 1; - } - env->active_tc.CP0_TCHalt =3D 1; - cs->halted =3D 1; - - if (cs->cpu_index =3D=3D 0) { - /* VPE0 starts up enabled. */ - env->mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP); - env->CP0_VPEConf0 |=3D (1 << CP0VPEC0_MVP) | (1 << CP0VPEC0_VP= A); - - /* TC0 starts up unhalted. */ - cs->halted =3D 0; - env->active_tc.CP0_TCHalt =3D 0; - env->tcs[0].CP0_TCHalt =3D 0; - /* With thread 0 active. */ - env->active_tc.CP0_TCStatus =3D (1 << CP0TCSt_A); - env->tcs[0].CP0_TCStatus =3D (1 << CP0TCSt_A); - } - } - - /* - * Configure default legacy segmentation control. We use this regardle= ss of - * whether segmentation control is presented to the guest. - */ - /* KSeg3 (seg0 0xE0000000..0xFFFFFFFF) */ - env->CP0_SegCtl0 =3D (CP0SC_AM_MK << CP0SC_AM); - /* KSeg2 (seg1 0xC0000000..0xDFFFFFFF) */ - env->CP0_SegCtl0 |=3D ((CP0SC_AM_MSK << CP0SC_AM)) << 16; - /* KSeg1 (seg2 0xA0000000..0x9FFFFFFF) */ - env->CP0_SegCtl1 =3D (0 << CP0SC_PA) | (CP0SC_AM_UK << CP0SC_AM) | - (2 << CP0SC_C); - /* KSeg0 (seg3 0x80000000..0x9FFFFFFF) */ - env->CP0_SegCtl1 |=3D ((0 << CP0SC_PA) | (CP0SC_AM_UK << CP0SC_AM) | - (3 << CP0SC_C)) << 16; - /* USeg (seg4 0x40000000..0x7FFFFFFF) */ - env->CP0_SegCtl2 =3D (2 << CP0SC_PA) | (CP0SC_AM_MUSK << CP0SC_AM) | - (1 << CP0SC_EU) | (2 << CP0SC_C); - /* USeg (seg5 0x00000000..0x3FFFFFFF) */ - env->CP0_SegCtl2 |=3D ((0 << CP0SC_PA) | (CP0SC_AM_MUSK << CP0SC_AM) | - (1 << CP0SC_EU) | (2 << CP0SC_C)) << 16; - /* XKPhys (note, SegCtl2.XR =3D 0, so XAM won't be used) */ - env->CP0_SegCtl1 |=3D (CP0SC_AM_UK << CP0SC1_XAM); -#endif - if ((env->insn_flags & ISA_MIPS32R6) && - (env->active_fpu.fcr0 & (1 << FCR0_F64))) { - /* Status.FR =3D 0 mode in 64-bit FPU not allowed in R6 */ - env->CP0_Status |=3D (1 << CP0St_FR); - } - - if (env->insn_flags & ISA_MIPS32R6) { - /* PTW =3D 1 */ - env->CP0_PWSize =3D 0x40; - /* GDI =3D 12 */ - /* UDI =3D 12 */ - /* MDI =3D 12 */ - /* PRI =3D 12 */ - /* PTEI =3D 2 */ - env->CP0_PWField =3D 0x0C30C302; - } else { - /* GDI =3D 0 */ - /* UDI =3D 0 */ - /* MDI =3D 0 */ - /* PRI =3D 0 */ - /* PTEI =3D 2 */ - env->CP0_PWField =3D 0x02; - } - - if (env->CP0_Config3 & (1 << CP0C3_ISA) & (1 << (CP0C3_ISA + 1))) { - /* microMIPS on reset when Config3.ISA is 3 */ - env->hflags |=3D MIPS_HFLAG_M16; - } - - /* MSA */ - if (env->CP0_Config3 & (1 << CP0C3_MSAP)) { - msa_reset(env); - } - - compute_hflags(env); - restore_fp_status(env); - restore_pamask(env); - cs->exception_index =3D EXCP_NONE; - - if (semihosting_get_argc()) { - /* UHI interface can be used to obtain argc and argv */ - env->active_tc.gpr[4] =3D -1; - } -} - void restore_state_to_opc(CPUMIPSState *env, TranslationBlock *tb, target_ulong *data) { --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607298076; cv=none; d=zohomail.com; s=zohoarc; b=mUmnvdhQdRfmmHMCRimMzuHFjsB70arki10hH2jPjf0zXohGTw/T8yQ/CoLwRO/ReaOLTQWppKqdrtNqMOCtvW6FWd+cTveaqGBW5CWsbbt1PYKCLxT8IxD3EmMjZjcEKrHD3IotP7+COJngElWn0jCVilyYy3OvxE0iH8yY1vg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rwJkcz0lXzb5vYIm5eeEUAMRTcJm9OyTFdsDcyLncdA=; b=PPbSip7FttMaAugl/80vTaj0AJfqKBW1/SfYgHtgewhr6+S5nKChRj80T0of50TN0ci7+JZkqprM5eAGkhOUuW5mTSiGMu9AdcBxyNjYLu0YnL/eBI3GRm6w9NHiUE1oth8ClO2h8m69ZFSAZGB/GPayivBw5V6uqKE9MlyNzd8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1607298076039214.2556509274956; Sun, 6 Dec 2020 15:41:16 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id w206so8473776wma.0 for ; Sun, 06 Dec 2020 15:41:15 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id y2sm12424711wrn.31.2020.12.06.15.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rwJkcz0lXzb5vYIm5eeEUAMRTcJm9OyTFdsDcyLncdA=; b=laKKK4RHTXy8RCtw8YQNsRI6lS8XnVTBs+k0U5wnfrp96iRrU7cYGLqtfaO7/imgqa AiUBjkAOSesZfYzma0jBgAy5zgRZot01FKcYILx6sFBv6NPtQvBZ7Ux5vPyjxsmhQn+A qhJp82N5XKYSBvrAfAKZr+zZ23+v+JWzlnCJtUc8WJdYbmDS9F97ztnSDflsxjTx0YMK 7k3UADxCZn2OBBt9rVwM2IxFykAXJ4PkMYrBG6h1odWUSVeFZP70NWDZ8N21EanXXPnr aZWc2fsPyknluRq+qH+x/dhJGo2c6/LHoUq6ejkxmO5vGu1kVZpzk8vEl3yz2rZnJkfc sf8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rwJkcz0lXzb5vYIm5eeEUAMRTcJm9OyTFdsDcyLncdA=; b=sIAkGx2iE9Wu+IcV6obhJa8VjadW4m3W4OClIJdgLTkHg0weUhOhUsa2J3n6V9dKix hJe8VZyJHRJxaBbn9wjrVhQy4L9KrA7EHPD37tOzL4ukQ2GV5SXhrOkKRzsTgarbaabZ YXS6w8zM6zc78QyDP1C+Y0v0bc5LHnBawdZnGPwL4lxBw/ti28Vr5yTH2TiuXqBC6avt WbKjz6XOawYZLcwAyk/bIhBdLu9KWIYZyIXlglfpkCw+HeIARYCPtCZ76dASA67fVD6P LDh9E6R1mz+xUWQfAiJQjVGjj8twylXZV35ho1OpKE9xpOKGgPBo5snJoRfC+VZIwtvC vYbQ== X-Gm-Message-State: AOAM532IvlRvOAVLIA2O2HYj7+LEuX4PxyGce/ifs+LwpNTmsXhHpbzo sK3RYBDEc1FGab7WriygW3I= X-Google-Smtp-Source: ABdhPJzhZk3PMkFWuwgqgm+vSByS3t56zMO6H60iDu1eNSR/tUHRY2Ir5MnTTAjNiAl+UrHL28WeTA== X-Received: by 2002:a1c:3c09:: with SMTP id j9mr15542997wma.180.1607298074148; Sun, 06 Dec 2020 15:41:14 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 16/19] target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn() Date: Mon, 7 Dec 2020 00:39:46 +0100 Message-Id: <20201206233949.3783184-17-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/cpu.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 1073db7f257..899a746c3e5 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -104,17 +104,6 @@ static bool mips_cpu_has_work(CPUState *cs) =20 #include "translate_init.c.inc" =20 -static void cpu_mips_realize_env(CPUMIPSState *env) -{ - env->exception_base =3D (int32_t)0xBFC00000; - -#ifndef CONFIG_USER_ONLY - mmu_init(env, env->cpu_model); -#endif - fpu_init(env, env->cpu_model); - mvp_init(env, env->cpu_model); -} - /* TODO QOM'ify CPU reset and remove */ static void cpu_state_reset(CPUMIPSState *env) { @@ -400,6 +389,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error = **errp) { CPUState *cs =3D CPU(dev); MIPSCPU *cpu =3D MIPS_CPU(dev); + CPUMIPSState *env =3D &cpu->env; MIPSCPUClass *mcc =3D MIPS_CPU_GET_CLASS(dev); Error *local_err =3D NULL; =20 @@ -423,7 +413,13 @@ static void mips_cpu_realizefn(DeviceState *dev, Error= **errp) return; } =20 - cpu_mips_realize_env(&cpu->env); + env->exception_base =3D (int32_t)0xBFC00000; + +#ifndef CONFIG_USER_ONLY + mmu_init(env, env->cpu_model); +#endif + fpu_init(env, env->cpu_model); + mvp_init(env, env->cpu_model); =20 cpu_reset(cs); qemu_init_vcpu(cs); --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298080; cv=none; d=zohomail.com; s=zohoarc; b=eBDSjmdXtCcPHp0/VA8MDMIqkA8zAbUqyEcyq3Ia6uGW5JDmijmWP9YOlnCHS0TktTxlMFDVZufgMasqA0anCS4pxWOlrb1AxFGmTUKcpJ9M+TNISw+gaZ83EJvhYXRFc/s+xqrwE7ldQmn34OlaiE2jD5Jy2nEXxVR351B9UaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298080; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xm/MxUEH7jkD1QG6cSrOIpJqx9OHIRmXgkVnHFu8QuE=; b=SpjQvxnbktqUZve87oWQrjzJick2YAaaciR+CaB8KbR89h5a3VmbXoggK7z3gv9/iQqAyq8cK4iSxLqvfUDBz3mcBV+QIStkVYWjMhQ0lBPrYPfnhZPcg/bSBJsfntZRYBdoQTk9yhuJkoda0l4QQ1EV+tGC+ZyUZ4mTdbK9Dh0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1607298080840263.0156026466001; Sun, 6 Dec 2020 15:41:20 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id a12so4231814wrv.8 for ; Sun, 06 Dec 2020 15:41:20 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id c4sm12542853wmf.19.2020.12.06.15.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xm/MxUEH7jkD1QG6cSrOIpJqx9OHIRmXgkVnHFu8QuE=; b=KyiSOuCQWG/R8m4WJmpVDlX6Irzi5kjH0pJ+KfpX4HifpbhVAWwyPEXoqrKyeWHWSL p4hwddyHrcVMm0pCUDsbjd2UcHADLhNdEbUJNc6Dh0axxwiW8bhuyz+bd8UD8rgZiuf3 F2SHdWOe7OxS6H54N0jXVa0s/0tVzpPE6A5xssnRJjV1LNVNA2snFmcjxGC3mq6AEDx+ MafT2MUI8kkAGgXkTuOEooO7M1mrxWCCtacSYLbAT4IsEjzSpeQufSqKJxiotDruilGd S9mM+6XXORONzD6ICCiCD0OPInGpWiHXFOUiD1dw6RVnYKTTibdJNfjr/sJXL5ptmjHV mRoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xm/MxUEH7jkD1QG6cSrOIpJqx9OHIRmXgkVnHFu8QuE=; b=SdtHghjo67G7gz3fvsoz8ao9vScZnWlmlQV3Tkg+cr+cGeOUl6VUQwcbI+W2W1vhm7 TAlll5AtIV5SOTP2YgHijL6P+c14VBf4e/GMBcXzswkgVSaug9QBiuqmTBPb0DoCTBZ+ Cin6ZrZvpJkNB11N784qMEiJA0aMbgg/wsBZBBGRNaybESz66kuQkpdUzQZxMzGBP5CI 9jNhsXVbiWdfRqw5K9g4oYhkbTMMPDRscDXVQrWR1UneprVSoltLEmMaW9xQ0qRfORCO cpGKeYmp/PP2g5xkzPBQyRDJ8SQ/qNpAJ0mw1/6y5Znx54p3MwHaRPz6+vA3BYL8FEGu eLug== X-Gm-Message-State: AOAM530hZ68f5UyFpexdZ3qBQFAF6aDVVOfJn05mvq8/jYneBjG5Znl1 wYPdHcBXrdIOUhTBPZ84I/I= X-Google-Smtp-Source: ABdhPJzXt3ifQfM2cwjMdevwVqsOb/NkKyOt1a61/Zmv8kSIR8bdzs9XS/k1lZiuUpSeu/NFS7gg8g== X-Received: by 2002:adf:ed51:: with SMTP id u17mr16909273wro.61.1607298079086; Sun, 06 Dec 2020 15:41:19 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [PATCH 17/19] target/mips: Rename translate_init.c as cpu-defs.c Date: Mon, 7 Dec 2020 00:39:47 +0100 Message-Id: <20201206233949.3783184-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This file is not TCG specific, contains CPU definitions and is consumed by cpu.c. Rename it as such. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- cpu-defs.c still contains fpu_init()/mvp_init()/msa_reset(). They are moved out in different series (already posted). --- target/mips/cpu.c | 11 ++++++++++- target/mips/{translate_init.c.inc =3D> cpu-defs.c.inc} | 9 --------- 2 files changed, 10 insertions(+), 10 deletions(-) rename target/mips/{translate_init.c.inc =3D> cpu-defs.c.inc} (99%) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 899a746c3e5..8a4486e3ea1 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -102,7 +102,16 @@ static bool mips_cpu_has_work(CPUState *cs) return has_work; } =20 -#include "translate_init.c.inc" +#include "cpu-defs.c.inc" + +void mips_cpu_list(void) +{ + int i; + + for (i =3D 0; i < ARRAY_SIZE(mips_defs); i++) { + qemu_printf("MIPS '%s'\n", mips_defs[i].name); + } +} =20 /* TODO QOM'ify CPU reset and remove */ static void cpu_state_reset(CPUMIPSState *env) diff --git a/target/mips/translate_init.c.inc b/target/mips/cpu-defs.c.inc similarity index 99% rename from target/mips/translate_init.c.inc rename to target/mips/cpu-defs.c.inc index f3daf451a63..ad578cb8601 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -922,15 +922,6 @@ const mips_def_t mips_defs[] =3D }; const int mips_defs_number =3D ARRAY_SIZE(mips_defs); =20 -void mips_cpu_list(void) -{ - int i; - - for (i =3D 0; i < ARRAY_SIZE(mips_defs); i++) { - qemu_printf("MIPS '%s'\n", mips_defs[i].name); - } -} - static void fpu_init (CPUMIPSState *env, const mips_def_t *def) { int i; --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607298085; cv=none; d=zohomail.com; s=zohoarc; b=WtxBbbItVj/S4vKNuHl3Vkt53+Tjnj5QxzM6XpNXpPtSqjMMWfZSWQh9efLVCDSWraxd049Kfjo9IjnQesVZdsRub+z1z4dkJkb8nsp7DSX8lOYNSSEJbfzNucmj62uAgS/jRZEyJzGKcfDinsuTPIQNwn3hAsMqWSQhjZJFo1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n+99MQGfH3ws6+hiYTWg+4rrAybzJdIAfbn40ls3kQA=; b=gW3TMsTnLjJ4dddUrnbyRR0uBYtGHE8pKNwRwsGsFK1Fbz57qBCIkLVnEovdWEm2zvndtn/36qqUPC0BnEzkNIu111G/8pWqa8rivipq7rmVLK3QbiglF02zJQR6SYCG6xC1TtxLoHgtT0ip/e2wkgYxh2GF7kajV/N0gqDhJsE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1607298085829499.4343912267616; Sun, 6 Dec 2020 15:41:25 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id d3so10004117wmb.4 for ; Sun, 06 Dec 2020 15:41:25 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id c2sm13819964wrf.68.2020.12.06.15.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n+99MQGfH3ws6+hiYTWg+4rrAybzJdIAfbn40ls3kQA=; b=VW7WqeZgfbUIfta173CGJdeR7dfKwzewm7EoRtrSTO3x2mRpzvi/abkbHam9G6TPmD fOWKGB5uSYlElBasR+JVTRkpCVm/f4pr/gp5FexX/gdYKuhCyg4/YwWL02Y4NIVN9Qvg mvAZRAGn7l76CGVBQIjCOWULmL75Jzm7VMVvtBzBZ1kYOqiiEU0U3jdanI7NTWe4+3mh 1MoBYxSHGJhuoYW4J8XDLyPxiEUMMce3/BUASEjZNDYU0tBwohxoZFZy1ZGoSzAgS2Kd ythIuTFf8f+DcYsKh11ijcuxb1Z71ALIS3u/xf/r8xrHnJYBiSwGVX59EedQkDDqfDh1 xFOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n+99MQGfH3ws6+hiYTWg+4rrAybzJdIAfbn40ls3kQA=; b=kstCugraovrmeBc7VndG0rTVMCECTW8cODSU59Eb3TdwHwMRtFfiOHa4/dQHSyxUJb rI3pzIrk050MPjPc//GzKW0jaDw25G+Y8G0spKJGzZ0xshFfhwy5zkGW63NYIo8oXSxo pMNXonV9F7mm0wEBEzBRA2/XmH50sbMQdRPR/P4mhY8SdbfN957gSuWcJP024jZpLqWw nV6EBl4eirrFUN+f7gEsae9dEED03gPOf9ZzZF58n0ZLb/0CajM7UUhRU6yaJYO0nnsG LgH/V3/j6UBK2ixIvOKnqGFIAlcos+1RbBwykbI5xuIj7+qRLPEbxVa29B0JL2/a15rb jcNQ== X-Gm-Message-State: AOAM5319wa1HsCDP9CX0oHCzvxFdbvdGKnerLHjfLwUYVlg1euxa8bJE +hRnsK1wipzGHxfS/7CKeVA= X-Google-Smtp-Source: ABdhPJyjns/B798+mFTm2wm7XE4zN7sKqY5G1A3JKvnUaOePKo4NsA6M8H2M1DJdBlQYE86l4bMqfQ== X-Received: by 2002:a1c:7218:: with SMTP id n24mr15456149wmc.186.1607298084105; Sun, 06 Dec 2020 15:41:24 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini , Claudio Fontana Subject: [RFC PATCH 18/19] target/mips: Restrict some TCG specific CPUClass handlers Date: Mon, 7 Dec 2020 00:39:48 +0100 Message-Id: <20201206233949.3783184-19-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Restrict the following CPUClass handlers to TCG: - do_interrupt - do_transaction_failed - do_unaligned_access Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Claudio Fontana target/mips/cpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 8a4486e3ea1..03bd35b7903 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -483,7 +483,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *d= ata) =20 cc->class_by_name =3D mips_cpu_class_by_name; cc->has_work =3D mips_cpu_has_work; - cc->do_interrupt =3D mips_cpu_do_interrupt; cc->cpu_exec_interrupt =3D mips_cpu_exec_interrupt; cc->dump_state =3D mips_cpu_dump_state; cc->set_pc =3D mips_cpu_set_pc; @@ -491,8 +490,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *d= ata) cc->gdb_read_register =3D mips_cpu_gdb_read_register; cc->gdb_write_register =3D mips_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed =3D mips_cpu_do_transaction_failed; - cc->do_unaligned_access =3D mips_cpu_do_unaligned_access; + cc->do_interrupt =3D mips_cpu_do_interrupt; cc->get_phys_page_debug =3D mips_cpu_get_phys_page_debug; cc->vmsd =3D &vmstate_mips_cpu; #endif @@ -500,6 +498,10 @@ static void mips_cpu_class_init(ObjectClass *c, void *= data) #ifdef CONFIG_TCG cc->tcg_initialize =3D mips_tcg_init; cc->tlb_fill =3D mips_cpu_tlb_fill; +#if !defined(CONFIG_USER_ONLY) + cc->do_unaligned_access =3D mips_cpu_do_unaligned_access; + cc->do_transaction_failed =3D mips_cpu_do_transaction_failed; +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ #endif =20 cc->gdb_num_core_regs =3D 73; --=20 2.26.2 From nobody Sat May 18 09:48:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607298091; cv=none; d=zohomail.com; s=zohoarc; b=fxGx0H6bNBrMElO/6ohEznsHsMdexyS16WdKDbMH0DtzjbjJabjMBuDajTCBxiH5H7VNwQocBxJk2CRAX6UC4IedX8TbnAex3zjfc67uHmt70MqbiXxfl+uWopBLrjpoH/djw4KCSs4AY/eyNIGsmFF9Rh+oMK3Zubf68ATArH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607298091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k4WG/zg3A8ipr+8A7P0n4m3RDjKDl/Q06gfRVWrIvHA=; b=MkXhxtunkj5hDzPjT2OkTaDZuCJ61qEWtE0KYr+Ac60/kz+c+n3JOQ0LU3LE4UpiGRpZWXEWhb6v9JmThDs78PUWyUo7iSQ5ibf0csDBF2wkBw/0KTc8K1+uYjeZJlUtzUoMAiU2dMI+/R25vPYCCVICiljrY5V8ypwAyP7Spoo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1607298091060719.59234947675; Sun, 6 Dec 2020 15:41:31 -0800 (PST) Received: by mail-wr1-f65.google.com with SMTP id p8so11056580wrx.5 for ; Sun, 06 Dec 2020 15:41:30 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id s13sm11135976wmj.28.2020.12.06.15.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 15:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k4WG/zg3A8ipr+8A7P0n4m3RDjKDl/Q06gfRVWrIvHA=; b=CjcdPERRFYdDm7Pq8nJzQdznI0uVtZpeDPO3WiImxywEkNRymEGw3O+sZ22xkrGx5/ bFDTITaUssJz2fpNucSftj2HmbFSrHezuDKTlZxJbK8dwwFA2DcFmq7o9w/134W9cCKi 3ARmMzZ9ID0hkxT/8DJNST9AHvUxO4KoFX0tORXJnt0ZTP8n1Q3Dbeo0WxzpQQIuru27 yAkx+F2wjMu2Xwmcsp9Tftqw/uBUWbHKbD+NAsK8dmWmMhW4TKYwUSRKDE+TROTp8JzE k4rZJuzsSdwvxfCQDv4J5klz/iUt2Xmsj7boknXR/GV1mLiIz5ApJ5PD8hw0wulZerRo oYIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=k4WG/zg3A8ipr+8A7P0n4m3RDjKDl/Q06gfRVWrIvHA=; b=lb6vK64m5UyjVN1XMonKFiedSouG4oLob7onRAIHkyYeGxUvWBRuFMHUldU2GpqjAJ +IY2ZP9zF1p7zhCk5/yU6BNq+pOOom05lku3iqF3MaL7EgMWvJHI9nOAnTrBVS02TeJ9 aKTrcRM3N/GZ9VtFQ80Xqvj2AEzlOGzwQfVUoo8aWs403NdUXIdNxnoY6cDAe5tGoNK1 RKBRdaKdznkNgJAxnkY3wTaGKNPgxWrWNHOZ6H95IEw1H2/y/qqyrumCCJKvc2bvrXUc ZFPEIyfoHJMl8YwZtUIspORMUiO2Kps4vP1hmoKrrR7g3D/xE/SARJ7yzflyTQeqUePG 43lA== X-Gm-Message-State: AOAM531RZFtMXwbThN2AUVNMHp22AvtXSnjgz6YDfK6QKCLBhhVYAYan ySCUUAdBwum22YzbRFrljK8= X-Google-Smtp-Source: ABdhPJzlEBxNwEXGOad/lFiRSGUTbNn0/EeExTcljG+Dg6lArdB7sGAjkFzn+Ckd4AU+UsiZozhsiA== X-Received: by 2002:a5d:6842:: with SMTP id o2mr9986471wrw.132.1607298089266; Sun, 06 Dec 2020 15:41:29 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Paul Burton , kvm@vger.kernel.org, Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Aleksandar Rikalo , Paolo Bonzini Subject: [RFC PATCH 19/19] target/mips: Only build TCG code when CONFIG_TCG is set Date: Mon, 7 Dec 2020 00:39:49 +0100 Message-Id: <20201206233949.3783184-20-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206233949.3783184-1-f4bug@amsat.org> References: <20201206233949.3783184-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- We are very close to build with '--enable-kvm --disable-tcg' :) --- target/mips/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/mips/meson.build b/target/mips/meson.build index c685f03fb28..ef70d9040e2 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -1,11 +1,13 @@ mips_ss =3D ss.source_set() mips_ss.add(files( - 'common_helper.c', - 'cp0_helper.c', 'cpu.c', + 'gdbstub.c', + 'common_helper.c', +)) +mips_ss.add(when: 'CONFIG_TCG', if_true: files( + 'cp0_helper.c', 'dsp_helper.c', 'fpu_helper.c', - 'gdbstub.c', 'lmmi_helper.c', 'msa_helper.c', 'op_helper.c', --=20 2.26.2