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,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 67C51C433B4 for ; Sun, 2 May 2021 16:30:05 +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 CD5796134F for ; Sun, 2 May 2021 16:30:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD5796134F 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]:50214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldEyp-0002AE-RR for qemu-devel@archiver.kernel.org; Sun, 02 May 2021 12:30:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldEm8-0005rQ-WD for qemu-devel@nongnu.org; Sun, 02 May 2021 12:16:57 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldEm7-0007aP-Cp for qemu-devel@nongnu.org; Sun, 02 May 2021 12:16:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id x7so3088085wrw.10 for ; Sun, 02 May 2021 09:16:55 -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=OwJLg2tW4ZdRD/7aHTFoTiaHHD7FHLRBZEprBnY8qnPbS1Co1J4NtWOVRr1AAtk7wi Zpuqotz2YWPIwQOHdQh+I3XXesZPzVD5LPvQerRVb9znBB12DzOb+v7gI5Ir2kVw1r3G 2Q4zzTCpIVkt2biYCwQOGATwC3g2TpzsF+hy5vKGt60laMI3dt/oAtsMVYbDiHwoYn6T DK1iUWsFdSk3xkyyeSm5pFhHPSOEGK1TaRf/rqTSmA8DKq1ZhbP2NVgGnmgyjHzWGB5L TfDmIX0ewIAY7Dkumzu7HDYNmCz9/t1ytKe/kakBxoXc35C5FQgTki1kKKCpOXMmKEbZ MI+w== X-Gm-Message-State: AOAM532ADG7J0lmYwts5yKXWMHgjKccEr+Sq5VnE7Pf4IWkLTh5CLUlu dhA0G1FVSPwOzrrmqly9KBVaKEAgXSc4QWyb 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.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.248, 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" 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é 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, int size, /* op_helper.c */ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); +static inline void mips_env_set_pc(CPUMIPSState *env, target_ulong value) +{ + env->active_tc.PC = value & ~(target_ulong)1; + if (value & 1) { + env->hflags |= MIPS_HFLAG_M16; + } else { + env->hflags &= ~(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 = MIPS_CPU(cs); - CPUMIPSState *env = &cpu->env; - env->active_tc.PC = value & ~(target_ulong)1; - if (value & 1) { - env->hflags |= MIPS_HFLAG_M16; - } else { - env->hflags &= ~(MIPS_HFLAG_M16); - } + mips_env_set_pc(&cpu->env, value); } #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) } } -static void set_pc(CPUMIPSState *env, target_ulong error_pc) -{ - env->active_tc.PC = error_pc & ~(target_ulong)1; - if (error_pc & 1) { - env->hflags |= MIPS_HFLAG_M16; - } else { - env->hflags &= ~(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 &= ~(1 << CP0St_ERL); } else { - set_pc(env, env->CP0_EPC); + mips_env_set_pc(env, env->CP0_EPC); env->CP0_Status &= ~(1 << CP0St_EXL); } compute_hflags(env); @@ -1036,7 +1026,7 @@ void helper_deret(CPUMIPSState *env) env->hflags &= ~MIPS_HFLAG_DM; compute_hflags(env); - set_pc(env, env->CP0_DEPC); + mips_env_set_pc(env, env->CP0_DEPC); debug_post_eret(env); } -- 2.26.3