From nobody Tue Feb 10 07:43:07 2026 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=1619972216; cv=none; d=zohomail.com; s=zohoarc; b=kWHa0h4F3pt8O9LYzfAElyFjEXedHze/vVoMRRnVyXMlJotbJTA8PVdUMU485PdIgpnFk0mgeNM9KG2sOAhV9D8PLZMjNulUUk9bnKkCFU2Qqk7PZD6CAhg7f1JiVQAuH3WHm19+CVftWBCntqqetU0Itx/2oH0Bv/KJe58nW3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619972216; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SAjsdRT6m+/gb9YjtjeiORJfX3lsELt6a2iqeSZGiwI=; b=d8r4ShTtzVNsOYKBcPXT26m+VGXI4jCsMq7Qn10nEAhgpt3V+slnDADXzzMVXJ8e//cMfehL2qOmKfu8FLG+T9E9DkyrsIMMv4O9zDKz9fBoRppSwAEZPRXczBgfhRITI56LopNzHaKXA04x3uy5rXNKNdBR0U45tfWNwMbbK1g= 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 1619972216606421.9891902064629; Sun, 2 May 2021 09:16:56 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id v12so3092926wrq.6 for ; Sun, 02 May 2021 09:16:55 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id a2sm9894505wrt.82.2021.05.02.09.16.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 09:16:53 -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=SAjsdRT6m+/gb9YjtjeiORJfX3lsELt6a2iqeSZGiwI=; b=XjipVA66tmQ4OSa+3+g8g2YFcbKzAbSD74lHtglef11Z9zIgeZoZnbAN0rzGjK+tkL +JpLtFrwryWu3QuLsVcVP5aejivVYF51wC7B91Ty2iV9xcuPsX2X0e3Tv+hW/FtP49aY mNwbT6/fYSEy4BurpcpaM9/FPsBHlPEbxCF6wq+YEUnq1DDy1A8cFP83+UomODEV87GT m2wFDIFvWcgRfKw7oTIE8pu2+8SN4mXK8o734kpmlNS21rgFEW3GtbWA2KjQKZNTsMEr 2qk8ejPmxACdXIQDq9m/QHV5HT/e+fU/pYwRLg+AR5R7PJuTwZbjczBLgyFQ6s9Z6pHK An7w== 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=SAjsdRT6m+/gb9YjtjeiORJfX3lsELt6a2iqeSZGiwI=; b=nMWF732zcf56zfnet0jRYx2mlIoJqsUdX3PP+3+9KYA4+6oxpav9K1Yq2kfQzYhtnC IAvpXmN4M4E5VXy/jS6UgKO12lUAFWUQr/1a1TXpP9ej/dYSxhVUP4XsRO5YpOVLHu7z 2myikIR4Sr2YD9Z/agfdHafpT0eJlveis18DlTuUi7qlNGWsjsiy8rsF0HiQU0+mgFPP k92d+2Qz6ZqI1x2TSIw+AFTgqmbz9uQxATRR4iyR7A2FfqgsVbr6RR3zhbZkBFOZNPZt kkDzgs0fccpxtU2oHgGYrsvOUzz6hLoBSsm4RM2uhKZ4w+9lKmARvPAvfJ6W5HDq/4n6 bv8g== X-Gm-Message-State: AOAM530FeaQVQ09JUVDAHQYWHGGJ0C4K57SFAK2YddWqGp7c5WIJgUI8 McSAvduT+wJRGopva78Eqks= X-Google-Smtp-Source: ABdhPJy1Bnip6k0IG0lqwjbDm2tKdLNZQo1eYNBri2pONhyFIZSjvD9B+L2OnNEP+UM/uDFrkQbkOA== X-Received: by 2002:adf:f205:: with SMTP id p5mr10671095wro.170.1619972213935; Sun, 02 May 2021 09:16:53 -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: Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , Huacai Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 14/36] target/mips: Declare mips_env_set_pc() inlined in "internal.h" Date: Sun, 2 May 2021 18:15:16 +0200 Message-Id: <20210502161538.534038-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210502161538.534038-1-f4bug@amsat.org> References: <20210502161538.534038-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) Rename set_pc() as mips_env_set_pc(), declare it inlined and use it in cpu.c and op_helper.c. Reported-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210428170410.479308-9-f4bug@amsat.org> --- target/mips/internal.h | 10 ++++++++++ target/mips/cpu.c | 8 +------- target/mips/op_helper.c | 16 +++------------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 57072a941e7..04f4b3d6614 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -219,6 +219,16 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, in= t size, /* op_helper.c */ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagema= sk); =20 +static inline void mips_env_set_pc(CPUMIPSState *env, target_ulong value) +{ + env->active_tc.PC =3D value & ~(target_ulong)1; + if (value & 1) { + env->hflags |=3D MIPS_HFLAG_M16; + } else { + env->hflags &=3D ~(MIPS_HFLAG_M16); + } +} + static inline void restore_pamask(CPUMIPSState *env) { if (env->hflags & MIPS_HFLAG_ELPA) { diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 8f76f4576f4..a751c958329 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -327,14 +327,8 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSState= *env, static void mips_cpu_set_pc(CPUState *cs, vaddr value) { MIPSCPU *cpu =3D MIPS_CPU(cs); - CPUMIPSState *env =3D &cpu->env; =20 - env->active_tc.PC =3D value & ~(target_ulong)1; - if (value & 1) { - env->hflags |=3D MIPS_HFLAG_M16; - } else { - env->hflags &=3D ~(MIPS_HFLAG_M16); - } + mips_env_set_pc(&cpu->env, value); } =20 #ifdef CONFIG_TCG diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index b80e8f75401..222a0d7c7b3 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -993,24 +993,14 @@ static void debug_post_eret(CPUMIPSState *env) } } =20 -static void set_pc(CPUMIPSState *env, target_ulong error_pc) -{ - env->active_tc.PC =3D error_pc & ~(target_ulong)1; - if (error_pc & 1) { - env->hflags |=3D MIPS_HFLAG_M16; - } else { - env->hflags &=3D ~(MIPS_HFLAG_M16); - } -} - static inline void exception_return(CPUMIPSState *env) { debug_pre_eret(env); if (env->CP0_Status & (1 << CP0St_ERL)) { - set_pc(env, env->CP0_ErrorEPC); + mips_env_set_pc(env, env->CP0_ErrorEPC); env->CP0_Status &=3D ~(1 << CP0St_ERL); } else { - set_pc(env, env->CP0_EPC); + mips_env_set_pc(env, env->CP0_EPC); env->CP0_Status &=3D ~(1 << CP0St_EXL); } compute_hflags(env); @@ -1036,7 +1026,7 @@ void helper_deret(CPUMIPSState *env) env->hflags &=3D ~MIPS_HFLAG_DM; compute_hflags(env); =20 - set_pc(env, env->CP0_DEPC); + mips_env_set_pc(env, env->CP0_DEPC); =20 debug_post_eret(env); } --=20 2.26.3