From nobody Tue Feb 10 14:33:21 2026 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