From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8027C433B4 for ; Mon, 19 Apr 2021 19:46:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E728611EE for ; Mon, 19 Apr 2021 19:46:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E728611EE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYZqW-0002Zg-1t for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 15:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYZR6-0007xf-8J for qemu-devel@nongnu.org; Mon, 19 Apr 2021 15:19:56 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYZR4-0001Yp-O8 for qemu-devel@nongnu.org; Mon, 19 Apr 2021 15:19:55 -0400 Received: by mail-wm1-x32e.google.com with SMTP id q123-20020a1c43810000b029012c7d852459so62386wma.0 for ; Mon, 19 Apr 2021 12:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rY6VYM7f58OgaMu7C4YgNya0LNZ6XdqytCqkxZNzGbo=; b=NRKjt5RlcXEuExTKiEy+99GWcx/cHYLzC5BxEVhLfboQS9tjzvtaR+G/dASuPMuYmR tBOV0n8jv0uI6BGmaSKnw5MAxCALKh3VkwT6hXWG1EeuqXVdwX0hnzxXULhutPkZb9jS K0PMyXysGKltcwKYrGl4fpggqm/vOyz+JoKJh6G9iPa9m8D6oJQHQBe+SasTImja3/6Q CrCc5mR8oJyvCd6hG2JD8lxbGVd1giPYcHH2QMYmS25E1AHIP3yQMqkJ78qP4Z6Yz/XJ VY8yOnrb5yJbYIjprDZGLOsHRiGf1RnYQbRRvwsOdtE/I+FK0HFhznPjig988qzrA0aD 3AzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rY6VYM7f58OgaMu7C4YgNya0LNZ6XdqytCqkxZNzGbo=; b=AA3TJLQmTwjObtIqZVjIJvMMfbk0fkgKxfyWQ+iQgIcLN7G/AlpFuovIJ07Bm9MHxU wlTndH9zfjacWMUR9AJm3xjjRTatAd6dBwlGjalzYtT0KKU2pvmT0oYB7dMBnZ/N/5rh JaeE5UnLN002PInMQ+yxGCb52NfeJun3YoWVPkGAML0jj7/Jwc8rua8DvF1d+6BMnuiN u0lVH5zih+3gQMcjtWUtaZjPXEcq24Er9SMDIcrTutH6g3oP0GJ78ylQUenGk26a41q/ q7KjZUfQnEfy6q4ntA+vCV8Ko7MPM3jSOcKciDP0p5W4lvkWg6zfNYFrJFU3vh95SL1n C26g== X-Gm-Message-State: AOAM5315iDlYqnyc3dqUK/sKHkBQPUwoQAgVZvzemXLY6QkA+Pe4JoJI d67dRu73scrqPFphw2kZoi3/xzJ5gbHWbQ== X-Google-Smtp-Source: ABdhPJxqP2fBOp2WSiuMdSuffzEUNfcu4pHvd9hSi983jKWbnq8WeAVO3MHRv3z0UHDarTXvye8TIA== X-Received: by 2002:a05:600c:219a:: with SMTP id e26mr562258wme.13.1618859993234; Mon, 19 Apr 2021 12:19:53 -0700 (PDT) Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id r22sm513905wmh.11.2021.04.19.12.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 12:19:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 18/30] target/mips: Restrict cpu_mips_get_random() / update_pagemask() to TCG Date: Mon, 19 Apr 2021 21:18:11 +0200 Message-Id: <20210419191823.1555482-19-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210419191823.1555482-1-f4bug@amsat.org> References: <20210419191823.1555482-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Aleksandar Rikalo , Huacai Chen , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- target/mips/internal.h | 4 ---- target/mips/tcg/tcg-internal.h | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 5e9228db3f1..0bce0950b2c 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -165,7 +165,6 @@ void r4k_helper_tlbr(CPUMIPSState *env); void r4k_helper_tlbinv(CPUMIPSState *env); void r4k_helper_tlbinvf(CPUMIPSState *env); void r4k_invalidate_tlb(CPUMIPSState *env, int idx, int use_extra); -uint32_t cpu_mips_get_random(CPUMIPSState *env); void mips_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, @@ -237,9 +236,6 @@ void cpu_mips_stop_count(CPUMIPSState *env); /* helper.c */ void mmu_init(CPUMIPSState *env, const mips_def_t *def); -/* op_helper.c */ -void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); - static inline void mips_cpu_set_error_pc(CPUMIPSState *env, target_ulong error_pc) { diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 24438667f47..b65580af211 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -11,10 +11,19 @@ #define MIPS_TCG_INTERNAL_H #include "hw/core/cpu.h" +#include "cpu.h" void mips_cpu_do_interrupt(CPUState *cpu); bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); +#if !defined(CONFIG_USER_ONLY) + +void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); + +uint32_t cpu_mips_get_random(CPUMIPSState *env); + +#endif /* !CONFIG_USER_ONLY */ + #endif -- 2.26.3