From patchwork Fri Oct 1 17:11:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515079 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp1015971jaf; Fri, 1 Oct 2021 10:36:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe6WWeqMUFOK2tddl0NJgst4bnYta2sXSDJcltYVP5+7skNY1etjUdczi2DnlemkCNtxji X-Received: by 2002:ab0:319a:: with SMTP id d26mr11322527uan.102.1633109799769; Fri, 01 Oct 2021 10:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633109799; cv=none; d=google.com; s=arc-20160816; b=Tb80Rq3f7fW9GHH1cKvY/5DYR66aVZpK2aCdiIyt9XjRCpbyeNJwko0LAbOy91Qpt5 UwCp7hmtSCABXoxikMCRrH1duFwUSb7EtYvYLsVoDbt08wWpAgHOeMqTfP8KNo6XRPVe fnN55zdcodDdtuSXi8lNN2ZqGEnOanX77HBybecl5HYrk6851A+5rP4Wcgsd0mP/Wi1p qP1lUUzmlZ8J5s1gRm6gxA+cz7Jvgl9bYPRAIfUtMQFNVcMSI7hWx5Xlny06Pb+NlZKa g83HgqrLhNy/7nPzpjYzpgG6PLmR14pEAkxmj2ZzzHpIrsmhGKqa+Y2Hte3oxDfnEs3L G5Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eeVnsYGPYAHebpgHrC5W3wwVNSfsNcsD0o1AtI7xBGA=; b=NRSlMfr1BDkpNJ26VfEjVFYGsyh7Av4PQL1yXN8Ifx5NrUngUFMBUnSDjj6FAOQD4r CPbm8uNGcUBzo7yV6kz0VFiyqEXm72QtIuHOqPw2QwKx6kD/WtBqFCbd3E8jlIPsV3AD d7kuwuN7jU8cVrY+j08S6f0JLVCmKuH8OcJY7jKNWrBUufp41b1SoBaxFMuShCYNse1w lhkAKTx6LwzSOd2z8bFWEuzRDXv3zB7NcihiFWMwuGv8kd0+0zwbbxAtcEjhDQpNjF1e cItCS16RiTU6c3/iUdvB0BEdFVwbJd013kR4AwHdMw6f4dhNr5Hg0v/kqbfnhpXrPzCO 2vaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CLcl0fmU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r1si1707651uaw.211.2021.10.01.10.36.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Oct 2021 10:36:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CLcl0fmU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWMSd-0003Yn-17 for patch@linaro.org; Fri, 01 Oct 2021 13:36:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWM53-00051R-Lb for qemu-devel@nongnu.org; Fri, 01 Oct 2021 13:12:17 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:40673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWM51-0005Bm-6m for qemu-devel@nongnu.org; Fri, 01 Oct 2021 13:12:17 -0400 Received: by mail-qt1-x834.google.com with SMTP id b16so9624091qtt.7 for ; Fri, 01 Oct 2021 10:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eeVnsYGPYAHebpgHrC5W3wwVNSfsNcsD0o1AtI7xBGA=; b=CLcl0fmUQ3wSGr/VMjEUqbNgm26UVqUT8ER6rVWFVVONZDp/1TePOgg8Qnp1iIogTE hXbiRiMOxpoHS03O/xsf8jNNU1hMchvl+pCTWqs//+sjW0g9RiDCUbmMTG4kcxxGS7zl gCEHXBKoxWjdkYPXJa0oPTCjgTDe9OtflqzDZ9zc6gXzzXLy1VmwFOAty4ooQxSjaurk hbVk4NQBgruJazkYotkopLp0qupec1u+SeGWxGIenI86YiWM8Z2hicJVlenXaR4jowhN ZhEVSd7LLIHhZs7+w3hITpWi2Em4eEVTAJY3f62bgJ3w3Ya3D9nMNtZdQlDv2e6VWRMX O7hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eeVnsYGPYAHebpgHrC5W3wwVNSfsNcsD0o1AtI7xBGA=; b=HO0XJyJTBKBp7X/36xI6lKE9tYFvVhVSSo4iqm3HhJNlFWF1xnaIZLVfG48Yye82lr csW9fmt/+bLYor7mZR9IP+vtPrmJDWLrbl0qpvfBT6oy9sooon+/a06sishdC8qqeJua AKnc1jiIOUgkQFSVrCT/04uVLrp/75p3MqPw33FIQL4YCOdN5iy3WZwk2rCAR1SftVZB YIDPOuFMJ0SN58F38iJJH7AH74vz4NHXGB9RugjR0rTMqQxdvFpf1n80qZE95R7uqtuC o4o3Vh8u41BCM5AvFur7W1ns3XGUmj5OA1NEH2FC60y95vqtLZ0F5cymSXagU72eNr9P Fc4Q== X-Gm-Message-State: AOAM532REFifN5o/0VMsHzPYcqaK6p+4hQh6QaSUe1cKGLlc0y6tyEZy F9bQdWk608ngdFoWV9OC8kj4yEtfwwn9aA== X-Received: by 2002:ac8:764a:: with SMTP id i10mr13887145qtr.414.1633108334250; Fri, 01 Oct 2021 10:12:14 -0700 (PDT) Received: from localhost.localdomain (c-67-174-166-185.hsd1.ga.comcast.net. [67.174.166.185]) by smtp.gmail.com with ESMTPSA id y15sm3557250qko.78.2021.10.01.10.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:12:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 24/41] target/cris: Make cris_cpu_tlb_fill sysemu only Date: Fri, 1 Oct 2021 13:11:34 -0400 Message-Id: <20211001171151.1739472-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211001171151.1739472-1-richard.henderson@linaro.org> References: <20211001171151.1739472-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::834; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x834.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , alex.bennee@linaro.org, laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The fallback code in raise_sigsegv is sufficient for cris-linux-user. Remove the code from cpu_loop that handled the unnamed 0xaa exception. This makes all of the code in helper.c sysemu only, so remove the ifdefs and move the file to cris_softmmu_ss. Cc: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/cris/cpu.h | 8 ++++---- linux-user/cris/cpu_loop.c | 10 ---------- target/cris/cpu.c | 4 ++-- target/cris/helper.c | 18 ------------------ target/cris/meson.build | 7 +++++-- 5 files changed, 11 insertions(+), 36 deletions(-) -- 2.25.1 diff --git a/target/cris/cpu.h b/target/cris/cpu.h index 6603565f83..b445b194ea 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -189,6 +189,10 @@ extern const VMStateDescription vmstate_cris_cpu; void cris_cpu_do_interrupt(CPUState *cpu); void crisv10_cpu_do_interrupt(CPUState *cpu); bool cris_cpu_exec_interrupt(CPUState *cpu, int int_req); + +bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); #endif void cris_cpu_dump_state(CPUState *cs, FILE *f, int flags); @@ -251,10 +255,6 @@ static inline int cpu_mmu_index (CPUCRISState *env, bool ifetch) return !!(env->pregs[PR_CCS] & U_FLAG); } -bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size, - MMUAccessType access_type, int mmu_idx, - bool probe, uintptr_t retaddr); - /* Support function regs. */ #define SFR_RW_GC_CFG 0][0 #define SFR_RW_MM_CFG env->pregs[PR_SRS]][0 diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c index b9085619c4..0d5d268609 100644 --- a/linux-user/cris/cpu_loop.c +++ b/linux-user/cris/cpu_loop.c @@ -37,16 +37,6 @@ void cpu_loop(CPUCRISState *env) process_queued_cpu_work(cs); switch (trapnr) { - case 0xaa: - { - info.si_signo = TARGET_SIGSEGV; - info.si_errno = 0; - /* XXX: check env->error_code */ - info.si_code = TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr = env->pregs[PR_EDA]; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - break; case EXCP_INTERRUPT: /* just indicate that signals should be handled asap */ break; diff --git a/target/cris/cpu.c b/target/cris/cpu.c index c2e7483f5b..ed6c781342 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -205,9 +205,9 @@ static const struct SysemuCPUOps cris_sysemu_ops = { static const struct TCGCPUOps crisv10_tcg_ops = { .initialize = cris_initialize_crisv10_tcg, - .tlb_fill = cris_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .tlb_fill = cris_cpu_tlb_fill, .cpu_exec_interrupt = cris_cpu_exec_interrupt, .do_interrupt = crisv10_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -215,9 +215,9 @@ static const struct TCGCPUOps crisv10_tcg_ops = { static const struct TCGCPUOps crisv32_tcg_ops = { .initialize = cris_initialize_tcg, - .tlb_fill = cris_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .tlb_fill = cris_cpu_tlb_fill, .cpu_exec_interrupt = cris_cpu_exec_interrupt, .do_interrupt = cris_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ diff --git a/target/cris/helper.c b/target/cris/helper.c index 36926faf32..a0d6ecdcd3 100644 --- a/target/cris/helper.c +++ b/target/cris/helper.c @@ -39,22 +39,6 @@ #define D_LOG(...) do { } while (0) #endif -#if defined(CONFIG_USER_ONLY) - -bool cris_cpu_tlb_fill(CPUState *cs, vaddr address, int size, - MMUAccessType access_type, int mmu_idx, - bool probe, uintptr_t retaddr) -{ - CRISCPU *cpu = CRIS_CPU(cs); - - cs->exception_index = 0xaa; - cpu->env.pregs[PR_EDA] = address; - cpu_loop_exit_restore(cs, retaddr); -} - -#else /* !CONFIG_USER_ONLY */ - - static void cris_shift_ccs(CPUCRISState *env) { uint32_t ccs; @@ -304,5 +288,3 @@ bool cris_cpu_exec_interrupt(CPUState *cs, int interrupt_request) return ret; } - -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/cris/meson.build b/target/cris/meson.build index 67c3793c85..c1e326d950 100644 --- a/target/cris/meson.build +++ b/target/cris/meson.build @@ -2,13 +2,16 @@ cris_ss = ss.source_set() cris_ss.add(files( 'cpu.c', 'gdbstub.c', - 'helper.c', 'op_helper.c', 'translate.c', )) cris_softmmu_ss = ss.source_set() -cris_softmmu_ss.add(files('mmu.c', 'machine.c')) +cris_softmmu_ss.add(files( + 'helper.c', + 'machine.c', + 'mmu.c', +)) target_arch += {'cris': cris_ss} target_softmmu_arch += {'cris': cris_softmmu_ss}