From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379283; cv=none; d=zohomail.com; s=zohoarc; b=FafUC/reEnaRJZiQqENDj30FViQtG46k3BTsBlxOLiZ/oAuH2gIUm2T5HkrlmgHKlfkOMK0NtUL1STCvv5Bypq7j1VvguVEEOGhYqtCa6/47mhrH1yKpncwu//+O0L2BkGAFnO15pEzXnpfCYeK7WF+YR87qzeG7N0qN92JDDHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379283; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A0j1B77tfGu0Cdv5/wUrGVom9bksudE56Q7hy0Jn3v0=; b=A6Swrf3fSsuf0k3n91jfXa0EMUyGGU0lzt8b0cdeopV5j6+dxkiuAfAq5PaEtB8zHjS0B2Up+VWLHY4t5C4LJyZKyFLNWX03HJKksFPJXR1dfsCwwBIXglp2yywSKdZVtB4BuorDTAQ9YUjudfcgoMoZ3x/O9H1qFE8NDptCMYY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1631379283209568.2961056194584; Sat, 11 Sep 2021 09:54:43 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so3734861wmq.1 for ; Sat, 11 Sep 2021 09:54:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id v28sm2140457wrv.93.2021.09.11.09.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A0j1B77tfGu0Cdv5/wUrGVom9bksudE56Q7hy0Jn3v0=; b=NKCgKkRIi7mGDr6gVgKLxPRKYGk8LhBuMjNCyzlBva9Qc+lHnNwR53gfdPQcOX4SQP YWbaChoTum2QRjR4Figvpp0CzoWYLF7QxHB314bn3xBId6roqPwhbfvf9wkLodm2HGDl kOsnXa8Gw+NcTgRZ2FzPxXcLEa+kPU3dC0UDVOmCWTU2HBsBlN3apJfOniX/PFnW4apM Clnw3Li1TymT3ugLKt0ERdKIb1qJLfkuDK+0GBllAWz/mMAYpHBt2Oliwe/085SeH+h3 VPDFfjqmD55gPicIFahn/APe7bnJd7PX6LdwsJGt1QiUdlvBbFR61mO5GilBHaRq8KIf qRgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A0j1B77tfGu0Cdv5/wUrGVom9bksudE56Q7hy0Jn3v0=; b=sgiGPo5AqIQ4gJpxwYkXPpEXeVo2fxkt+l8UMYelkTSGY2HIjeX5Xuj0+qbMIFv1++ o8Usdh3mxlTRn4FLG2hutozvROYqYvv5dVjsRlrN2eJxkq/BZMIeQihYPqJgxoO+79ax pyzta786bfrg+rd8RsD2JetrkeoMUTm/E6TP+9UgcliGKeZQcZ6oeAsaJeC79OwmM7PS VqgMMTxNFsVPeUtUpH80OE4NOBbztzuQp1ccZu9/E+PbMzcRq6b5kK/FpNIHgZdlh1kg C0aDEXGQg37FfF9UGKVFrwfGMlDbQEj3lMGGVmh4izqu5HQEtvTriBQ/Py7TLaKasjgx Q5Xw== X-Gm-Message-State: AOAM533I2FNltzRVdFziqDTESrRgQQpLHZz8hmjBj/vekg5Mrei/huAz P42XJdkgPttvZ/hGTi/WA7Y= X-Google-Smtp-Source: ABdhPJy90Zb22MfWTczZpMBVCmAjIsqMbVmFaujvtv7oIVOGY31iQ0ixYZ6Dacmw+3O9lyr/ups0jA== X-Received: by 2002:a05:600c:8a9:: with SMTP id l41mr3358748wmp.29.1631379281484; Sat, 11 Sep 2021 09:54:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 01/24] target/avr: Remove pointless use of CONFIG_USER_ONLY definition Date: Sat, 11 Sep 2021 18:54:11 +0200 Message-Id: <20210911165434.531552-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379284776100001 Commit f1c671f96cb ("target/avr: Introduce basic CPU class object") added to target/avr/cpu.h: #ifdef CONFIG_USER_ONLY #error "AVR 8-bit does not support user mode" #endif Remove the CONFIG_USER_ONLY definition introduced by mistake in commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Reported-by: Richard Henderson Reviewed-by: Richard Henderson Reviewed-By: Warner Losh Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/avr/cpu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index ea14175ca55..5d70e34dd54 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -197,10 +197,7 @@ static const struct TCGCPUOps avr_tcg_ops =3D { .synchronize_from_tb =3D avr_cpu_synchronize_from_tb, .cpu_exec_interrupt =3D avr_cpu_exec_interrupt, .tlb_fill =3D avr_cpu_tlb_fill, - -#ifndef CONFIG_USER_ONLY .do_interrupt =3D avr_cpu_do_interrupt, -#endif /* !CONFIG_USER_ONLY */ }; =20 static void avr_cpu_class_init(ObjectClass *oc, void *data) --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379288; cv=none; d=zohomail.com; s=zohoarc; b=LXzGzAN+RIIZmCP1GGmn9fZadScOaVBvlMZpNVi9Oto1l5+Y5MEsDpGcyA66IqjO9U8Kn7PpkDwm1yoownc5jTf62TZu6bSsGi3n7AGLkbqxSgMTQACVm281ThWmpQsm05ThRNGD7pLxTKbRknFyvI1VDOehZaIVrPg8hVXSEeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379288; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l8Jx1m6Bv2t518ZIG2TWOXwbWEoTAme9VK7NQaY4YX8=; b=YjUgEv1t2V7PSMRGWCUjKrTcCYwmjBALanFODPPT6vH+Wmps0wobwy/MP6HmFjk0lePJZPUm6v0UdJrsBt1kITj6kl98G5FbJVbDiKgVIJxKo7PCVXG7BNZ0WXxt/1ugqDnBKkcCouwwuK7UsoaRywuxZdc1fq6GhFJz5bB9lcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1631379288100573.777645018912; Sat, 11 Sep 2021 09:54:48 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id u15so1435190wru.6 for ; Sat, 11 Sep 2021 09:54:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id t64sm1932224wma.48.2021.09.11.09.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l8Jx1m6Bv2t518ZIG2TWOXwbWEoTAme9VK7NQaY4YX8=; b=Ijui4pwwSDnWn+fQzU5fqPxEPYikDpA7UqEtyu8LS57PXvEANIeHJyzhuIV/FBE5qS XH8lMhveBNWTsCBtmJO8wHOWGzCTnS5UDI14LBWe/0poaW+b9zmXExuF4A8TiFon6Gai /9y+ykbfWFJqbSxPx086kfyBnNG0Z6ARejVEaXb+NxEno82i2UuQhY9op/lrUDW1zGxj XK9wi0Be8+h8YiWc6nFW7SIGzCtRHX9qUYlGL1EGH5WvDBFDKi7ajaQhY05Xz2pUvEFl fbRb5zsiSXSTXm87HIRcNyDKVoD6Iv4BhS3W2Ovcgg5rzmPFYimWyAG3ZzqprjTS3QB/ sR1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=l8Jx1m6Bv2t518ZIG2TWOXwbWEoTAme9VK7NQaY4YX8=; b=4uebKPE4Hqsy32/6Av1jKhED53tDz5n7HUKVNlYCe4hviDM9vgVbgfSUob+87rlSqR iP4xlSQMeOfsYrrypMzmHvDJBgaluOU5IQ7IAr28Ep/AkroRUJoNsqGEbbOs/PFwvpj3 b5JOaURzLeeChryLuB4rpO9bHNZHhc0E5PAw1odEqsRaKA7a1wMlOM1DJ+5MS7MrTm8a mdjv2li1rVgMmAi3N9ZQaeBQTmSJsx7rIhh2uAHCzm73bFcGoRxrJ2rni1IktFoIYxrd h+aY6whGhW58HGsHj2osWyk2U6GxLqnAA3+3m/64f/CrCV63SPUXsTlpTxplflYsf8Qk 00vQ== X-Gm-Message-State: AOAM5304wwz1n+dstX8SHa8NmWI+99Hf0JF4YBZb85F7w71RH15arp3o 3zqUHgHcUlVeF+pqDDMZW1FZhqt5LFk= X-Google-Smtp-Source: ABdhPJxjG4Vw9A2AmqqadETnFDudHg2njHPeXmysELlJHmGr6U4eKEE+CnpufoS909QiU7V8dXvwmQ== X-Received: by 2002:a05:6000:1186:: with SMTP id g6mr3921013wrx.126.1631379286405; Sat, 11 Sep 2021 09:54:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 02/24] target/i386: Restrict sysemu-only fpu_helper helpers Date: Sat, 11 Sep 2021 18:54:12 +0200 Message-Id: <20210911165434.531552-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379288877100001 Restrict some sysemu-only fpu_helper helpers (see commit 83a3d9c7402: "i386: separate fpu_helper sysemu-only parts"). Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 6c50d3ab4f1..c241bc183d2 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1833,11 +1833,14 @@ void x86_cpu_list(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); =20 int cpu_get_pic_interrupt(CPUX86State *s); + +#ifndef CONFIG_USER_ONLY /* MSDOS compatibility mode FPU exception support */ void x86_register_ferr_irq(qemu_irq irq); void fpu_check_raise_ferr_irq(CPUX86State *s); void cpu_set_ignne(void); void cpu_clear_ignne(void); +#endif =20 /* mpx_helper.c */ void cpu_sync_bndcs_hflags(CPUX86State *env); --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379293; cv=none; d=zohomail.com; s=zohoarc; b=cPdqxPhaqVnCx30zBAj51ZsCgPm/sGaOFH08sAIrI0gTIVuPmGBvn0SJZ2tscJdNZAhLaVLvX+/E2IKJqViDV8ztn7vNFF3BvW/4CRL1voBKtwE4a4RCWlvKWMh5LrTibf4QlY5FGaaZLDcXXFlKGqc5k9VRbhzuRfMqbMqnkak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379293; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=I0PofFlFryEci4ajjUY4eb7X1D7BBcJSpcwilTMBywvPmwnPTvV33VBEyo9ESnmrUFgQPlVSZtV5pPhy0o5UfT1I9IP9GhZo3icgPXFJTz5+SA7XQbu+nrXm3sED2blaeMcAslXpuRpKF8+ayK8lzZ64IDtK1VvhMMl4sjNcKqM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1631379293004329.2093008712535; Sat, 11 Sep 2021 09:54:53 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id b6so7459489wrh.10 for ; Sat, 11 Sep 2021 09:54:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id y18sm2174002wrq.6.2021.09.11.09.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=B2cPwU6uBkt0E42CdgO+HC0TFDfX0nWohCtyQyAdOmLaWPvG85p0ybjK7XLniieQGw bF2iZ0ClIKdO9zFCtX/jgvOMGVCahRf2pwWdVVxedz3CwbZCE6aOkSX8u7xmu26dBHKp ZG+Ts4twYkoNsuBRk6Q91jZsnC/oNDHZr7VG+gGqy6CPhnaSBc7zqJYRwGt7WEMeFO8S RfL0JFRrBcmaUQzGy2av0UEODKf508xnbxOWhRPDwRW6nXogk2jgUWkiuLpH4TrdnPJ0 y41EH7SSbgf0tEnZuuiAAxGrFLNexoUpvihIIJ/nhoOecAhFVIetWBkhGWVJ8m+y2f8h vYKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NZvvlRpa8DC97DN+aH7Pj/vVpZZsHFPzTcOdAGwjWjs=; b=uGXXN+HVnZ7ZHtxvwxgamEXl8d02HcNVzTAicK56BZYEF6wcEMCFlQy044ieP55ZKY REFfbkja6SBjvHUE7HbawpLUCIv0+YuvZfkG2D9eVnQAWE8lOnoh/0ij833lFf2O5c4z T3X0nLRXdRQb54yUwEc059O37c0/uop7p5TWMYZvi1Pc6H4HoSMG9haeflzx4myI/uaP wWmQYtr2chBio4A3qDLwNFIgopV71l5+54bmMAvToKCMItGNaHCuYEshOSNGVBJ2Nv5w rSqFYx2q2UnbCm5eJpWQcMe3UNHnJGGMFm9uo/ieoTiPXJplYKCtCvnfxRo2O2Ldb/+C WOGg== X-Gm-Message-State: AOAM532ojHH+cSK/8TIWmW3JdqF5tdqhDguD1s4bKsjxpZkFtlj9HJ0L Krh4veSQ0piE6SOE/bIYLZr9i3dU5Ms= X-Google-Smtp-Source: ABdhPJxT6i3ughafuEm8UkGbUNSWX88JY7+BJ9t4NGFnaML1XNt/KB3Wx91gTBGLZY+swQ6kz9VAvA== X-Received: by 2002:adf:de8a:: with SMTP id w10mr3802445wrl.388.1631379291288; Sat, 11 Sep 2021 09:54:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 03/24] target/i386: Simplify TARGET_X86_64 #ifdef'ry Date: Sat, 11 Sep 2021 18:54:13 +0200 Message-Id: <20210911165434.531552-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379295304100001 Merge two TARGET_X86_64 consecutive blocks. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/tcg/seg_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 3ed20ca31d7..dee7bef68c6 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -929,9 +929,7 @@ static void do_interrupt64(CPUX86State *env, int intno,= int is_int, e2); env->eip =3D offset; } -#endif =20 -#ifdef TARGET_X86_64 void helper_sysret(CPUX86State *env, int dflag) { int cpl, selector; @@ -984,7 +982,7 @@ void helper_sysret(CPUX86State *env, int dflag) DESC_W_MASK | DESC_A_MASK); } } -#endif +#endif /* TARGET_X86_64 */ =20 /* real mode interrupt */ static void do_interrupt_real(CPUX86State *env, int intno, int is_int, --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379297; cv=none; d=zohomail.com; s=zohoarc; b=JumvwSnvps/I/I8QwGj56pkXQ8DaaaJe3QNtyZAMJTEnYAlXKt+MIlmeWjxO07GQUxEkpGHianaLLbSweL5k/dC7+GB9HmlvILnU//KhsRvzZQZTEcffohX+mGVryGqIV6ODKIbQrRxHK6ikr6rHMixsOB1nMuATCTHbraxjaM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/LWud8OdJVFwV057VSOD2zPTsJ4r3xLQGTPSjELmcjM=; b=ApheqyzAJNwYECFmMh7PwHZE2MHc1hTX1sxkPaG0TpZ1NcZZDXLBROTwZERbg6bueW1sqY1mCcnU8YzWpukjJIHrU64eEVO54G8xqBlCg/AvaA5iB6UV9JG/AioQgVRsXii3HdexFrhu5edmM3Y3TotD0D2lrgXugPc1XnSof6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1631379297765609.7518503780454; Sat, 11 Sep 2021 09:54:57 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id x6so7454353wrv.13 for ; Sat, 11 Sep 2021 09:54:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id u25sm2019941wmj.10.2021.09.11.09.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/LWud8OdJVFwV057VSOD2zPTsJ4r3xLQGTPSjELmcjM=; b=X6FJpsz8P9UaBk4Ir5VjesV9HtdzOe6FoBcBEeXquRqJSOJ8chVwUvdxm68nEy7m0l fuGm5aNCCHgRTo4adU2O8T8W3/hoIEMdli+mwAtPcmew6ggt5tuUfZ9c61CzHk6W+JUt +v88AnochnTIkM8JLgVNEv84pvX9yc8ZrL+8+WQ9TivgAthORajTZEcKb2rI2xRxHsB/ oTPFhFyeiGwQn5uQ4wZs/Kk1Vn07q5u/eQXlzYuYyPFIIAwHlKgxDUil/5Nw0oX2xcp4 B7w7R+Y2QC4hs0OiZytXGF4PbMgBU925uhwDT96Looy+k/JLbZaHmTCsj+gBTpnXzNf4 diPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/LWud8OdJVFwV057VSOD2zPTsJ4r3xLQGTPSjELmcjM=; b=5Uy9L37l6n1jsM1hAJOjuuSx3aHs6VAF/qEh2EbdytH5xaEItvs+tKEfQ/ZPJM/cFe 3c/jaIl1JZrbgOp8mgTNInXsZf+mqWbvt9tlZz2zeKGf/KSvRqFyvRZtuf6zWtu5mXDd RpzpxO19H6rNyqfbcgBh473dsWrTUJ8+4Iqrozj36xh+dCKxBpTojPHvRJlpErRFy/87 /InhzBbbs/5Oq9QDJdEBk3Pornf3HER2YatSYrocGqgihV2sqNYG0XQpuPAIiGzROJBA 50xQbutAFpln+wD75293ZfixilTgU001ixiPB3WIMI8Frkqj6r+QNQjcuosrpE1XMs7H y58g== X-Gm-Message-State: AOAM531/bRMyRm5Mygf1SyoHoOJVsteAkmd96nMj3a9DxZX6M6lJLvOW /w7deriAwDoyETpNsrq248U= X-Google-Smtp-Source: ABdhPJw4UMz4wjRHdKMg+A53oZ5IRnc56l7F5ybt7t41jI8B8J1cqOA+Xmv7ED79sbtY4nDeWEV4hw== X-Received: by 2002:adf:f0c7:: with SMTP id x7mr3858728wro.432.1631379296014; Sat, 11 Sep 2021 09:54:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 04/24] target/xtensa: Restrict do_transaction_failed() to sysemu Date: Sat, 11 Sep 2021 18:54:14 +0200 Message-Id: <20210911165434.531552-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379299386100001 The do_transaction_failed() is restricted to system emulation since commit cbc183d2d9f ("cpu: move cc->transaction_failed to tcg_ops"). Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/cpu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 2345cb59c79..1e0cb1535ca 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -568,10 +568,12 @@ bool xtensa_cpu_tlb_fill(CPUState *cs, vaddr address,= int size, bool probe, uintptr_t retaddr); void xtensa_cpu_do_interrupt(CPUState *cpu); bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request); +#ifndef CONFIG_USER_ONLY void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr= addr, unsigned size, MMUAccessType access_= type, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t reta= ddr); +#endif /* !CONFIG_USER_ONLY */ void xtensa_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); void xtensa_count_regs(const XtensaConfig *config, --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379302; cv=none; d=zohomail.com; s=zohoarc; b=gOwOblvrLnOTTF+FIa8rqCGIGAq8KcD1ZlewryM0txMCMg2Ke0yFNfXgI/h/IUNivIdxpS6DDO9CghphXAuZsUu5SlAnK6+GYBDqXKUfID2yuryqCVIyf2aD7iIIJwhKdmpU1UdPJvjoCwJFZudvS4M0UepXBw+xP7yEMjs+GlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379302; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=82KmkOHInD6T32/MBrAXuGha1mEQ9aTunJA89epWqX8=; b=dIfhMjdueccYiHJTluH39bvQYHF136qggQ4K/GBJQg6a76WSONtIWUQGd/fy/vt0e9KdReqpC9QmU8naoFxMCNojl9mNFdQnincto3N4ACTDVgm5KpabPPjWnpF7N/NDgVWO/xEboVjLutI6A7qzpHPRC8DTY2IIKITe2ZSp77Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1631379302477860.823484729727; Sat, 11 Sep 2021 09:55:02 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id n5so7458001wro.12 for ; Sat, 11 Sep 2021 09:55:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id k22sm2161065wrd.59.2021.09.11.09.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=82KmkOHInD6T32/MBrAXuGha1mEQ9aTunJA89epWqX8=; b=Wvx18w7OXDMt3qrFbOeAJi01TZPxs6nfyKUuc1WoZpxPbN0luw8v90VdrQP8WpXxvz 6D5Z9YN06NEuWYNUOWpOFtgRuqDO1ofR+8c8+Adrr6+lH7VpSjAm0RD4DBbToIWBKr4O EpcSnGgKKnBjDnbMAyv+l4tj6NyBAwt7kZEQqHtpu+mrJBg9lIUOHURWt8YNbjcNNekI PsSNkyj7HWyZhh+oo7qQKlSqTJicoQ4/diXt6kWUbicyX6LOYgdiLJtYaLWAv6sesqFI fyA3QIMa0d5w9reWvrevYuOFDJO4lqOdvEGSV6x/w/kKpfrEYL+7I47qZw+23ogphZX4 G4ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=82KmkOHInD6T32/MBrAXuGha1mEQ9aTunJA89epWqX8=; b=FQu5EoDB3QejBfc3ZNvD97MQDgvEBagZqSUscXveyr07vQmStIwoBFVnIBfHxPGbp8 CATwilepD0goZxNWBllCLjT2+M0xB2UkofPxUvPgvY4DltrfEPhjfWgBVKvJHvr4/AzK B38l9cXEZ+JFXOd9T51LgWXdLTQy/OQs9N7czGublR/bVLJ87kthr+ac86eDq48mOat6 Zp82tbpPNkaCoQNufWLZZmskOMJ7eM9BPxNehhw/LCYQEDTAdvgekzJCQRtRP2xQXRAu /lFszt0mf110qoFgwkHlwIFvtDF+YOkvUx8QQeyYKHSeoYEsfqyhobqEcRigLOYzPk5b ot9w== X-Gm-Message-State: AOAM5309fUzfEvm1XCBpHpamIhaGh11Aacm31XDF9dhKBR+pCcN7T7Xv nJs/DRntzNALXrykimzQqJM= X-Google-Smtp-Source: ABdhPJyZOkeQqeD9Cha1QZ+au7oTLStFUBD5ohQ53fqgRfqQc/XFPWDiauSpdQuOdbGBK+hI2RSlpQ== X-Received: by 2002:a05:6000:7:: with SMTP id h7mr3871888wrx.134.1631379300719; Sat, 11 Sep 2021 09:55:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 05/24] accel/tcg: Rename user-mode do_interrupt hack as fake_user_interrupt Date: Sat, 11 Sep 2021 18:54:15 +0200 Message-Id: <20210911165434.531552-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379303893100001 do_interrupt() is sysemu specific. However due to some X86 specific hack, it is also used in user-mode emulation, which is why it couldn't be restricted to CONFIG_SOFTMMU (see the comment around added in commit 78271684719: "cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Keep the hack but rename the handler as fake_user_interrupt() and restrict do_interrupt() to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/tcg-cpu-ops.h | 22 ++++++++++++++-------- accel/tcg/cpu-exec.c | 4 ++-- target/i386/tcg/tcg-cpu.c | 6 ++++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index eab27d0c030..6c7ab9600ba 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -37,14 +37,6 @@ struct TCGCPUOps { void (*cpu_exec_exit)(CPUState *cpu); /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); - /** - * @do_interrupt: Callback for interrupt handling. - * - * note that this is in general SOFTMMU only, but it actually isn't - * because of an x86 hack (accel/tcg/cpu-exec.c), so we cannot put it - * in the SOFTMMU section in general. - */ - void (*do_interrupt)(CPUState *cpu); /** * @tlb_fill: Handle a softmmu tlb miss or user-only address fault * @@ -61,6 +53,20 @@ struct TCGCPUOps { void (*debug_excp_handler)(CPUState *cpu); =20 #ifdef NEED_CPU_H +#if defined(CONFIG_USER_ONLY) && defined(TARGET_I386) + /** + * @fake_user_interrupt: Callback for 'fake exception' handling. + * + * Simulate 'fake exception' which will be handled outside the + * cpu execution loop (hack for x86 user mode). + */ + void (*fake_user_interrupt)(CPUState *cpu); +#else + /** + * @do_interrupt: Callback for interrupt handling. + */ + void (*do_interrupt)(CPUState *cpu); +#endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU /** * @do_transaction_failed: Callback for handling failed memory transac= tions diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index e5c0ccd1a2a..2838177e7f0 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -651,8 +651,8 @@ static inline bool cpu_handle_exception(CPUState *cpu, = int *ret) loop */ #if defined(TARGET_I386) CPUClass *cc =3D CPU_GET_CLASS(cpu); - cc->tcg_ops->do_interrupt(cpu); -#endif + cc->tcg_ops->fake_user_interrupt(cpu); +#endif /* TARGET_I386 */ *ret =3D cpu->exception_index; cpu->exception_index =3D -1; return true; diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 93a79a57415..04c35486a2f 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -73,9 +73,11 @@ static const struct TCGCPUOps x86_tcg_ops =3D { .cpu_exec_enter =3D x86_cpu_exec_enter, .cpu_exec_exit =3D x86_cpu_exec_exit, .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, - .do_interrupt =3D x86_cpu_do_interrupt, .tlb_fill =3D x86_cpu_tlb_fill, -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + .fake_user_interrupt =3D x86_cpu_do_interrupt, +#else + .do_interrupt =3D x86_cpu_do_interrupt, .debug_excp_handler =3D breakpoint_handler, .debug_check_breakpoint =3D x86_debug_check_breakpoint, #endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379307; cv=none; d=zohomail.com; s=zohoarc; b=eR7mq575s4DXkACftqSHSyVeF9kX/tY8tahM3ilMnC4JBmLXAKnCZKfDkm23+eOTYAFRXWUYdQQSa1SiHCizAVbX3g25WRdWsapAdEFC5tvmOZyfqqJrJxrD3xN0DV95Iz5KVZncEGpRPvtKLEoAfhjCX2SNz4BGImtJtDtTpNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379307; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KL1Kqw8poO/L4JKKXeGzPnOl81Q/NwCgyvh1EIRZFV8=; b=jGwLMGu5t5WqmL06fwv2Aag79j7P8sqVmb+sCSPeTQclgz/zRYMj+rxPQe7FHx23AIFizvYtNaLcWcj705jWku/ItrRI5G7WBlgsEdqSlTjlcDrLIvUg7qa7aTZCNYpchxBdG57jCSFTdp65Wh1DGzsQLnpkc6xyNuVeS40m9Xw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1631379307637312.4988810951169; Sat, 11 Sep 2021 09:55:07 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id n5so7458233wro.12 for ; Sat, 11 Sep 2021 09:55:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id a6sm2017569wmb.7.2021.09.11.09.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KL1Kqw8poO/L4JKKXeGzPnOl81Q/NwCgyvh1EIRZFV8=; b=LJtloVRzt5IktL3vZL1p9i3JhRNIksbpxj2ML4Gn5UsL0NgYBJjwvOXWoPPr0SnYMg OqgcMkvrbRLF2JXYBH4OnRjj3vu/n8jEoDVsRvngRv03VyTVb0NCQ8+SSz7I2WYVfe1N NEJPC1fEH0c7zF5IEIk9y6aMFMmAvVHIwNAEmlcz1MCLfFi+xHGi5Z+0SKg93JtDjBFy 4UuHP0lY7Q92B5OAfLKvjHxeiPhvHNvTQmwMvT7KNOA7eeu5jv5vKgX5pARow6miRbrW 0hbE6tsRwDr24uXAXvoi8TBLMLellLANQeVgRiA1FFlDQn0vVO7AiSATSk8YMBqxboku CR4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KL1Kqw8poO/L4JKKXeGzPnOl81Q/NwCgyvh1EIRZFV8=; b=Nxrc7t3RKOQHPEqJ7oKX+9BrFWFnFfTiTzspN/Egbzaz0NeVrenNTmSUXkpXGF9tWE QmF4x6VGWTUkypetoRecNx/ZoR0AxrR1/xnECkm1HpUOvSDhT0KfeFEz6C3k5wpNbyxV WqFhcggFhAOim9RHCFNy5bCmAdRCoZVM5g+P9UglItjnBdGUuv+/ezqVXvoYc77XgoJT qv33g6hQ7Jvq9PZ8plmsDIE0FJNVe0+S115SoJ5LnYifNmU8oEjGtXr5OGMmWdJJJ6Gq qNLtCuC7/xnjg0P5fUuCsVnYg0FGDzfDay9dy++x8iGeom/1tyLMvuO0OwzDHZlmDLHC cfTA== X-Gm-Message-State: AOAM531ryREuB52Q/yk01+MXhghgdwdpAvNzlXTIhjpQRx+ueOX7g1MU wdWNTFcVAzY3hdMq8z8ZUYs= X-Google-Smtp-Source: ABdhPJyPceiFeTrN3aNbGhOjqUAUyPdgQNvj6Ekm5EsWk99N38UhL4hRexsfpKuQwftajEBoz5oxuw== X-Received: by 2002:a5d:4212:: with SMTP id n18mr3927863wrq.37.1631379305872; Sat, 11 Sep 2021 09:55:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 06/24] target/alpha: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:16 +0200 Message-Id: <20210911165434.531552-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379308006100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/cpu.h | 2 +- target/alpha/cpu.c | 2 +- target/alpha/helper.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 82df108967b..4e993bd15bd 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -274,10 +274,10 @@ struct AlphaCPU { =20 #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_alpha_cpu; -#endif =20 void alpha_cpu_do_interrupt(CPUState *cpu); bool alpha_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif /* !CONFIG_USER_ONLY */ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags); hwaddr alpha_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int alpha_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 4871ad0c0a6..93e16a2ffb4 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -218,10 +218,10 @@ static const struct SysemuCPUOps alpha_sysemu_ops =3D= { =20 static const struct TCGCPUOps alpha_tcg_ops =3D { .initialize =3D alpha_translate_init, - .cpu_exec_interrupt =3D alpha_cpu_exec_interrupt, .tlb_fill =3D alpha_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D alpha_cpu_exec_interrupt, .do_interrupt =3D alpha_cpu_do_interrupt, .do_transaction_failed =3D alpha_cpu_do_transaction_failed, .do_unaligned_access =3D alpha_cpu_do_unaligned_access, diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 4f56fe4d231..81550d9e2ff 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -293,7 +293,6 @@ bool alpha_cpu_tlb_fill(CPUState *cs, vaddr addr, int s= ize, prot, mmu_idx, TARGET_PAGE_SIZE); return true; } -#endif /* USER_ONLY */ =20 void alpha_cpu_do_interrupt(CPUState *cs) { @@ -348,7 +347,6 @@ void alpha_cpu_do_interrupt(CPUState *cs) =20 cs->exception_index =3D -1; =20 -#if !defined(CONFIG_USER_ONLY) switch (i) { case EXCP_RESET: i =3D 0x0000; @@ -404,7 +402,6 @@ void alpha_cpu_do_interrupt(CPUState *cs) =20 /* Switch to PALmode. */ env->flags |=3D ENV_FLAG_PAL_MODE; -#endif /* !USER_ONLY */ } =20 bool alpha_cpu_exec_interrupt(CPUState *cs, int interrupt_request) @@ -451,6 +448,8 @@ bool alpha_cpu_exec_interrupt(CPUState *cs, int interru= pt_request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags) { static const char linux_reg_names[31][4] =3D { --=20 2.31.1 From nobody Mon May 6 09:49:06 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=1631379312; cv=none; d=zohomail.com; s=zohoarc; b=T783JTxr73k2PL8URj94Q4qrkoSljlGee6lxCuj7pncd4XC+sK7PHeVF3sdr3KuN7q09pujybg/PNKtVE9qjB8np3mu6xz1tTHM6gJ8DhAu9+JZaYbCAS860rL+JqJIGgo/bIStzeWj+pwBRtVOwp1y47M8JC3mrIW/M4JxpB4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V7zq9ygHOST6Surc7M7Rd7Muo9vEZYb0xO5KQYL2Z9g=; b=cEethdjsJoTowKl/y4++S0A8unPZrIVBZAwUpM3+vstJAiP8XAhdtuqCwFH28AxmEDvo6PEx4u2Y7yFl3U1q0lkCHxnmCBMFQBFbG5g4Et30QFZ8Tfx0bJsTy65Cwy22vXY4m97AY4j96MtXfNgefnRkih2BgHySmh+LPb16uf8= 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 1631379312899524.09967362038; Sat, 11 Sep 2021 09:55:12 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id u16so7477703wrn.5 for ; Sat, 11 Sep 2021 09:55:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id u13sm2185968wrg.68.2021.09.11.09.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V7zq9ygHOST6Surc7M7Rd7Muo9vEZYb0xO5KQYL2Z9g=; b=XzyRMGklhJv/3jO2rzP+eHd7rg/GI3/pbHRLE+S+PseXqg5y00obXvD/QPi4ENd+s6 Le2N8XGN/D14V92gY9UiYmS2cOghgkOke+o44m/TMNSkOQ6WuzhGdj2xVb8CaJbrvbR9 9JkALCvyv0HpnXrNVZ0olnyQsvrh9t9LW32uWkQ/S9JjGh7zSER99mkpnthRQsrPhPJU fCwrOS8ndhAkIeXJDxDTCc81PvFEDTsotXY7F00T6ou153C/PHOharqlBF3i/c4FCC1X bYu0/dSlisP/pmT13gPglbSZap70cn13vdfI6UMdW5qboGuAXFp7uoTDoBhzTvogYVfh PV0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=V7zq9ygHOST6Surc7M7Rd7Muo9vEZYb0xO5KQYL2Z9g=; b=dqfEBZ1Zpi0bNO+m2JH+hTCPdPH5TZ1VdbapCNAzH9bG7sYLENqBBmWyOOCZ2Q80fD LYH1EimNOCTqWG3nWvCgId545qnUzMT3WpOkEPHm6sYfVG22wVl7f2pZCMgoa7DkgJSr zFRKYFwmoFlvrVDgU3wnYChjCAUQdTysfO3J9V8dPmRcP+n1ByCGWTQtlbOGkPGOUZgu Q87TCrOY5LXd+k/FltEnED33jNc3yqwD5GOcgUl4bvk4rPlmoqP2Hoj3XigsTSGlWrLn vRNKp4ob15/NVHpfRJa09v6Hui9RugoWABlCfNU2m33agzRXUwcqvcZpiRrhjMm3G6Fq nriA== X-Gm-Message-State: AOAM5319N5XfAVZ1iR+63Jg2oy7rS1E3b8AVsM8mE4w6hMcu2XI63gZ5 SPFHUiyrnOZcwqm77FVReRY= X-Google-Smtp-Source: ABdhPJxqMlQ9bijBVciVwcZ6hXF4FqTXXJwnpstopv8oQqaisHACNDccDRg+tvRDSW9i631NpbeHiQ== X-Received: by 2002:a5d:65d0:: with SMTP id e16mr3930572wrw.182.1631379311159; Sat, 11 Sep 2021 09:55:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 07/24] target/arm: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:17 +0200 Message-Id: <20210911165434.531552-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379314330100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.h | 3 +-- target/arm/cpu.c | 7 +++++-- target/arm/cpu_tcg.c | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6a987f65e41..cfd755cff99 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1040,11 +1040,10 @@ uint64_t arm_cpu_mp_affinity(int idx, uint8_t clust= ersz); =20 #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_arm_cpu; -#endif =20 void arm_cpu_do_interrupt(CPUState *cpu); void arm_v7m_cpu_do_interrupt(CPUState *cpu); -bool arm_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif /* !CONFIG_USER_ONLY */ =20 hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr, MemTxAttrs *attrs); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index d631c4683c4..ba0741b20e4 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -440,6 +440,8 @@ static void arm_cpu_reset(DeviceState *dev) arm_rebuild_hflags(env); } =20 +#ifndef CONFIG_USER_ONLY + static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx, unsigned int target_el, unsigned int cur_el, bool secure, @@ -556,7 +558,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsi= gned int excp_idx, return unmasked || pstate_unmasked; } =20 -bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request) +static bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc =3D CPU_GET_CLASS(cs); CPUARMState *env =3D cs->env_ptr; @@ -608,6 +610,7 @@ bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt= _request) cc->tcg_ops->do_interrupt(cs); return true; } +#endif /* !CONFIG_USER_ONLY */ =20 void arm_cpu_update_virq(ARMCPU *cpu) { @@ -2010,11 +2013,11 @@ static const struct SysemuCPUOps arm_sysemu_ops =3D= { static const struct TCGCPUOps arm_tcg_ops =3D { .initialize =3D arm_translate_init, .synchronize_from_tb =3D arm_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .tlb_fill =3D arm_cpu_tlb_fill, .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .do_interrupt =3D arm_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, .do_unaligned_access =3D arm_cpu_do_unaligned_access, diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 33cc75af57d..0d5adccf1a7 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -22,7 +22,7 @@ /* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) =20 -#ifdef CONFIG_TCG +#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc =3D CPU_GET_CLASS(cs); @@ -46,7 +46,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int = interrupt_request) } return ret; } -#endif /* CONFIG_TCG */ +#endif /* !CONFIG_USER_ONLY && CONFIG_TCG */ =20 static void arm926_initfn(Object *obj) { @@ -898,11 +898,11 @@ static void pxa270c5_initfn(Object *obj) static const struct TCGCPUOps arm_v7m_tcg_ops =3D { .initialize =3D arm_translate_init, .synchronize_from_tb =3D arm_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt, .tlb_fill =3D arm_cpu_tlb_fill, .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt, .do_interrupt =3D arm_v7m_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, .do_unaligned_access =3D arm_cpu_do_unaligned_access, --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379317; cv=none; d=zohomail.com; s=zohoarc; b=d+0X0kNBz5PgMZFWb7NpU78Sd4vZQrsKu09IYPYlUHofvM7/xrG0D7ht2X9VGyPFXw+RUK+452StsS76tL15r5+Mjtq9ypHtMCBiKwkEG0CM5RkyOguRgSj1jPlk+i7aya+cUr1fCM2xpuanbTQmH6HQv1vQe9rmXFeIZFKUN44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=geqo+TfqXlGgpu7vXFZNKLzFP6S151+7irB5AEU8QIk=; b=hkuFrffmZDPXzfGQB8VddL56jI7lsg6n/A/+9aptbUZsqFW6KCHpL+mJGHx+NBkhvMmzxahtVBxu5FJM2klci5kaMpDkftBHBaDd4obJ56ZnuDaB5b4UXy8ZVAHEbcGBafXT5k2TPUdU83q92oo1exS2jqkcSG4fV8ozHc46QnE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1631379317930143.4178602773718; Sat, 11 Sep 2021 09:55:17 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id n5so7458624wro.12 for ; Sat, 11 Sep 2021 09:55:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id l124sm2023427wml.8.2021.09.11.09.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=geqo+TfqXlGgpu7vXFZNKLzFP6S151+7irB5AEU8QIk=; b=IDFzf7nGI4NuCEO7ATmtnY0sLQSx9mJ+m6h0qthylyFe9fRKnXhJZyGmu70yE4BFha QzHBfYILyFfZoBA6BxixN1JCdTafMXE6ivxR6cy7VMD8ICVvDRtbvWm82E+8a3EwyOn6 h4TeUxTSK0/LNBdbdnPU+nAtTJcwRtWUXppDGLihME9ybwl9kK/TsHhhNMqwKbrUj8f6 k04lLLdQYKFVa7fgT/gRWqGsW91+//PLhn9Sr7Eaaz9TWPo5YHZOb47XgDVttD6PPNmM 0NrifKSEio7vA6nC0QW8gaq8UjUUu7loPpE0SpNpKNiZGfbc9KzQMq67WzX8vNcp5KkL vf1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=geqo+TfqXlGgpu7vXFZNKLzFP6S151+7irB5AEU8QIk=; b=VSIQiJPMnkrKvBB3FyTFX2/6SKM2x8Vwrb516tDti9UHOrOXLcTIWzCl8KRQsgKdCR f1XKJYfE7CO/iTo077FTvv0M+OtbOcAswpis+vg8tIZTIOUgRA2iTmNsgk0+A/4hYbvG GoNqcKmERB4ivtVIBAsZaQV7Mo04qvqWviRgVAsWc9tq0NbPUO9HFELur/lXgXd5YwCH 5ZSoNXse23ZxdasOwG1jk7bt1w6BNvdHKkPSFOBufckBla5Ijb3eglNel9eQLKqixWr3 335UYWM6Dn1x/+z61qQqvKC8UQk/0BwBSTKm9PhYjsY1dnT2FY++uRvpcYu4bKmfz4Hl klsA== X-Gm-Message-State: AOAM530Ctyic/tdI7nLeUhC+f5JEPwy+Y12WAdEir/PkJvEVFTf++5pe 0nSddftec2zjWi554eL6mms= X-Google-Smtp-Source: ABdhPJw9bHA7HE3lakYAFtA/OMyqeWbPmJ+IZkvlG7vNkN+U9u9wIYJTE44598EPQR3/CnW6n7pBBg== X-Received: by 2002:adf:9d4b:: with SMTP id o11mr3836952wre.29.1631379316117; Sat, 11 Sep 2021 09:55:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 08/24] target/cris: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:18 +0200 Message-Id: <20210911165434.531552-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379318426100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/cris/cpu.h | 2 +- target/cris/cpu.c | 4 ++-- target/cris/helper.c | 17 ++--------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/target/cris/cpu.h b/target/cris/cpu.h index d3b64929096..be021899ae8 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -185,11 +185,11 @@ struct CRISCPU { =20 #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_cris_cpu; -#endif =20 void cris_cpu_do_interrupt(CPUState *cpu); void crisv10_cpu_do_interrupt(CPUState *cpu); bool cris_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif =20 void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags); =20 diff --git a/target/cris/cpu.c b/target/cris/cpu.c index 70932b1f8c7..c2e7483f5bd 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -205,20 +205,20 @@ static const struct SysemuCPUOps cris_sysemu_ops =3D { =20 static const struct TCGCPUOps crisv10_tcg_ops =3D { .initialize =3D cris_initialize_crisv10_tcg, - .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D crisv10_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ }; =20 static const struct TCGCPUOps crisv32_tcg_ops =3D { .initialize =3D cris_initialize_tcg, - .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D cris_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ }; diff --git a/target/cris/helper.c b/target/cris/helper.c index 911867f3b48..36926faf323 100644 --- a/target/cris/helper.c +++ b/target/cris/helper.c @@ -41,20 +41,6 @@ =20 #if defined(CONFIG_USER_ONLY) =20 -void cris_cpu_do_interrupt(CPUState *cs) -{ - CRISCPU *cpu =3D CRIS_CPU(cs); - CPUCRISState *env =3D &cpu->env; - - cs->exception_index =3D -1; - env->pregs[PR_ERP] =3D env->pc; -} - -void crisv10_cpu_do_interrupt(CPUState *cs) -{ - cris_cpu_do_interrupt(cs); -} - bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr) @@ -287,7 +273,6 @@ hwaddr cris_cpu_get_phys_page_debug(CPUState *cs, vaddr= addr) D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy)); return phy; } -#endif =20 bool cris_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { @@ -319,3 +304,5 @@ bool cris_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) =20 return ret; } + +#endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 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=1631379322; cv=none; d=zohomail.com; s=zohoarc; b=Oe0ykEfXSDlPmtHx37rveiGH6U0/zby6nyCmEevHpL1jn6Zyylv+L3MR29dZJbXpAYgtyCdFknBZ+bo7HELh9oDaobBnOAAEDsaIsdltVqJUHRBZ4wAGn6skchE5dodKpTvi8etQ7t041BVnZXO4EZWnfo0I5qR1yEcrWCEOzmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TN+Zrhaefhs3QjxEX21PjGTtA8lFVaKomYkrzGxUkf0=; b=bvmLc4Ya+4OsDqYEWCqZkVrZ9Y760DAo2tYCoqw8Qr8RZHi/XzZWzl7FS2V6twWokenKyVJL3SIOw/AHz89ea7YnfSuOo5dcCb7/9Hq7oGo9kaNih0lhzIvrvjTirkIxfFIU4FLx/TnGCgg3LIjwExSL/Zvl1e0eqo69ByYsIzw= 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 1631379322932295.33364593565057; Sat, 11 Sep 2021 09:55:22 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id m9so7506424wrb.1 for ; Sat, 11 Sep 2021 09:55:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id p13sm2102622wro.8.2021.09.11.09.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TN+Zrhaefhs3QjxEX21PjGTtA8lFVaKomYkrzGxUkf0=; b=h+NTPtwx3UHTE7siyE39xuiR9Dh4Si9JsNrBFemFvfUayt3pmpEbUeX3iKxgvdRZM0 bAzvuXNpjM4VupwyxYo3Vfd/JdqYG6XD3WtpgCsffDJOyOJw7NAR7b64QtXnaYXhX6hs CChmpjTwIlSxcqRO3qJ1O/GbpsO59PqYxYxt15WfgGPjP1Hu8jRiRhWnj179YOjXeFEZ bBK3y0HCV23n1hoyqzou+PEnG0/cFDlylPOhozsOU0B71qBx/XRKkP99gIzJYOxuQ+LY zD3S5PwY8LWOUruQwkfamyoLLG0badMUQq8wVx63YcAwJHkJDZYOQ6aRnXEIEdxQa8YL +utw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TN+Zrhaefhs3QjxEX21PjGTtA8lFVaKomYkrzGxUkf0=; b=fSL90ER03pfkrhKInbi69EymjdLxz4opaYMu+sO+dfncnqC8Gqhfnu7cjGiVcnNCxz Mb4vN506jIGOzcTWtzE0crahF7RrrkViRpy2kqSlIxIWUKazakbC55d8zIZE5dE6KfyI eJlMM0wc0NNvhbIfDP5STIwau/GZVWfg74BhuRECE1HST9WMH8F5CN76qj3IvDRukakt PZVi0cd0KHBSv6cPDmDwLfwEkzdUXel9ZkCywAAEWwrYW9f2pPx7bW1LIOIgZngCFYDl 0I+ndaXGZ0Aoadp5tqesLTJV9inxLN6fMhgGsuZi2gju5aUkvPXyXB/+Hn2QNXaLk0PO YQFg== X-Gm-Message-State: AOAM5301jamZ9ilxAbBUrJizOn7qESTIP9Qmte68EzS1TqcI/DIm1VuE D1pmv5/4veK/sqN83Oi5nXA= X-Google-Smtp-Source: ABdhPJwX0AFXeehfprRVw9Xxq+edQZRBL3srvl0G/66fknJoluIWFHBLUBuhdZb84vFmKrN5q05JzA== X-Received: by 2002:adf:9e48:: with SMTP id v8mr3861701wre.141.1631379321197; Sat, 11 Sep 2021 09:55:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 09/24] target/hppa: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:19 +0200 Message-Id: <20210911165434.531552-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379324651100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu.h | 4 ++-- target/hppa/cpu.c | 2 +- target/hppa/int_helper.c | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 748270bfa31..7854675b903 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -325,13 +325,13 @@ int cpu_hppa_signal_handler(int host_signum, void *pi= nfo, void *puc); hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr); int hppa_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -void hppa_cpu_do_interrupt(CPUState *cpu); -bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); void hppa_cpu_dump_state(CPUState *cs, FILE *f, int); bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); #ifndef CONFIG_USER_ONLY +void hppa_cpu_do_interrupt(CPUState *cpu); +bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 2eace4ee124..e8edd189bfc 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -144,10 +144,10 @@ static const struct SysemuCPUOps hppa_sysemu_ops =3D { static const struct TCGCPUOps hppa_tcg_ops =3D { .initialize =3D hppa_translate_init, .synchronize_from_tb =3D hppa_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D hppa_cpu_exec_interrupt, .tlb_fill =3D hppa_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D hppa_cpu_exec_interrupt, .do_interrupt =3D hppa_cpu_do_interrupt, .do_unaligned_access =3D hppa_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 349495d3610..13073ae2bda 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -88,7 +88,6 @@ void HELPER(write_eiem)(CPUHPPAState *env, target_ureg va= l) eval_interrupt(env_archcpu(env)); qemu_mutex_unlock_iothread(); } -#endif /* !CONFIG_USER_ONLY */ =20 void hppa_cpu_do_interrupt(CPUState *cs) { @@ -100,7 +99,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) uint64_t iasq_f =3D env->iasq_f; uint64_t iasq_b =3D env->iasq_b; =20 -#ifndef CONFIG_USER_ONLY target_ureg old_psw; =20 /* As documented in pa2.0 -- interruption handling. */ @@ -187,7 +185,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) env->iaoq_b =3D env->iaoq_f + 4; env->iasq_f =3D 0; env->iasq_b =3D 0; -#endif =20 if (qemu_loglevel_mask(CPU_LOG_INT)) { static const char * const names[] =3D { @@ -248,7 +245,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) =20 bool hppa_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { -#ifndef CONFIG_USER_ONLY HPPACPU *cpu =3D HPPA_CPU(cs); CPUHPPAState *env =3D &cpu->env; =20 @@ -258,6 +254,7 @@ bool hppa_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) hppa_cpu_do_interrupt(cs); return true; } -#endif return false; } + +#endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379327; cv=none; d=zohomail.com; s=zohoarc; b=Wci4I5Ykl0BLOoHcS35o0E5+ntqHl55Fvw1szu9JAlpdsdvrPg4XVHkbYf3+WjV9C5OFil7qYQAVUKu8M7eFvOMzmJKVFe7uYksXe7Sp/2dIBnPUznSBs7b/dtzy9U0CjdQpaCjyuhJkqvf72+vV/16QhDYPUQf8sTiAoC5Uppg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379327; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ySPqMD9ZyNtG7iqcl+Yn5bN0IEHkMFklgd5QFPSdjlQ=; b=nd1UAQeDgbhLRizm46HOUSKsQkx3lhawHscuptFZRGAfaRNamehjkHtx9nHPWxsZdbet0PKKxSaSELUW8GFe2gY8f0c3Ii0BAu5vSvIE47HWaVHykgzRIAzTuLIt70PRwWzIsXOIVKFztLQm3LgOijn7FHJRNL9EKZ4ZEMhizcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1631379327808822.6416986613098; Sat, 11 Sep 2021 09:55:27 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id i23so7496534wrb.2 for ; Sat, 11 Sep 2021 09:55:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id t18sm2058786wrp.97.2021.09.11.09.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ySPqMD9ZyNtG7iqcl+Yn5bN0IEHkMFklgd5QFPSdjlQ=; b=bpE/KVUBVKyum2YVrj5djqP6EG67iwLPtAzrgdsmJYInHbGLQau555j2v+wTbHZjNl qzXbaj7De6NwrlZneqc7gaF9KjMa9UfOYF2tk6wTNQ39TMs8n5eunpdsUuR8rU7J1jgr JmXJ2pFNxxFNTZ//drRsM7dpygWMs21WvE7Bnu2bFQ2ubcMzTcYSOmaPD4LtsLAuttp/ BHMbrRCLCt15dSiQbioL5idyb8CEyt2nBfsQnJU/tGtVLjTLCVLExnwdeJpmqomDmHvd 338Cqun5JNLB+1c19S5j2UvxGIUIQyVM3eS5Yu7wnNAdn70kG/RaBHjD4xSILK9PKSt+ /WWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ySPqMD9ZyNtG7iqcl+Yn5bN0IEHkMFklgd5QFPSdjlQ=; b=13rN5kn40xU7aXS8VcFH799RHY/Bum/McwLFdMK7Geb8sJcP+UuWuWGu9KAAXciVRT ic+ywUt4+6z34+oZRxadHqb8ItEpyQXpjLRJ/P82m7Lx3hPonl9Kxi+ilFYL+xau1GMZ RZ/NHUHXZJshwj3Ac08pLio5cLnCpT+bU1u/sHQZeGcRvmI1V8voxCjCULuQHUisLbnc ZCrKK7zGrXptNj1bvHoyXmdhOOFAMv8JIc1fC9zo0fbaHYNjgNyiSio8EXdokKhBm5mf hQL47PpcJ5YnsoHcNDC0ReZHWv+hqfMpkFAKvpOD1VkGZLxwQmRgngGvfkNoT5MkzVgD b1bw== X-Gm-Message-State: AOAM530DBXxEo2J0QyNYSZJ3fHzGeHmWwTERt/WU9UYIBTIiXZyEIZY+ 35SCv35b5ynCHLOnNwK6tJc= X-Google-Smtp-Source: ABdhPJySEOkvk1+blg3x923oFj0cU0U1hdoHIyQ0qXqRtssBBfdscgdbwJR/pYlo+xwWygm0RK0vrA== X-Received: by 2002:a5d:470b:: with SMTP id y11mr3914172wrq.213.1631379326094; Sat, 11 Sep 2021 09:55:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 10/24] target/i386: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:20 +0200 Message-Id: <20210911165434.531552-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379328878100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/tcg/helper-tcg.h | 2 ++ target/i386/tcg/seg_helper.c | 10 ++-------- target/i386/tcg/tcg-cpu.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h index 2510cc244e9..60ca09e95eb 100644 --- a/target/i386/tcg/helper-tcg.h +++ b/target/i386/tcg/helper-tcg.h @@ -38,7 +38,9 @@ QEMU_BUILD_BUG_ON(TCG_PHYS_ADDR_BITS > TARGET_PHYS_ADDR_S= PACE_BITS); * @cpu: vCPU the interrupt is to be handled by. */ void x86_cpu_do_interrupt(CPUState *cpu); +#ifndef CONFIG_USER_ONLY bool x86_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif =20 /* helper.c */ bool x86_cpu_tlb_fill(CPUState *cs, vaddr address, int size, diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index dee7bef68c6..13c6e6ee62e 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -1110,6 +1110,7 @@ void do_interrupt_x86_hardirq(CPUX86State *env, int i= ntno, int is_hw) do_interrupt_all(env_archcpu(env), intno, 0, 0, 0, is_hw); } =20 +#ifndef CONFIG_USER_ONLY bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { X86CPU *cpu =3D X86_CPU(cs); @@ -1125,23 +1126,17 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int inter= rupt_request) * This is required to make icount-driven execution deterministic. */ switch (interrupt_request) { -#if !defined(CONFIG_USER_ONLY) case CPU_INTERRUPT_POLL: cs->interrupt_request &=3D ~CPU_INTERRUPT_POLL; apic_poll_irq(cpu->apic_state); break; -#endif case CPU_INTERRUPT_SIPI: do_cpu_sipi(cpu); break; case CPU_INTERRUPT_SMI: cpu_svm_check_intercept_param(env, SVM_EXIT_SMI, 0, 0); cs->interrupt_request &=3D ~CPU_INTERRUPT_SMI; -#ifdef CONFIG_USER_ONLY - cpu_abort(CPU(cpu), "SMI interrupt: cannot enter SMM in user-mode"= ); -#else do_smm_enter(cpu); -#endif /* CONFIG_USER_ONLY */ break; case CPU_INTERRUPT_NMI: cpu_svm_check_intercept_param(env, SVM_EXIT_NMI, 0, 0); @@ -1162,7 +1157,6 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interru= pt_request) "Servicing hardware INT=3D0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); break; -#if !defined(CONFIG_USER_ONLY) case CPU_INTERRUPT_VIRQ: /* FIXME: this should respect TPR */ cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); @@ -1173,12 +1167,12 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int inter= rupt_request) do_interrupt_x86_hardirq(env, intno, 1); cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; break; -#endif } =20 /* Ensure that no TB jump will be modified as the program flow was cha= nged. */ return true; } +#endif /* CONFIG_USER_ONLY */ =20 void helper_lldt(CPUX86State *env, int selector) { diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 04c35486a2f..3ecfae34cb5 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -72,12 +72,12 @@ static const struct TCGCPUOps x86_tcg_ops =3D { .synchronize_from_tb =3D x86_cpu_synchronize_from_tb, .cpu_exec_enter =3D x86_cpu_exec_enter, .cpu_exec_exit =3D x86_cpu_exec_exit, - .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, .tlb_fill =3D x86_cpu_tlb_fill, #ifdef CONFIG_USER_ONLY .fake_user_interrupt =3D x86_cpu_do_interrupt, #else .do_interrupt =3D x86_cpu_do_interrupt, + .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, .debug_excp_handler =3D breakpoint_handler, .debug_check_breakpoint =3D x86_debug_check_breakpoint, #endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379332; cv=none; d=zohomail.com; s=zohoarc; b=Cj36XMp7URn/3A0M4D5F2kWYhAVdClihV5cMFT19ZPV8JgFOj++0CxQfRxko3vIhm77xCdErZVw59VIlZA3QJZ19M9nJbaaHDlCiRB5MvEdH/g1+Tiy0hvgkzIuBrqo0z09jJ75iZMeQWsejNfGTizX2nH1eN6WAm+6FMrHi3vI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KmrmQJKuuxtvSWhjZHiSYnfiuVq11gAlW4sC8tAjXUk=; b=IhQwLEGN+I1dRw1UpBweME999FLnJyBqztsJU6YnD21lUQKuKN4Z5VS9c5MivGhurkZXcaRkmTOQ05y5lBXHGQ9kjwxm7mbSZciCr7HKefER7gEcQO8qg8bQOCogWjqXoegh23vAIGT78Dr28zUNyHZBLbtXWYWpOhEeAOBwnDk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1631379332815949.6012039475748; Sat, 11 Sep 2021 09:55:32 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id q11so7476157wrr.9 for ; Sat, 11 Sep 2021 09:55:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id s14sm1912541wmc.25.2021.09.11.09.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KmrmQJKuuxtvSWhjZHiSYnfiuVq11gAlW4sC8tAjXUk=; b=NAxzEVkDy77sPBxEMuLmND+N75WXUMp66ryBeqNrWMnnPhMOFSD7noSrN+cUwgdQMb wC+VMcgru4KhuIm3IfzuZ1ACwyoi2aF7m4ZqM9d3oWSSaypwBgM8b+u69F6lal0oA0+w AWqZ8A3QUof+B2613/IRqlghg12h5ybXoCQ3y0EMre/cLBnc8wuwrqDHGf29iWmhbgNW O4LJaoSvUYyXu5oKKjmXcfrHVjkWoyJ5sdLIDVtrKfUTNS96XvWF1x5C0tf/jXzp56/g q8yohhrt9fs7KIYY7n+8486BsFFP3WNfrweENNiH9SJ20tRLtBWFRelnn316xqbYN2Ds x8kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KmrmQJKuuxtvSWhjZHiSYnfiuVq11gAlW4sC8tAjXUk=; b=qhMgTLCgK8TWV8w8oFCoE2PYwVqlwUFdI40v3KjfomGlDp7ULMAlKDhfECiB47gytv fxtekVQ1WvG2DRmqtAdfUfYKNZi8Ogj5gBFPVf0yB9xvYwocj+NNp+JfIuTZzZzySvpm zbpO77kt9/kJbzEucfB+u/pXq1FSrnGyLFi7q+mH6KHISRiH0BJx52itSMxYbwMwuSmd d/rYyTo+bGh8P9Rl8i7mmXT2tCYbK4EIWrFm5Dut1sLSpfGq6ugw9NN0nlwkQHqKKN1e O6c6i4TP2LMIT0orByQWfxfcZAu6wUCJB/8vXGFrBJdSWrxeXv+xAiIQaVIPVHwalNB+ QYPQ== X-Gm-Message-State: AOAM5333C29Ys/PXWJDHM7eo7JEl9hICMrHCp9tMumW4DMuUrc3nJNa1 BNNsKylsolQ2fjWcf3ex30Y= X-Google-Smtp-Source: ABdhPJz+JC5O2lLLbpJobtASucneZLg/TgPVXZlhkb7xv67RcBYks6QuSh82sPN89d7R84Gx3gRoUw== X-Received: by 2002:adf:c501:: with SMTP id q1mr3846189wrf.150.1631379331059; Sat, 11 Sep 2021 09:55:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 11/24] target/i386: Move x86_cpu_exec_interrupt() under sysemu/ folder Date: Sat, 11 Sep 2021 18:54:21 +0200 Message-Id: <20210911165434.531552-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379333218100001 Following the logic of commit 30493a030ff ("i386: split seg_helper into user-only and sysemu parts"), move x86_cpu_exec_interrupt() under sysemu/seg_helper.c. Reviewed-by: Richard Henderson Reviewed-By: Warner Losh Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/tcg/seg_helper.c | 64 ---------------------------- target/i386/tcg/sysemu/seg_helper.c | 65 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 13c6e6ee62e..baa905a0cd6 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -1110,70 +1110,6 @@ void do_interrupt_x86_hardirq(CPUX86State *env, int = intno, int is_hw) do_interrupt_all(env_archcpu(env), intno, 0, 0, 0, is_hw); } =20 -#ifndef CONFIG_USER_ONLY -bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) -{ - X86CPU *cpu =3D X86_CPU(cs); - CPUX86State *env =3D &cpu->env; - int intno; - - interrupt_request =3D x86_cpu_pending_interrupt(cs, interrupt_request); - if (!interrupt_request) { - return false; - } - - /* Don't process multiple interrupt requests in a single call. - * This is required to make icount-driven execution deterministic. - */ - switch (interrupt_request) { - case CPU_INTERRUPT_POLL: - cs->interrupt_request &=3D ~CPU_INTERRUPT_POLL; - apic_poll_irq(cpu->apic_state); - break; - case CPU_INTERRUPT_SIPI: - do_cpu_sipi(cpu); - break; - case CPU_INTERRUPT_SMI: - cpu_svm_check_intercept_param(env, SVM_EXIT_SMI, 0, 0); - cs->interrupt_request &=3D ~CPU_INTERRUPT_SMI; - do_smm_enter(cpu); - break; - case CPU_INTERRUPT_NMI: - cpu_svm_check_intercept_param(env, SVM_EXIT_NMI, 0, 0); - cs->interrupt_request &=3D ~CPU_INTERRUPT_NMI; - env->hflags2 |=3D HF2_NMI_MASK; - do_interrupt_x86_hardirq(env, EXCP02_NMI, 1); - break; - case CPU_INTERRUPT_MCE: - cs->interrupt_request &=3D ~CPU_INTERRUPT_MCE; - do_interrupt_x86_hardirq(env, EXCP12_MCHK, 0); - break; - case CPU_INTERRUPT_HARD: - cpu_svm_check_intercept_param(env, SVM_EXIT_INTR, 0, 0); - cs->interrupt_request &=3D ~(CPU_INTERRUPT_HARD | - CPU_INTERRUPT_VIRQ); - intno =3D cpu_get_pic_interrupt(env); - qemu_log_mask(CPU_LOG_TB_IN_ASM, - "Servicing hardware INT=3D0x%02x\n", intno); - do_interrupt_x86_hardirq(env, intno, 1); - break; - case CPU_INTERRUPT_VIRQ: - /* FIXME: this should respect TPR */ - cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); - intno =3D x86_ldl_phys(cs, env->vm_vmcb - + offsetof(struct vmcb, control.int_vector)); - qemu_log_mask(CPU_LOG_TB_IN_ASM, - "Servicing virtual hardware INT=3D0x%02x\n", intno); - do_interrupt_x86_hardirq(env, intno, 1); - cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; - break; - } - - /* Ensure that no TB jump will be modified as the program flow was cha= nged. */ - return true; -} -#endif /* CONFIG_USER_ONLY */ - void helper_lldt(CPUX86State *env, int selector) { SegmentCache *dt; diff --git a/target/i386/tcg/sysemu/seg_helper.c b/target/i386/tcg/sysemu/s= eg_helper.c index 82c0856c417..b425b930f9d 100644 --- a/target/i386/tcg/sysemu/seg_helper.c +++ b/target/i386/tcg/sysemu/seg_helper.c @@ -125,6 +125,71 @@ void x86_cpu_do_interrupt(CPUState *cs) } } =20 +bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) +{ + X86CPU *cpu =3D X86_CPU(cs); + CPUX86State *env =3D &cpu->env; + int intno; + + interrupt_request =3D x86_cpu_pending_interrupt(cs, interrupt_request); + if (!interrupt_request) { + return false; + } + + /* + * Don't process multiple interrupt requests in a single call. + * This is required to make icount-driven execution deterministic. + */ + switch (interrupt_request) { + case CPU_INTERRUPT_POLL: + cs->interrupt_request &=3D ~CPU_INTERRUPT_POLL; + apic_poll_irq(cpu->apic_state); + break; + case CPU_INTERRUPT_SIPI: + do_cpu_sipi(cpu); + break; + case CPU_INTERRUPT_SMI: + cpu_svm_check_intercept_param(env, SVM_EXIT_SMI, 0, 0); + cs->interrupt_request &=3D ~CPU_INTERRUPT_SMI; + do_smm_enter(cpu); + break; + case CPU_INTERRUPT_NMI: + cpu_svm_check_intercept_param(env, SVM_EXIT_NMI, 0, 0); + cs->interrupt_request &=3D ~CPU_INTERRUPT_NMI; + env->hflags2 |=3D HF2_NMI_MASK; + do_interrupt_x86_hardirq(env, EXCP02_NMI, 1); + break; + case CPU_INTERRUPT_MCE: + cs->interrupt_request &=3D ~CPU_INTERRUPT_MCE; + do_interrupt_x86_hardirq(env, EXCP12_MCHK, 0); + break; + case CPU_INTERRUPT_HARD: + cpu_svm_check_intercept_param(env, SVM_EXIT_INTR, 0, 0); + cs->interrupt_request &=3D ~(CPU_INTERRUPT_HARD | + CPU_INTERRUPT_VIRQ); + intno =3D cpu_get_pic_interrupt(env); + qemu_log_mask(CPU_LOG_TB_IN_ASM, + "Servicing hardware INT=3D0x%02x\n", intno); + do_interrupt_x86_hardirq(env, intno, 1); + break; + case CPU_INTERRUPT_VIRQ: + /* FIXME: this should respect TPR */ + cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); + intno =3D x86_ldl_phys(cs, env->vm_vmcb + + offsetof(struct vmcb, control.int_vector)); + qemu_log_mask(CPU_LOG_TB_IN_ASM, + "Servicing virtual hardware INT=3D0x%02x\n", intno); + do_interrupt_x86_hardirq(env, intno, 1); + cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; + break; + } + + /* + * Ensure that no TB jump will be modified as the program flow was cha= nged. + */ + return true; +} + /* check if Port I/O is allowed in TSS */ void helper_check_io(CPUX86State *env, uint32_t addr, uint32_t size) { --=20 2.31.1 From nobody Mon May 6 09:49:06 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=1631379338; cv=none; d=zohomail.com; s=zohoarc; b=eGtItZCCxzKqfTGBdqpb8b0uUhA2DJ2YqecNmqtHU94bc7q8L/wWh6KgBG+SQ36oc2EzhSSBmrmKq+a+vvUSyA4i7KS1/KkzXqg6lY6qxtm0KIp+dEy7RaoOP6r6HPSmrExOjqpee+CYQuHbyFIb+/g8u6SIlGUeIFjrsPRxynw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379338; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H6+WFk4l4QrgCDS0Vj4M4XW6RAkhPWPQKWOhbJqzIFQ=; b=jw1RKB7c2bprFe4nE31RYMvzRbHV9aMM4bharwt/1tIGTFMsLNjjVP/oKv4XHGsDPtkw0HjZMVK+a5ch6v1VLXbaGsst4gZMm8HGVXpoCb2/h12dCFUMwtr/KpnMM2lZboInai45vSuRFi3Tm9DHn3dIVXudwTvAVWCIwzqZidM= 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 1631379338064425.7841650009061; Sat, 11 Sep 2021 09:55:38 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id n5so7459432wro.12 for ; Sat, 11 Sep 2021 09:55:37 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id s15sm2142292wrb.22.2021.09.11.09.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H6+WFk4l4QrgCDS0Vj4M4XW6RAkhPWPQKWOhbJqzIFQ=; b=TddMrYdsJ4aK5Fdwtk+FIKntcogL8nYPD0sQNfBpW3NeMztqinocBKXMRKTrBhsR8B POxTaqSkbD1yRSa5DWMepvMWCehjUwaq2mjAnBDSeMOSBCJxDlkFMLwnn2VSljqeqlmu NlUBTKKYt+bxj+qanBTUFWz+YKuOe4QrQ9HZhnYcRx9C1HrcQluRo/fy/zqMEUyMUk5s N/4Wn0P0XxiPS9TDcOeMp1pOskXoWPDb96HDVbHCIuABVbeawNrnPlFITxtSA40sil9J er59Oyvxr83LebvS0ZksJGbZhE6N26vj/yss+GHHkxRF+A3jqRg41P031vMbecF+FgnC KXdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=H6+WFk4l4QrgCDS0Vj4M4XW6RAkhPWPQKWOhbJqzIFQ=; b=7AbvREvZOw+GEw5mBEEwOMiKzTU+bDwPuu7gb/AyWCRFkyAuBkEKl4I8hfhE1MCVDl 0Oh4OwKU7vIlCl19K4dLJxpmxAyv9AcChaYiRyUvGR2VVmtKegQXkYct1/IZ5DY8UuzY eWCjtIyo2dlbiedphASg1Cbr9uHxYomy2hhmDXW1jtU0d8JAxbH36EyJ+3a02u1EPoyV EuvegyMb+kr5FdJJyVbkjEgyuwATNFrEmNyUqbiPIHzCyMAq5n5nYVA4dalu2nWOwn22 11k2+Z/5b+DI7GVpam+W0sOgguLIINhxUzGcfoyCcNNL86IYKVB5H1nUVH3m5eMeZfaF kT4w== X-Gm-Message-State: AOAM531p+6946/e0/IlMqGTKBMSvjFU1XR7yTgJ3/aCWe5Flx1j8nOaZ dAnGNF8894dgDNEnGvn7r7w= X-Google-Smtp-Source: ABdhPJyz5Cfwa5nD5csSd4nuwBAJu4I12qxl8nnZ6hSA/3WC08yKAbP5FPF5JCcKW7l/++k2OXVRFA== X-Received: by 2002:adf:d1c3:: with SMTP id b3mr3891872wrd.286.1631379336419; Sat, 11 Sep 2021 09:55:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 12/24] target/m68k: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:22 +0200 Message-Id: <20210911165434.531552-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379339556100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.h | 2 ++ target/m68k/cpu.c | 2 +- target/m68k/op_helper.c | 16 +++------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 997d588911c..550eb028b6e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -166,8 +166,10 @@ struct M68kCPU { }; =20 =20 +#ifndef CONFIG_USER_ONLY void m68k_cpu_do_interrupt(CPUState *cpu); bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif /* !CONFIG_USER_ONLY */ void m68k_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int m68k_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 72de6e97262..66d22d11895 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -515,10 +515,10 @@ static const struct SysemuCPUOps m68k_sysemu_ops =3D { =20 static const struct TCGCPUOps m68k_tcg_ops =3D { .initialize =3D m68k_tcg_init, - .cpu_exec_interrupt =3D m68k_cpu_exec_interrupt, .tlb_fill =3D m68k_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D m68k_cpu_exec_interrupt, .do_interrupt =3D m68k_cpu_do_interrupt, .do_transaction_failed =3D m68k_cpu_transaction_failed, #endif /* !CONFIG_USER_ONLY */ diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index d006d1cb3ea..5d624838ae6 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -24,18 +24,7 @@ #include "semihosting/semihost.h" #include "tcg/tcg.h" =20 -#if defined(CONFIG_USER_ONLY) - -void m68k_cpu_do_interrupt(CPUState *cs) -{ - cs->exception_index =3D -1; -} - -static inline void do_interrupt_m68k_hardirq(CPUM68KState *env) -{ -} - -#else +#if !defined(CONFIG_USER_ONLY) =20 static void cf_rte(CPUM68KState *env) { @@ -516,7 +505,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr p= hysaddr, vaddr addr, cpu_loop_exit(cs); } } -#endif =20 bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { @@ -538,6 +526,8 @@ bool m68k_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + static void raise_exception_ra(CPUM68KState *env, int tt, uintptr_t raddr) { CPUState *cs =3D env_cpu(env); --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379343; cv=none; d=zohomail.com; s=zohoarc; b=XCvacU1zuWB8bkcRh05k2dP3SdCo28gAai8GeitdlezqAOynjW0Y/GJLQww5q6uMToUVxwPmf9FR1D+wL1BN/8Qpr0tfwk4gsbkDFFJfMcdFBTZz+TZZKcRxFDeRpEPH0gFTa6Ar+voinuZ24yHu3MrxSD1JMB7avYJwiL3ncTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379343; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rO0D2OFkHiHdtobaxK4sUMpGxbIKEwY3AB/t5R4+r5g=; b=Z6Nvwsr6GKqz4q/H7BqF1AfwO6gGqTe98dtVuLfewIy9E7sYJTH3PeUuHbLsI162BboFudxgHzYFnYQy7TTdyjtKuW0cU3AjuLlEoRtDy1dYRDFjbjl3W8VW7eqg0dImSUxo90dx036WocWr1pFOcd4ZbG5izPua5721BzBlSko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1631379343272549.5139384829165; Sat, 11 Sep 2021 09:55:43 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id u16so7479108wrn.5 for ; Sat, 11 Sep 2021 09:55:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id t6sm1964798wmj.12.2021.09.11.09.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rO0D2OFkHiHdtobaxK4sUMpGxbIKEwY3AB/t5R4+r5g=; b=JZh9gkHQ9ffSsEMmhCGZ3142LCjapcN7nNVcr8wm9xUKM4vapI4/b4IxdK0FENL8nf JRT8oehyIJm3NVXoM/V3ueRuAGLkuC2wIX9GDnfDNEdckUc7tKfEft97hu22EsQggXRf gQ92n0XiHaO4pN44s3MZPpXIPsTokFbe4o2A6sRC3lxKNRF55S4cDSbIpn9OwUtMQ5s6 O3lxemetgKiuYc+tLJixuRpziMcGv9tE8O9JGQOKkUMDvbHP4VvePyvDtMNM4VLorhp3 iEuqo2MK8+cL94Zy/9pvb+h0vrveQbLX0TohI6U4FVWVaxgS3nFSQG/E4TiYSGh/LkHI XWEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rO0D2OFkHiHdtobaxK4sUMpGxbIKEwY3AB/t5R4+r5g=; b=CpSVGT91TwpDkPTD0r08plT51Oa7OZ0ZZEcBGPBQ+P4L2qZl4OPXhubuG/NwYaIlk1 ynPIuScOUxAHqQvWiptZpcApj3fEiYiWveImVaDIw2uxhjncI2mHepLL/s85aaU+j4P/ NvdUoZhomRbroflYQk3sCL+6INa8l2obsuckSCInNObYbmKvg9Y5dKLklf9Upiq1a8SF yumXtvDaeiQ0M18l86TYU8d5Y0n3PubOLCWcP9dJ9ORrQILnlBuYJQ29v8fVO8lYVo6y 6YwBKr5zSgyiyhzHt2u2/vtRSHzOxc9kr8CxRtkZe73rBk4EmwTH0NmLCvNGn7ZY8ZLX CGxQ== X-Gm-Message-State: AOAM533q/o13PbeuaitoxE73AmO+F9IsgV9Ew4HsDpvLdTALcQ1EmHdg 2tG7X2B7Nw/GYg1w9m9Cj+g= X-Google-Smtp-Source: ABdhPJxYvehly841dVGlabTxEblZ7tm+GfKKYjSEnqhj3ul816Sc/FcJnkKYGy+dkzrOcZDgtAbCMw== X-Received: by 2002:a5d:6e09:: with SMTP id h9mr3886973wrz.82.1631379341600; Sat, 11 Sep 2021 09:55:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 13/24] target/microblaze: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:23 +0200 Message-Id: <20210911165434.531552-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379343812100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/microblaze/cpu.h | 2 ++ target/microblaze/cpu.c | 2 +- target/microblaze/helper.c | 13 ++----------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index e4bba8a7551..40401c33b72 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -355,8 +355,10 @@ struct MicroBlazeCPU { }; =20 =20 +#ifndef CONFIG_USER_ONLY void mb_cpu_do_interrupt(CPUState *cs); bool mb_cpu_exec_interrupt(CPUState *cs, int int_req); +#endif /* !CONFIG_USER_ONLY */ void mb_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 72d8f2a0daa..15db277925f 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -365,10 +365,10 @@ static const struct SysemuCPUOps mb_sysemu_ops =3D { static const struct TCGCPUOps mb_tcg_ops =3D { .initialize =3D mb_tcg_init, .synchronize_from_tb =3D mb_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D mb_cpu_exec_interrupt, .tlb_fill =3D mb_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D mb_cpu_exec_interrupt, .do_interrupt =3D mb_cpu_do_interrupt, .do_transaction_failed =3D mb_cpu_transaction_failed, .do_unaligned_access =3D mb_cpu_do_unaligned_access, diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index 20dbd673136..dd2aecd1d58 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -26,16 +26,6 @@ =20 #if defined(CONFIG_USER_ONLY) =20 -void mb_cpu_do_interrupt(CPUState *cs) -{ - MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); - CPUMBState *env =3D &cpu->env; - - cs->exception_index =3D -1; - env->res_addr =3D RES_ADDR_NONE; - env->regs[14] =3D env->pc; -} - bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr) @@ -271,7 +261,6 @@ hwaddr mb_cpu_get_phys_page_attrs_debug(CPUState *cs, v= addr addr, =20 return paddr; } -#endif =20 bool mb_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { @@ -289,6 +278,8 @@ bool mb_cpu_exec_interrupt(CPUState *cs, int interrupt_= request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + void mb_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379348; cv=none; d=zohomail.com; s=zohoarc; b=F9b61YGhdQyVL8olY8NAih0k62jWc7EmDH6t9M+rIBJ9uDbxkoUzvw8gzkNxkat47JZ/BPSfCxS9fNfgZ14FKzrBs061jJsBV+kVho7pvHVY/3JPSTj43GDklE0Anicvc+kQGhtSZQ1nzF5PVCPSCn8IHM4yMTr4A1HlzA0Fnuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379348; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oAm0Jcp7Dg3eAE8iWKGhR4SrU9JkFdpvVtk43FQam+A=; b=g6DWpqDYepg4MvqadR5B0Q1mJHuAVOeEMQEEJCaAS9qrWT9tGWMyV4VyH0ePnHEROp5wWmYuERll+yFfYLWXjU6dh/ed0TdP0AUvs3SiODi4wMXT6q1vT03eOy2ZWxBOnMMUcjgmiLc7sy6iEeoj6wq+tsJpv7aUMCvwlzSrA7w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 163137934807914.146355342978495; Sat, 11 Sep 2021 09:55:48 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id w29so6731289wra.8 for ; Sat, 11 Sep 2021 09:55:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id h11sm2582477wrx.9.2021.09.11.09.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oAm0Jcp7Dg3eAE8iWKGhR4SrU9JkFdpvVtk43FQam+A=; b=bYk4YK19R3tHg1IGRF2iRsnM9vViR+YFrMt0Mmds7JaBHsw0h6xsJA70BGDpK1/R7P DYu0SZCJ/fJoLJuMdoFqJXz3bXLNQTQhbYOPa8g5+XT2x7k10lDTQnZbJiIErSFaeVdS uPab8zz5YNc0DuQ+z6obnzTUtXEVDK/jkLGFzDdLyrsc8hTbs3uVz6sJR/Gqd57OP5F9 2jLGe3T7Co4ob2p87KOFjkbUv3eap8kdzVdc4sRjcFFP0woRD30qADI8ETV2fMIascnm PbjjEDQvTpjZlkjBKAHhrJ9OQe96fXU8lm7Tgye2VTC0aKu4XwdeZoyxVUWSeZ11lECy YUUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oAm0Jcp7Dg3eAE8iWKGhR4SrU9JkFdpvVtk43FQam+A=; b=WozTKQxwBV7u+Ck7vthCsai3lyBzVnnkHyqA1P7Dm+lYA2SfL75w8Xm5CFKHl58lGH dIl7hXqZ8hICTs5TbIEKgDl4CZTazBEwZcjFlfaVcV8yQg7Mb1J+1ldI1uwS8wq3AbAM tuw7jsYg647cbnZYa+zvYhHE80l8ovVQDIyj1UbCUxIm5XvXhevJQ/PqX4Uf1hTGj6Fo +Em6UbEOT4p3oUJu2Io132iTkKcYq+G4WOk/IIJk6PiclmjkJngrmWvkvz1Qi4hTbbdS xtGQevPc8/Gs2fgIePIlILiQ6dAZYyD9KaJC0k3vkmfKZr78NpSLANeYgCWMhxgyVaqR H0PQ== X-Gm-Message-State: AOAM530vGI8RHewigw5oDUp196cumnVKWhESd4MIUZhsgCqXArF+jlzp IdxmPxFBBv35BOGJqlLcIHY= X-Google-Smtp-Source: ABdhPJwgeB4ZXpeq3QMZnkfXUYrCTuVhuwdd09ixmf0WqS5ChqzM29iQl+k3gA+aAh2VWXRb9opFKg== X-Received: by 2002:adf:d1b2:: with SMTP id w18mr4021625wrc.6.1631379346392; Sat, 11 Sep 2021 09:55:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 14/24] target/mips: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:24 +0200 Message-Id: <20210911165434.531552-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379350038100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/tcg-internal.h | 5 +++-- target/mips/cpu.c | 2 +- target/mips/tcg/exception.c | 18 ------------------ target/mips/tcg/sysemu/tlb_helper.c | 18 ++++++++++++++++++ target/mips/tcg/user/tlb_helper.c | 5 ----- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 81b14eb219e..c7a77ddccdd 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -18,8 +18,6 @@ void mips_tcg_init(void); =20 void mips_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb= ); -void mips_cpu_do_interrupt(CPUState *cpu); -bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); @@ -41,6 +39,9 @@ static inline void QEMU_NORETURN do_raise_exception(CPUMI= PSState *env, =20 #if !defined(CONFIG_USER_ONLY) =20 +void mips_cpu_do_interrupt(CPUState *cpu); +bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); + void mmu_init(CPUMIPSState *env, const mips_def_t *def); =20 void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagema= sk); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index d426918291a..00e0c55d0e4 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -539,10 +539,10 @@ static const struct SysemuCPUOps mips_sysemu_ops =3D { static const struct TCGCPUOps mips_tcg_ops =3D { .initialize =3D mips_tcg_init, .synchronize_from_tb =3D mips_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D mips_cpu_exec_interrupt, .tlb_fill =3D mips_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .cpu_exec_interrupt =3D mips_cpu_exec_interrupt, .do_interrupt =3D mips_cpu_do_interrupt, .do_transaction_failed =3D mips_cpu_do_transaction_failed, .do_unaligned_access =3D mips_cpu_do_unaligned_access, diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c index 4fb8b00711d..7b3026b105b 100644 --- a/target/mips/tcg/exception.c +++ b/target/mips/tcg/exception.c @@ -86,24 +86,6 @@ void mips_cpu_synchronize_from_tb(CPUState *cs, const Tr= anslationBlock *tb) env->hflags |=3D tb->flags & MIPS_HFLAG_BMASK; } =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; -} - static const char * const excp_names[EXCP_LAST + 1] =3D { [EXCP_RESET] =3D "reset", [EXCP_SRESET] =3D "soft reset", diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/t= lb_helper.c index a150a014ec1..73254d19298 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -1339,6 +1339,24 @@ 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; +} + void r4k_invalidate_tlb(CPUMIPSState *env, int idx, int use_extra) { CPUState *cs =3D env_cpu(env); diff --git a/target/mips/tcg/user/tlb_helper.c b/target/mips/tcg/user/tlb_h= elper.c index b835144b820..210c6d529ef 100644 --- a/target/mips/tcg/user/tlb_helper.c +++ b/target/mips/tcg/user/tlb_helper.c @@ -57,8 +57,3 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int s= ize, raise_mmu_exception(env, address, access_type); do_raise_exception_err(env, cs->exception_index, env->error_code, reta= ddr); } - -void mips_cpu_do_interrupt(CPUState *cs) -{ - cs->exception_index =3D EXCP_NONE; -} --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379352; cv=none; d=zohomail.com; s=zohoarc; b=Poni9udO/Snu7HqoqeFjaRDciOO9p6f8B0Hd3KSbHOonG1viH9XPDCPqmIWYLvCwAdEX/jUFlA+u6efNYmyd2/aaB+xjOjMfx6uIQm0p8e4FJ2FsF+eUULOpEPHOrRvrp2Wzx50d0iUAEPNN8SCLvQjbqBqlA1/xOYRBe8THg2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379352; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J5rx4TkBW8G8gScO08U1pK8zY4A0mljSOlfasCw3q/k=; b=h4ZutXCfiBWB3FhzHS4g2qlB6c1dO5mD4nDWTUVa6gDG/V2vEJ5dsZFgRAjoPmZO2Yz5X5aHETthh4iKW2vzLLAKB8Aj8iHUQ4pQ96G4AvgWHgXZk2Wo+qTq31HBP4djFj7z7gN8Xw29PrfOHrzbd7wOamNQ3W89vbsOU1onzUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1631379352868585.4514878560329; Sat, 11 Sep 2021 09:55:52 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id e26so3437564wmk.2 for ; Sat, 11 Sep 2021 09:55:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id r129sm1979396wmr.7.2021.09.11.09.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J5rx4TkBW8G8gScO08U1pK8zY4A0mljSOlfasCw3q/k=; b=k6VhsEObtW/eX1GKZLHDUNac/HBrZsJQ0P311Ff3m5Nu3tXNGRusuk6iUAvTOubjLp BXzF4zEZ2LAv+Fz/ajGZ39N+fdHKp3tqgUQ9eJocMlYmbOKsWf2bCJho9lNX2WhmFU+0 blwopjB8G9m5cH9FyWf+11GRHluhNst0PsgOSDTxDiZq1LiqPMVT1RroSN17pD/NrMTz yoN3uPEhvoFuRC5ccvyQETTWsTehBeQkKXVX0DUuFnlnw6eBYt4Mb7U5z/6C8Ab25qxS QPc5n9YtjmhYgKdF2fWkq+rHaT+Aa3qOHlqqNkB1e+4qkf3dgp2V5cmkiPLyFk220HdU jmbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J5rx4TkBW8G8gScO08U1pK8zY4A0mljSOlfasCw3q/k=; b=VSwDdIpEnQvDqSAPNm3Wy4ZmABhBdteyC/Qg183G0ocotEDrRxMI+EXxxXWMXhOs8w Q/jQvzo39k/R7nL2QeFVRqshCt8IUoFb3V8Xxx3SIZOPDfyNiij5swO+P3SxWgvEsSMm 4u+P/a2ON/tEeaDhvfw6Tv1uppzbZ+Z0JVt4YhtN0rMwk600SafyAkjGay6qH2EHhwmG vYbAmjYjfhCGkH3HkTDRq7qMZbrF+JJlQg0kkL/nfnqQnpxIN/IcVynPf7sGGeVNCo1P xBvq5rKJKqR/DFgQ7uru7xPOCnj8hJy4Tu2WH0oRGeEaC86ZUAECKSI1CKaaq8iPM26a Kkew== X-Gm-Message-State: AOAM531rGlgGjfSEYEYGmkRTjCEC0qGmyNuTPeWaTaH4OvB4LxEinSoV t75DOiv6Ei8pGLqbpX4pSlE= X-Google-Smtp-Source: ABdhPJymL6EMN40D6kLo2zJWlowyX7kndrLw0tRcyocVrkVXHfRmoXmcELNTi9POM7LpOEzMR4yODg== X-Received: by 2002:a1c:9a0e:: with SMTP id c14mr3443877wme.119.1631379351224; Sat, 11 Sep 2021 09:55:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 15/24] target/nios2: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:25 +0200 Message-Id: <20210911165434.531552-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379354267100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/nios2/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 5e37defef80..947bb09bc1e 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -127,6 +127,7 @@ static void nios2_cpu_realizefn(DeviceState *dev, Error= **errp) ncc->parent_realize(dev, errp); } =20 +#ifndef CONFIG_USER_ONLY static bool nios2_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { Nios2CPU *cpu =3D NIOS2_CPU(cs); @@ -140,7 +141,7 @@ static bool nios2_cpu_exec_interrupt(CPUState *cs, int = interrupt_request) } return false; } - +#endif /* !CONFIG_USER_ONLY */ =20 static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -219,10 +220,10 @@ static const struct SysemuCPUOps nios2_sysemu_ops =3D= { =20 static const struct TCGCPUOps nios2_tcg_ops =3D { .initialize =3D nios2_tcg_init, - .cpu_exec_interrupt =3D nios2_cpu_exec_interrupt, .tlb_fill =3D nios2_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D nios2_cpu_exec_interrupt, .do_interrupt =3D nios2_cpu_do_interrupt, .do_unaligned_access =3D nios2_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379357; cv=none; d=zohomail.com; s=zohoarc; b=epIrot8C61U+zpVzQtpLUa1QIC11IjbD/1Zb6BkdtIXb0vjxvyLMFwkD5mUQn3UBu5Jtcvr/BQwF6+aCiABdotJSW4uBbODb8JfTJnp6Kt7C1rHxGgI0CafSJBFZZzezoPSvFXNVdxmrouPaEwXLY16U9rWzMl5Ll5wCpK+egtE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SlXQUNKS3c3ZKazmS/+w3RMtDhurrxUzxhSxeew26+k=; b=WQZJH5yVMZpYqChHA036jutZt42oOLRSlTsI/pb2b3oTXj1o0WKBTVy5ABAYYjt2NHt6ZRQdzCYZh3d9zI041zMhKvMZHSktFt0M7INh/lH+8pYIjL/VdrqOmIB7J0WXsxIX08Qiyc2al8qVSGXPQmEi0AgDEBWpYIw/ffs5Z4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1631379357556491.8773656470005; Sat, 11 Sep 2021 09:55:57 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id i23so7497813wrb.2 for ; Sat, 11 Sep 2021 09:55:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id z19sm2369237wma.0.2021.09.11.09.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SlXQUNKS3c3ZKazmS/+w3RMtDhurrxUzxhSxeew26+k=; b=FbiVsXj3FAZx5ZjncQN9iEIfsVeLqeBuwOPoqI6UQ63fHO+/83LFAhS7XD3vY+Brzw Yqa0kWbTn545ks2TCE47BkEDx+3Kb3sVS4u/F6e4iZmu8Ez8h10W5Mjf3bx73dKDyhhm 16mWBuKeqNAFz6UCKmRBTDjjXYq/eQZ3PJX19S45DSQp71m218kuT3pdHVZvWGc7eGV/ XMUB9V5ujtfiBgDPgioFwIavDkZEFJ+wYRTvVKGk8YlZhslcngjh8YRqSq7gyZd/fo76 Wno12siEhYPLD3bpDAtPs9FlhcO9kGC926wkUbeUXViecJeJDvKLH+pevpAokEF5F04u z+Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SlXQUNKS3c3ZKazmS/+w3RMtDhurrxUzxhSxeew26+k=; b=6yz32BTE0nLkN+wPhmDplS+0Mtkc12QKUOelxupe4Jm/fKDxSF3UTHMuWOWJ9ghgkj VTdnULx/9gUzrbP9uUD3UTQb1Mr3zdBkAndkv/9ktjS4fwnun/uwk3lo+JG46b58XJCx BJWACPwcmL+GaMbxhH3kH+jwdU6jVhnDXi3Kme3pvmq1GInfW9dBbXOdChkwI1/Hrvpb IGaaO94zNdSHmu4jGIi7ka5u99JCQpp2jSU0vysPbj3ptYUZbCGVJG1qSDmfoQMZboij HkNw8bp74RYa2H+zlzLpCyIHiiacUf7gg1xBICP0YvjFOa5W89xsSNxfdrRzZPkMfzmZ OqAA== X-Gm-Message-State: AOAM532Gyq7DtWzc+O1dSdwhRxnHqA5e6Tc5X4nlnkxkJzhcOCjUl6LZ EPhNV58Ruw0I4hSsCMVsd44= X-Google-Smtp-Source: ABdhPJxK+oCZiehRlNPyQF2hLSkfA1CxPBnch9PQF5ryk0EIJOTHvHhl0uHXcZyP//yh8kc+sLuN2g== X-Received: by 2002:a5d:48c5:: with SMTP id p5mr3745013wrs.303.1631379355868; Sat, 11 Sep 2021 09:55:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 16/24] target/openrisc: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:26 +0200 Message-Id: <20210911165434.531552-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379358424100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/cpu.h | 5 +++-- target/openrisc/cpu.c | 2 +- target/openrisc/interrupt.c | 2 -- target/openrisc/meson.build | 6 ++++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index 82cbaeb4f84..be6df81a810 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -312,8 +312,6 @@ struct OpenRISCCPU { =20 =20 void cpu_openrisc_list(void); -void openrisc_cpu_do_interrupt(CPUState *cpu); -bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req); void openrisc_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int openrisc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg= ); @@ -331,6 +329,9 @@ int print_insn_or1k(bfd_vma addr, disassemble_info *inf= o); #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_openrisc_cpu; =20 +void openrisc_cpu_do_interrupt(CPUState *cpu); +bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req); + /* hw/openrisc_pic.c */ void cpu_openrisc_pic_init(OpenRISCCPU *cpu); =20 diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index bd34e429ecb..27cb04152f9 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -186,10 +186,10 @@ static const struct SysemuCPUOps openrisc_sysemu_ops = =3D { =20 static const struct TCGCPUOps openrisc_tcg_ops =3D { .initialize =3D openrisc_translate_init, - .cpu_exec_interrupt =3D openrisc_cpu_exec_interrupt, .tlb_fill =3D openrisc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D openrisc_cpu_exec_interrupt, .do_interrupt =3D openrisc_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ }; diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c index 3eab771dcda..19223e3f25b 100644 --- a/target/openrisc/interrupt.c +++ b/target/openrisc/interrupt.c @@ -28,7 +28,6 @@ =20 void openrisc_cpu_do_interrupt(CPUState *cs) { -#ifndef CONFIG_USER_ONLY OpenRISCCPU *cpu =3D OPENRISC_CPU(cs); CPUOpenRISCState *env =3D &cpu->env; int exception =3D cs->exception_index; @@ -96,7 +95,6 @@ void openrisc_cpu_do_interrupt(CPUState *cs) } else { cpu_abort(cs, "Unhandled exception 0x%x\n", exception); } -#endif =20 cs->exception_index =3D -1; } diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build index 9774a583065..e445dec4a00 100644 --- a/target/openrisc/meson.build +++ b/target/openrisc/meson.build @@ -9,7 +9,6 @@ 'exception_helper.c', 'fpu_helper.c', 'gdbstub.c', - 'interrupt.c', 'interrupt_helper.c', 'mmu.c', 'sys_helper.c', @@ -17,7 +16,10 @@ )) =20 openrisc_softmmu_ss =3D ss.source_set() -openrisc_softmmu_ss.add(files('machine.c')) +openrisc_softmmu_ss.add(files( + 'interrupt.c', + 'machine.c', +)) =20 target_arch +=3D {'openrisc': openrisc_ss} target_softmmu_arch +=3D {'openrisc': openrisc_softmmu_ss} --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379362; cv=none; d=zohomail.com; s=zohoarc; b=NsfTGSM+xZUpiHhvyf/g1XRlCB554pNkULoXM2jEqgABJxfhrDkLpYYOt0qOyp35X/UHb1qbA47/AlGrGvhrwmdrkJZ2NcfBXHGqOEqhdYzDvWayNes3D/KzWL+JPPmdtfhnRQBtEQvrDaT4X00o8UsWbp1NUYhB4mquaQde2+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379362; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ckzIrTOGwucKvNX/l+ogfKjL1PFJKsWDkPt+s6zjYCI=; b=oBjIy2csobWFMzWqPZRmKWkxuMFEvOwNSymfKWAm1h/lMgERa0kI1EdOuM2xn9GBjoykJ85wuVdeiqE1OdjFwe2lVBMfZiqVa7PvhgEfRJZ+jRvvtXbxAVkPZIsI/PshD/v6srMAOl1iWO/BYWE2gag/nThAvwAsKmXZUHuj8cs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1631379362594513.0930110361136; Sat, 11 Sep 2021 09:56:02 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id q26so7484587wrc.7 for ; Sat, 11 Sep 2021 09:56:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id v10sm2192763wrg.15.2021.09.11.09.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ckzIrTOGwucKvNX/l+ogfKjL1PFJKsWDkPt+s6zjYCI=; b=OCp5awyfFS9riM+T+wrtHz5h2nfVYyUHspa5X1wcj7vGQg18YvPDJr+VtntH+iOMzj qCKZEBOakPY9d35fjxAjzyPQN4sgtRY1dtk9Z8OHGQlXTmOiELCyMtMTWqb292Bvj2RJ I3bHQrOOp4YRjEYbHRCYthD+x2Gw2CQ/HOKsH5gkDX4ZMsusxX9ghq4Al53l5e7fij7Q 2daoS/UvYXP5JBGA1qLZobQi+AP44davF13RvLv3K7jyT/zWxlTM17RmggzL3T5f/ZYZ SG023q2n6HVshsQRnYGxvgTfcyRuX95s7RX9kIhUBfiDJziZ1TN075gEywOvDXFD0GUv r9uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ckzIrTOGwucKvNX/l+ogfKjL1PFJKsWDkPt+s6zjYCI=; b=GFg5QtdjQqSik5c8T2nrywUtcFuFO9NXeJ/cfaUcLUkLcSDkDcouqwokMHNvl8tV5D X3eKeqeRqIy7l8JEZl6N85h3UZzOf4O5dVFFM5s27FDtZAqT1owOKyTHDwnXGIBQOcvv EtzpKL3lYWUUztSi30aoRJjsj/WtltdTh+G2WRrQldPxrx/xbKAt2PpKNzQDeyA5S/lg xngxEUxfZSFQH7vo3kaLGHMiS/ciPfhzBVJSFqTvppLIuhzjQLor6lpKAD8VgjosuHIP QCZd9u9fGP0wKbt0fPszB9tenPp13va5ywqIsWaULw++W/hJRyHYXP16e9g1KlsbWX5n Mpgg== X-Gm-Message-State: AOAM532FfAlUpzqoVWIbLR6q6fu/l5sQh8QVZgcyCKsMl+ACmmw3+Q60 D0BdfWvDvt50U2flBsPura96aRNsqEA= X-Google-Smtp-Source: ABdhPJwN0VpvbfB8cVfSr4MQjbPQS7+gs85z9at7r4xHVwNrtdvv0oy+F2wsQVWEoqgm+XA/vn8tkw== X-Received: by 2002:adf:80eb:: with SMTP id 98mr3870925wrl.370.1631379360871; Sat, 11 Sep 2021 09:56:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , David Gibson Subject: [PATCH v3 17/24] target/ppc: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:27 +0200 Message-Id: <20210911165434.531552-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379364584100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Acked-by: David Gibson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu.h | 4 ++-- target/ppc/cpu_init.c | 2 +- target/ppc/excp_helper.c | 21 +++------------------ 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 500205229c0..362e7c4c5c7 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1254,8 +1254,6 @@ DECLARE_OBJ_CHECKERS(PPCVirtualHypervisor, PPCVirtual= HypervisorClass, PPC_VIRTUAL_HYPERVISOR, TYPE_PPC_VIRTUAL_HYPERVISOR) #endif /* CONFIG_USER_ONLY */ =20 -void ppc_cpu_do_interrupt(CPUState *cpu); -bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req); void ppc_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int ppc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); @@ -1271,6 +1269,8 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction = f, CPUState *cs, int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); #ifndef CONFIG_USER_ONLY +void ppc_cpu_do_interrupt(CPUState *cpu); +bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req); void ppc_cpu_do_system_reset(CPUState *cs); void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector); extern const VMStateDescription vmstate_ppc_cpu; diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index ad7abc6041a..6aad01d1d3a 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -9014,10 +9014,10 @@ static const struct SysemuCPUOps ppc_sysemu_ops =3D= { =20 static const struct TCGCPUOps ppc_tcg_ops =3D { .initialize =3D ppc_translate_init, - .cpu_exec_interrupt =3D ppc_cpu_exec_interrupt, .tlb_fill =3D ppc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D ppc_cpu_exec_interrupt, .do_interrupt =3D ppc_cpu_do_interrupt, .cpu_exec_enter =3D ppc_cpu_exec_enter, .cpu_exec_exit =3D ppc_cpu_exec_exit, diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 7b6ac16eef7..d7e32ee107e 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -40,24 +40,8 @@ =20 /*************************************************************************= ****/ /* Exception processing */ -#if defined(CONFIG_USER_ONLY) -void ppc_cpu_do_interrupt(CPUState *cs) -{ - PowerPCCPU *cpu =3D POWERPC_CPU(cs); - CPUPPCState *env =3D &cpu->env; +#if !defined(CONFIG_USER_ONLY) =20 - cs->exception_index =3D POWERPC_EXCP_NONE; - env->error_code =3D 0; -} - -static void ppc_hw_interrupt(CPUPPCState *env) -{ - CPUState *cs =3D env_cpu(env); - - cs->exception_index =3D POWERPC_EXCP_NONE; - env->error_code =3D 0; -} -#else /* defined(CONFIG_USER_ONLY) */ static inline void dump_syscall(CPUPPCState *env) { qemu_log_mask(CPU_LOG_INT, "syscall r0=3D%016" PRIx64 @@ -1113,7 +1097,6 @@ void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, tar= get_ulong vector) =20 powerpc_set_excp_state(cpu, vector, msr); } -#endif /* !CONFIG_USER_ONLY */ =20 bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { @@ -1130,6 +1113,8 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interru= pt_request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + #if defined(DEBUG_OP) static void cpu_dump_rfi(target_ulong RA, target_ulong msr) { --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379367; cv=none; d=zohomail.com; s=zohoarc; b=iT6B8Kt5ZuCKCM3qitaOv3WQy+RjXnb3VPlBtaDwkpMNPQBiFnm5yMaMJqsoCl8dSq8tX/6n+qo1hPxHgtzYrhHwweExJ1g1plCF0PJSshqroSppD83W32c9sjSVP8nd3Z6ja5KIobUqxOER6SxOEOqt5sghWCFE/63N6ED1f4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379367; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j9PM97jpqrx9RzHI+KsmBSg+6+9rj2SJK4q8cO/CNpE=; b=VXqJL/HtCRictKdaPtIPjXPXGAkzZspSYkROrEgJpBbonXt05vgvv0hmKdGHu59fxcIbvf4weZEja9fsLnfVOyLvakdm4ZJ5OB1+Nn4vke5e1QMQZ8bkEdVrpk40TdatAVrw8mRAXDK6RRw5Nhjbq3eY46/Hv01pYLF+jHvoG9A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 163137936757299.09965207453979; Sat, 11 Sep 2021 09:56:07 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id w29so6732134wra.8 for ; Sat, 11 Sep 2021 09:56:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id j17sm2113722wrh.67.2021.09.11.09.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j9PM97jpqrx9RzHI+KsmBSg+6+9rj2SJK4q8cO/CNpE=; b=bsQeH4AcGspn+4Meelms8C/sAQhY5D9MfKC3AvHUjmsvnPf+FJSxiq9OT4AKKuALTA qldb4kjBMwDE4031OgdlS6diX56tzjjlqFQV9MvI8UxRhGLX9TO4ixtYHXtMR5i0xTyF 2YmWFmveNvDR9qD4Lz37Pu6hD8V701HhdLNdZYZEZjnHK5EehwpSPd4+PeB2Fv5tvVqR tKVYom984eQbzf0a2I0sUgAV0NUNrkov94a53PFq6hAWGtNwbhT1omSl49YiN8D7c/8n 9LxwEBY+7zmfDJRoIvPKcWjfDfgI+4V1TtcW6KaoMGUEi1j9gI3OtMPyb05Mx2D9oZ8F eV7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=j9PM97jpqrx9RzHI+KsmBSg+6+9rj2SJK4q8cO/CNpE=; b=NLwHXkK0tI0WBh0+uXNVn/HSQRyPkut2KQeQ1kJ1D9/htuAONA0CGPyfjjmcYlSDpJ J2XulbfdVDzuvFjJRmKfrBXYR6Zqp9mQaFfFZyJ/8+oX/IcfTyCoFAUV42mn+rBRxNvB /4ezv3eOk4FIzs6i+D9FUw75eM0lUDR9es86C7Yhj3Ec2WEYCiBNC8gdp9CvGf+6PPE/ CFjaT9jd5ynp7wob0GFusuxe5BL9+ewKjRBGSLXk6iUKDyqp9VUjI+nLk+hx/wI56Wbp VfbsNrqd6fAPniqHzt8OJlV/igtUMx5Z+DBb5e2HzUwdKmqFIXiWdO7B5FRGTY82AYrg gxnA== X-Gm-Message-State: AOAM532NNt+NxX4VawarpBgp+KLs0ZisgWPthNMzkYiRSwd3XUnvQK9w AX2FjaexTGgv2Cnl+sjZY2s= X-Google-Smtp-Source: ABdhPJyvFhFhGZFAm/dT6+mJaPZZyfUo5jImbnNC/uz/Ca//l3gV+dl9T1FN9XkwEqdZ6Fc21ZfBbA== X-Received: by 2002:adf:b78d:: with SMTP id s13mr3934379wre.344.1631379365845; Sat, 11 Sep 2021 09:56:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Bin Meng Subject: [PATCH v3 18/24] target/riscv: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:28 +0200 Message-Id: <20210911165434.531552-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379368798100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Reviewed-by: Bin Meng Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu.h | 2 +- target/riscv/cpu.c | 2 +- target/riscv/cpu_helper.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index bf1c899c00b..e735e53e26c 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -334,7 +334,6 @@ int riscv_cpu_write_elf32_note(WriteCoreDumpFunction f,= CPUState *cs, int cpuid, void *opaque); int riscv_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int riscv_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request); bool riscv_cpu_fp_enabled(CPURISCVState *env); bool riscv_cpu_virt_enabled(CPURISCVState *env); void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); @@ -362,6 +361,7 @@ void riscv_cpu_list(void); #define cpu_mmu_index riscv_cpu_mmu_index =20 #ifndef CONFIG_USER_ONLY +bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request); void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env); int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint32_t interrupts); uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value= ); diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1a2b03d579c..13575c14085 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -644,10 +644,10 @@ static const struct SysemuCPUOps riscv_sysemu_ops =3D= { static const struct TCGCPUOps riscv_tcg_ops =3D { .initialize =3D riscv_translate_init, .synchronize_from_tb =3D riscv_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .tlb_fill =3D riscv_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .do_interrupt =3D riscv_cpu_do_interrupt, .do_transaction_failed =3D riscv_cpu_do_transaction_failed, .do_unaligned_access =3D riscv_cpu_do_unaligned_access, diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 968cb8046f4..701858d670c 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -75,11 +75,9 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *en= v) return RISCV_EXCP_NONE; /* indicates no pending interrupt */ } } -#endif =20 bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { -#if !defined(CONFIG_USER_ONLY) if (interrupt_request & CPU_INTERRUPT_HARD) { RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; @@ -90,12 +88,9 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrup= t_request) return true; } } -#endif return false; } =20 -#if !defined(CONFIG_USER_ONLY) - /* Return true is floating point support is currently enabled */ bool riscv_cpu_fp_enabled(CPURISCVState *env) { --=20 2.31.1 From nobody Mon May 6 09:49:06 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=1631379372; cv=none; d=zohomail.com; s=zohoarc; b=iU5lLIYEucm5lBHBBiDFSY49oej57UvkxZhDOgVPy+daa7Mo+Hokd85KRM13d67RFYgxkHUr6ZpfIMwUPrTHOd9bH0241sdNUuV3LecvnkmPIUkhlAQFuUytosmyyCUlBZ+QlrYPfSgTRLMx4pqqA19j/WsmcCkekSqHB26C0u4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379372; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UtJq3N+o/FB/vJogkj3xMiVffE8zdE5GfFgTZhZFv9U=; b=WbDtns0/j4ZMUssQZ2INUp+/VT7s5aUkTn3icw+BJyjxEWi+sHa9lpHwp9sp/TusL6PpZ5rVyw8h6QAwPB4uQEQyH0iugqq27d5TpmBSLGz5B2Iyp77o44ZClropoIYo2YkX1pNLtDzqQe7KZuSnsyel12ZSf17GeJouKPXSf5s= 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 1631379372815583.104005650249; Sat, 11 Sep 2021 09:56:12 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id 196-20020a1c04cd000000b002fa489ffe1fso3719865wme.4 for ; Sat, 11 Sep 2021 09:56:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id q128sm2415301wma.27.2021.09.11.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UtJq3N+o/FB/vJogkj3xMiVffE8zdE5GfFgTZhZFv9U=; b=Jj3pZJubcki583hST9Ml4WiUPpALow/vOMXxn5XAYawBnV40NEe3Lbv3VO8WHQFoE0 U3yjryoh43IJsIM/bS7c5s60L66lA2xuuSxJOjhaG0Uhkz5ZlTtubZETEanE2Yvh3EpZ 9Y30oQCi4esU6I9Y91kjPwxw1NWEnKjdkQ62wv9pn6fwUgPGOH2WclrppGrdbsTSSLAP kNAqvkXsrDWh0gjy3NPMSo/rcdDA7IjepDbtLQ9ScW+P/uC4oOYDVSjiM8kO02FCjmOZ IGWBbDjJ+hV9BbuayjKnBM5097ECxZv24Bn2r2RpPQ4fOFTCoUVxd7S81aUy3xPD8mz7 nVGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UtJq3N+o/FB/vJogkj3xMiVffE8zdE5GfFgTZhZFv9U=; b=Op59Wd1PxeEqmSjFSMLzp4HCwh074F+qHk4Ga938Tn3OpjnLrrAch34E0Fb+p82Vdv zG7EbkBhr/JgDEkDqJyAIG2KiUUjJKuoi09ugTUEwoXeUbttRLasNKK8F6sGKf5gqQka TfjrmNCSJt3vW5uE7j7g2u6RuBXm2LR2C5UrxbwYY06ofhQ8aOykauXnigKUe62za0sj lMCtT90B4ghoUnQbJ8ohO4T/1+Df26qp8KTSAQaM4SJMFjUTGBfiO0bee4qSfaQanGGt YRbpfTppeQ7n/0NykM02KDZVyNhw0vHNRD2zI5DD0II4aw4mg+S4ZUwYxGdlXug/dDW7 upaw== X-Gm-Message-State: AOAM5305C1hcNpoWtAOTQMegZj2bzUq5S/Bw7UulvFatVHskWCEwOVQ7 ttmQ/1S3NhhdkzJ3MVY+PkIqMUHfkT4= X-Google-Smtp-Source: ABdhPJzgG56PUPSFjtbFUA/91RlH06oMeAM8Tni8zC9INHsQ7Grgo4frnIz/HLxRar1Fxxlr5hamWQ== X-Received: by 2002:a05:600c:4fc8:: with SMTP id o8mr3327597wmq.153.1631379371097; Sat, 11 Sep 2021 09:56:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 19/24] target/sh4: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:29 +0200 Message-Id: <20210911165434.531552-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379375012100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sh4/cpu.h | 4 ++-- target/sh4/cpu.c | 2 +- target/sh4/helper.c | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 01c43440822..017a7702140 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -204,8 +204,6 @@ struct SuperHCPU { }; =20 =20 -void superh_cpu_do_interrupt(CPUState *cpu); -bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req); void superh_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr superh_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int superh_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); @@ -223,6 +221,8 @@ bool superh_cpu_tlb_fill(CPUState *cs, vaddr address, i= nt size, =20 void sh4_cpu_list(void); #if !defined(CONFIG_USER_ONLY) +void superh_cpu_do_interrupt(CPUState *cpu); +bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req); void cpu_sh4_invalidate_tlb(CPUSH4State *s); uint32_t cpu_sh4_read_mmaped_itlb_addr(CPUSH4State *s, hwaddr addr); diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 83269229421..2047742d03c 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -236,10 +236,10 @@ static const struct SysemuCPUOps sh4_sysemu_ops =3D { static const struct TCGCPUOps superh_tcg_ops =3D { .initialize =3D sh4_translate_init, .synchronize_from_tb =3D superh_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D superh_cpu_exec_interrupt, .tlb_fill =3D superh_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D superh_cpu_exec_interrupt, .do_interrupt =3D superh_cpu_do_interrupt, .do_unaligned_access =3D superh_cpu_do_unaligned_access, .io_recompile_replay_branch =3D superh_io_recompile_replay_branch, diff --git a/target/sh4/helper.c b/target/sh4/helper.c index 2d622081e85..53cb9c3b631 100644 --- a/target/sh4/helper.c +++ b/target/sh4/helper.c @@ -45,11 +45,6 @@ =20 #if defined(CONFIG_USER_ONLY) =20 -void superh_cpu_do_interrupt(CPUState *cs) -{ - cs->exception_index =3D -1; -} - int cpu_sh4_is_cached(CPUSH4State *env, target_ulong addr) { /* For user mode, only U0 area is cacheable. */ @@ -784,8 +779,6 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong a= ddr) return 0; } =20 -#endif - bool superh_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { if (interrupt_request & CPU_INTERRUPT_HARD) { @@ -803,6 +796,8 @@ bool superh_cpu_exec_interrupt(CPUState *cs, int interr= upt_request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + bool superh_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr) --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379377; cv=none; d=zohomail.com; s=zohoarc; b=b2erSI0ePJfl5y6f4iEzm9Zciibq01sLTnPuc3x4tyrf3+gSDNEm26telF02Ty0oY7b700iBhnHmPUgsJWm7CK9UKgqOZS8kMeL4ZVK4Twe9ACixM55qgFeVGhPhKJr9cxzzizPSj4zGUKaspn1GWFsGHDuGLuZ7qXbz971OI0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HTLBpMUvcY2BxzZIjZoxS//8tbEgCAlf+xtbD3ElAZQ=; b=J67ijAQulZbHDoPssru+Z44UBHT0SUrJj73zkQKrZ51mbVdJ40nLc7cWBCUO8te0FTs0HUFEeCNdM8qnC4UqlSb6m3b4knxADsCBnRqphswsgn9WZyX8BScU5zJEVYBrQXcdIA4BB1VlvX5Ja4HLj6qC2yl7joyvtic7FRvY+Gc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1631379377680403.6801842315841; Sat, 11 Sep 2021 09:56:17 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id 140so6986wma.0 for ; Sat, 11 Sep 2021 09:56:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id s14sm1913896wmc.25.2021.09.11.09.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HTLBpMUvcY2BxzZIjZoxS//8tbEgCAlf+xtbD3ElAZQ=; b=b/LlVW3DhSiwv4vtUi6kR3E4BEfkT610OdllyqrQjfOqyPhC8WcRWqw/IMFEe+q6ua 2iT+miGT1UTaIl+FHImTDpllZGZejkgZoB7pCHeEeC496EFU7mPGf2FxjadSUJijNhKB +dScjGJs4L4ghaadKYIVAQiH4uqO1enr3sGyxD5oI6kYoWMpT6oZTTbT+AY0MwKOnY2h P/ojAmEbuqR5I/dltpSc5LAAPbVMDyAHtcN+Pjl0AXOqbk7LBNoDzr2Qr9vSzX/cgv5Y pL5Zmp8izpI3YO13k3LxoXfIWNyhQrV7nRmMb6tFmwXmJ4m1zyBfnbjMTZm6jekNx5Dh RxmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HTLBpMUvcY2BxzZIjZoxS//8tbEgCAlf+xtbD3ElAZQ=; b=BJwhNgWe3bFX+YuHd7c8qWaadmBaxh0JlwR2fxB289z34sKmvDs6nBwP5xRzz6rHC/ QGlBPjAva8tKFLKrSZuvhDsZOykFQ4un9a7PBNqbRjMEcjGSvpmg4cc/rDiuTAbINA/w JuN4OZGgn1HJjraBonLij4LmsQsp79OeJCLLazGjGYPVc+PeT5p05W8TgZqg6wlJsqtn gJdduCxAVLNsqY2+au/veUE3vgC1dT6BLdd8jKgJTPRp8iT2fatjr3tzokP+L/B+baCs RqdVLQOkzJ42BvF4sbUgpAQYJIrfcL7eT+/t3IwvdkMC02wfl8rqsgsOPYl/6AwXGuPr v6mQ== X-Gm-Message-State: AOAM533KXWFK0m80czgPcd4o1xsWrmP477AQLzs8mv61Mj5hClY7Dgzz 5qDk5MXP+e6Of6BCCvnf8z0= X-Google-Smtp-Source: ABdhPJwHxU0kAm+AuDowrvrYIxotU4CgV4C5OfRKcNUwvBZy5ePZ4CODF0tpBQ/1WlD5C6ZYuplMWg== X-Received: by 2002:a7b:c351:: with SMTP id l17mr3394778wmj.120.1631379375961; Sat, 11 Sep 2021 09:56:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 20/24] target/sparc: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:30 +0200 Message-Id: <20210911165434.531552-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379379154100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index da6b30ec747..5a8a4ce7506 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -77,6 +77,7 @@ static void sparc_cpu_reset(DeviceState *dev) env->cache_control =3D 0; } =20 +#ifndef CONFIG_USER_ONLY static bool sparc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { if (interrupt_request & CPU_INTERRUPT_HARD) { @@ -96,6 +97,7 @@ static bool sparc_cpu_exec_interrupt(CPUState *cs, int in= terrupt_request) } return false; } +#endif /* !CONFIG_USER_ONLY */ =20 static void cpu_sparc_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -863,10 +865,10 @@ static const struct SysemuCPUOps sparc_sysemu_ops =3D= { static const struct TCGCPUOps sparc_tcg_ops =3D { .initialize =3D sparc_tcg_init, .synchronize_from_tb =3D sparc_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .tlb_fill =3D sparc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, .do_unaligned_access =3D sparc_cpu_do_unaligned_access, --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379382; cv=none; d=zohomail.com; s=zohoarc; b=aBrYRnVKbvFdmmU1WMlWqPCmx/67dfrzsqdEQ4ES1jFUI6XJdWiG7zVK4v6EwkniMuQxu+stamOrZb8EDpxMoatPBoMvpchTK8L3HpV11mKS+aTaFD3HcssdKE0sld/tvd4s6bta+pUua3CgAsqXYJ1dYcrbaW5bk3gpWszERHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379382; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LgdMlt85/dxzemJRBccypcQeoOnrjCkyjoaKtxyctHU=; b=jg5a5c8P6dOG8+dLFFYJpZFzhxBLoHDKnCosdXAbDa4ZDwaTE8y6Y+pJ2YNM7QL2er+YU/PFFJlaNr/WQGuh+o1RlrJCJ8UBIkt3U8xdhKpdVv0eiU4vhEhjBWbIYWtd+3yObAWtXPZ7MlUq4FbO03J3iB17BkCeEoHlM6g58q4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 163137938282344.10539238653996; Sat, 11 Sep 2021 09:56:22 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id b6so7463385wrh.10 for ; Sat, 11 Sep 2021 09:56:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id n1sm2087494wrp.49.2021.09.11.09.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LgdMlt85/dxzemJRBccypcQeoOnrjCkyjoaKtxyctHU=; b=WjS0v/rxBHXUPYr5wth/E07YrNDAdjzyOoN4SIkxY89P7Rql/I2031v/UsWXEpSBdO D3Nwzd4B0HOrcFgIxf6TlVWczAuw6ewV0Xd6MO7bQfxJeVtyocs0ia8Rh9D1xbRsLHw1 MFDaDIvW3Ypmk2VtvDw+czWR0HJc8PW6gAPO1L8s5eg3IrMMt8bHC6X6jEng6oLHbtmf PUvSxgut89KyQqWdgfCPAXrnPOfVU7YERIvAkwu09Zu57wghO7ipwq+UUfYB4i3bIBGt /EUi/BNvFnvBBg05nQoDZudUmU1OcqbSjnOJTjC+3AMbyqgaN3MKF90+X1Dbx9abLkJp d9ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LgdMlt85/dxzemJRBccypcQeoOnrjCkyjoaKtxyctHU=; b=t2c1H3xCO+OR2gH8bjApJKsJMnCNUtJ+2KXdlwQqeHRWoD7RmqkdsgntVYy5qJzgeL wynyM8w1wTPK8U445JnN/LUnL8RFMnqJFwXXviHIJ/mfl45QosdrIucRnF7UoXM+trBp xkRqOlf+7l9vSsVJUeSL9KQiZQrtpsp8G5RbX3aiEEk9GQWfVRcQEtcP1CPZQSNRSg57 bCKqnZtuyRrMPm9MeIh321FEWjaU0CjC8GsQq5zKr/VWW/WpS0xWbH5w5FGrwqYRTHo4 NciPObl5JmxNca6Pz5+XaAsQNBLOWBl0cRvb/UcMET5nbPRsCBrXnZ9iQGldg2WifNMc 6I1Q== X-Gm-Message-State: AOAM5335CMIaLAjYqKVxJ24hR0dXmzlL0U9zOi59Y7D+LhKbCcU7SZmx 4E5hg9CDI86HRrLEClXEj2k= X-Google-Smtp-Source: ABdhPJywD5PAv6XlZ8uXz9X/9boNg/g3aBR9udAqB8ATQ4FClYXNJ05s4ZY3yNtGfuf+WWV5c5QSww== X-Received: by 2002:adf:dd01:: with SMTP id a1mr1956926wrm.132.1631379380999; Sat, 11 Sep 2021 09:56:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 21/24] target/rx: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:31 +0200 Message-Id: <20210911165434.531552-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379383386100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/rx/cpu.h | 2 ++ target/rx/cpu.c | 2 +- target/rx/helper.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 0b4b998c7be..faa3606f52f 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -124,8 +124,10 @@ typedef RXCPU ArchCPU; #define CPU_RESOLVING_TYPE TYPE_RX_CPU =20 const char *rx_crname(uint8_t cr); +#ifndef CONFIG_USER_ONLY void rx_cpu_do_interrupt(CPUState *cpu); bool rx_cpu_exec_interrupt(CPUState *cpu, int int_req); +#endif /* !CONFIG_USER_ONLY */ void rx_cpu_dump_state(CPUState *cpu, FILE *f, int flags); int rx_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int rx_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 96cc96e514f..25a4aa2976d 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -186,10 +186,10 @@ static const struct SysemuCPUOps rx_sysemu_ops =3D { static const struct TCGCPUOps rx_tcg_ops =3D { .initialize =3D rx_translate_init, .synchronize_from_tb =3D rx_cpu_synchronize_from_tb, - .cpu_exec_interrupt =3D rx_cpu_exec_interrupt, .tlb_fill =3D rx_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D rx_cpu_exec_interrupt, .do_interrupt =3D rx_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ }; diff --git a/target/rx/helper.c b/target/rx/helper.c index db6b07e3890..f34945e7e2c 100644 --- a/target/rx/helper.c +++ b/target/rx/helper.c @@ -40,6 +40,8 @@ void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int= rte) env->psw_c =3D FIELD_EX32(psw, PSW, C); } =20 +#ifndef CONFIG_USER_ONLY + #define INT_FLAGS (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIR) void rx_cpu_do_interrupt(CPUState *cs) { @@ -142,6 +144,8 @@ bool rx_cpu_exec_interrupt(CPUState *cs, int interrupt_= request) return false; } =20 +#endif /* !CONFIG_USER_ONLY */ + hwaddr rx_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { return addr; --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379387; cv=none; d=zohomail.com; s=zohoarc; b=H5FpYIz/fWCwg6XdkhHI1d7p9R82KNPUBUSXp86lmVsxXLN/4L1RpJlqcAXfu0qhRfTrK60uq2lVR3EEYW2AZe7jKAarbZvsU/lfZ4TuWgFu8R+bkwcN7C6x6SMoFBakYoMUTgJCurp8Xfo/xE+0s1rW8BxlmUa/D41fzFf1BvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379387; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xbkBh1p97u6mIkTKAA2kHg2qUMQVayjkKn9c7GCbY1E=; b=kGA63cx6G6BTg1XaBOT0cNLUDvpoP3t1HvbWLTPGCzxvY0N+MKYDkb6G6o9AexrkUAWZjoOd3WfvrbwSEHCYCwGBH5Ez+zEE4WGrU2fMpVXZFrufeCuLynNmbJYd1dZ2xWloQcqMNNLi6suRSnEn9jBY9OK0BKSD5eCMYQTTsjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1631379387866195.237657309655; Sat, 11 Sep 2021 09:56:27 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id d6so7462917wrc.11 for ; Sat, 11 Sep 2021 09:56:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id i5sm2142844wrc.86.2021.09.11.09.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xbkBh1p97u6mIkTKAA2kHg2qUMQVayjkKn9c7GCbY1E=; b=UQwnDSxyMweeFtj5Fa5bMASwnc0ciijB5BiX1QcWRq32P99rOHMe2Wm0neiMrxLCFz 5i5QBKkhxesx4LexCGZ5HgUuW1TfCtCU+6/zpTP2bhlGckRTJJbARJKgoX280mAGSztR YBRcybu5GhOOfJrQKebUJ5cruUs9rkF7Pz0XpupY0kvFUlglcrJu2zl4JsUv4Hxej+CS 6oi0QqGA1IwvbopD4zNjX82uaEUKYi2S82m8HA2XkyBlPilLBkx0mQX2+ZRJsxP7pMAQ B6r4tkLEW5hU4LrLUter1L5rUmJXVT69VeDeKb3y7pmk0qjqKdSWArNsyTn87IJOXXHK Nq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xbkBh1p97u6mIkTKAA2kHg2qUMQVayjkKn9c7GCbY1E=; b=ylryNkQ/wZPnjjl7qDDZFODsxn5aDgQ1ugJHClxU15q1p9FnMmrBYS9HmaerVRftKS j/PCDtI2+nBTz+u0Sr22asUQa3UeZi4jy4uWUM4ESejvtrDANNVXb8k7RWna+zxyw360 m4mWnIgsl9NiM9+PPZsKagdOvwXTjBrHCzzeaRY/f2+/vdKQrf4oHAZqrMLRFaOFChO4 aFWyCyy9mMjdMCm9P6TVaHAIGCsEwkX9TSDMeur+wV3WAMGFPi5amelMT1oT5n6JqYM7 6/JTygHKYsYM0tv1n/aIQWsKBV9ZevbhtuF9c8IRcGAE6Pv2SMmOqoRLFRbA1D/yHJ0I fAtQ== X-Gm-Message-State: AOAM530m9i63/Xpug5SHMK+DQiIGP14x/5pZC3aGnSMwwQeUucHmWkgZ FWBoj9rlTeIIuUYlzNY+15U= X-Google-Smtp-Source: ABdhPJxnsTjQLCAs34H3SwBZjFextnwAWGqT9zEzKDBdQCo68YpjZb6L+6aBlPNBehVOpCpJ5giCGA== X-Received: by 2002:a5d:4e47:: with SMTP id r7mr3902835wrt.417.1631379386058; Sat, 11 Sep 2021 09:56:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 22/24] target/xtensa: Restrict cpu_exec_interrupt() handler to sysemu Date: Sat, 11 Sep 2021 18:54:32 +0200 Message-Id: <20210911165434.531552-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379389684100001 Restrict cpu_exec_interrupt() and its callees to sysemu. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/cpu.h | 4 ++-- target/xtensa/cpu.c | 2 +- target/xtensa/exc_helper.c | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 1e0cb1535ca..cbb720e7cca 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -566,14 +566,14 @@ struct XtensaCPU { bool xtensa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); +#ifndef CONFIG_USER_ONLY void xtensa_cpu_do_interrupt(CPUState *cpu); bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request); -#ifndef CONFIG_USER_ONLY void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr= addr, unsigned size, MMUAccessType access_= type, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t reta= ddr); -#endif /* !CONFIG_USER_ONLY */ +#endif void xtensa_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); void xtensa_count_regs(const XtensaConfig *config, diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 58ec3a08622..c1cbd03595e 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -192,11 +192,11 @@ static const struct SysemuCPUOps xtensa_sysemu_ops = =3D { =20 static const struct TCGCPUOps xtensa_tcg_ops =3D { .initialize =3D xtensa_translate_init, - .cpu_exec_interrupt =3D xtensa_cpu_exec_interrupt, .tlb_fill =3D xtensa_cpu_tlb_fill, .debug_excp_handler =3D xtensa_breakpoint_handler, =20 #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt =3D xtensa_cpu_exec_interrupt, .do_interrupt =3D xtensa_cpu_do_interrupt, .do_transaction_failed =3D xtensa_cpu_do_transaction_failed, .do_unaligned_access =3D xtensa_cpu_do_unaligned_access, diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c index 10e75ab070d..9bc7f50d355 100644 --- a/target/xtensa/exc_helper.c +++ b/target/xtensa/exc_helper.c @@ -255,11 +255,6 @@ void xtensa_cpu_do_interrupt(CPUState *cs) } check_interrupts(env); } -#else -void xtensa_cpu_do_interrupt(CPUState *cs) -{ -} -#endif =20 bool xtensa_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { @@ -270,3 +265,5 @@ bool xtensa_cpu_exec_interrupt(CPUState *cs, int interr= upt_request) } return false; } + +#endif /* !CONFIG_USER_ONLY */ --=20 2.31.1 From nobody Mon May 6 09:49:06 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=1631379393; cv=none; d=zohomail.com; s=zohoarc; b=fecODDkZXFm/s59stgL4r473HU8HCVtQGUW+1mQ5lzKITGtoovzX4juKzaZdl+6fPMyW1Fn/c1QYh3QFKDwgxV31IVxECXxYmzWLpv+oz+8ekgsUrXWwxSKm7Qu/hWfdfim4VBGJX4UCNNRPPZkg7/ShI4XV/VJiJdDv8ahKZZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379393; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JWKBtEMqz5hUsAPJr5foR0KE5eQgXFRtLCwxDOixiMc=; b=HEB23naedVVytHqDYpl8mAuqKZadHCJhiVBR55NXgnh7v8wKp48M9Vp+idVPbZ9MPvWiJUZ8Z8r13VWKA9kHSyx5gnicNfh6gzb0wrjFnRxecDwYuIDNTuzVPcWuIfI/6/QCh1bK0dKpKg7GTCZxAe7DNEMfLaCN7401x6Y0t8Y= 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 1631379393409452.99324129647096; Sat, 11 Sep 2021 09:56:33 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id d6so7463139wrc.11 for ; Sat, 11 Sep 2021 09:56:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id g9sm2082333wmg.21.2021.09.11.09.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JWKBtEMqz5hUsAPJr5foR0KE5eQgXFRtLCwxDOixiMc=; b=e+qje1cuNCCYtVs3KdwRTIkK5ZSjpTp6BMpUs7GfwGUUqy9HrXZS9daBZrcx5mI4ok OENU+npl3zj6/dVuVcRYhUhAqDhVjmXp38eSUE86vftr3VWxgvw7Q94BDdlUMdjz/T30 sk6eAXeNxKSC3DpwPB9v00vTQM5zhDHwUwtkhnEsxaVdZYFZaLiAWVDAiKpjK3NHzcNK 5VUdN4o84R9/XMFwwevHfp65f/Qj4JGPgiCKMnhlEzBWD6sTGjLfVBwUbLbuuA7HtwGe 7Q4eJhIaNer4ZGDHhqI9N5OoxAwx/cAPC3daT2WQddta09UaQuuE83Y6iGvX66IPSIxZ dE6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JWKBtEMqz5hUsAPJr5foR0KE5eQgXFRtLCwxDOixiMc=; b=yewJEffk9plAzfifmtXB0rhRblbL/cJEAVo6YpXFNx+Bf9vwwvp7j8EB17+EqysBfU 5gfRVZZxfystSPTza7lUqRMj5vApGzc9XZ/WFdURAuzgJ2kB4iZGq8XdMBwDCrhJc8BX mglpae1XkncjwjbjLSo0RjhZXiP2IQ6GwPzuUD9TueNphNFAx7oqJLLfPdSkcob2AHBR 1VoXs0ImpSxJygPX8WcL3IWoffrUpKtahMwdNC9UNHOPTVXpCLDIYFSntGLz1sZbLPko PnPmNqTB7sw10RcTuD9JEQ4l3aW7eBxUKa/LQsOlrjEdk2Dpb9zFltJudRYRdtdaNiid uhFw== X-Gm-Message-State: AOAM530rOxVWRfzhaNQeRM5Lz9lzePW9o1eKEsJTsmUs16pJGeTkVJoP qEvz7azkwF3IwxSBrQBxVG4= X-Google-Smtp-Source: ABdhPJy+XHF69mbQsLLAtV7bZsAkSniKDt5sTjSzxp9SGCwJ2i2TA2ouRs1eUod+YbkkquNP91rP9g== X-Received: by 2002:adf:fd03:: with SMTP id e3mr3900306wrr.46.1631379391724; Sat, 11 Sep 2021 09:56:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 23/24] accel/tcg: Restrict TCGCPUOps::cpu_exec_interrupt() to sysemu Date: Sat, 11 Sep 2021 18:54:33 +0200 Message-Id: <20210911165434.531552-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379393845100001 All targets call TCGCPUOps::cpu_exec_interrupt() from sysemu code. Move its declaration to restrict it to system emulation. Extend the code guarded. Restrict the static inlined need_replay_interrupt() method to avoid a "defined but not used" warning. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/tcg-cpu-ops.h | 4 ++-- accel/tcg/cpu-exec.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 6c7ab9600ba..55123cb4d22 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -35,8 +35,6 @@ struct TCGCPUOps { void (*cpu_exec_enter)(CPUState *cpu); /** @cpu_exec_exit: Callback for cpu_exec cleanup */ void (*cpu_exec_exit)(CPUState *cpu); - /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ - bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** * @tlb_fill: Handle a softmmu tlb miss or user-only address fault * @@ -68,6 +66,8 @@ struct TCGCPUOps { void (*do_interrupt)(CPUState *cpu); #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU + /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ + bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** * @do_transaction_failed: Callback for handling failed memory transac= tions * (ie bus faults or external aborts; not MMU faults) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 2838177e7f0..75dbc1e4e33 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -685,6 +685,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, = int *ret) return false; } =20 +#ifndef CONFIG_USER_ONLY /* * CPU_INTERRUPT_POLL is a virtual event which gets converted into a * "real" interrupt event later. It does not need to be recorded for @@ -698,12 +699,11 @@ static inline bool need_replay_interrupt(int interrup= t_request) return true; #endif } +#endif /* !CONFIG_USER_ONLY */ =20 static inline bool cpu_handle_interrupt(CPUState *cpu, TranslationBlock **last_tb) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); - /* Clear the interrupt flag now since we're processing * cpu->interrupt_request and cpu->exit_request. * Ensure zeroing happens before reading cpu->exit_request or @@ -725,6 +725,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, qemu_mutex_unlock_iothread(); return true; } +#if !defined(CONFIG_USER_ONLY) if (replay_mode =3D=3D REPLAY_MODE_PLAY && !replay_has_interrupt()= ) { /* Do nothing */ } else if (interrupt_request & CPU_INTERRUPT_HALT) { @@ -753,12 +754,14 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, qemu_mutex_unlock_iothread(); return true; } -#endif +#endif /* !TARGET_I386 */ /* The target hook has 3 exit conditions: False when the interrupt isn't processed, True when it is, and we should restart on a new TB, and via longjmp via cpu_loop_exit. */ else { + CPUClass *cc =3D CPU_GET_CLASS(cpu); + if (cc->tcg_ops->cpu_exec_interrupt && cc->tcg_ops->cpu_exec_interrupt(cpu, interrupt_request)) { if (need_replay_interrupt(interrupt_request)) { @@ -777,6 +780,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, * reload the 'interrupt_request' value */ interrupt_request =3D cpu->interrupt_request; } +#endif /* !CONFIG_USER_ONLY */ if (interrupt_request & CPU_INTERRUPT_EXITTB) { cpu->interrupt_request &=3D ~CPU_INTERRUPT_EXITTB; /* ensure that no TB jump will be modified as --=20 2.31.1 From nobody Mon May 6 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631379398; cv=none; d=zohomail.com; s=zohoarc; b=EpQwu4jm/Z39J1tDD8203ZBUnGmf5QpIhyuYw5whZXth//9kBJuPg5s6DeMpnnoNXwYNjKGK6+b/aJoq0WOIhA5eTWfN5tssOtkWw6WPix8RehSuZ/k1Lj89rpxALCj0SSQqKBXI78fOpYfFqdBe+3gM/zokc4GGD7jLTZyrK6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631379398; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nAFz6uvNO4/9EYWu5DXduJISoPxs8WbCdajWsYkTN9U=; b=dfEchcMLf7C5YVgh9iQnNbNbDXwWoxF10HJSozjsTnoQBi4/H7X+KMzttgDdNkgAhckVkqeBDfYw8l6c0iO4l+Z9h4cLQ6nYKswI4eSc+4U8xMioN+g45eE/hpEMplcHsRfZLDnTftHD+9+OD95wf0b0qYhjpmKHfGa1qSIUgC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1631379398311330.2896540242032; Sat, 11 Sep 2021 09:56:38 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id b6so7464049wrh.10 for ; Sat, 11 Sep 2021 09:56:37 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id l3sm1977278wms.4.2021.09.11.09.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Sep 2021 09:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nAFz6uvNO4/9EYWu5DXduJISoPxs8WbCdajWsYkTN9U=; b=FC9yc79mpkX9Z48izAMhm2ukvfK95DoTM20mE2x/WD0DMdj4fD1Bl0eomnNdiZH9Xh FqRpxUjMC128ef0fNdt+RLiLouA7ll7RGzvqgF67Y5y8MOjRclQhcz3Gtt0J2KjLDp0Z IyEV3gBbH/ZMqrNTOz+0aoN3oBItEu6MuSIWYE5Bp41jmNtIJU58VaRLmfXK7s+FDjXk yJc9W0a+Lq1Clj9K47IYsgsqErCcxTXgsu5a4vhwAQjnToJS+2FD6iafng8V7aBlYGOR XF/Nmyei5ij0gpDoVRdlpgxsLWI3QaqAdovh6SPhckl25PnEujGC2Vsv/2cF1ytY/XX5 Z/og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nAFz6uvNO4/9EYWu5DXduJISoPxs8WbCdajWsYkTN9U=; b=EkEJ/XklQIeq0YCIIPH9EqTIrBmohqZNnJyXGBMOe1FtDkZJHyL07B2SXp/TrwsLXd WIhLtMSkHxu7c/KXYQAPoHijzlcCcsLviCBvdyuHwhXuC3SIuiw3GD5jv/URTZ3FAoEs JXxXZ/cTeVSVLXuEHo8QEfBNFZMPmkXdJyq3p20K/4PvPBAl6bGnuELUbP8Se/GquGiH MkqliUqtgCZsEo1Hg+Fhi9GVr0R+G2YiclYmaYFgIecTis4GX1Etea2IRVjwlh8obVDZ LQGmyDm1Cq82N1D2NTlD3B7p9RAuhkuwPxUMrfsFaqzOPc0HuGsXqDfKGVXu32xw1E1y FZUw== X-Gm-Message-State: AOAM533Icb7u+Q1318KXZLT4KFCmYVHRXdjvCHOQsn6x9F3F+/nWr7vA yX9tYrPx0FhbubK6XsoJlBY= X-Google-Smtp-Source: ABdhPJwsvGd/4V668UVQkVkX2A7YUCQ8PYUz5Lq9qq+qk3q/kvyKZJb72zlYXRx0zOghI8/i00xqlQ== X-Received: by 2002:adf:b789:: with SMTP id s9mr3870061wre.315.1631379396644; Sat, 11 Sep 2021 09:56:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Subject: [PATCH v3 24/24] user: Remove cpu_get_pic_interrupt() stubs Date: Sat, 11 Sep 2021 18:54:34 +0200 Message-Id: <20210911165434.531552-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210911165434.531552-1-f4bug@amsat.org> References: <20210911165434.531552-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) X-ZM-MESSAGEID: 1631379400055100001 cpu_get_pic_interrupt() is now unreachable from user-mode, delete the unnecessary stubs. Reviewed-by: Warner Losh Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.h | 2 +- bsd-user/i386/target_arch_cpu.c | 5 ----- bsd-user/x86_64/target_arch_cpu.c | 5 ----- linux-user/main.c | 7 ------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index c241bc183d2..c7cc65e92d5 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1832,9 +1832,9 @@ int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t= *buf, int reg); void x86_cpu_list(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); =20 +#ifndef CONFIG_USER_ONLY int cpu_get_pic_interrupt(CPUX86State *s); =20 -#ifndef CONFIG_USER_ONLY /* MSDOS compatibility mode FPU exception support */ void x86_register_ferr_irq(qemu_irq irq); void fpu_check_raise_ferr_irq(CPUX86State *s); diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cp= u.c index 71998e5ba56..d349e452997 100644 --- a/bsd-user/i386/target_arch_cpu.c +++ b/bsd-user/i386/target_arch_cpu.c @@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env) return cpu_get_host_ticks(); } =20 -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} - void bsd_i386_write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags) { diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arc= h_cpu.c index db822e54c66..be7bd107200 100644 --- a/bsd-user/x86_64/target_arch_cpu.c +++ b/bsd-user/x86_64/target_arch_cpu.c @@ -33,11 +33,6 @@ uint64_t cpu_get_tsc(CPUX86State *env) return cpu_get_host_ticks(); } =20 -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} - void bsd_x86_64_write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags) { diff --git a/linux-user/main.c b/linux-user/main.c index a6094563b6b..45bde4598d5 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -120,13 +120,6 @@ const char *qemu_uname_release; by remapping the process stack directly at the right place */ unsigned long guest_stack_size =3D 8 * 1024 * 1024UL; =20 -#if defined(TARGET_I386) -int cpu_get_pic_interrupt(CPUX86State *env) -{ - return -1; -} -#endif - /***********************************************************/ /* Helper routines for implementing atomic operations. */ =20 --=20 2.31.1