From nobody Thu Apr 25 11:02:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618763569; cv=none; d=zohomail.com; s=zohoarc; b=V0MRlIzlZ5nOIfBlY8jvC1oDYRzftZ96Q/p8dNFkUrXCHnChAaUBdt5nQL5swhhwLGM6SU7q+vIgTqVXvQtumfdsppEDWVp7V1KDFLkrXPZ9odIg/p+4pYHx5pIezvMqCWGTKtWWaI/EobktWTS64EFGY1Lf0y6KdiZIRirTT6Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618763569; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cI4PhTSssBzprnZ9SB2PDNkaKKDmK+zR2mUB8dIm1f8=; b=Nb41CTsD0YhOI3XlvFLvomMYz921JpfBmC0lMXP8TBGkwSR4T2U1lb0TcaqHvU9JQw0dZ1ODvffKnTTLrKoacn0WDvoydu2IN53A75zRQBLdWUAtcBg8a4J36ryDyHNT6adhkw4gUgo0Bw0YVVU/6kQH0wBrWa+8AYwPNFkyS+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1618763569879103.8630847337198; Sun, 18 Apr 2021 09:32:49 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id x7so31477136wrw.10 for ; Sun, 18 Apr 2021 09:32:49 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id q10sm16652158wmc.31.2021.04.18.09.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 09:32:47 -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=cI4PhTSssBzprnZ9SB2PDNkaKKDmK+zR2mUB8dIm1f8=; b=KEKbRbsa2f2G22Y2inuzubP5Eq/wiREfvKZDs5nl+LGGmOtvXfpiKMvD3dhkxdfOn5 IM9YbT9Nr7QPRRvOJJzHe9++Mnu/GBwK/xOW4SXBS3N8IQsyhH0ZsvT44PrdHDpasHxC euwJ8l9iAC2vdPf26TK8DfuLnaRImeTYZBsmHxOmRbIotHAK5AAKxiBBdN77KIz10Efg L9Mep61Ag9SpKDc/DgPXSMdjIznf2xvziZLGyRpUjZY+PnpI8+a9F7rb0SVEBD48ilxP T4LHU05YEXIuUTetq2svLRBdktyy5l0Cl7YGCRoYeX4P9D6io70XHrHjr/OtyjHsBLBg yJug== 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=cI4PhTSssBzprnZ9SB2PDNkaKKDmK+zR2mUB8dIm1f8=; b=R16aN/jUOxCRPvJu8hh8cGo1qVslUddxJwZBjEetv+VtM1ltl8p32Na2dxe0o2fbgd qGbq+8KdlLiumoqtux8ASS+jcG+4kafXDJjv74gv+M7SiPUnwwdJHoFZv4vZ6ygHL501 ldKiZRDdQUlZN66kKOet7Z6wWkb5G+oN1ONPXv22wGIC9ZQc/M6IijVQsIByeellzTs4 fkD1O63jvqXZahRhScMQe8vnmigZjTdmxEmp4DdLT2jwvVc3aQesWXvuPMLQtycpFFqX 3myXOxFP0PPYxag4q6D5kyNLFidMuIof9HpOkBRdXQxN712XkHw68Tli5/C0FE5xdRpX J50w== X-Gm-Message-State: AOAM533z9YaMHLSGKam17HMzjQhi+Fj/YtvTY1+R+5JxZDkL5HOctQAO KfY4DePF2hUtAT9x9vOwcrY= X-Google-Smtp-Source: ABdhPJz/QVJzcwROUFOwqZt6enXpMGm7isC084naZPNds8n1/BxnuQxhsSyadI+BUxhqdEoqqbxeqw== X-Received: by 2002:a5d:590d:: with SMTP id v13mr9661732wrd.85.1618763568242; Sun, 18 Apr 2021 09:32:48 -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: Huacai Chen , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Richard Henderson , Aurelien Jarno Subject: [PATCH 15/26] target/mips: Restrict mmu_init() to TCG Date: Sun, 18 Apr 2021 18:31:23 +0200 Message-Id: <20210418163134.1133100-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418163134.1133100-1-f4bug@amsat.org> References: <20210418163134.1133100-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) mmu_init() is only required by TCG accelerator. Restrict its declaration and call to TCG. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/internal.h | 3 --- target/mips/tcg/tcg-internal.h | 2 ++ target/mips/cpu.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 59c2c22cd0a..13f8e421662 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -233,9 +233,6 @@ void cpu_mips_store_compare(CPUMIPSState *env, uint32_t= value); void cpu_mips_start_count(CPUMIPSState *env); void cpu_mips_stop_count(CPUMIPSState *env); =20 -/* helper.c */ -void mmu_init(CPUMIPSState *env, const mips_def_t *def); - static inline void restore_pamask(CPUMIPSState *env) { if (env->hflags & MIPS_HFLAG_ELPA) { diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index b65580af211..70655bab45c 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -20,6 +20,8 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int s= ize, =20 #if !defined(CONFIG_USER_ONLY) =20 +void mmu_init(CPUMIPSState *env, const mips_def_t *def); + void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagema= sk); =20 uint32_t cpu_mips_get_random(CPUMIPSState *env); diff --git a/target/mips/cpu.c b/target/mips/cpu.c index ac38a3262ca..bfc927dd9cd 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -718,7 +718,7 @@ static void mips_cpu_realizefn(DeviceState *dev, Error = **errp) =20 env->exception_base =3D (int32_t)0xBFC00000; =20 -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) mmu_init(env, env->cpu_model); #endif fpu_init(env, env->cpu_model); --=20 2.26.3