From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571829222; cv=none; d=zoho.com; s=zohoarc; b=gR8CSgmGkR3lC6Ecs2+L7HuRgPSXkH2tyFxenngL0Ab+EvNAZezS06TLFnAd+R2PYrkGT93nNomoQ0kOfSYTQM5y9jiMRYzaGw/zJpzJJR9kc5eYC3FMf9RoBSE3QmnQ7taa7WxRcWJ+I2KbA3CVWxphQfSGlPfKLpVSt3FpPyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571829222; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=2H/YcrQ9T+L6T8BAsC7arp38sQijvhRhkXYZcgJBi/w=; b=BHFyfRIExV5VVnLy97WH/jmeXmnyhJ6ogboDU2UgeKIPMlSdCmIYaz+LGVpCo7TZPTzKEWQq1F7cNpkUFEm2ID8uZ/8rT9bzfZ4p/5AH531B6kQ0JknEm2u2kG135PZwc7iuxVaGhcT8KGXAdGvNRe50RyedGdmMfwNdKQodjgg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571829222900725.9676875607884; Wed, 23 Oct 2019 04:13:42 -0700 (PDT) Received: from localhost ([::1]:60520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEaC-0001z2-Pc for importer@patchew.org; Wed, 23 Oct 2019 07:13:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpv-0000yY-3E for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpp-0002wY-Cn for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:47 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:45148 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpo-0002Ur-9E for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:44 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 39A8D1A21F2; Wed, 23 Oct 2019 12:24:38 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 1036E1A22A4; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 01/14] target/mips: Clean up helper.c Date: Wed, 23 Oct 2019 12:23:34 +0200 Message-Id: <1571826227-10583-2-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Markus Armbruster , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Mostly fix errors and warnings reported by 'checkpatch.pl -f'. Cc: Markus Armbruster Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.c | 123 +++++++++++++++++++++++++++++++----------------= ---- 1 file changed, 74 insertions(+), 49 deletions(-) diff --git a/target/mips/helper.c b/target/mips/helper.c index a2b6459..781930a 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -39,8 +39,8 @@ enum { #if !defined(CONFIG_USER_ONLY) =20 /* no MMU emulation */ -int no_mmu_map_address (CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) +int no_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, + target_ulong address, int rw, int access_type) { *physical =3D address; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -48,26 +48,28 @@ int no_mmu_map_address (CPUMIPSState *env, hwaddr *phys= ical, int *prot, } =20 /* fixed mapping MMU emulation */ -int fixed_mmu_map_address (CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) +int fixed_mmu_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, + target_ulong address, int rw, int access_type) { if (address <=3D (int32_t)0x7FFFFFFFUL) { - if (!(env->CP0_Status & (1 << CP0St_ERL))) + if (!(env->CP0_Status & (1 << CP0St_ERL))) { *physical =3D address + 0x40000000UL; - else + } else { *physical =3D address; - } else if (address <=3D (int32_t)0xBFFFFFFFUL) + } + } else if (address <=3D (int32_t)0xBFFFFFFFUL) { *physical =3D address & 0x1FFFFFFF; - else + } else { *physical =3D address; + } =20 *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; return TLBRET_MATCH; } =20 /* MIPS32/MIPS64 R4000-style MMU emulation */ -int r4k_map_address (CPUMIPSState *env, hwaddr *physical, int *prot, - target_ulong address, int rw, int access_type) +int r4k_map_address(CPUMIPSState *env, hwaddr *physical, int *prot, + target_ulong address, int rw, int access_type) { uint16_t ASID =3D env->CP0_EntryHi & env->CP0_EntryHi_ASID_mask; int i; @@ -99,8 +101,9 @@ int r4k_map_address (CPUMIPSState *env, hwaddr *physical= , int *prot, if (rw !=3D MMU_DATA_STORE || (n ? tlb->D1 : tlb->D0)) { *physical =3D tlb->PFN[n] | (address & (mask >> 1)); *prot =3D PAGE_READ; - if (n ? tlb->D1 : tlb->D0) + if (n ? tlb->D1 : tlb->D0) { *prot |=3D PAGE_WRITE; + } if (!(n ? tlb->XI1 : tlb->XI0)) { *prot |=3D PAGE_EXEC; } @@ -130,7 +133,7 @@ static int is_seg_am_mapped(unsigned int am, bool eu, i= nt mmu_idx) int32_t adetlb_mask; =20 switch (mmu_idx) { - case 3 /* ERL */: + case 3: /* ERL */ /* If EU is set, always unmapped */ if (eu) { return 0; @@ -204,7 +207,7 @@ static int get_segctl_physical_address(CPUMIPSState *en= v, hwaddr *physical, pa & ~(hwaddr)segmask); } =20 -static int get_physical_address (CPUMIPSState *env, hwaddr *physical, +static int get_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, int rw, int access_type, int mmu_idx) { @@ -252,14 +255,15 @@ static int get_physical_address (CPUMIPSState *env, h= waddr *physical, } else { segctl =3D env->CP0_SegCtl2 >> 16; } - ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, - access_type, mmu_idx, segctl, - 0x3FFFFFFF); + ret =3D get_segctl_physical_address(env, physical, prot, + real_address, rw, access_type, + mmu_idx, segctl, 0x3FFFFFFF); #if defined(TARGET_MIPS64) } else if (address < 0x4000000000000000ULL) { /* xuseg */ if (UX && address <=3D (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) { - ret =3D env->tlb->map_address(env, physical, prot, real_addres= s, rw, access_type); + ret =3D env->tlb->map_address(env, physical, prot, + real_address, rw, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -267,7 +271,8 @@ static int get_physical_address (CPUMIPSState *env, hwa= ddr *physical, /* xsseg */ if ((supervisor_mode || kernel_mode) && SX && address <=3D (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) { - ret =3D env->tlb->map_address(env, physical, prot, real_addres= s, rw, access_type); + ret =3D env->tlb->map_address(env, physical, prot, + real_address, rw, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -307,7 +312,8 @@ static int get_physical_address (CPUMIPSState *env, hwa= ddr *physical, /* xkseg */ if (kernel_mode && KX && address <=3D (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) { - ret =3D env->tlb->map_address(env, physical, prot, real_addres= s, rw, access_type); + ret =3D env->tlb->map_address(env, physical, prot, + real_address, rw, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -328,8 +334,10 @@ static int get_physical_address (CPUMIPSState *env, hw= addr *physical, access_type, mmu_idx, env->CP0_SegCtl0 >> 16, 0x1FFFFF= FF); } else { - /* kseg3 */ - /* XXX: debug segment is not emulated */ + /* + * kseg3 + * XXX: debug segment is not emulated + */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, rw, access_type, mmu_idx, env->CP0_SegCtl0, 0x1FFFFFFF); @@ -515,9 +523,9 @@ static void raise_mmu_exception(CPUMIPSState *env, targ= et_ulong address, #if defined(TARGET_MIPS64) env->CP0_EntryHi &=3D env->SEGMask; env->CP0_XContext =3D - /* PTEBase */ (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7= ))) | - /* R */ (extract64(address, 62, 2) << (env->SEGBITS - 9)) | - /* BadVPN2 */ (extract64(address, 13, env->SEGBITS - 13) << 4); + (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) | /* PTEBase= */ + (extract64(address, 62, 2) << (env->SEGBITS - 9)) | /* R = */ + (extract64(address, 13, env->SEGBITS - 13) << 4); /* BadVPN2= */ #endif cs->exception_index =3D exception; env->error_code =3D error_code; @@ -945,7 +953,8 @@ bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, } =20 #ifndef CONFIG_USER_ONLY -hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address,= int rw) +hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, + int rw) { hwaddr physical; int prot; @@ -1005,7 +1014,7 @@ static const char * const excp_names[EXCP_LAST + 1] = =3D { }; #endif =20 -target_ulong exception_resume_pc (CPUMIPSState *env) +target_ulong exception_resume_pc(CPUMIPSState *env) { target_ulong bad_pc; target_ulong isa_mode; @@ -1013,8 +1022,10 @@ target_ulong exception_resume_pc (CPUMIPSState *env) isa_mode =3D !!(env->hflags & MIPS_HFLAG_M16); bad_pc =3D env->active_tc.PC | isa_mode; if (env->hflags & MIPS_HFLAG_BMASK) { - /* If the exception was raised from a delay slot, come back to - the jump. */ + /* + * If the exception was raised from a delay slot, come back to + * the jump. + */ bad_pc -=3D (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); } =20 @@ -1022,14 +1033,14 @@ target_ulong exception_resume_pc (CPUMIPSState *env) } =20 #if !defined(CONFIG_USER_ONLY) -static void set_hflags_for_handler (CPUMIPSState *env) +static void set_hflags_for_handler(CPUMIPSState *env) { /* Exception handlers are entered in 32-bit mode. */ env->hflags &=3D ~(MIPS_HFLAG_M16); /* ...except that microMIPS lets you choose. */ if (env->insn_flags & ASE_MICROMIPS) { - env->hflags |=3D (!!(env->CP0_Config3 - & (1 << CP0C3_ISA_ON_EXC)) + env->hflags |=3D (!!(env->CP0_Config3 & + (1 << CP0C3_ISA_ON_EXC)) << MIPS_HFLAG_M16_SHIFT); } } @@ -1096,10 +1107,12 @@ void mips_cpu_do_interrupt(CPUState *cs) switch (cs->exception_index) { case EXCP_DSS: env->CP0_Debug |=3D 1 << CP0DB_DSS; - /* Debug single step cannot be raised inside a delay slot and - resume will always occur on the next instruction - (but we assume the pc has always been updated during - code translation). */ + /* + * Debug single step cannot be raised inside a delay slot and + * resume will always occur on the next instruction + * (but we assume the pc has always been updated during + * code translation). + */ env->CP0_DEPC =3D env->active_tc.PC | !!(env->hflags & MIPS_HFLAG_= M16); goto enter_debug_mode; case EXCP_DINT: @@ -1111,7 +1124,8 @@ void mips_cpu_do_interrupt(CPUState *cs) case EXCP_DBp: env->CP0_Debug |=3D 1 << CP0DB_DBp; /* Setup DExcCode - SDBBP instruction */ - env->CP0_Debug =3D (env->CP0_Debug & ~(0x1fULL << CP0DB_DEC)) | 9 = << CP0DB_DEC; + env->CP0_Debug =3D (env->CP0_Debug & ~(0x1fULL << CP0DB_DEC)) | + (9 << CP0DB_DEC); goto set_DEPC; case EXCP_DDBS: env->CP0_Debug |=3D 1 << CP0DB_DDBS; @@ -1132,8 +1146,9 @@ void mips_cpu_do_interrupt(CPUState *cs) env->hflags |=3D MIPS_HFLAG_DM | MIPS_HFLAG_CP0; env->hflags &=3D ~(MIPS_HFLAG_KSU); /* EJTAG probe trap enable is not implemented... */ - if (!(env->CP0_Status & (1 << CP0St_EXL))) + if (!(env->CP0_Status & (1 << CP0St_EXL))) { env->CP0_Cause &=3D ~(1U << CP0Ca_BD); + } env->active_tc.PC =3D env->exception_base + 0x480; set_hflags_for_handler(env); break; @@ -1159,8 +1174,9 @@ void mips_cpu_do_interrupt(CPUState *cs) } env->hflags |=3D MIPS_HFLAG_CP0; env->hflags &=3D ~(MIPS_HFLAG_KSU); - if (!(env->CP0_Status & (1 << CP0St_EXL))) + if (!(env->CP0_Status & (1 << CP0St_EXL))) { env->CP0_Cause &=3D ~(1U << CP0Ca_BD); + } env->active_tc.PC =3D env->exception_base; set_hflags_for_handler(env); break; @@ -1176,12 +1192,16 @@ void mips_cpu_do_interrupt(CPUState *cs) uint32_t pending =3D (env->CP0_Cause & CP0Ca_IP_mask) >> C= P0Ca_IP; =20 if (env->CP0_Config3 & (1 << CP0C3_VEIC)) { - /* For VEIC mode, the external interrupt controller fe= eds - * the vector through the CP0Cause IP lines. */ + /* + * For VEIC mode, the external interrupt controller fe= eds + * the vector through the CP0Cause IP lines. + */ vector =3D pending; } else { - /* Vectored Interrupts - * Mask with Status.IM7-IM0 to get enabled interrupts.= */ + /* + * Vectored Interrupts + * Mask with Status.IM7-IM0 to get enabled interrupts. + */ pending &=3D (env->CP0_Status >> CP0St_IM) & 0xff; /* Find the highest-priority interrupt. */ while (pending >>=3D 1) { @@ -1354,7 +1374,8 @@ void mips_cpu_do_interrupt(CPUState *cs) =20 env->active_tc.PC +=3D offset; set_hflags_for_handler(env); - env->CP0_Cause =3D (env->CP0_Cause & ~(0x1f << CP0Ca_EC)) | (cause= << CP0Ca_EC); + env->CP0_Cause =3D (env->CP0_Cause & ~(0x1f << CP0Ca_EC)) | + (cause << CP0Ca_EC); break; default: abort(); @@ -1390,7 +1411,7 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interr= upt_request) } =20 #if !defined(CONFIG_USER_ONLY) -void r4k_invalidate_tlb (CPUMIPSState *env, int idx, int use_extra) +void r4k_invalidate_tlb(CPUMIPSState *env, int idx, int use_extra) { CPUState *cs =3D env_cpu(env); r4k_tlb_t *tlb; @@ -1400,16 +1421,20 @@ void r4k_invalidate_tlb (CPUMIPSState *env, int idx= , int use_extra) target_ulong mask; =20 tlb =3D &env->tlb->mmu.r4k.tlb[idx]; - /* The qemu TLB is flushed when the ASID changes, so no need to - flush these entries again. */ + /* + * The qemu TLB is flushed when the ASID changes, so no need to + * flush these entries again. + */ if (tlb->G =3D=3D 0 && tlb->ASID !=3D ASID) { return; } =20 if (use_extra && env->tlb->tlb_in_use < MIPS_TLB_MAX) { - /* For tlbwr, we can shadow the discarded entry into - a new (fake) TLB entry, as long as the guest can not - tell that it's there. */ + /* + * For tlbwr, we can shadow the discarded entry into + * a new (fake) TLB entry, as long as the guest can not + * tell that it's there. + */ env->tlb->mmu.r4k.tlb[env->tlb->tlb_in_use] =3D *tlb; env->tlb->tlb_in_use++; return; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571830434; cv=none; d=zoho.com; s=zohoarc; b=T0QLmPliOAc0YuGYBuSJjgQwrlrb1veWS855fZYX8OgrPpnPyedHxSHP8awQndL8zzxrrXsQcQ0094PKB3ZyrWuE5JZ4D7bwWDaJpse4mY+0fLhOu34yhOjJn04ryYKQPiqsFQ4iDwKYnAo7/r/suogR1j43k0CYGuzDi4CBROM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571830434; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=85LL39ggXP1NAyHRuPmY6DoAuPWvTCq6o6y07eS2/yg=; b=RJAf5lbxoVId4Od63c44fjAruE/Gy6BuGoUUBRbACEhxr3kMLzVJmvQzquIW/JNmUyexAb5onXD5xxoKSCGLOnzcLxY6D62xbSs+YjbRlUBE8J5RHSXsPF1tUw8IqNulm47id06z7ulDe69pRkvPWtTci1AhFMc5uWUNt4cSj0M= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157183043460321.95042272150374; Wed, 23 Oct 2019 04:33:54 -0700 (PDT) Received: from localhost ([::1]:60840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEtk-0007Yj-DR for importer@patchew.org; Wed, 23 Oct 2019 07:33:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDqI-0001Cz-Ui for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDq6-00037k-D3 for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:11 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35649 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDq5-0002wk-Jw for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:02 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 5D7C11A2171; Wed, 23 Oct 2019 12:24:39 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 1D93C1A22A8; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 02/14] target/mips: Clean up op_helper.c Date: Wed, 23 Oct 2019 12:23:35 +0200 Message-Id: <1571826227-10583-3-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Mostly fix errors and warnings reported by 'checkpatch.pl -f'. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/op_helper.c | 1010 +++++++++++++++++++++++++++++++------------= ---- 1 file changed, 663 insertions(+), 347 deletions(-) diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 4de6465..18fcee4 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -64,8 +64,7 @@ static inline type do_##name(CPUMIPSState *env, target_ul= ong addr, \ static inline type do_##name(CPUMIPSState *env, target_ulong addr, \ int mem_idx, uintptr_t retaddr) \ { \ - switch (mem_idx) \ - { \ + switch (mem_idx) { \ case 0: return (type) cpu_##insn##_kernel_ra(env, addr, retaddr); \ case 1: return (type) cpu_##insn##_super_ra(env, addr, retaddr); \ default: \ @@ -92,12 +91,17 @@ static inline void do_##name(CPUMIPSState *env, target_= ulong addr, \ static inline void do_##name(CPUMIPSState *env, target_ulong addr, \ type val, int mem_idx, uintptr_t retaddr) \ { \ - switch (mem_idx) \ - { \ - case 0: cpu_##insn##_kernel_ra(env, addr, val, retaddr); break; \ - case 1: cpu_##insn##_super_ra(env, addr, val, retaddr); break; \ + switch (mem_idx) { \ + case 0: \ + cpu_##insn##_kernel_ra(env, addr, val, retaddr); \ + break; \ + case 1: \ + cpu_##insn##_super_ra(env, addr, val, retaddr); \ + break; \ default: \ - case 2: cpu_##insn##_user_ra(env, addr, val, retaddr); break; \ + case 2: \ + cpu_##insn##_user_ra(env, addr, val, retaddr); \ + break; \ case 3: \ cpu_##insn##_error_ra(env, addr, val, retaddr); \ break; \ @@ -114,7 +118,8 @@ HELPER_ST(sd, stq, uint64_t) /* 64 bits arithmetic for 32 bits hosts */ static inline uint64_t get_HILO(CPUMIPSState *env) { - return ((uint64_t)(env->active_tc.HI[0]) << 32) | (uint32_t)env->activ= e_tc.LO[0]; + return ((uint64_t)(env->active_tc.HI[0]) << 32) | + (uint32_t)env->active_tc.LO[0]; } =20 static inline target_ulong set_HIT0_LO(CPUMIPSState *env, uint64_t HILO) @@ -435,9 +440,10 @@ void helper_swr(CPUMIPSState *env, target_ulong arg1, = target_ulong arg2, } =20 #if defined(TARGET_MIPS64) -/* "half" load and stores. We must do the memory access inline, - or fault handling won't work. */ - +/* + * "half" load and stores. We must do the memory access inline, + * or fault handling won't work. + */ #ifdef TARGET_WORDS_BIGENDIAN #define GET_LMASK64(v) ((v) & 7) #else @@ -535,7 +541,7 @@ void helper_lwm(CPUMIPSState *env, target_ulong addr, t= arget_ulong reglist, target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 - if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE (multiple_regs)) { + if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { @@ -557,7 +563,7 @@ void helper_swm(CPUMIPSState *env, target_ulong addr, t= arget_ulong reglist, target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 - if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE (multiple_regs)) { + if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { @@ -579,7 +585,7 @@ void helper_ldm(CPUMIPSState *env, target_ulong addr, t= arget_ulong reglist, target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 - if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE (multiple_regs)) { + if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { @@ -600,7 +606,7 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr, t= arget_ulong reglist, target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 - if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE (multiple_regs)) { + if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { target_ulong i; =20 for (i =3D 0; i < base_reglist; i++) { @@ -623,8 +629,10 @@ static bool mips_vpe_is_wfi(MIPSCPU *c) CPUState *cpu =3D CPU(c); CPUMIPSState *env =3D &c->env; =20 - /* If the VPE is halted but otherwise active, it means it's waiting for - an interrupt. */ + /* + * If the VPE is halted but otherwise active, it means it's waiting for + * an interrupt.\ + */ return cpu->halted && mips_vpe_active(env); } =20 @@ -638,9 +646,11 @@ static bool mips_vp_is_wfi(MIPSCPU *c) =20 static inline void mips_vpe_wake(MIPSCPU *c) { - /* Don't set ->halted =3D 0 directly, let it be done via cpu_has_work - because there might be other conditions that state that c should - be sleeping. */ + /* + * Don't set ->halted =3D 0 directly, let it be done via cpu_has_work + * because there might be other conditions that state that c should + * be sleeping. + */ qemu_mutex_lock_iothread(); cpu_interrupt(CPU(c), CPU_INTERRUPT_WAKE); qemu_mutex_unlock_iothread(); @@ -650,8 +660,10 @@ static inline void mips_vpe_sleep(MIPSCPU *cpu) { CPUState *cs =3D CPU(cpu); =20 - /* The VPE was shut off, really go to bed. - Reset any old _WAKE requests. */ + /* + * The VPE was shut off, really go to bed. + * Reset any old _WAKE requests. + */ cs->halted =3D 1; cpu_reset_interrupt(cs, CPU_INTERRUPT_WAKE); } @@ -684,9 +696,12 @@ static inline void mips_tc_sleep(MIPSCPU *cpu, int tc) * This function will transform @tc into a local index within the * returned #CPUMIPSState. */ -/* FIXME: This code assumes that all VPEs have the same number of TCs, - which depends on runtime setup. Can probably be fixed by - walking the list of CPUMIPSStates. */ + +/* + * FIXME: This code assumes that all VPEs have the same number of TCs, + * which depends on runtime setup. Can probably be fixed by + * walking the list of CPUMIPSStates. + */ static CPUMIPSState *mips_cpu_map_tc(CPUMIPSState *env, int *tc) { MIPSCPU *cpu; @@ -712,17 +727,21 @@ static CPUMIPSState *mips_cpu_map_tc(CPUMIPSState *en= v, int *tc) return &cpu->env; } =20 -/* The per VPE CP0_Status register shares some fields with the per TC - CP0_TCStatus registers. These fields are wired to the same registers, - so changes to either of them should be reflected on both registers. - - Also, EntryHi shares the bottom 8 bit ASID with TCStauts. - - These helper call synchronizes the regs for a given cpu. */ +/* + * The per VPE CP0_Status register shares some fields with the per TC + * CP0_TCStatus registers. These fields are wired to the same registers, + * so changes to either of them should be reflected on both registers. + * + * Also, EntryHi shares the bottom 8 bit ASID with TCStauts. + * + * These helper call synchronizes the regs for a given cpu. + */ =20 -/* Called for updates to CP0_Status. Defined in "cpu.h" for gdbstub.c. */ -/* static inline void sync_c0_status(CPUMIPSState *env, CPUMIPSState *cpu, - int tc); */ +/* + * Called for updates to CP0_Status. Defined in "cpu.h" for gdbstub.c. + * static inline void sync_c0_status(CPUMIPSState *env, CPUMIPSState *cpu, + * int tc); + */ =20 /* Called for updates to CP0_TCStatus. */ static void sync_c0_tcstatus(CPUMIPSState *cpu, int tc, @@ -805,10 +824,11 @@ target_ulong helper_mftc0_tcstatus(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCStatus; - else + } else { return other->tcs[other_tc].CP0_TCStatus; + } } =20 target_ulong helper_mfc0_tcbind(CPUMIPSState *env) @@ -821,10 +841,11 @@ target_ulong helper_mftc0_tcbind(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCBind; - else + } else { return other->tcs[other_tc].CP0_TCBind; + } } =20 target_ulong helper_mfc0_tcrestart(CPUMIPSState *env) @@ -837,10 +858,11 @@ target_ulong helper_mftc0_tcrestart(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.PC; - else + } else { return other->tcs[other_tc].PC; + } } =20 target_ulong helper_mfc0_tchalt(CPUMIPSState *env) @@ -853,10 +875,11 @@ target_ulong helper_mftc0_tchalt(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCHalt; - else + } else { return other->tcs[other_tc].CP0_TCHalt; + } } =20 target_ulong helper_mfc0_tccontext(CPUMIPSState *env) @@ -869,10 +892,11 @@ target_ulong helper_mftc0_tccontext(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCContext; - else + } else { return other->tcs[other_tc].CP0_TCContext; + } } =20 target_ulong helper_mfc0_tcschedule(CPUMIPSState *env) @@ -885,10 +909,11 @@ target_ulong helper_mftc0_tcschedule(CPUMIPSState *en= v) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCSchedule; - else + } else { return other->tcs[other_tc].CP0_TCSchedule; + } } =20 target_ulong helper_mfc0_tcschefback(CPUMIPSState *env) @@ -901,10 +926,11 @@ target_ulong helper_mftc0_tcschefback(CPUMIPSState *e= nv) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.CP0_TCScheFBack; - else + } else { return other->tcs[other_tc].CP0_TCScheFBack; + } } =20 target_ulong helper_mfc0_count(CPUMIPSState *env) @@ -987,8 +1013,9 @@ target_ulong helper_mfc0_watchhi(CPUMIPSState *env, ui= nt32_t sel) target_ulong helper_mfc0_debug(CPUMIPSState *env) { target_ulong t0 =3D env->CP0_Debug; - if (env->hflags & MIPS_HFLAG_DM) + if (env->hflags & MIPS_HFLAG_DM) { t0 |=3D 1 << CP0DB_DM; + } =20 return t0; } @@ -999,10 +1026,11 @@ target_ulong helper_mftc0_debug(CPUMIPSState *env) int32_t tcstatus; CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { tcstatus =3D other->active_tc.CP0_Debug_tcstatus; - else + } else { tcstatus =3D other->tcs[other_tc].CP0_Debug_tcstatus; + } =20 /* XXX: Might be wrong, check with EJTAG spec. */ return (other->CP0_Debug & ~((1 << CP0DB_SSt) | (1 << CP0DB_Halt))) | @@ -1076,14 +1104,16 @@ void helper_mtc0_mvpcontrol(CPUMIPSState *env, targ= et_ulong arg1) uint32_t mask =3D 0; uint32_t newval; =20 - if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) + if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { mask |=3D (1 << CP0MVPCo_CPA) | (1 << CP0MVPCo_VPC) | (1 << CP0MVPCo_EVP); - if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) + } + if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0MVPCo_STLB); + } newval =3D (env->mvp->CP0_MVPControl & ~mask) | (arg1 & mask); =20 - // TODO: Enable/disable shared TLB, enable/disable VPEs. + /* TODO: Enable/disable shared TLB, enable/disable VPEs. */ =20 env->mvp->CP0_MVPControl =3D newval; } @@ -1097,10 +1127,12 @@ void helper_mtc0_vpecontrol(CPUMIPSState *env, targ= et_ulong arg1) (1 << CP0VPECo_TE) | (0xff << CP0VPECo_TargTC); newval =3D (env->CP0_VPEControl & ~mask) | (arg1 & mask); =20 - /* Yield scheduler intercept not implemented. */ - /* Gating storage scheduler intercept not implemented. */ + /* + * Yield scheduler intercept not implemented. + * Gating storage scheduler intercept not implemented. + */ =20 - // TODO: Enable/disable TCs. + /* TODO: Enable/disable TCs. */ =20 env->CP0_VPEControl =3D newval; } @@ -1143,13 +1175,14 @@ void helper_mtc0_vpeconf0(CPUMIPSState *env, target= _ulong arg1) uint32_t newval; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { - if (env->CP0_VPEConf0 & (1 << CP0VPEC0_VPA)) + if (env->CP0_VPEConf0 & (1 << CP0VPEC0_VPA)) { mask |=3D (0xff << CP0VPEC0_XTC); + } mask |=3D (1 << CP0VPEC0_MVP) | (1 << CP0VPEC0_VPA); } newval =3D (env->CP0_VPEConf0 & ~mask) | (arg1 & mask); =20 - // TODO: TC exclusive handling due to ERL/EXL. + /* TODO: TC exclusive handling due to ERL/EXL. */ =20 env->CP0_VPEConf0 =3D newval; } @@ -1181,7 +1214,7 @@ void helper_mtc0_vpeconf1(CPUMIPSState *env, target_u= long arg1) /* UDI not implemented. */ /* CP2 not implemented. */ =20 - // TODO: Handle FPU (CP1) binding. + /* TODO: Handle FPU (CP1) binding. */ =20 env->CP0_VPEConf1 =3D newval; } @@ -1233,10 +1266,11 @@ void helper_mttc0_tcstatus(CPUMIPSState *env, targe= t_ulong arg1) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_TCStatus =3D arg1; - else + } else { other->tcs[other_tc].CP0_TCStatus =3D arg1; + } sync_c0_tcstatus(other, other_tc, arg1); } =20 @@ -1245,8 +1279,9 @@ void helper_mtc0_tcbind(CPUMIPSState *env, target_ulo= ng arg1) uint32_t mask =3D (1 << CP0TCBd_TBE); uint32_t newval; =20 - if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) + if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0TCBd_CurVPE); + } newval =3D (env->active_tc.CP0_TCBind & ~mask) | (arg1 & mask); env->active_tc.CP0_TCBind =3D newval; } @@ -1258,8 +1293,9 @@ void helper_mttc0_tcbind(CPUMIPSState *env, target_ul= ong arg1) uint32_t newval; CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) + if (other->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0TCBd_CurVPE); + } if (other_tc =3D=3D other->current_tc) { newval =3D (other->active_tc.CP0_TCBind & ~mask) | (arg1 & mask); other->active_tc.CP0_TCBind =3D newval; @@ -1304,7 +1340,7 @@ void helper_mtc0_tchalt(CPUMIPSState *env, target_ulo= ng arg1) =20 env->active_tc.CP0_TCHalt =3D arg1 & 0x1; =20 - // TODO: Halt TC / Restart (if allocated+active) TC. + /* TODO: Halt TC / Restart (if allocated+active) TC. */ if (env->active_tc.CP0_TCHalt & 1) { mips_tc_sleep(cpu, env->current_tc); } else { @@ -1318,12 +1354,13 @@ void helper_mttc0_tchalt(CPUMIPSState *env, target_= ulong arg1) CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); MIPSCPU *other_cpu =3D env_archcpu(other); =20 - // TODO: Halt TC / Restart (if allocated+active) TC. + /* TODO: Halt TC / Restart (if allocated+active) TC. */ =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_TCHalt =3D arg1; - else + } else { other->tcs[other_tc].CP0_TCHalt =3D arg1; + } =20 if (arg1 & 1) { mips_tc_sleep(other_cpu, other_tc); @@ -1342,10 +1379,11 @@ void helper_mttc0_tccontext(CPUMIPSState *env, targ= et_ulong arg1) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_TCContext =3D arg1; - else + } else { other->tcs[other_tc].CP0_TCContext =3D arg1; + } } =20 void helper_mtc0_tcschedule(CPUMIPSState *env, target_ulong arg1) @@ -1358,10 +1396,11 @@ void helper_mttc0_tcschedule(CPUMIPSState *env, tar= get_ulong arg1) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_TCSchedule =3D arg1; - else + } else { other->tcs[other_tc].CP0_TCSchedule =3D arg1; + } } =20 void helper_mtc0_tcschefback(CPUMIPSState *env, target_ulong arg1) @@ -1374,10 +1413,11 @@ void helper_mttc0_tcschefback(CPUMIPSState *env, ta= rget_ulong arg1) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_TCScheFBack =3D arg1; - else + } else { other->tcs[other_tc].CP0_TCScheFBack =3D arg1; + } } =20 void helper_mtc0_entrylo1(CPUMIPSState *env, target_ulong arg1) @@ -1703,9 +1743,15 @@ void helper_mtc0_status(CPUMIPSState *env, target_ul= ong arg1) case 3: qemu_log(", ERL\n"); break; - case MIPS_HFLAG_UM: qemu_log(", UM\n"); break; - case MIPS_HFLAG_SM: qemu_log(", SM\n"); break; - case MIPS_HFLAG_KM: qemu_log("\n"); break; + case MIPS_HFLAG_UM: + qemu_log(", UM\n"); + break; + case MIPS_HFLAG_SM: + qemu_log(", SM\n"); + break; + case MIPS_HFLAG_KM: + qemu_log("\n"); + break; default: cpu_abort(env_cpu(env), "Invalid MMU mode!\n"); break; @@ -1860,21 +1906,26 @@ void helper_mtc0_maari(CPUMIPSState *env, target_ul= ong arg1) { int index =3D arg1 & 0x3f; if (index =3D=3D 0x3f) { - /* Software may write all ones to INDEX to determine the - maximum value supported. */ + /* + * Software may write all ones to INDEX to determine the + * maximum value supported. + */ env->CP0_MAARI =3D MIPS_MAAR_MAX - 1; } else if (index < MIPS_MAAR_MAX) { env->CP0_MAARI =3D index; } - /* Other than the all ones, if the - value written is not supported, then INDEX is unchanged - from its previous value. */ + /* + * Other than the all ones, if the value written is not supported, + * then INDEX is unchanged from its previous value. + */ } =20 void helper_mtc0_watchlo(CPUMIPSState *env, target_ulong arg1, uint32_t se= l) { - /* Watch exceptions for instructions, data loads, data stores - not implemented. */ + /* + * Watch exceptions for instructions, data loads, data stores + * not implemented. + */ env->CP0_WatchLo[sel] =3D (arg1 & ~0x7); } =20 @@ -1899,10 +1950,11 @@ void helper_mtc0_framemask(CPUMIPSState *env, targe= t_ulong arg1) void helper_mtc0_debug(CPUMIPSState *env, target_ulong arg1) { env->CP0_Debug =3D (env->CP0_Debug & 0x8C03FC1F) | (arg1 & 0x13300120); - if (arg1 & (1 << CP0DB_DM)) + if (arg1 & (1 << CP0DB_DM)) { env->hflags |=3D MIPS_HFLAG_DM; - else + } else { env->hflags &=3D ~MIPS_HFLAG_DM; + } } =20 void helper_mttc0_debug(CPUMIPSState *env, target_ulong arg1) @@ -1912,10 +1964,11 @@ void helper_mttc0_debug(CPUMIPSState *env, target_u= long arg1) CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 /* XXX: Might be wrong, check with EJTAG spec. */ - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.CP0_Debug_tcstatus =3D val; - else + } else { other->tcs[other_tc].CP0_Debug_tcstatus =3D val; + } other->CP0_Debug =3D (other->CP0_Debug & ((1 << CP0DB_SSt) | (1 << CP0DB_Halt))) | (arg1 & ~((1 << CP0DB_SSt) | (1 << CP0DB_Halt))); @@ -1944,9 +1997,11 @@ void helper_mtc0_errctl(CPUMIPSState *env, target_ul= ong arg1) void helper_mtc0_taglo(CPUMIPSState *env, target_ulong arg1) { if (env->hflags & MIPS_HFLAG_ITC_CACHE) { - /* If CACHE instruction is configured for ITC tags then make all - CP0.TagLo bits writable. The actual write to ITC Configuration - Tag will take care of the read-only bits. */ + /* + * If CACHE instruction is configured for ITC tags then make all + * CP0.TagLo bits writable. The actual write to ITC Configuration + * Tag will take care of the read-only bits. + */ env->CP0_TagLo =3D arg1; } else { env->CP0_TagLo =3D arg1 & 0xFFFFFCF6; @@ -1974,10 +2029,11 @@ target_ulong helper_mftgpr(CPUMIPSState *env, uint3= 2_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.gpr[sel]; - else + } else { return other->tcs[other_tc].gpr[sel]; + } } =20 target_ulong helper_mftlo(CPUMIPSState *env, uint32_t sel) @@ -1985,10 +2041,11 @@ target_ulong helper_mftlo(CPUMIPSState *env, uint32= _t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.LO[sel]; - else + } else { return other->tcs[other_tc].LO[sel]; + } } =20 target_ulong helper_mfthi(CPUMIPSState *env, uint32_t sel) @@ -1996,10 +2053,11 @@ target_ulong helper_mfthi(CPUMIPSState *env, uint32= _t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.HI[sel]; - else + } else { return other->tcs[other_tc].HI[sel]; + } } =20 target_ulong helper_mftacx(CPUMIPSState *env, uint32_t sel) @@ -2007,10 +2065,11 @@ target_ulong helper_mftacx(CPUMIPSState *env, uint3= 2_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.ACX[sel]; - else + } else { return other->tcs[other_tc].ACX[sel]; + } } =20 target_ulong helper_mftdsp(CPUMIPSState *env) @@ -2018,10 +2077,11 @@ target_ulong helper_mftdsp(CPUMIPSState *env) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { return other->active_tc.DSPControl; - else + } else { return other->tcs[other_tc].DSPControl; + } } =20 void helper_mttgpr(CPUMIPSState *env, target_ulong arg1, uint32_t sel) @@ -2029,10 +2089,11 @@ void helper_mttgpr(CPUMIPSState *env, target_ulong = arg1, uint32_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.gpr[sel] =3D arg1; - else + } else { other->tcs[other_tc].gpr[sel] =3D arg1; + } } =20 void helper_mttlo(CPUMIPSState *env, target_ulong arg1, uint32_t sel) @@ -2040,10 +2101,11 @@ void helper_mttlo(CPUMIPSState *env, target_ulong a= rg1, uint32_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.LO[sel] =3D arg1; - else + } else { other->tcs[other_tc].LO[sel] =3D arg1; + } } =20 void helper_mtthi(CPUMIPSState *env, target_ulong arg1, uint32_t sel) @@ -2051,10 +2113,11 @@ void helper_mtthi(CPUMIPSState *env, target_ulong a= rg1, uint32_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.HI[sel] =3D arg1; - else + } else { other->tcs[other_tc].HI[sel] =3D arg1; + } } =20 void helper_mttacx(CPUMIPSState *env, target_ulong arg1, uint32_t sel) @@ -2062,10 +2125,11 @@ void helper_mttacx(CPUMIPSState *env, target_ulong = arg1, uint32_t sel) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.ACX[sel] =3D arg1; - else + } else { other->tcs[other_tc].ACX[sel] =3D arg1; + } } =20 void helper_mttdsp(CPUMIPSState *env, target_ulong arg1) @@ -2073,22 +2137,23 @@ void helper_mttdsp(CPUMIPSState *env, target_ulong = arg1) int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); =20 - if (other_tc =3D=3D other->current_tc) + if (other_tc =3D=3D other->current_tc) { other->active_tc.DSPControl =3D arg1; - else + } else { other->tcs[other_tc].DSPControl =3D arg1; + } } =20 /* MIPS MT functions */ target_ulong helper_dmt(void) { - // TODO - return 0; + /* TODO */ + return 0; } =20 target_ulong helper_emt(void) { - // TODO + /* TODO */ return 0; } =20 @@ -2130,8 +2195,10 @@ target_ulong helper_evpe(CPUMIPSState *env) =20 void helper_fork(target_ulong arg1, target_ulong arg2) { - // arg1 =3D rt, arg2 =3D rs - // TODO: store to TC register + /* + * arg1 =3D rt, arg2 =3D rs + * TODO: store to TC register + */ } =20 target_ulong helper_yield(CPUMIPSState *env, target_ulong arg) @@ -2149,11 +2216,12 @@ target_ulong helper_yield(CPUMIPSState *env, target= _ulong arg) } } } else if (arg1 =3D=3D 0) { - if (0 /* TODO: TC underflow */) { + if (0) { + /* TODO: TC underflow */ env->CP0_VPEControl &=3D ~(0x7 << CP0VPECo_EXCPT); do_raise_exception(env, EXCP_THREAD, GETPC()); } else { - // TODO: Deallocate TC + /* TODO: Deallocate TC */ } } else if (arg1 > 0) { /* Yield qualifier inputs not implemented. */ @@ -2193,8 +2261,10 @@ target_ulong helper_evp(CPUMIPSState *env) CPU_FOREACH(other_cs) { MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); if ((&other_cpu->env !=3D env) && !mips_vp_is_wfi(other_cpu)) { - /* If the VP is WFI, don't disturb its sleep. - * Otherwise, wake it up. */ + /* + * If the VP is WFI, don't disturb its sleep. + * Otherwise, wake it up. + */ mips_vpe_wake(other_cpu); } } @@ -2206,7 +2276,7 @@ target_ulong helper_evp(CPUMIPSState *env) =20 #ifndef CONFIG_USER_ONLY /* TLB management */ -static void r4k_mips_tlb_flush_extra (CPUMIPSState *env, int first) +static void r4k_mips_tlb_flush_extra(CPUMIPSState *env, int first) { /* Discard entries from env->tlb[first] onwards. */ while (env->tlb->tlb_in_use > first) { @@ -2308,8 +2378,10 @@ void r4k_helper_tlbwi(CPUMIPSState *env) XI1 =3D (env->CP0_EntryLo1 >> CP0EnLo_XI) &1; RI1 =3D (env->CP0_EntryLo1 >> CP0EnLo_RI) &1; =20 - /* Discard cached TLB entries, unless tlbwi is just upgrading access - permissions on the current entry. */ + /* + * Discard cached TLB entries, unless tlbwi is just upgrading access + * permissions on the current entry. + */ if (tlb->VPN !=3D VPN || tlb->ASID !=3D ASID || tlb->G !=3D G || (!tlb->EHINV && EHINV) || (tlb->V0 && !V0) || (tlb->D0 && !D0) || @@ -2370,7 +2442,7 @@ void r4k_helper_tlbp(CPUMIPSState *env) #endif /* Check ASID, virtual page number & size */ if ((tlb->G =3D=3D 1 || tlb->ASID =3D=3D ASID) && VPN =3D=3D t= ag) { - r4k_mips_tlb_flush_extra (env, i); + r4k_mips_tlb_flush_extra(env, i); break; } } @@ -2400,8 +2472,9 @@ void r4k_helper_tlbr(CPUMIPSState *env) tlb =3D &env->tlb->mmu.r4k.tlb[idx]; =20 /* If this will change the current ASID, flush qemu's TLB. */ - if (ASID !=3D tlb->ASID) + if (ASID !=3D tlb->ASID) { cpu_mips_tlb_flush(env); + } =20 r4k_mips_tlb_flush_extra(env, env->tlb->nb_tlb); =20 @@ -2476,10 +2549,12 @@ static void debug_pre_eret(CPUMIPSState *env) if (qemu_loglevel_mask(CPU_LOG_EXEC)) { qemu_log("ERET: PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx, env->active_tc.PC, env->CP0_EPC); - if (env->CP0_Status & (1 << CP0St_ERL)) + if (env->CP0_Status & (1 << CP0St_ERL)) { qemu_log(" ErrorEPC " TARGET_FMT_lx, env->CP0_ErrorEPC); - if (env->hflags & MIPS_HFLAG_DM) + } + if (env->hflags & MIPS_HFLAG_DM) { qemu_log(" DEPC " TARGET_FMT_lx, env->CP0_DEPC); + } qemu_log("\n"); } } @@ -2489,17 +2564,25 @@ static void debug_post_eret(CPUMIPSState *env) if (qemu_loglevel_mask(CPU_LOG_EXEC)) { qemu_log(" =3D> PC " TARGET_FMT_lx " EPC " TARGET_FMT_lx, env->active_tc.PC, env->CP0_EPC); - if (env->CP0_Status & (1 << CP0St_ERL)) + if (env->CP0_Status & (1 << CP0St_ERL)) { qemu_log(" ErrorEPC " TARGET_FMT_lx, env->CP0_ErrorEPC); - if (env->hflags & MIPS_HFLAG_DM) + } + if (env->hflags & MIPS_HFLAG_DM) { qemu_log(" DEPC " TARGET_FMT_lx, env->CP0_DEPC); + } switch (cpu_mmu_index(env, false)) { case 3: qemu_log(", ERL\n"); break; - case MIPS_HFLAG_UM: qemu_log(", UM\n"); break; - case MIPS_HFLAG_SM: qemu_log(", SM\n"); break; - case MIPS_HFLAG_KM: qemu_log("\n"); break; + case MIPS_HFLAG_UM: + qemu_log(", UM\n"); + break; + case MIPS_HFLAG_SM: + qemu_log(", SM\n"); + break; + case MIPS_HFLAG_KM: + qemu_log("\n"); + break; default: cpu_abort(env_cpu(env), "Invalid MMU mode!\n"); break; @@ -2609,8 +2692,9 @@ void helper_pmon(CPUMIPSState *env, int function) function /=3D 2; switch (function) { case 2: /* TODO: char inbyte(int waitflag); */ - if (env->active_tc.gpr[4] =3D=3D 0) + if (env->active_tc.gpr[4] =3D=3D 0) { env->active_tc.gpr[2] =3D -1; + } /* Fall through */ case 11: /* TODO: char inbyte (void); */ env->active_tc.gpr[2] =3D -1; @@ -2636,8 +2720,10 @@ void helper_wait(CPUMIPSState *env) =20 cs->halted =3D 1; cpu_reset_interrupt(cs, CPU_INTERRUPT_WAKE); - /* Last instruction in the block, PC was updated before - - no need to recover PC and icount */ + /* + * Last instruction in the block, PC was updated before + * - no need to recover PC and icount. + */ raise_exception(env, EXCP_HLT); } =20 @@ -2731,13 +2817,15 @@ target_ulong helper_cfc1(CPUMIPSState *env, uint32_= t reg) } break; case 25: - arg1 =3D ((env->active_fpu.fcr31 >> 24) & 0xfe) | ((env->active_fp= u.fcr31 >> 23) & 0x1); + arg1 =3D ((env->active_fpu.fcr31 >> 24) & 0xfe) | + ((env->active_fpu.fcr31 >> 23) & 0x1); break; case 26: arg1 =3D env->active_fpu.fcr31 & 0x0003f07c; break; case 28: - arg1 =3D (env->active_fpu.fcr31 & 0x00000f83) | ((env->active_fpu.= fcr31 >> 22) & 0x4); + arg1 =3D (env->active_fpu.fcr31 & 0x00000f83) | + ((env->active_fpu.fcr31 >> 22) & 0x4); break; default: arg1 =3D (int32_t)env->active_fpu.fcr31; @@ -2802,19 +2890,24 @@ void helper_ctc1(CPUMIPSState *env, target_ulong ar= g1, uint32_t fs, uint32_t rt) if ((env->insn_flags & ISA_MIPS32R6) || (arg1 & 0xffffff00)) { return; } - env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0x017fffff) | (= (arg1 & 0xfe) << 24) | - ((arg1 & 0x1) << 23); + env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0x017fffff) | + ((arg1 & 0xfe) << 24) | + ((arg1 & 0x1) << 23); break; case 26: - if (arg1 & 0x007c0000) + if (arg1 & 0x007c0000) { return; - env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0xfffc0f83) | (= arg1 & 0x0003f07c); + } + env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0xfffc0f83) | + (arg1 & 0x0003f07c); break; case 28: - if (arg1 & 0x007c0000) + if (arg1 & 0x007c0000) { return; - env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0xfefff07c) | (= arg1 & 0x00000f83) | - ((arg1 & 0x4) << 22); + } + env->active_fpu.fcr31 =3D (env->active_fpu.fcr31 & 0xfefff07c) | + (arg1 & 0x00000f83) | + ((arg1 & 0x4) << 22); break; case 31: env->active_fpu.fcr31 =3D (arg1 & env->active_fpu.fcr31_rw_bitmask= ) | @@ -2828,8 +2921,10 @@ void helper_ctc1(CPUMIPSState *env, target_ulong arg= 1, uint32_t fs, uint32_t rt) } restore_fp_status(env); set_float_exception_flags(0, &env->active_fpu.fp_status); - if ((GET_FP_ENABLE(env->active_fpu.fcr31) | 0x20) & GET_FP_CAUSE(env->= active_fpu.fcr31)) + if ((GET_FP_ENABLE(env->active_fpu.fcr31) | 0x20) & + GET_FP_CAUSE(env->active_fpu.fcr31)) { do_raise_exception(env, EXCP_FPE, GETPC()); + } } =20 int ieee_ex_to_mips(int xcpt) @@ -2857,7 +2952,8 @@ int ieee_ex_to_mips(int xcpt) =20 static inline void update_fcr31(CPUMIPSState *env, uintptr_t pc) { - int tmp =3D ieee_ex_to_mips(get_float_exception_flags(&env->active_fpu= .fp_status)); + int tmp =3D ieee_ex_to_mips(get_float_exception_flags( + &env->active_fpu.fp_status)); =20 SET_FP_CAUSE(env->active_fpu.fcr31, tmp); =20 @@ -2872,10 +2968,12 @@ static inline void update_fcr31(CPUMIPSState *env, = uintptr_t pc) } } =20 -/* Float support. - Single precition routines have a "s" suffix, double precision a - "d" suffix, 32bit integer "w", 64bit integer "l", paired single "ps", - paired single lower "pl", paired single upper "pu". */ +/* + * Float support. + * Single precition routines have a "s" suffix, double precision a + * "d" suffix, 32bit integer "w", 64bit integer "l", paired single "ps", + * paired single lower "pl", paired single upper "pu". + */ =20 /* unary operations, modifying fp status */ uint64_t helper_float_sqrt_d(CPUMIPSState *env, uint64_t fdt0) @@ -3056,7 +3154,8 @@ uint64_t helper_float_round_l_d(CPUMIPSState *env, ui= nt64_t fdt0) { uint64_t dt2; =20 - set_float_rounding_mode(float_round_nearest_even, &env->active_fpu.fp_= status); + set_float_rounding_mode(float_round_nearest_even, + &env->active_fpu.fp_status); dt2 =3D float64_to_int64(fdt0, &env->active_fpu.fp_status); restore_rounding_mode(env); if (get_float_exception_flags(&env->active_fpu.fp_status) @@ -3071,7 +3170,8 @@ uint64_t helper_float_round_l_s(CPUMIPSState *env, ui= nt32_t fst0) { uint64_t dt2; =20 - set_float_rounding_mode(float_round_nearest_even, &env->active_fpu.fp_= status); + set_float_rounding_mode(float_round_nearest_even, + &env->active_fpu.fp_status); dt2 =3D float32_to_int64(fst0, &env->active_fpu.fp_status); restore_rounding_mode(env); if (get_float_exception_flags(&env->active_fpu.fp_status) @@ -3086,7 +3186,8 @@ uint32_t helper_float_round_w_d(CPUMIPSState *env, ui= nt64_t fdt0) { uint32_t wt2; =20 - set_float_rounding_mode(float_round_nearest_even, &env->active_fpu.fp_= status); + set_float_rounding_mode(float_round_nearest_even, + &env->active_fpu.fp_status); wt2 =3D float64_to_int32(fdt0, &env->active_fpu.fp_status); restore_rounding_mode(env); if (get_float_exception_flags(&env->active_fpu.fp_status) @@ -3101,7 +3202,8 @@ uint32_t helper_float_round_w_s(CPUMIPSState *env, ui= nt32_t fst0) { uint32_t wt2; =20 - set_float_rounding_mode(float_round_nearest_even, &env->active_fpu.fp_= status); + set_float_rounding_mode(float_round_nearest_even, + &env->active_fpu.fp_status); wt2 =3D float32_to_int32(fst0, &env->active_fpu.fp_status); restore_rounding_mode(env); if (get_float_exception_flags(&env->active_fpu.fp_status) @@ -3116,7 +3218,8 @@ uint64_t helper_float_trunc_l_d(CPUMIPSState *env, ui= nt64_t fdt0) { uint64_t dt2; =20 - dt2 =3D float64_to_int64_round_to_zero(fdt0, &env->active_fpu.fp_statu= s); + dt2 =3D float64_to_int64_round_to_zero(fdt0, + &env->active_fpu.fp_status); if (get_float_exception_flags(&env->active_fpu.fp_status) & (float_flag_invalid | float_flag_overflow)) { dt2 =3D FP_TO_INT64_OVERFLOW; @@ -3697,7 +3800,8 @@ uint64_t helper_float_recip1_ps(CPUMIPSState *env, ui= nt64_t fdt0) uint32_t fst2; uint32_t fsth2; =20 - fst2 =3D float32_div(float32_one, fdt0 & 0XFFFFFFFF, &env->active_fpu.= fp_status); + fst2 =3D float32_div(float32_one, fdt0 & 0XFFFFFFFF, + &env->active_fpu.fp_status); fsth2 =3D float32_div(float32_one, fdt0 >> 32, &env->active_fpu.fp_sta= tus); update_fcr31(env, GETPC()); return ((uint64_t)fsth2 << 32) | fst2; @@ -3737,8 +3841,8 @@ uint64_t helper_float_rsqrt1_ps(CPUMIPSState *env, ui= nt64_t fdt0) } =20 #define FLOAT_RINT(name, bits) = \ -uint ## bits ## _t helper_float_ ## name (CPUMIPSState *env, = \ - uint ## bits ## _t fs) = \ +uint ## bits ## _t helper_float_ ## name(CPUMIPSState *env, = \ + uint ## bits ## _t fs) = \ { = \ uint ## bits ## _t fdret; = \ = \ @@ -3763,8 +3867,8 @@ FLOAT_RINT(rint_d, 64) #define FLOAT_CLASS_POSITIVE_ZERO 0x200 =20 #define FLOAT_CLASS(name, bits) \ -uint ## bits ## _t float_ ## name (uint ## bits ## _t arg, \ - float_status *status) \ +uint ## bits ## _t float_ ## name(uint ## bits ## _t arg, \ + float_status *status) \ { \ if (float ## bits ## _is_signaling_nan(arg, status)) { \ return FLOAT_CLASS_SIGNALING_NAN; \ @@ -3793,8 +3897,8 @@ uint ## bits ## _t float_ ## name (uint ## bits ## _t= arg, \ } \ } \ \ -uint ## bits ## _t helper_float_ ## name (CPUMIPSState *env, \ - uint ## bits ## _t arg) \ +uint ## bits ## _t helper_float_ ## name(CPUMIPSState *env, \ + uint ## bits ## _t arg) \ { \ return float_ ## name(arg, &env->active_fpu.fp_status); \ } @@ -3810,7 +3914,7 @@ uint64_t helper_float_ ## name ## _d(CPUMIPSState *en= v, \ { \ uint64_t dt2; \ \ - dt2 =3D float64_ ## name (fdt0, fdt1, &env->active_fpu.fp_status); = \ + dt2 =3D float64_ ## name(fdt0, fdt1, &env->active_fpu.fp_status);\ update_fcr31(env, GETPC()); \ return dt2; \ } \ @@ -3820,7 +3924,7 @@ uint32_t helper_float_ ## name ## _s(CPUMIPSState *en= v, \ { \ uint32_t wt2; \ \ - wt2 =3D float32_ ## name (fst0, fst1, &env->active_fpu.fp_status); = \ + wt2 =3D float32_ ## name(fst0, fst1, &env->active_fpu.fp_status);\ update_fcr31(env, GETPC()); \ return wt2; \ } \ @@ -3836,8 +3940,8 @@ uint64_t helper_float_ ## name ## _ps(CPUMIPSState *e= nv, \ uint32_t wt2; \ uint32_t wth2; \ \ - wt2 =3D float32_ ## name (fst0, fst1, &env->active_fpu.fp_status); = \ - wth2 =3D float32_ ## name (fsth0, fsth1, &env->active_fpu.fp_status); = \ + wt2 =3D float32_ ## name(fst0, fst1, &env->active_fpu.fp_status); \ + wth2 =3D float32_ ## name(fsth0, fsth1, &env->active_fpu.fp_status); \ update_fcr31(env, GETPC()); \ return ((uint64_t)wth2 << 32) | wt2; \ } @@ -3852,7 +3956,8 @@ FLOAT_BINOP(div) uint64_t helper_float_recip2_d(CPUMIPSState *env, uint64_t fdt0, uint64_t = fdt2) { fdt2 =3D float64_mul(fdt0, fdt2, &env->active_fpu.fp_status); - fdt2 =3D float64_chs(float64_sub(fdt2, float64_one, &env->active_fpu.f= p_status)); + fdt2 =3D float64_chs(float64_sub(fdt2, float64_one, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return fdt2; } @@ -3860,7 +3965,8 @@ uint64_t helper_float_recip2_d(CPUMIPSState *env, uin= t64_t fdt0, uint64_t fdt2) uint32_t helper_float_recip2_s(CPUMIPSState *env, uint32_t fst0, uint32_t = fst2) { fst2 =3D float32_mul(fst0, fst2, &env->active_fpu.fp_status); - fst2 =3D float32_chs(float32_sub(fst2, float32_one, &env->active_fpu.f= p_status)); + fst2 =3D float32_chs(float32_sub(fst2, float32_one, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return fst2; } @@ -3874,8 +3980,10 @@ uint64_t helper_float_recip2_ps(CPUMIPSState *env, u= int64_t fdt0, uint64_t fdt2) =20 fst2 =3D float32_mul(fst0, fst2, &env->active_fpu.fp_status); fsth2 =3D float32_mul(fsth0, fsth2, &env->active_fpu.fp_status); - fst2 =3D float32_chs(float32_sub(fst2, float32_one, &env->active_fpu.f= p_status)); - fsth2 =3D float32_chs(float32_sub(fsth2, float32_one, &env->active_fpu= .fp_status)); + fst2 =3D float32_chs(float32_sub(fst2, float32_one, + &env->active_fpu.fp_status)); + fsth2 =3D float32_chs(float32_sub(fsth2, float32_one, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return ((uint64_t)fsth2 << 32) | fst2; } @@ -3884,7 +3992,8 @@ uint64_t helper_float_rsqrt2_d(CPUMIPSState *env, uin= t64_t fdt0, uint64_t fdt2) { fdt2 =3D float64_mul(fdt0, fdt2, &env->active_fpu.fp_status); fdt2 =3D float64_sub(fdt2, float64_one, &env->active_fpu.fp_status); - fdt2 =3D float64_chs(float64_div(fdt2, FLOAT_TWO64, &env->active_fpu.f= p_status)); + fdt2 =3D float64_chs(float64_div(fdt2, FLOAT_TWO64, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return fdt2; } @@ -3893,7 +4002,8 @@ uint32_t helper_float_rsqrt2_s(CPUMIPSState *env, uin= t32_t fst0, uint32_t fst2) { fst2 =3D float32_mul(fst0, fst2, &env->active_fpu.fp_status); fst2 =3D float32_sub(fst2, float32_one, &env->active_fpu.fp_status); - fst2 =3D float32_chs(float32_div(fst2, FLOAT_TWO32, &env->active_fpu.f= p_status)); + fst2 =3D float32_chs(float32_div(fst2, FLOAT_TWO32, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return fst2; } @@ -3909,8 +4019,10 @@ uint64_t helper_float_rsqrt2_ps(CPUMIPSState *env, u= int64_t fdt0, uint64_t fdt2) fsth2 =3D float32_mul(fsth0, fsth2, &env->active_fpu.fp_status); fst2 =3D float32_sub(fst2, float32_one, &env->active_fpu.fp_status); fsth2 =3D float32_sub(fsth2, float32_one, &env->active_fpu.fp_status); - fst2 =3D float32_chs(float32_div(fst2, FLOAT_TWO32, &env->active_fpu.f= p_status)); - fsth2 =3D float32_chs(float32_div(fsth2, FLOAT_TWO32, &env->active_fpu= .fp_status)); + fst2 =3D float32_chs(float32_div(fst2, FLOAT_TWO32, + &env->active_fpu.fp_status)); + fsth2 =3D float32_chs(float32_div(fsth2, FLOAT_TWO32, + &env->active_fpu.fp_status)); update_fcr31(env, GETPC()); return ((uint64_t)fsth2 << 32) | fst2; } @@ -3924,8 +4036,8 @@ uint64_t helper_float_addr_ps(CPUMIPSState *env, uint= 64_t fdt0, uint64_t fdt1) uint32_t fst2; uint32_t fsth2; =20 - fst2 =3D float32_add (fst0, fsth0, &env->active_fpu.fp_status); - fsth2 =3D float32_add (fst1, fsth1, &env->active_fpu.fp_status); + fst2 =3D float32_add(fst0, fsth0, &env->active_fpu.fp_status); + fsth2 =3D float32_add(fst1, fsth1, &env->active_fpu.fp_status); update_fcr31(env, GETPC()); return ((uint64_t)fsth2 << 32) | fst2; } @@ -3939,16 +4051,16 @@ uint64_t helper_float_mulr_ps(CPUMIPSState *env, ui= nt64_t fdt0, uint64_t fdt1) uint32_t fst2; uint32_t fsth2; =20 - fst2 =3D float32_mul (fst0, fsth0, &env->active_fpu.fp_status); - fsth2 =3D float32_mul (fst1, fsth1, &env->active_fpu.fp_status); + fst2 =3D float32_mul(fst0, fsth0, &env->active_fpu.fp_status); + fsth2 =3D float32_mul(fst1, fsth1, &env->active_fpu.fp_status); update_fcr31(env, GETPC()); return ((uint64_t)fsth2 << 32) | fst2; } =20 #define FLOAT_MINMAX(name, bits, minmaxfunc) \ -uint ## bits ## _t helper_float_ ## name (CPUMIPSState *env, \ - uint ## bits ## _t fs, \ - uint ## bits ## _t ft) \ +uint ## bits ## _t helper_float_ ## name(CPUMIPSState *env, \ + uint ## bits ## _t fs, \ + uint ## bits ## _t ft) \ { \ uint ## bits ## _t fdret; \ \ @@ -4026,10 +4138,10 @@ FLOAT_FMA(nmsub, float_muladd_negate_result | float= _muladd_negate_c) #undef FLOAT_FMA =20 #define FLOAT_FMADDSUB(name, bits, muladd_arg) \ -uint ## bits ## _t helper_float_ ## name (CPUMIPSState *env, \ - uint ## bits ## _t fs, \ - uint ## bits ## _t ft, \ - uint ## bits ## _t fd) \ +uint ## bits ## _t helper_float_ ## name(CPUMIPSState *env, \ + uint ## bits ## _t fs, \ + uint ## bits ## _t ft, \ + uint ## bits ## _t fd) \ { \ uint ## bits ## _t fdret; \ \ @@ -4072,26 +4184,58 @@ void helper_cmpabs_d_ ## op(CPUMIPSState *env, uint= 64_t fdt0, \ CLEAR_FP_COND(cc, env->active_fpu); \ } =20 -/* NOTE: the comma operator will make "cond" to eval to false, - * but float64_unordered_quiet() is still called. */ -FOP_COND_D(f, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_s= tatus), 0)) -FOP_COND_D(un, float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_st= atus)) -FOP_COND_D(eq, float64_eq_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ueq, float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_st= atus) || float64_eq_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(olt, float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ult, float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_st= atus) || float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ole, float64_le_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ule, float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_st= atus) || float64_le_quiet(fdt0, fdt1, &env->active_fpu.fp_status)) -/* NOTE: the comma operator will make "cond" to eval to false, - * but float64_unordered() is still called. */ -FOP_COND_D(sf, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_status)= , 0)) -FOP_COND_D(ngle,float64_unordered(fdt1, fdt0, &env->active_fpu.fp_status)) -FOP_COND_D(seq, float64_eq(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ngl, float64_unordered(fdt1, fdt0, &env->active_fpu.fp_status) = || float64_eq(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(lt, float64_lt(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(nge, float64_unordered(fdt1, fdt0, &env->active_fpu.fp_status) = || float64_lt(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(le, float64_le(fdt0, fdt1, &env->active_fpu.fp_status)) -FOP_COND_D(ngt, float64_unordered(fdt1, fdt0, &env->active_fpu.fp_status) = || float64_le(fdt0, fdt1, &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float64_unordered_quiet() is still called. + */ +FOP_COND_D(f, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status), 0)) +FOP_COND_D(un, float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status)) +FOP_COND_D(eq, float64_eq_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ueq, float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_eq_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(olt, float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ult, float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ole, float64_le_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ule, float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le_quiet(fdt0, fdt1, + &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float64_unordered() is still called. + */ +FOP_COND_D(sf, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status), 0)) +FOP_COND_D(ngle, float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status)) +FOP_COND_D(seq, float64_eq(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ngl, float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_eq(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(lt, float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(nge, float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(le, float64_le(fdt0, fdt1, + &env->active_fpu.fp_status)) +FOP_COND_D(ngt, float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le(fdt0, fdt1, + &env->active_fpu.fp_status)) =20 #define FOP_COND_S(op, cond) \ void helper_cmp_s_ ## op(CPUMIPSState *env, uint32_t fst0, \ @@ -4119,26 +4263,58 @@ void helper_cmpabs_s_ ## op(CPUMIPSState *env, uint= 32_t fst0, \ CLEAR_FP_COND(cc, env->active_fpu); \ } =20 -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered_quiet() is still called. */ -FOP_COND_S(f, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_s= tatus), 0)) -FOP_COND_S(un, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_st= atus)) -FOP_COND_S(eq, float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ueq, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_st= atus) || float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(olt, float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ult, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_st= atus) || float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ole, float32_le_quiet(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ule, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_st= atus) || float32_le_quiet(fst0, fst1, &env->active_fpu.fp_status)) -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered() is still called. */ -FOP_COND_S(sf, (float32_unordered(fst1, fst0, &env->active_fpu.fp_status)= , 0)) -FOP_COND_S(ngle,float32_unordered(fst1, fst0, &env->active_fpu.fp_status)) -FOP_COND_S(seq, float32_eq(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ngl, float32_unordered(fst1, fst0, &env->active_fpu.fp_status) = || float32_eq(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(lt, float32_lt(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(nge, float32_unordered(fst1, fst0, &env->active_fpu.fp_status) = || float32_lt(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(le, float32_le(fst0, fst1, &env->active_fpu.fp_status)) -FOP_COND_S(ngt, float32_unordered(fst1, fst0, &env->active_fpu.fp_status) = || float32_le(fst0, fst1, &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered_quiet() is still called. + */ +FOP_COND_S(f, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status), 0)) +FOP_COND_S(un, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status)) +FOP_COND_S(eq, float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ueq, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(olt, float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ult, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ole, float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ule, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered() is still called. + */ +FOP_COND_S(sf, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status), 0)) +FOP_COND_S(ngle, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status)) +FOP_COND_S(seq, float32_eq(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ngl, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(lt, float32_lt(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(nge, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(le, float32_le(fst0, fst1, + &env->active_fpu.fp_status)) +FOP_COND_S(ngt, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le(fst0, fst1, + &env->active_fpu.fp_status)) =20 #define FOP_COND_PS(op, condl, condh) \ void helper_cmp_ps_ ## op(CPUMIPSState *env, uint64_t fdt0, \ @@ -4184,47 +4360,107 @@ void helper_cmpabs_ps_ ## op(CPUMIPSState *env, ui= nt64_t fdt0, \ CLEAR_FP_COND(cc + 1, env->active_fpu); \ } =20 -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered_quiet() is still called. */ -FOP_COND_PS(f, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_= status), 0), - (float32_unordered_quiet(fsth1, fsth0, &env->active_fpu.f= p_status), 0)) -FOP_COND_PS(un, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_s= tatus), - float32_unordered_quiet(fsth1, fsth0, &env->active_fpu.fp= _status)) -FOP_COND_PS(eq, float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_eq_quiet(fsth0, fsth1, &env->active_fpu.fp_status= )) -FOP_COND_PS(ueq, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_s= tatus) || float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered_quiet(fsth1, fsth0, &env->active_fpu.fp= _status) || float32_eq_quiet(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(olt, float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_lt_quiet(fsth0, fsth1, &env->active_fpu.fp_status= )) -FOP_COND_PS(ult, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_s= tatus) || float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered_quiet(fsth1, fsth0, &env->active_fpu.fp= _status) || float32_lt_quiet(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(ole, float32_le_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_le_quiet(fsth0, fsth1, &env->active_fpu.fp_status= )) -FOP_COND_PS(ule, float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp_s= tatus) || float32_le_quiet(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered_quiet(fsth1, fsth0, &env->active_fpu.fp= _status) || float32_le_quiet(fsth0, fsth1, &env->active_fpu.fp_status)) -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered() is still called. */ -FOP_COND_PS(sf, (float32_unordered(fst1, fst0, &env->active_fpu.fp_status= ), 0), - (float32_unordered(fsth1, fsth0, &env->active_fpu.fp_stat= us), 0)) -FOP_COND_PS(ngle,float32_unordered(fst1, fst0, &env->active_fpu.fp_status), - float32_unordered(fsth1, fsth0, &env->active_fpu.fp_statu= s)) -FOP_COND_PS(seq, float32_eq(fst0, fst1, &env->active_fpu.fp_status), - float32_eq(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(ngl, float32_unordered(fst1, fst0, &env->active_fpu.fp_status)= || float32_eq(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered(fsth1, fsth0, &env->active_fpu.fp_statu= s) || float32_eq(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(lt, float32_lt(fst0, fst1, &env->active_fpu.fp_status), - float32_lt(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(nge, float32_unordered(fst1, fst0, &env->active_fpu.fp_status)= || float32_lt(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered(fsth1, fsth0, &env->active_fpu.fp_statu= s) || float32_lt(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(le, float32_le(fst0, fst1, &env->active_fpu.fp_status), - float32_le(fsth0, fsth1, &env->active_fpu.fp_status)) -FOP_COND_PS(ngt, float32_unordered(fst1, fst0, &env->active_fpu.fp_status)= || float32_le(fst0, fst1, &env->active_fpu.fp_status), - float32_unordered(fsth1, fsth0, &env->active_fpu.fp_statu= s) || float32_le(fsth0, fsth1, &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered_quiet() is still called. + */ +FOP_COND_PS(f, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status), 0), + (float32_unordered_quiet(fsth1, fsth0, + &env->active_fpu.fp_status), 0)) +FOP_COND_PS(un, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status), + float32_unordered_quiet(fsth1, fsth0, + &env->active_fpu.fp_status)) +FOP_COND_PS(eq, float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_eq_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ueq, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered_quiet(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_eq_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(olt, float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_lt_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ult, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered_quiet(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ole, float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_le_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ule, float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered_quiet(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_le_quiet(fsth0, fsth1, + &env->active_fpu.fp_status)) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered() is still called. + */ +FOP_COND_PS(sf, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status), 0), + (float32_unordered(fsth1, fsth0, + &env->active_fpu.fp_status), 0)) +FOP_COND_PS(ngle, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status), + float32_unordered(fsth1, fsth0, + &env->active_fpu.fp_status)) +FOP_COND_PS(seq, float32_eq(fst0, fst1, + &env->active_fpu.fp_status), + float32_eq(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ngl, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_eq(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(lt, float32_lt(fst0, fst1, + &env->active_fpu.fp_status), + float32_lt(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(nge, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_lt(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(le, float32_le(fst0, fst1, + &env->active_fpu.fp_status), + float32_le(fsth0, fsth1, + &env->active_fpu.fp_status)) +FOP_COND_PS(ngt, float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le(fst0, fst1, + &env->active_fpu.fp_status), + float32_unordered(fsth1, fsth0, + &env->active_fpu.fp_status) + || float32_le(fsth0, fsth1, + &env->active_fpu.fp_status)) =20 /* R6 compare operations */ #define FOP_CONDN_D(op, cond) \ -uint64_t helper_r6_cmp_d_ ## op(CPUMIPSState * env, uint64_t fdt0, \ - uint64_t fdt1) \ +uint64_t helper_r6_cmp_d_ ## op(CPUMIPSState *env, uint64_t fdt0, \ + uint64_t fdt1) \ { \ uint64_t c; \ c =3D cond; \ @@ -4236,50 +4472,90 @@ uint64_t helper_r6_cmp_d_ ## op(CPUMIPSState * env,= uint64_t fdt0, \ } \ } =20 -/* NOTE: the comma operator will make "cond" to eval to false, - * but float64_unordered_quiet() is still called. */ -FOP_CONDN_D(af, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_= status), 0)) -FOP_CONDN_D(un, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_= status))) -FOP_CONDN_D(eq, (float64_eq_quiet(fdt0, fdt1, &env->active_fpu.fp_status)= )) -FOP_CONDN_D(ueq, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_= status) - || float64_eq_quiet(fdt0, fdt1, &env->active_fpu.fp_stat= us))) -FOP_CONDN_D(lt, (float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_status)= )) -FOP_CONDN_D(ult, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_= status) - || float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_stat= us))) -FOP_CONDN_D(le, (float64_le_quiet(fdt0, fdt1, &env->active_fpu.fp_status)= )) -FOP_CONDN_D(ule, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp_= status) - || float64_le_quiet(fdt0, fdt1, &env->active_fpu.fp_stat= us))) -/* NOTE: the comma operator will make "cond" to eval to false, - * but float64_unordered() is still called. */ -FOP_CONDN_D(saf, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s), 0)) -FOP_CONDN_D(sun, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s))) -FOP_CONDN_D(seq, (float64_eq(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sueq, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s) - || float64_eq(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(slt, (float64_lt(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sult, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s) - || float64_lt(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sle, (float64_le(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sule, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s) - || float64_le(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(or, (float64_le_quiet(fdt1, fdt0, &env->active_fpu.fp_status) - || float64_le_quiet(fdt0, fdt1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_D(une, (float64_unordered_quiet(fdt1, fdt0, &env->active_fpu.fp= _status) - || float64_lt_quiet(fdt1, fdt0, &env->active_fpu.fp_sta= tus) - || float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_D(ne, (float64_lt_quiet(fdt1, fdt0, &env->active_fpu.fp_status) - || float64_lt_quiet(fdt0, fdt1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_D(sor, (float64_le(fdt1, fdt0, &env->active_fpu.fp_status) - || float64_le(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sune, (float64_unordered(fdt1, fdt0, &env->active_fpu.fp_statu= s) - || float64_lt(fdt1, fdt0, &env->active_fpu.fp_status) - || float64_lt(fdt0, fdt1, &env->active_fpu.fp_status))) -FOP_CONDN_D(sne, (float64_lt(fdt1, fdt0, &env->active_fpu.fp_status) - || float64_lt(fdt0, fdt1, &env->active_fpu.fp_status))) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float64_unordered_quiet() is still called. + */ +FOP_CONDN_D(af, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status), 0)) +FOP_CONDN_D(un, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status))) +FOP_CONDN_D(eq, (float64_eq_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(ueq, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_eq_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(lt, (float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(ult, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(le, (float64_le_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(ule, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float64_unordered() is still called.\ + */ +FOP_CONDN_D(saf, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status), 0)) +FOP_CONDN_D(sun, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status))) +FOP_CONDN_D(seq, (float64_eq(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sueq, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_eq(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(slt, (float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sult, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sle, (float64_le(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sule, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(or, (float64_le_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(une, (float64_unordered_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(ne, (float64_lt_quiet(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt_quiet(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sor, (float64_le(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_le(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sune, (float64_unordered(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status))) +FOP_CONDN_D(sne, (float64_lt(fdt1, fdt0, + &env->active_fpu.fp_status) + || float64_lt(fdt0, fdt1, + &env->active_fpu.fp_status))) =20 #define FOP_CONDN_S(op, cond) \ -uint32_t helper_r6_cmp_s_ ## op(CPUMIPSState * env, uint32_t fst0, \ - uint32_t fst1) \ +uint32_t helper_r6_cmp_s_ ## op(CPUMIPSState *env, uint32_t fst0, \ + uint32_t fst1) \ { \ uint64_t c; \ c =3D cond; \ @@ -4291,46 +4567,86 @@ uint32_t helper_r6_cmp_s_ ## op(CPUMIPSState * env,= uint32_t fst0, \ } \ } =20 -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered_quiet() is still called. */ -FOP_CONDN_S(af, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status), 0)) -FOP_CONDN_S(un, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status))) -FOP_CONDN_S(eq, (float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_status= ))) -FOP_CONDN_S(ueq, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status) - || float32_eq_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_S(lt, (float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_status= ))) -FOP_CONDN_S(ult, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status) - || float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_S(le, (float32_le_quiet(fst0, fst1, &env->active_fpu.fp_status= ))) -FOP_CONDN_S(ule, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status) - || float32_le_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -/* NOTE: the comma operator will make "cond" to eval to false, - * but float32_unordered() is still called. */ -FOP_CONDN_S(saf, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s), 0)) -FOP_CONDN_S(sun, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s))) -FOP_CONDN_S(seq, (float32_eq(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sueq, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s) - || float32_eq(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(slt, (float32_lt(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sult, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s) - || float32_lt(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sle, (float32_le(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sule, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s) - || float32_le(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(or, (float32_le_quiet(fst1, fst0, &env->active_fpu.fp_status) - || float32_le_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_S(une, (float32_unordered_quiet(fst1, fst0, &env->active_fpu.fp= _status) - || float32_lt_quiet(fst1, fst0, &env->active_fpu.fp_sta= tus) - || float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_S(ne, (float32_lt_quiet(fst1, fst0, &env->active_fpu.fp_status) - || float32_lt_quiet(fst0, fst1, &env->active_fpu.fp_sta= tus))) -FOP_CONDN_S(sor, (float32_le(fst1, fst0, &env->active_fpu.fp_status) - || float32_le(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sune, (float32_unordered(fst1, fst0, &env->active_fpu.fp_statu= s) - || float32_lt(fst1, fst0, &env->active_fpu.fp_status) - || float32_lt(fst0, fst1, &env->active_fpu.fp_status))) -FOP_CONDN_S(sne, (float32_lt(fst1, fst0, &env->active_fpu.fp_status) - || float32_lt(fst0, fst1, &env->active_fpu.fp_status))) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered_quiet() is still called. + */ +FOP_CONDN_S(af, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status), 0)) +FOP_CONDN_S(un, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status))) +FOP_CONDN_S(eq, (float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(ueq, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(lt, (float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(ult, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(le, (float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(ule, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +/* + * NOTE: the comma operator will make "cond" to eval to false, + * but float32_unordered() is still called. + */ +FOP_CONDN_S(saf, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status), 0)) +FOP_CONDN_S(sun, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status))) +FOP_CONDN_S(seq, (float32_eq(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sueq, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_eq(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(slt, (float32_lt(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sult, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sle, (float32_le(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sule, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(or, (float32_le_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(une, (float32_unordered_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(ne, (float32_lt_quiet(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt_quiet(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sor, (float32_le(fst1, fst0, + &env->active_fpu.fp_status) + || float32_le(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sune, (float32_unordered(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst0, fst1, + &env->active_fpu.fp_status))) +FOP_CONDN_S(sne, (float32_lt(fst1, fst0, + &env->active_fpu.fp_status) + || float32_lt(fst0, fst1, + &env->active_fpu.fp_status))) =20 /* MSA */ /* Data format min and max values */ @@ -4522,7 +4838,7 @@ void helper_msa_ld_d(CPUMIPSState *env, uint32_t wd, } =20 #define MSA_PAGESPAN(x) \ - ((((x) & ~TARGET_PAGE_MASK) + MSA_WRLEN/8 - 1) >=3D TARGET_PAGE_SI= ZE) + ((((x) & ~TARGET_PAGE_MASK) + MSA_WRLEN / 8 - 1) >=3D TARGET_PAGE_= SIZE) =20 static inline void ensure_writable_pages(CPUMIPSState *env, target_ulong addr, --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571828938; cv=none; d=zoho.com; s=zohoarc; b=HMszqfQqd8vfsbsQr69b5iEVuyNW0RbuOpUTMnW03PAhSLhELl7EX9rOfyZGMMmwm4sePTvQzADBrlbOUhANGjBwV3OMPKky/VgTHRMqQ8PwOvuUnP+uhkbheCvYOXWPU0Oz+RV+eXMcGm/BGNC0NaquseznP0Nz12bqEfgyJvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571828938; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7PGuI+g0XF1W5uCR54U0QEpP8bzY8il30VKdAt8gdNI=; b=TQjiofAStIH2g6uxpjfW1F4PGU5o3VO6GQVuOEgeCBm472lbwxD71xQKJXRhhv+sHp6LG9wQ7F4gvOzUHx1wJ+1SzzOnXh5EFw9xHhlnZgsXRJXnm9g7f+39ncN9/1JhNJg8ugDzujBWQ82+sOslgbME+/sNJzTsvTo92psuMvo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157182893804775.76970408569616; Wed, 23 Oct 2019 04:08:58 -0700 (PDT) Received: from localhost ([::1]:60468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEVb-0006X8-R3 for importer@patchew.org; Wed, 23 Oct 2019 07:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42928) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpv-0000yX-2N for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpp-0002wR-Ch for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:47 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:45271 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpo-0002V2-9Z for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:44 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 4F8DA1A1D7A; Wed, 23 Oct 2019 12:24:38 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 628B61A22A9; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 03/14] MAINTAINERS: Update mail address of Aleksandar Rikalo Date: Wed, 23 Oct 2019 12:23:36 +0200 Message-Id: <1571826227-10583-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Aleksandar Rikalo wishes to change his primary mail address for QEMU. Some minor line order is corrected in .mailmap to be alphabetical, too. Reviewed-by: Aleksandar Rikalo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Aleksandar Markovic --- .mailmap | 5 +++-- MAINTAINERS | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.mailmap b/.mailmap index 0756a0b..3816e4e 100644 --- a/.mailmap +++ b/.mailmap @@ -39,10 +39,11 @@ Julia Suvorova Julia Suvorova via Qemu= -devel Justin Terry (VM) via Qemu-devel= =20 # Next, replace old addresses by a more recent one. -Anthony Liguori Anthony Liguori -James Hogan Aleksandar Markovic Aleksandar Markovic +Aleksandar Rikalo +Anthony Liguori Anthony Liguori +James Hogan Paul Burton Paul Burton Paul Burton diff --git a/MAINTAINERS b/MAINTAINERS index 3ca8148..4964fbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -208,7 +208,7 @@ F: disas/microblaze.c MIPS TCG CPUs M: Aurelien Jarno M: Aleksandar Markovic -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: target/mips/ F: default-configs/*mips* @@ -363,7 +363,7 @@ F: target/arm/kvm.c =20 MIPS KVM CPUs M: James Hogan -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: target/mips/kvm.c =20 @@ -934,7 +934,7 @@ MIPS Machines ------------- Jazz M: Herv=C3=A9 Poussineau -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/mips/mips_jazz.c F: hw/display/jazz_led.c @@ -942,7 +942,7 @@ F: hw/dma/rc4030.c =20 Malta M: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/mips/mips_malta.c F: hw/mips/gt64xxx_pci.c @@ -950,20 +950,20 @@ F: tests/acceptance/linux_ssh_mips_malta.py =20 Mipssim M: Aleksandar Markovic -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Odd Fixes F: hw/mips/mips_mipssim.c F: hw/net/mipsnet.c =20 R4000 M: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/mips/mips_r4k.c =20 Fulong 2E M: Aleksandar Markovic -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Odd Fixes F: hw/mips/mips_fulong2e.c F: hw/isa/vt82c686.c @@ -972,7 +972,7 @@ F: include/hw/isa/vt82c686.h =20 Boston M: Paul Burton -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: hw/core/loader-fit.c F: hw/mips/boston.c @@ -2348,7 +2348,7 @@ F: disas/i386.c =20 MIPS TCG target M: Aurelien Jarno -R: Aleksandar Rikalo +R: Aleksandar Rikalo S: Maintained F: tcg/mips/ =20 --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571826939; cv=none; d=zoho.com; s=zohoarc; b=HWMToxJp2OhTchKkkuIVJ4+QYlGwZQKapLSqnc07xL0GtPgRbmNa6MXW+ZG8NLxN5X6PJua+d46MkjqqSfqJHxf3UJyqKlJHZkrlSO3Gcgwcc+DJhN6mr0ctepeW0tR4s5QHDFzttXnw/9VKZN5Oz4wJXVgq9ohJmbHqnocImFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571826939; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HcDkX3GtWJNsFFK72uGwy8qcWeSgtw2jW9u8pPOuC+Y=; b=EVSRACXuIJQhtYfM2a7Gc3LXbPp1NOfDTRwin97/V3gucho8SIV6gHhU8Vj7AvU/fyssuV1uzPXK/gYjMNVixVCLpNW6NSBwe4tRABFGsOKVrlQSsVizEr2VEgXpJ7RcJrU6pWPBCNVt+rJL0O3dEimy+IGsL7/keydsskY+9HU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571826939132720.4334451268112; Wed, 23 Oct 2019 03:35:39 -0700 (PDT) Received: from localhost ([::1]:60050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDzJ-0006FI-8G for importer@patchew.org; Wed, 23 Oct 2019 06:35:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42935) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpv-0000yg-6D for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpr-0002xX-FM for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:50 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:45374 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpo-0002VE-Rm for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:45 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 753EC1A1E09; Wed, 23 Oct 2019 12:24:38 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 6E5161A22AD; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 04/14] target/mips: msa: Split helpers for _A. Date: Wed, 23 Oct 2019 12:23:37 +0200 Message-Id: <1571826227-10583-5-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 11 +++- target/mips/msa_helper.c | 163 ++++++++++++++++++++++++++++++++++++++++++-= ---- target/mips/translate.c | 38 +++++++++-- 3 files changed, 187 insertions(+), 25 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index d615c83..cef4de6 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -877,6 +877,15 @@ DEF_HELPER_4(msa_div_u_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_div_u_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_div_u_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_max_a_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_a_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_a_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_a_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_a_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_a_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_a_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_a_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_mod_u_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_u_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_u_w, void, env, i32, i32, i32) @@ -940,8 +949,6 @@ DEF_HELPER_5(msa_max_s_df, void, env, i32, i32, i32, i3= 2) DEF_HELPER_5(msa_max_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_min_s_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_min_u_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_max_a_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_min_a_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_add_a_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_adds_a_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_adds_s_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index a2052ba..3eb0ab1 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -1736,7 +1736,152 @@ void helper_msa_div_u_d(CPUMIPSState *env, * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Int Max Min group helpers here */ +static inline int64_t msa_max_a_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; + uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; + return abs_arg1 > abs_arg2 ? arg1 : arg2; +} + +void helper_msa_max_a_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_max_a_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_max_a_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_max_a_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_max_a_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_max_a_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_max_a_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_max_a_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_max_a_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_max_a_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_max_a_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_max_a_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_max_a_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_max_a_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_max_a_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_max_a_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_max_a_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_max_a_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_max_a_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_max_a_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_max_a_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_max_a_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_max_a_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_max_a_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_max_a_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_max_a_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_max_a_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_max_a_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_max_a_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_max_a_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_max_a_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_max_a_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_max_a_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_max_a_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_min_a_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; + uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; + return abs_arg1 < abs_arg2 ? arg1 : arg2; +} + +void helper_msa_min_a_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_min_a_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_min_a_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_min_a_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_min_a_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_min_a_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_min_a_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_min_a_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_min_a_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_min_a_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_min_a_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_min_a_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_min_a_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_min_a_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_min_a_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_min_a_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_min_a_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_min_a_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_min_a_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_min_a_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_min_a_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_min_a_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_min_a_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_min_a_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_min_a_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_min_a_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_min_a_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_min_a_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_min_a_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_min_a_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_min_a_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_min_a_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_min_a_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_min_a_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} =20 =20 /* @@ -2456,20 +2601,6 @@ MSA_TEROP_IMMU_DF(binsli, binsl) MSA_TEROP_IMMU_DF(binsri, binsr) #undef MSA_TEROP_IMMU_DF =20 -static inline int64_t msa_max_a_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; - uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; - return abs_arg1 > abs_arg2 ? arg1 : arg2; -} - -static inline int64_t msa_min_a_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; - uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; - return abs_arg1 < abs_arg2 ? arg1 : arg2; -} - static inline int64_t msa_add_a_df(uint32_t df, int64_t arg1, int64_t arg2) { uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; @@ -2773,8 +2904,6 @@ MSA_BINOP_DF(max_s) MSA_BINOP_DF(max_u) MSA_BINOP_DF(min_s) MSA_BINOP_DF(min_u) -MSA_BINOP_DF(max_a) -MSA_BINOP_DF(min_a) MSA_BINOP_DF(add_a) MSA_BINOP_DF(adds_a) MSA_BINOP_DF(adds_s) diff --git a/target/mips/translate.c b/target/mips/translate.c index 5039716..8e26548 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28642,6 +28642,38 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_MAX_A_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_max_a_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_max_a_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_max_a_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_max_a_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_MIN_A_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_min_a_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_min_a_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_min_a_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_min_a_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_MOD_S_df: switch (df) { case DF_BYTE: @@ -28767,15 +28799,9 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_ILVR_df: gen_helper_msa_ilvr_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MAX_A_df: - gen_helper_msa_max_a_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ILVEV_df: gen_helper_msa_ilvev_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MIN_A_df: - gen_helper_msa_min_a_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ILVOD_df: gen_helper_msa_ilvod_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571827589; cv=none; d=zoho.com; s=zohoarc; b=SHao0DuiGKQ/nRqdB9e8+oyh6HBt++iXP3O+UQAZCM1RXNeV92GK03K1a3MA+iNnf2Sn20AQ4NYUTtTZgp5c3NVOjYAJJeOBFv18E7zT+BTSZ1EziSXJu3oI1Qj2/U2vtT+roh+6xX6NZ8WT1IahlsU0VBPq15pkhVylYZXC2pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571827589; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=hb6Scnj+EbhKf1SAGPluypBLIRkBp9KuG/8Rw2CINaU=; b=fGJD1h5VWwOZWeLIOnhaKF2oOYPvN15/BAdPvf5o8QqJZt0KgmM1niGQHDD3Xf1eG8JGU99gMlBZo2CjRhe+m8v6dY+cjxFHDYrX5Ib3rpglNY1oUmCRyUIhoJBMFJha2eIo0C2L5+f3H01/mblf6nnsol4lqNhwzbTRL+/UmX8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571827589418125.22434815230099; Wed, 23 Oct 2019 03:46:29 -0700 (PDT) Received: from localhost ([::1]:60132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNE9q-00077J-ON for importer@patchew.org; Wed, 23 Oct 2019 06:46:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43043) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpz-00010m-Ul for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpv-00030A-Mn for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:55 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35709 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002xh-0i for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id A753D1A214B; Wed, 23 Oct 2019 12:24:40 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 857771A21AC; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 05/14] target/mips: msa: Split helpers for _. Date: Wed, 23 Oct 2019 12:23:38 +0200 Message-Id: <1571826227-10583-6-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 20 ++- target/mips/msa_helper.c | 320 ++++++++++++++++++++++++++++++++++++++++++-= ---- target/mips/translate.c | 76 +++++++++-- 3 files changed, 372 insertions(+), 44 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index cef4de6..6419bb8 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -881,10 +881,26 @@ DEF_HELPER_4(msa_max_a_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_max_a_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_max_a_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_max_a_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_s_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_s_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_u_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_max_u_d, void, env, i32, i32, i32) DEF_HELPER_4(msa_min_a_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_min_a_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_min_a_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_min_a_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_s_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_s_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_u_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_min_u_d, void, env, i32, i32, i32) =20 DEF_HELPER_4(msa_mod_u_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_u_h, void, env, i32, i32, i32) @@ -945,10 +961,6 @@ DEF_HELPER_5(msa_binsl_df, void, env, i32, i32, i32, i= 32) DEF_HELPER_5(msa_binsr_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_addv_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subv_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_max_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_max_u_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_min_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_min_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_add_a_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_adds_a_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_adds_s_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 3eb0ab1..65df15d 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -1810,6 +1810,152 @@ void helper_msa_max_a_d(CPUMIPSState *env, } =20 =20 +static inline int64_t msa_max_s_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + return arg1 > arg2 ? arg1 : arg2; +} + +void helper_msa_max_s_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_max_s_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_max_s_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_max_s_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_max_s_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_max_s_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_max_s_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_max_s_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_max_s_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_max_s_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_max_s_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_max_s_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_max_s_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_max_s_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_max_s_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_max_s_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_max_s_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_max_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_max_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_max_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_max_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_max_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_max_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_max_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_max_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_max_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_max_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_max_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_max_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_max_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_max_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_max_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_max_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_max_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_max_u_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + uint64_t u_arg2 =3D UNSIGNED(arg2, df); + return u_arg1 > u_arg2 ? arg1 : arg2; +} + +void helper_msa_max_u_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_max_u_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_max_u_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_max_u_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_max_u_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_max_u_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_max_u_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_max_u_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_max_u_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_max_u_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_max_u_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_max_u_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_max_u_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_max_u_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_max_u_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_max_u_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_max_u_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_max_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_max_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_max_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_max_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_max_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_max_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_max_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_max_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_max_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_max_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_max_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_max_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_max_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_max_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_max_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_max_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_max_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + static inline int64_t msa_min_a_df(uint32_t df, int64_t arg1, int64_t arg2) { uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; @@ -1884,6 +2030,152 @@ void helper_msa_min_a_d(CPUMIPSState *env, } =20 =20 +static inline int64_t msa_min_s_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + return arg1 < arg2 ? arg1 : arg2; +} + +void helper_msa_min_s_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_min_s_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_min_s_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_min_s_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_min_s_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_min_s_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_min_s_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_min_s_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_min_s_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_min_s_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_min_s_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_min_s_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_min_s_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_min_s_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_min_s_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_min_s_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_min_s_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_min_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_min_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_min_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_min_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_min_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_min_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_min_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_min_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_min_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_min_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_min_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_min_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_min_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_min_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_min_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_min_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_min_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_min_u_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + uint64_t u_arg2 =3D UNSIGNED(arg2, df); + return u_arg1 < u_arg2 ? arg1 : arg2; +} + +void helper_msa_min_u_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_min_u_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_min_u_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_min_u_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_min_u_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_min_u_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_min_u_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_min_u_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_min_u_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_min_u_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_min_u_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_min_u_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_min_u_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_min_u_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_min_u_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_min_u_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_min_u_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_min_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_min_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_min_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_min_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_min_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_min_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_min_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_min_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_min_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_min_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_min_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_min_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_min_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_min_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_min_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_min_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_min_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + /* * Int Modulo * ---------- @@ -2354,30 +2646,6 @@ static inline int64_t msa_subv_df(uint32_t df, int64= _t arg1, int64_t arg2) return arg1 - arg2; } =20 -static inline int64_t msa_max_s_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - return arg1 > arg2 ? arg1 : arg2; -} - -static inline int64_t msa_max_u_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - uint64_t u_arg2 =3D UNSIGNED(arg2, df); - return u_arg1 > u_arg2 ? arg1 : arg2; -} - -static inline int64_t msa_min_s_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - return arg1 < arg2 ? arg1 : arg2; -} - -static inline int64_t msa_min_u_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - uint64_t u_arg2 =3D UNSIGNED(arg2, df); - return u_arg1 < u_arg2 ? arg1 : arg2; -} - #define MSA_BINOP_IMM_DF(helper, func) \ void helper_msa_ ## helper ## _df(CPUMIPSState *env, uint32_t df, \ uint32_t wd, uint32_t ws, int32_t u5) \ @@ -2900,10 +3168,6 @@ MSA_BINOP_DF(sra) MSA_BINOP_DF(srl) MSA_BINOP_DF(addv) MSA_BINOP_DF(subv) -MSA_BINOP_DF(max_s) -MSA_BINOP_DF(max_u) -MSA_BINOP_DF(min_s) -MSA_BINOP_DF(min_u) MSA_BINOP_DF(add_a) MSA_BINOP_DF(adds_a) MSA_BINOP_DF(adds_s) diff --git a/target/mips/translate.c b/target/mips/translate.c index 8e26548..7a35c26 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28658,6 +28658,38 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_MAX_S_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_max_s_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_max_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_max_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_max_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_MAX_U_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_max_u_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_max_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_max_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_max_u_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_MIN_A_df: switch (df) { case DF_BYTE: @@ -28674,6 +28706,38 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_MIN_S_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_min_s_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_min_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_min_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_min_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_MIN_U_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_min_u_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_min_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_min_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_min_u_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_MOD_S_df: switch (df) { case DF_BYTE: @@ -28751,9 +28815,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_SRL_df: gen_helper_msa_srl_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MAX_S_df: - gen_helper_msa_max_s_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ADDS_S_df: gen_helper_msa_adds_s_df(cpu_env, tdf, twd, tws, twt); break; @@ -28769,9 +28830,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_SRLR_df: gen_helper_msa_srlr_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MAX_U_df: - gen_helper_msa_max_u_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ADDS_U_df: gen_helper_msa_adds_u_df(cpu_env, tdf, twd, tws, twt); break; @@ -28781,18 +28839,12 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCo= ntext *ctx) case OPC_PCKOD_df: gen_helper_msa_pckod_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MIN_S_df: - gen_helper_msa_min_s_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ASUB_S_df: gen_helper_msa_asub_s_df(cpu_env, tdf, twd, tws, twt); break; case OPC_ILVL_df: gen_helper_msa_ilvl_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_MIN_U_df: - gen_helper_msa_min_u_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ASUB_U_df: gen_helper_msa_asub_u_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571829487; cv=none; d=zoho.com; s=zohoarc; b=iv4t1PjMB2RpkWZyc8f2KHeg8rcUX3PenPKtMu9+q6dFJS914aorMhN+D7UochdtMCZOZMF/6N4RGz8nBNaVy2UDrPfw1FHbV/eOm1Pw0RmuRZ9atbA7cwKcU6/8lL3kEI9zEtOeJ2mNmi+6V5WaJULt3Fb+BpoeetNyR9IwPLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571829487; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=T+F+YaezE+zewQJz9eunZOK4h7QFnThxHye7KTQcs8U=; b=XqLbf0sBfd0+KG/PVbm0m657e6OyFwuKTrVmcqWtaEBMnRyosegUbwNA/s12qWFXJjBYPPmEmwMQ10v8Ja21kQowDq7LvMwPXJLAVnAVG+D99cH+27/OLAkauSBAyf044UFnPt+sBDb9cxCgGGDx59AF0rEhXsOqyA+9FiRIJ/Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571829487344368.2954441392126; Wed, 23 Oct 2019 04:18:07 -0700 (PDT) Received: from localhost ([::1]:60590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEeT-0004qq-Ax for importer@patchew.org; Wed, 23 Oct 2019 07:18:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq3-00013H-3G for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpy-00032U-1t for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:58 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35647 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002wg-BI for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 804461A21FF; Wed, 23 Oct 2019 12:24:39 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 9418F1A221F; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 06/14] target/mips: msa: Split helpers for ILV. Date: Wed, 23 Oct 2019 12:23:39 +0200 Message-Id: <1571826227-10583-7-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 21 +- target/mips/msa_helper.c | 768 +++++++++++++++++++++++++------------------= ---- target/mips/translate.c | 76 ++++- 3 files changed, 496 insertions(+), 369 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index 6419bb8..f3df187 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -912,6 +912,23 @@ DEF_HELPER_4(msa_mod_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_ilvev_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvev_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvev_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvev_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvod_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvod_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvod_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvod_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvl_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvl_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvl_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvl_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvr_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvr_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvr_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_ilvr_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_and_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_nor_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_or_v, void, env, i32, i32, i32) @@ -984,10 +1001,6 @@ DEF_HELPER_5(msa_sld_df, void, env, i32, i32, i32, i3= 2) DEF_HELPER_5(msa_splat_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_pckev_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_pckod_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_ilvl_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_ilvr_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_ilvev_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_ilvod_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_vshf_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_srar_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_srlr_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 65df15d..499fcde 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -2432,7 +2432,421 @@ void helper_msa_mod_u_d(CPUMIPSState *env, * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Interleave group helpers here */ + +void helper_msa_ilvev_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[8] =3D pws->b[9]; + pwd->b[9] =3D pwt->b[9]; + pwd->b[10] =3D pws->b[11]; + pwd->b[11] =3D pwt->b[11]; + pwd->b[12] =3D pws->b[13]; + pwd->b[13] =3D pwt->b[13]; + pwd->b[14] =3D pws->b[15]; + pwd->b[15] =3D pwt->b[15]; + pwd->b[0] =3D pws->b[1]; + pwd->b[1] =3D pwt->b[1]; + pwd->b[2] =3D pws->b[3]; + pwd->b[3] =3D pwt->b[3]; + pwd->b[4] =3D pws->b[5]; + pwd->b[5] =3D pwt->b[5]; + pwd->b[6] =3D pws->b[7]; + pwd->b[7] =3D pwt->b[7]; +#else + pwd->b[15] =3D pws->b[14]; + pwd->b[14] =3D pwt->b[14]; + pwd->b[13] =3D pws->b[12]; + pwd->b[12] =3D pwt->b[12]; + pwd->b[11] =3D pws->b[10]; + pwd->b[10] =3D pwt->b[10]; + pwd->b[9] =3D pws->b[8]; + pwd->b[8] =3D pwt->b[8]; + pwd->b[7] =3D pws->b[6]; + pwd->b[6] =3D pwt->b[6]; + pwd->b[5] =3D pws->b[4]; + pwd->b[4] =3D pwt->b[4]; + pwd->b[3] =3D pws->b[2]; + pwd->b[2] =3D pwt->b[2]; + pwd->b[1] =3D pws->b[0]; + pwd->b[0] =3D pwt->b[0]; +#endif +} + +void helper_msa_ilvev_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[4] =3D pws->h[5]; + pwd->h[5] =3D pwt->h[5]; + pwd->h[6] =3D pws->h[7]; + pwd->h[7] =3D pwt->h[7]; + pwd->h[0] =3D pws->h[1]; + pwd->h[1] =3D pwt->h[1]; + pwd->h[2] =3D pws->h[3]; + pwd->h[3] =3D pwt->h[3]; +#else + pwd->h[7] =3D pws->h[6]; + pwd->h[6] =3D pwt->h[6]; + pwd->h[5] =3D pws->h[4]; + pwd->h[4] =3D pwt->h[4]; + pwd->h[3] =3D pws->h[2]; + pwd->h[2] =3D pwt->h[2]; + pwd->h[1] =3D pws->h[0]; + pwd->h[0] =3D pwt->h[0]; +#endif +} + +void helper_msa_ilvev_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[2] =3D pws->w[3]; + pwd->w[3] =3D pwt->w[3]; + pwd->w[0] =3D pws->w[1]; + pwd->w[1] =3D pwt->w[1]; +#else + pwd->w[3] =3D pws->w[2]; + pwd->w[2] =3D pwt->w[2]; + pwd->w[1] =3D pws->w[0]; + pwd->w[0] =3D pwt->w[0]; +#endif +} + +void helper_msa_ilvev_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[1] =3D pws->d[0]; + pwd->d[0] =3D pwt->d[0]; +} + + +void helper_msa_ilvod_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[7] =3D pwt->b[6]; + pwd->b[6] =3D pws->b[6]; + pwd->b[5] =3D pwt->b[4]; + pwd->b[4] =3D pws->b[4]; + pwd->b[3] =3D pwt->b[2]; + pwd->b[2] =3D pws->b[2]; + pwd->b[1] =3D pwt->b[0]; + pwd->b[0] =3D pws->b[0]; + pwd->b[15] =3D pwt->b[14]; + pwd->b[14] =3D pws->b[14]; + pwd->b[13] =3D pwt->b[12]; + pwd->b[12] =3D pws->b[12]; + pwd->b[11] =3D pwt->b[10]; + pwd->b[10] =3D pws->b[10]; + pwd->b[9] =3D pwt->b[8]; + pwd->b[8] =3D pws->b[8]; +#else + pwd->b[0] =3D pwt->b[1]; + pwd->b[1] =3D pws->b[1]; + pwd->b[2] =3D pwt->b[3]; + pwd->b[3] =3D pws->b[3]; + pwd->b[4] =3D pwt->b[5]; + pwd->b[5] =3D pws->b[5]; + pwd->b[6] =3D pwt->b[7]; + pwd->b[7] =3D pws->b[7]; + pwd->b[8] =3D pwt->b[9]; + pwd->b[9] =3D pws->b[9]; + pwd->b[10] =3D pwt->b[11]; + pwd->b[11] =3D pws->b[11]; + pwd->b[12] =3D pwt->b[13]; + pwd->b[13] =3D pws->b[13]; + pwd->b[14] =3D pwt->b[15]; + pwd->b[15] =3D pws->b[15]; +#endif +} + +void helper_msa_ilvod_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[3] =3D pwt->h[2]; + pwd->h[2] =3D pws->h[2]; + pwd->h[1] =3D pwt->h[0]; + pwd->h[0] =3D pws->h[0]; + pwd->h[7] =3D pwt->h[6]; + pwd->h[6] =3D pws->h[6]; + pwd->h[5] =3D pwt->h[4]; + pwd->h[4] =3D pws->h[4]; +#else + pwd->h[0] =3D pwt->h[1]; + pwd->h[1] =3D pws->h[1]; + pwd->h[2] =3D pwt->h[3]; + pwd->h[3] =3D pws->h[3]; + pwd->h[4] =3D pwt->h[5]; + pwd->h[5] =3D pws->h[5]; + pwd->h[6] =3D pwt->h[7]; + pwd->h[7] =3D pws->h[7]; +#endif +} + +void helper_msa_ilvod_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[1] =3D pwt->w[0]; + pwd->w[0] =3D pws->w[0]; + pwd->w[3] =3D pwt->w[2]; + pwd->w[2] =3D pws->w[2]; +#else + pwd->w[0] =3D pwt->w[1]; + pwd->w[1] =3D pws->w[1]; + pwd->w[2] =3D pwt->w[3]; + pwd->w[3] =3D pws->w[3]; +#endif +} + +void helper_msa_ilvod_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D pwt->d[1]; + pwd->d[1] =3D pws->d[1]; +} + + +void helper_msa_ilvl_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[7] =3D pwt->b[15]; + pwd->b[6] =3D pws->b[15]; + pwd->b[5] =3D pwt->b[14]; + pwd->b[4] =3D pws->b[14]; + pwd->b[3] =3D pwt->b[13]; + pwd->b[2] =3D pws->b[13]; + pwd->b[1] =3D pwt->b[12]; + pwd->b[0] =3D pws->b[12]; + pwd->b[15] =3D pwt->b[11]; + pwd->b[14] =3D pws->b[11]; + pwd->b[13] =3D pwt->b[10]; + pwd->b[12] =3D pws->b[10]; + pwd->b[11] =3D pwt->b[9]; + pwd->b[10] =3D pws->b[9]; + pwd->b[9] =3D pwt->b[8]; + pwd->b[8] =3D pws->b[8]; +#else + pwd->b[0] =3D pwt->b[8]; + pwd->b[1] =3D pws->b[8]; + pwd->b[2] =3D pwt->b[9]; + pwd->b[3] =3D pws->b[9]; + pwd->b[4] =3D pwt->b[10]; + pwd->b[5] =3D pws->b[10]; + pwd->b[6] =3D pwt->b[11]; + pwd->b[7] =3D pws->b[11]; + pwd->b[8] =3D pwt->b[12]; + pwd->b[9] =3D pws->b[12]; + pwd->b[10] =3D pwt->b[13]; + pwd->b[11] =3D pws->b[13]; + pwd->b[12] =3D pwt->b[14]; + pwd->b[13] =3D pws->b[14]; + pwd->b[14] =3D pwt->b[15]; + pwd->b[15] =3D pws->b[15]; +#endif +} + +void helper_msa_ilvl_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[3] =3D pwt->h[7]; + pwd->h[2] =3D pws->h[7]; + pwd->h[1] =3D pwt->h[6]; + pwd->h[0] =3D pws->h[6]; + pwd->h[7] =3D pwt->h[5]; + pwd->h[6] =3D pws->h[5]; + pwd->h[5] =3D pwt->h[4]; + pwd->h[4] =3D pws->h[4]; +#else + pwd->h[0] =3D pwt->h[4]; + pwd->h[1] =3D pws->h[4]; + pwd->h[2] =3D pwt->h[5]; + pwd->h[3] =3D pws->h[5]; + pwd->h[4] =3D pwt->h[6]; + pwd->h[5] =3D pws->h[6]; + pwd->h[6] =3D pwt->h[7]; + pwd->h[7] =3D pws->h[7]; +#endif +} + +void helper_msa_ilvl_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[1] =3D pwt->w[3]; + pwd->w[0] =3D pws->w[3]; + pwd->w[3] =3D pwt->w[2]; + pwd->w[2] =3D pws->w[2]; +#else + pwd->w[0] =3D pwt->w[2]; + pwd->w[1] =3D pws->w[2]; + pwd->w[2] =3D pwt->w[3]; + pwd->w[3] =3D pws->w[3]; +#endif +} + +void helper_msa_ilvl_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D pwt->d[1]; + pwd->d[1] =3D pws->d[1]; +} + + +void helper_msa_ilvr_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[8] =3D pws->b[0]; + pwd->b[9] =3D pwt->b[0]; + pwd->b[10] =3D pws->b[1]; + pwd->b[11] =3D pwt->b[1]; + pwd->b[12] =3D pws->b[2]; + pwd->b[13] =3D pwt->b[2]; + pwd->b[14] =3D pws->b[3]; + pwd->b[15] =3D pwt->b[3]; + pwd->b[0] =3D pws->b[4]; + pwd->b[1] =3D pwt->b[4]; + pwd->b[2] =3D pws->b[5]; + pwd->b[3] =3D pwt->b[5]; + pwd->b[4] =3D pws->b[6]; + pwd->b[5] =3D pwt->b[6]; + pwd->b[6] =3D pws->b[7]; + pwd->b[7] =3D pwt->b[7]; +#else + pwd->b[15] =3D pws->b[7]; + pwd->b[14] =3D pwt->b[7]; + pwd->b[13] =3D pws->b[6]; + pwd->b[12] =3D pwt->b[6]; + pwd->b[11] =3D pws->b[5]; + pwd->b[10] =3D pwt->b[5]; + pwd->b[9] =3D pws->b[4]; + pwd->b[8] =3D pwt->b[4]; + pwd->b[7] =3D pws->b[3]; + pwd->b[6] =3D pwt->b[3]; + pwd->b[5] =3D pws->b[2]; + pwd->b[4] =3D pwt->b[2]; + pwd->b[3] =3D pws->b[1]; + pwd->b[2] =3D pwt->b[1]; + pwd->b[1] =3D pws->b[0]; + pwd->b[0] =3D pwt->b[0]; +#endif +} + +void helper_msa_ilvr_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[4] =3D pws->h[0]; + pwd->h[5] =3D pwt->h[0]; + pwd->h[6] =3D pws->h[1]; + pwd->h[7] =3D pwt->h[1]; + pwd->h[0] =3D pws->h[2]; + pwd->h[1] =3D pwt->h[2]; + pwd->h[2] =3D pws->h[3]; + pwd->h[3] =3D pwt->h[3]; +#else + pwd->h[7] =3D pws->h[3]; + pwd->h[6] =3D pwt->h[3]; + pwd->h[5] =3D pws->h[2]; + pwd->h[4] =3D pwt->h[2]; + pwd->h[3] =3D pws->h[1]; + pwd->h[2] =3D pwt->h[1]; + pwd->h[1] =3D pws->h[0]; + pwd->h[0] =3D pwt->h[0]; +#endif +} + +void helper_msa_ilvr_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[2] =3D pws->w[0]; + pwd->w[3] =3D pwt->w[0]; + pwd->w[0] =3D pws->w[1]; + pwd->w[1] =3D pwt->w[1]; +#else + pwd->w[3] =3D pws->w[1]; + pwd->w[2] =3D pwt->w[1]; + pwd->w[1] =3D pws->w[0]; + pwd->w[0] =3D pwt->w[0]; +#endif +} + +void helper_msa_ilvr_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[1] =3D pws->d[0]; + pwd->d[0] =3D pwt->d[0]; +} =20 =20 /* @@ -3522,358 +3936,6 @@ MSA_FN_DF(vshf_df) #undef MSA_FN_DF =20 =20 -void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[8] =3D pws->b[9]; - pwd->b[9] =3D pwt->b[9]; - pwd->b[10] =3D pws->b[11]; - pwd->b[11] =3D pwt->b[11]; - pwd->b[12] =3D pws->b[13]; - pwd->b[13] =3D pwt->b[13]; - pwd->b[14] =3D pws->b[15]; - pwd->b[15] =3D pwt->b[15]; - pwd->b[0] =3D pws->b[1]; - pwd->b[1] =3D pwt->b[1]; - pwd->b[2] =3D pws->b[3]; - pwd->b[3] =3D pwt->b[3]; - pwd->b[4] =3D pws->b[5]; - pwd->b[5] =3D pwt->b[5]; - pwd->b[6] =3D pws->b[7]; - pwd->b[7] =3D pwt->b[7]; -#else - pwd->b[15] =3D pws->b[14]; - pwd->b[14] =3D pwt->b[14]; - pwd->b[13] =3D pws->b[12]; - pwd->b[12] =3D pwt->b[12]; - pwd->b[11] =3D pws->b[10]; - pwd->b[10] =3D pwt->b[10]; - pwd->b[9] =3D pws->b[8]; - pwd->b[8] =3D pwt->b[8]; - pwd->b[7] =3D pws->b[6]; - pwd->b[6] =3D pwt->b[6]; - pwd->b[5] =3D pws->b[4]; - pwd->b[4] =3D pwt->b[4]; - pwd->b[3] =3D pws->b[2]; - pwd->b[2] =3D pwt->b[2]; - pwd->b[1] =3D pws->b[0]; - pwd->b[0] =3D pwt->b[0]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[4] =3D pws->h[5]; - pwd->h[5] =3D pwt->h[5]; - pwd->h[6] =3D pws->h[7]; - pwd->h[7] =3D pwt->h[7]; - pwd->h[0] =3D pws->h[1]; - pwd->h[1] =3D pwt->h[1]; - pwd->h[2] =3D pws->h[3]; - pwd->h[3] =3D pwt->h[3]; -#else - pwd->h[7] =3D pws->h[6]; - pwd->h[6] =3D pwt->h[6]; - pwd->h[5] =3D pws->h[4]; - pwd->h[4] =3D pwt->h[4]; - pwd->h[3] =3D pws->h[2]; - pwd->h[2] =3D pwt->h[2]; - pwd->h[1] =3D pws->h[0]; - pwd->h[0] =3D pwt->h[0]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[2] =3D pws->w[3]; - pwd->w[3] =3D pwt->w[3]; - pwd->w[0] =3D pws->w[1]; - pwd->w[1] =3D pwt->w[1]; -#else - pwd->w[3] =3D pws->w[2]; - pwd->w[2] =3D pwt->w[2]; - pwd->w[1] =3D pws->w[0]; - pwd->w[0] =3D pwt->w[0]; -#endif - break; - case DF_DOUBLE: - pwd->d[1] =3D pws->d[0]; - pwd->d[0] =3D pwt->d[0]; - break; - default: - assert(0); - } -} - -void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[7] =3D pwt->b[6]; - pwd->b[6] =3D pws->b[6]; - pwd->b[5] =3D pwt->b[4]; - pwd->b[4] =3D pws->b[4]; - pwd->b[3] =3D pwt->b[2]; - pwd->b[2] =3D pws->b[2]; - pwd->b[1] =3D pwt->b[0]; - pwd->b[0] =3D pws->b[0]; - pwd->b[15] =3D pwt->b[14]; - pwd->b[14] =3D pws->b[14]; - pwd->b[13] =3D pwt->b[12]; - pwd->b[12] =3D pws->b[12]; - pwd->b[11] =3D pwt->b[10]; - pwd->b[10] =3D pws->b[10]; - pwd->b[9] =3D pwt->b[8]; - pwd->b[8] =3D pws->b[8]; -#else - pwd->b[0] =3D pwt->b[1]; - pwd->b[1] =3D pws->b[1]; - pwd->b[2] =3D pwt->b[3]; - pwd->b[3] =3D pws->b[3]; - pwd->b[4] =3D pwt->b[5]; - pwd->b[5] =3D pws->b[5]; - pwd->b[6] =3D pwt->b[7]; - pwd->b[7] =3D pws->b[7]; - pwd->b[8] =3D pwt->b[9]; - pwd->b[9] =3D pws->b[9]; - pwd->b[10] =3D pwt->b[11]; - pwd->b[11] =3D pws->b[11]; - pwd->b[12] =3D pwt->b[13]; - pwd->b[13] =3D pws->b[13]; - pwd->b[14] =3D pwt->b[15]; - pwd->b[15] =3D pws->b[15]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[3] =3D pwt->h[2]; - pwd->h[2] =3D pws->h[2]; - pwd->h[1] =3D pwt->h[0]; - pwd->h[0] =3D pws->h[0]; - pwd->h[7] =3D pwt->h[6]; - pwd->h[6] =3D pws->h[6]; - pwd->h[5] =3D pwt->h[4]; - pwd->h[4] =3D pws->h[4]; -#else - pwd->h[0] =3D pwt->h[1]; - pwd->h[1] =3D pws->h[1]; - pwd->h[2] =3D pwt->h[3]; - pwd->h[3] =3D pws->h[3]; - pwd->h[4] =3D pwt->h[5]; - pwd->h[5] =3D pws->h[5]; - pwd->h[6] =3D pwt->h[7]; - pwd->h[7] =3D pws->h[7]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[1] =3D pwt->w[0]; - pwd->w[0] =3D pws->w[0]; - pwd->w[3] =3D pwt->w[2]; - pwd->w[2] =3D pws->w[2]; -#else - pwd->w[0] =3D pwt->w[1]; - pwd->w[1] =3D pws->w[1]; - pwd->w[2] =3D pwt->w[3]; - pwd->w[3] =3D pws->w[3]; -#endif - break; - case DF_DOUBLE: - pwd->d[0] =3D pwt->d[1]; - pwd->d[1] =3D pws->d[1]; - break; - default: - assert(0); - } -} - -void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[7] =3D pwt->b[15]; - pwd->b[6] =3D pws->b[15]; - pwd->b[5] =3D pwt->b[14]; - pwd->b[4] =3D pws->b[14]; - pwd->b[3] =3D pwt->b[13]; - pwd->b[2] =3D pws->b[13]; - pwd->b[1] =3D pwt->b[12]; - pwd->b[0] =3D pws->b[12]; - pwd->b[15] =3D pwt->b[11]; - pwd->b[14] =3D pws->b[11]; - pwd->b[13] =3D pwt->b[10]; - pwd->b[12] =3D pws->b[10]; - pwd->b[11] =3D pwt->b[9]; - pwd->b[10] =3D pws->b[9]; - pwd->b[9] =3D pwt->b[8]; - pwd->b[8] =3D pws->b[8]; -#else - pwd->b[0] =3D pwt->b[8]; - pwd->b[1] =3D pws->b[8]; - pwd->b[2] =3D pwt->b[9]; - pwd->b[3] =3D pws->b[9]; - pwd->b[4] =3D pwt->b[10]; - pwd->b[5] =3D pws->b[10]; - pwd->b[6] =3D pwt->b[11]; - pwd->b[7] =3D pws->b[11]; - pwd->b[8] =3D pwt->b[12]; - pwd->b[9] =3D pws->b[12]; - pwd->b[10] =3D pwt->b[13]; - pwd->b[11] =3D pws->b[13]; - pwd->b[12] =3D pwt->b[14]; - pwd->b[13] =3D pws->b[14]; - pwd->b[14] =3D pwt->b[15]; - pwd->b[15] =3D pws->b[15]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[3] =3D pwt->h[7]; - pwd->h[2] =3D pws->h[7]; - pwd->h[1] =3D pwt->h[6]; - pwd->h[0] =3D pws->h[6]; - pwd->h[7] =3D pwt->h[5]; - pwd->h[6] =3D pws->h[5]; - pwd->h[5] =3D pwt->h[4]; - pwd->h[4] =3D pws->h[4]; -#else - pwd->h[0] =3D pwt->h[4]; - pwd->h[1] =3D pws->h[4]; - pwd->h[2] =3D pwt->h[5]; - pwd->h[3] =3D pws->h[5]; - pwd->h[4] =3D pwt->h[6]; - pwd->h[5] =3D pws->h[6]; - pwd->h[6] =3D pwt->h[7]; - pwd->h[7] =3D pws->h[7]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[1] =3D pwt->w[3]; - pwd->w[0] =3D pws->w[3]; - pwd->w[3] =3D pwt->w[2]; - pwd->w[2] =3D pws->w[2]; -#else - pwd->w[0] =3D pwt->w[2]; - pwd->w[1] =3D pws->w[2]; - pwd->w[2] =3D pwt->w[3]; - pwd->w[3] =3D pws->w[3]; -#endif - break; - case DF_DOUBLE: - pwd->d[0] =3D pwt->d[1]; - pwd->d[1] =3D pws->d[1]; - break; - default: - assert(0); - } -} - -void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[8] =3D pws->b[0]; - pwd->b[9] =3D pwt->b[0]; - pwd->b[10] =3D pws->b[1]; - pwd->b[11] =3D pwt->b[1]; - pwd->b[12] =3D pws->b[2]; - pwd->b[13] =3D pwt->b[2]; - pwd->b[14] =3D pws->b[3]; - pwd->b[15] =3D pwt->b[3]; - pwd->b[0] =3D pws->b[4]; - pwd->b[1] =3D pwt->b[4]; - pwd->b[2] =3D pws->b[5]; - pwd->b[3] =3D pwt->b[5]; - pwd->b[4] =3D pws->b[6]; - pwd->b[5] =3D pwt->b[6]; - pwd->b[6] =3D pws->b[7]; - pwd->b[7] =3D pwt->b[7]; -#else - pwd->b[15] =3D pws->b[7]; - pwd->b[14] =3D pwt->b[7]; - pwd->b[13] =3D pws->b[6]; - pwd->b[12] =3D pwt->b[6]; - pwd->b[11] =3D pws->b[5]; - pwd->b[10] =3D pwt->b[5]; - pwd->b[9] =3D pws->b[4]; - pwd->b[8] =3D pwt->b[4]; - pwd->b[7] =3D pws->b[3]; - pwd->b[6] =3D pwt->b[3]; - pwd->b[5] =3D pws->b[2]; - pwd->b[4] =3D pwt->b[2]; - pwd->b[3] =3D pws->b[1]; - pwd->b[2] =3D pwt->b[1]; - pwd->b[1] =3D pws->b[0]; - pwd->b[0] =3D pwt->b[0]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[4] =3D pws->h[0]; - pwd->h[5] =3D pwt->h[0]; - pwd->h[6] =3D pws->h[1]; - pwd->h[7] =3D pwt->h[1]; - pwd->h[0] =3D pws->h[2]; - pwd->h[1] =3D pwt->h[2]; - pwd->h[2] =3D pws->h[3]; - pwd->h[3] =3D pwt->h[3]; -#else - pwd->h[7] =3D pws->h[3]; - pwd->h[6] =3D pwt->h[3]; - pwd->h[5] =3D pws->h[2]; - pwd->h[4] =3D pwt->h[2]; - pwd->h[3] =3D pws->h[1]; - pwd->h[2] =3D pwt->h[1]; - pwd->h[1] =3D pws->h[0]; - pwd->h[0] =3D pwt->h[0]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[2] =3D pws->w[0]; - pwd->w[3] =3D pwt->w[0]; - pwd->w[0] =3D pws->w[1]; - pwd->w[1] =3D pwt->w[1]; -#else - pwd->w[3] =3D pws->w[1]; - pwd->w[2] =3D pwt->w[1]; - pwd->w[1] =3D pws->w[0]; - pwd->w[0] =3D pwt->w[0]; -#endif - break; - case DF_DOUBLE: - pwd->d[1] =3D pws->d[0]; - pwd->d[0] =3D pwt->d[0]; - break; - default: - assert(0); - } -} - void helper_msa_pckev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, uint32_t ws, uint32_t wt) { diff --git a/target/mips/translate.c b/target/mips/translate.c index 7a35c26..ea8b8f4 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28770,6 +28770,70 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_ILVEV_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_ilvev_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_ilvev_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_ilvev_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_ilvev_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ILVOD_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_ilvod_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_ilvod_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_ilvod_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_ilvod_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ILVL_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_ilvl_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_ilvl_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_ilvl_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_ilvl_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ILVR_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_ilvr_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_ilvr_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_ilvr_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_ilvr_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_SLL_df: gen_helper_msa_sll_df(cpu_env, tdf, twd, tws, twt); break; @@ -28842,21 +28906,9 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_ASUB_S_df: gen_helper_msa_asub_s_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ILVL_df: - gen_helper_msa_ilvl_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ASUB_U_df: gen_helper_msa_asub_u_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ILVR_df: - gen_helper_msa_ilvr_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_ILVEV_df: - gen_helper_msa_ilvev_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_ILVOD_df: - gen_helper_msa_ilvod_df(cpu_env, tdf, twd, tws, twt); - break; =20 case OPC_DOTP_S_df: case OPC_DOTP_U_df: --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571828346; cv=none; d=zoho.com; s=zohoarc; b=cGGliS7gboJB0mni4gKJwT8VxaaJO06Ox5TWbjqyioFC0qK2Her0+8DFobt9I6vGEMawPFMfMEgDzLMSEd29XNmGF6ueSb2x8r+f7ePYAB4GpIJ9HvmoRe8+oCORDh4pZEFFWcmj+atdFz9vQvwWHPJMKh0AsdkMFSFZtTPEgsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571828346; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Z4RQ8fhAd5kDZpURVLB8EFFbWNnRKoeWqeuNtPUijN8=; b=e+XHO4KScP4Fot4AdziPIpdStQBKLgxiVB73LUu3ShPrZuDdNRfjAO1KqFhNWI0GcLzvAmwjO0YYhamtgfuG5fufbfAzL2yL0jQ6Y+4fGVtR5epsUpDaMVDUO3BxyWVXYcNhgL1kPnqUzXgXBBLv+6wUdFB7RgJIHNDqGu2yeiU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571828346930987.315937833578; Wed, 23 Oct 2019 03:59:06 -0700 (PDT) Received: from localhost ([::1]:60350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEM3-0008U0-2n for importer@patchew.org; Wed, 23 Oct 2019 06:59:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43076) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq1-00011I-2w for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpx-00031L-Px for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35650 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002wl-8z for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 7B3BF1A21E6; Wed, 23 Oct 2019 12:24:39 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id C716E1A21B6; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 07/14] target/mips: msa: Split helpers for ADD<_A|S_A|S_S|S_U|V>. Date: Wed, 23 Oct 2019 12:23:40 +0200 Message-Id: <1571826227-10583-8-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 30 +++- target/mips/msa_helper.c | 426 +++++++++++++++++++++++++++++++++++++++++--= ---- target/mips/translate.c | 95 +++++++++-- 3 files changed, 482 insertions(+), 69 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index f3df187..ce01e97 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -822,6 +822,31 @@ DEF_HELPER_4(msa_bset_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_bset_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_bset_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_add_a_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_add_a_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_add_a_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_add_a_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_adds_a_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_a_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_a_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_a_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_adds_s_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_s_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_adds_u_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_adds_u_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_addv_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_addv_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_addv_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_addv_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_ave_s_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_ave_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_ave_s_w, void, env, i32, i32, i32) @@ -976,12 +1001,7 @@ DEF_HELPER_5(msa_sra_df, void, env, i32, i32, i32, i3= 2) DEF_HELPER_5(msa_srl_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_binsl_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_binsr_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_addv_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subv_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_add_a_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_adds_a_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_adds_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_adds_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subs_s_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subs_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subsus_u_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 499fcde..c31f46c 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -805,7 +805,383 @@ void helper_msa_bset_d(CPUMIPSState *env, uint32_t wd= , uint32_t ws, uint32_t wt) * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Int Add group helpers here */ + +static inline int64_t msa_add_a_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; + uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; + return abs_arg1 + abs_arg2; +} + +void helper_msa_add_a_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_add_a_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_add_a_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_add_a_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_add_a_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_add_a_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_add_a_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_add_a_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_add_a_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_add_a_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_add_a_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_add_a_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_add_a_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_add_a_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_add_a_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_add_a_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_add_a_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_add_a_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_add_a_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_add_a_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_add_a_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_add_a_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_add_a_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_add_a_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_add_a_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_add_a_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_add_a_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_add_a_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_add_a_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_add_a_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_add_a_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_add_a_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_add_a_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_add_a_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_adds_a_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + uint64_t max_int =3D (uint64_t)DF_MAX_INT(df); + uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; + uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; + if (abs_arg1 > max_int || abs_arg2 > max_int) { + return (int64_t)max_int; + } else { + return (abs_arg1 < max_int - abs_arg2) ? abs_arg1 + abs_arg2 : max= _int; + } +} + +void helper_msa_adds_a_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_adds_a_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_adds_a_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_adds_a_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_adds_a_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_adds_a_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_adds_a_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_adds_a_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_adds_a_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_adds_a_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_adds_a_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_adds_a_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_adds_a_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_adds_a_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_adds_a_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_adds_a_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_adds_a_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_adds_a_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_adds_a_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_adds_a_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_adds_a_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_adds_a_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_adds_a_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_adds_a_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_adds_a_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_adds_a_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_adds_a_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_adds_a_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_adds_a_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_adds_a_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_adds_a_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_adds_a_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_adds_a_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_adds_a_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_adds_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + int64_t max_int =3D DF_MAX_INT(df); + int64_t min_int =3D DF_MIN_INT(df); + if (arg1 < 0) { + return (min_int - arg1 < arg2) ? arg1 + arg2 : min_int; + } else { + return (arg2 < max_int - arg1) ? arg1 + arg2 : max_int; + } +} + +void helper_msa_adds_s_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_adds_s_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_adds_s_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_adds_s_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_adds_s_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_adds_s_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_adds_s_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_adds_s_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_adds_s_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_adds_s_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_adds_s_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_adds_s_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_adds_s_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_adds_s_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_adds_s_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_adds_s_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_adds_s_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_adds_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_adds_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_adds_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_adds_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_adds_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_adds_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_adds_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_adds_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_adds_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_adds_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_adds_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_adds_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_adds_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_adds_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_adds_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_adds_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_adds_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline uint64_t msa_adds_u_df(uint32_t df, uint64_t arg1, uint64_t = arg2) +{ + uint64_t max_uint =3D DF_MAX_UINT(df); + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + uint64_t u_arg2 =3D UNSIGNED(arg2, df); + return (u_arg1 < max_uint - u_arg2) ? u_arg1 + u_arg2 : max_uint; +} + +void helper_msa_adds_u_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_adds_u_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_adds_u_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_adds_u_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_adds_u_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_adds_u_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_adds_u_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_adds_u_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_adds_u_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_adds_u_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_adds_u_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_adds_u_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_adds_u_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_adds_u_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_adds_u_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_adds_u_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_adds_u_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_adds_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_adds_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_adds_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_adds_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_adds_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_adds_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_adds_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_adds_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_adds_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_adds_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_adds_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_adds_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_adds_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_adds_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_adds_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_adds_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_adds_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_addv_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + return arg1 + arg2; +} + +void helper_msa_addv_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_addv_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_addv_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_addv_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_addv_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_addv_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_addv_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_addv_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_addv_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_addv_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_addv_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_addv_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_addv_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_addv_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_addv_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_addv_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_addv_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_addv_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_addv_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_addv_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_addv_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_addv_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_addv_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_addv_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_addv_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_addv_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_addv_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_addv_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_addv_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_addv_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_addv_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_addv_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_addv_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_addv_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} =20 =20 /* @@ -3050,11 +3426,6 @@ void helper_msa_shf_df(CPUMIPSState *env, uint32_t d= f, uint32_t wd, msa_move_v(pwd, pwx); } =20 -static inline int64_t msa_addv_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - return arg1 + arg2; -} - static inline int64_t msa_subv_df(uint32_t df, int64_t arg1, int64_t arg2) { return arg1 - arg2; @@ -3283,44 +3654,6 @@ MSA_TEROP_IMMU_DF(binsli, binsl) MSA_TEROP_IMMU_DF(binsri, binsr) #undef MSA_TEROP_IMMU_DF =20 -static inline int64_t msa_add_a_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; - uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; - return abs_arg1 + abs_arg2; -} - -static inline int64_t msa_adds_a_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - uint64_t max_int =3D (uint64_t)DF_MAX_INT(df); - uint64_t abs_arg1 =3D arg1 >=3D 0 ? arg1 : -arg1; - uint64_t abs_arg2 =3D arg2 >=3D 0 ? arg2 : -arg2; - if (abs_arg1 > max_int || abs_arg2 > max_int) { - return (int64_t)max_int; - } else { - return (abs_arg1 < max_int - abs_arg2) ? abs_arg1 + abs_arg2 : max= _int; - } -} - -static inline int64_t msa_adds_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - int64_t max_int =3D DF_MAX_INT(df); - int64_t min_int =3D DF_MIN_INT(df); - if (arg1 < 0) { - return (min_int - arg1 < arg2) ? arg1 + arg2 : min_int; - } else { - return (arg2 < max_int - arg1) ? arg1 + arg2 : max_int; - } -} - -static inline uint64_t msa_adds_u_df(uint32_t df, uint64_t arg1, uint64_t = arg2) -{ - uint64_t max_uint =3D DF_MAX_UINT(df); - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - uint64_t u_arg2 =3D UNSIGNED(arg2, df); - return (u_arg1 < max_uint - u_arg2) ? u_arg1 + u_arg2 : max_uint; -} - static inline int64_t msa_subs_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) { int64_t max_int =3D DF_MAX_INT(df); @@ -3580,12 +3913,7 @@ void helper_msa_ ## func ## _df(CPUMIPSState *env, u= int32_t df, \ MSA_BINOP_DF(sll) MSA_BINOP_DF(sra) MSA_BINOP_DF(srl) -MSA_BINOP_DF(addv) MSA_BINOP_DF(subv) -MSA_BINOP_DF(add_a) -MSA_BINOP_DF(adds_a) -MSA_BINOP_DF(adds_s) -MSA_BINOP_DF(adds_u) MSA_BINOP_DF(subs_s) MSA_BINOP_DF(subs_u) MSA_BINOP_DF(subsus_u) diff --git a/target/mips/translate.c b/target/mips/translate.c index ea8b8f4..14f9891 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28466,6 +28466,86 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_ADD_A_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_add_a_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_add_a_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_add_a_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_add_a_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ADDS_A_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_adds_a_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_adds_a_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_adds_a_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_adds_a_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ADDS_S_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_adds_s_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_adds_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_adds_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_adds_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ADDS_U_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_adds_u_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_adds_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_adds_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_adds_u_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ADDV_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_addv_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_addv_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_addv_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_addv_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_AVE_S_df: switch (df) { case DF_BYTE: @@ -28837,12 +28917,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_SLL_df: gen_helper_msa_sll_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ADDV_df: - gen_helper_msa_addv_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_ADD_A_df: - gen_helper_msa_add_a_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBS_S_df: gen_helper_msa_subs_s_df(cpu_env, tdf, twd, tws, twt); break; @@ -28861,9 +28935,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_SUBV_df: gen_helper_msa_subv_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ADDS_A_df: - gen_helper_msa_adds_a_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBS_U_df: gen_helper_msa_subs_u_df(cpu_env, tdf, twd, tws, twt); break; @@ -28879,9 +28950,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_SRL_df: gen_helper_msa_srl_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ADDS_S_df: - gen_helper_msa_adds_s_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBSUS_U_df: gen_helper_msa_subsus_u_df(cpu_env, tdf, twd, tws, twt); break; @@ -28894,9 +28962,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_SRLR_df: gen_helper_msa_srlr_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ADDS_U_df: - gen_helper_msa_adds_u_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBSUU_S_df: gen_helper_msa_subsuu_s_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571829588; cv=none; d=zoho.com; s=zohoarc; b=FKrpqnku6czM5z8g2yxdhxqrRgp1pNDg9EfUm98BRwKpZF7s1pJ2kgWGg3Hjl1Prg5zqfC9DCtQcQngdxq2qE+0h5qs/37VaV/42fh2XIrwQfRzlpUFCkdL+GZ4Lrhf18n5ZOxnHyqrUkk17mmvU9Lwq0j/gaAIO0LGMm9iPtv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571829588; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Jtr49vKMB83NT3epJJZmc7D0nXqoaFsxh3lK3WC2Luc=; b=H9n7ihu4IZhiFC8FvszUMpDfUAkRT6IgxUlTpjXYBCI/hUTpN1eb8HT7Y4s4s0KCMkt5Ut6ttUZnh6w7ADQklpCi4HEJ1f29R0JU+pFA5wZcz7S8zF7mbKf5iyC2ZILTggu3xwAilawahW3wBh2w+RV7x8BS6GB5SrIXXv2oRE4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571829588610719.9302866515357; Wed, 23 Oct 2019 04:19:48 -0700 (PDT) Received: from localhost ([::1]:60594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEg4-0005Qt-H2 for importer@patchew.org; Wed, 23 Oct 2019 07:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42981) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpx-000102-TN for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpu-0002yi-5q for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:45453 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpp-0002VP-A3 for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:47 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 52A6B1A2143; Wed, 23 Oct 2019 12:24:39 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id F29811A2261; Wed, 23 Oct 2019 12:23:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 08/14] target/mips: msa: Split helpers for HADD_. Date: Wed, 23 Oct 2019 12:23:41 +0200 Message-Id: <1571826227-10583-9-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 10 +++- target/mips/msa_helper.c | 131 ++++++++++++++++++++++++++++++++++++++-----= ---- target/mips/translate.c | 32 +++++++++--- 3 files changed, 141 insertions(+), 32 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index ce01e97..f25ba90 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -847,6 +847,14 @@ DEF_HELPER_4(msa_addv_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_addv_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_addv_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_hadd_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hadd_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hadd_s_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_hadd_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hadd_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hadd_u_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_ave_s_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_ave_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_ave_s_w, void, env, i32, i32, i32) @@ -1024,8 +1032,6 @@ DEF_HELPER_5(msa_pckod_df, void, env, i32, i32, i32, = i32) DEF_HELPER_5(msa_vshf_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_srar_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_srlr_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_hadd_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_hadd_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_s_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_u_df, void, env, i32, i32, i32, i32) =20 diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index c31f46c..f5d3737 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -1184,6 +1184,113 @@ void helper_msa_addv_d(CPUMIPSState *env, } =20 =20 +#define SIGNED_EVEN(a, df) \ + ((((int64_t)(a)) << (64 - DF_BITS(df) / 2)) >> (64 - DF_BITS(df) /= 2)) + +#define UNSIGNED_EVEN(a, df) \ + ((((uint64_t)(a)) << (64 - DF_BITS(df) / 2)) >> (64 - DF_BITS(df) = / 2)) + +#define SIGNED_ODD(a, df) \ + ((((int64_t)(a)) << (64 - DF_BITS(df))) >> (64 - DF_BITS(df) / 2)) + +#define UNSIGNED_ODD(a, df) \ + ((((uint64_t)(a)) << (64 - DF_BITS(df))) >> (64 - DF_BITS(df) / 2)) + + +static inline int64_t msa_hadd_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + return SIGNED_ODD(arg1, df) + SIGNED_EVEN(arg2, df); +} + +void helper_msa_hadd_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_hadd_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_hadd_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_hadd_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_hadd_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_hadd_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_hadd_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_hadd_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_hadd_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_hadd_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_hadd_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_hadd_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_hadd_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_hadd_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_hadd_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_hadd_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_hadd_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_hadd_u_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + return UNSIGNED_ODD(arg1, df) + UNSIGNED_EVEN(arg2, df); +} + +void helper_msa_hadd_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_hadd_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_hadd_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_hadd_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_hadd_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_hadd_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_hadd_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_hadd_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_hadd_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_hadd_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_hadd_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_hadd_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_hadd_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_hadd_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_hadd_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_hadd_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_hadd_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + /* * Int Average * ----------- @@ -3727,18 +3834,6 @@ static inline int64_t msa_mulv_df(uint32_t df, int64= _t arg1, int64_t arg2) return arg1 * arg2; } =20 -#define SIGNED_EVEN(a, df) \ - ((((int64_t)(a)) << (64 - DF_BITS(df) / 2)) >> (64 - DF_BITS(df) /= 2)) - -#define UNSIGNED_EVEN(a, df) \ - ((((uint64_t)(a)) << (64 - DF_BITS(df) / 2)) >> (64 - DF_BITS(df) = / 2)) - -#define SIGNED_ODD(a, df) \ - ((((int64_t)(a)) << (64 - DF_BITS(df))) >> (64 - DF_BITS(df) / 2)) - -#define UNSIGNED_ODD(a, df) \ - ((((uint64_t)(a)) << (64 - DF_BITS(df))) >> (64 - DF_BITS(df) / 2)) - #define SIGNED_EXTRACT(e, o, a, df) \ do { \ e =3D SIGNED_EVEN(a, df); \ @@ -3815,16 +3910,6 @@ static inline void msa_sld_df(uint32_t df, wr_t *pwd, } } =20 -static inline int64_t msa_hadd_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - return SIGNED_ODD(arg1, df) + SIGNED_EVEN(arg2, df); -} - -static inline int64_t msa_hadd_u_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - return UNSIGNED_ODD(arg1, df) + UNSIGNED_EVEN(arg2, df); -} - static inline int64_t msa_hsub_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) { return SIGNED_ODD(arg1, df) - SIGNED_EVEN(arg2, df); @@ -3925,8 +4010,6 @@ MSA_BINOP_DF(dotp_s) MSA_BINOP_DF(dotp_u) MSA_BINOP_DF(srar) MSA_BINOP_DF(srlr) -MSA_BINOP_DF(hadd_s) -MSA_BINOP_DF(hadd_u) MSA_BINOP_DF(hsub_s) MSA_BINOP_DF(hsub_u) =20 diff --git a/target/mips/translate.c b/target/mips/translate.c index 14f9891..9e8e973 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28990,6 +28990,32 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } switch (MASK_MSA_3R(ctx->opcode)) { + case OPC_HADD_S_df: + switch (df) { + case DF_HALF: + gen_helper_msa_hadd_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_hadd_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_hadd_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_HADD_U_df: + switch (df) { + case DF_HALF: + gen_helper_msa_hadd_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_hadd_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_hadd_u_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_DOTP_S_df: gen_helper_msa_dotp_s_df(cpu_env, tdf, twd, tws, twt); break; @@ -29005,15 +29031,9 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_DPSUB_S_df: gen_helper_msa_dpsub_s_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_HADD_S_df: - gen_helper_msa_hadd_s_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_DPSUB_U_df: gen_helper_msa_dpsub_u_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_HADD_U_df: - gen_helper_msa_hadd_u_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_HSUB_S_df: gen_helper_msa_hsub_s_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571829797; cv=none; d=zoho.com; s=zohoarc; b=mSehjF9en1qn8LpDHRwkq10JimWL4aSKPuyN1unBE4w1/+ZCClPjbpiZlUn5pa2XNnTxCk1ra/Q8Snob1WbF3c6TLxl1SKc6gSwflIKeR1iCfyt3w2Na+2Q2Sz7f5hFknaTmGqdWIFmk5EOu0pY57cVtfXtHhjBp+buEE/8JmD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571829797; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZXF6V8G7dUQWkhtCYeEqYUP3ziaorQ12YgBKSUtPu98=; b=A4396LTCUUPj9jR1ic5b72o91BrTcY5guXJn8rxqVzUoHpZO+QvSllXHHoKuaqPSVsgAOtfysFo4E6CE2ve8scvPJhFPsmzqCTeI/GGIxaNgWldQL86MgNtM7f2IFdZSINAIRkbS0hVw9MyIEfils9O0u7jwf0LKGSqpbcCSW68= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571829797032449.2332728781894; Wed, 23 Oct 2019 04:23:17 -0700 (PDT) Received: from localhost ([::1]:60680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEjS-0008C1-N0 for importer@patchew.org; Wed, 23 Oct 2019 07:23:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq2-000132-Vk for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpy-00032O-11 for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35871 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002ys-KQ for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 222961A1D8C; Wed, 23 Oct 2019 12:24:43 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 153B91A22B4; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 09/14] target/mips: msa: Split helpers for S. Date: Wed, 23 Oct 2019 12:23:42 +0200 Message-Id: <1571826227-10583-10-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 30 +++- target/mips/msa_helper.c | 424 +++++++++++++++++++++++++++++++++++++++++--= ---- target/mips/translate.c | 91 ++++++++-- 3 files changed, 479 insertions(+), 66 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index f25ba90..f779404 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -967,6 +967,31 @@ DEF_HELPER_4(msa_nor_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_or_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_xor_v, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_sll_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sll_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sll_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sll_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_sra_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sra_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sra_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_sra_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_srar_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srar_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srar_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srar_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_srl_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srl_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srl_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srl_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_srlr_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srlr_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srlr_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_srlr_d, void, env, i32, i32, i32) + DEF_HELPER_3(msa_move_v, void, env, i32, i32) =20 DEF_HELPER_4(msa_andi_b, void, env, i32, i32, i32) @@ -1004,9 +1029,6 @@ DEF_HELPER_5(msa_sat_u_df, void, env, i32, i32, i32, = i32) DEF_HELPER_5(msa_srari_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_srlri_df, void, env, i32, i32, i32, i32) =20 -DEF_HELPER_5(msa_sll_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_sra_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_srl_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_binsl_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_binsr_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subv_df, void, env, i32, i32, i32, i32) @@ -1030,8 +1052,6 @@ DEF_HELPER_5(msa_splat_df, void, env, i32, i32, i32, = i32) DEF_HELPER_5(msa_pckev_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_pckod_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_vshf_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_srar_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_srlr_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_s_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_u_df, void, env, i32, i32, i32, i32) =20 diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index f5d3737..38ff1da 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -3461,7 +3461,382 @@ void helper_msa_move_v(CPUMIPSState *env, uint32_t = wd, uint32_t ws) * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Shift group helpers here */ + +static inline int64_t msa_sll_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + int32_t b_arg2 =3D BIT_POSITION(arg2, df); + return arg1 << b_arg2; +} + +void helper_msa_sll_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_sll_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_sll_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_sll_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_sll_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_sll_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_sll_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_sll_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_sll_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_sll_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_sll_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_sll_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_sll_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_sll_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_sll_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_sll_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_sll_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_sll_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_sll_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_sll_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_sll_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_sll_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_sll_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_sll_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_sll_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_sll_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_sll_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_sll_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_sll_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_sll_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_sll_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_sll_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_sll_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_sll_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_sra_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + int32_t b_arg2 =3D BIT_POSITION(arg2, df); + return arg1 >> b_arg2; +} + +void helper_msa_sra_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_sra_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_sra_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_sra_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_sra_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_sra_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_sra_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_sra_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_sra_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_sra_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_sra_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_sra_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_sra_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_sra_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_sra_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_sra_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_sra_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_sra_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_sra_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_sra_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_sra_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_sra_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_sra_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_sra_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_sra_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_sra_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_sra_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_sra_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_sra_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_sra_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_sra_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_sra_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_sra_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_sra_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_srar_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + int32_t b_arg2 =3D BIT_POSITION(arg2, df); + if (b_arg2 =3D=3D 0) { + return arg1; + } else { + int64_t r_bit =3D (arg1 >> (b_arg2 - 1)) & 1; + return (arg1 >> b_arg2) + r_bit; + } +} + +void helper_msa_srar_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_srar_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_srar_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_srar_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_srar_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_srar_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_srar_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_srar_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_srar_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_srar_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_srar_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_srar_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_srar_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_srar_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_srar_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_srar_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_srar_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_srar_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_srar_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_srar_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_srar_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_srar_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_srar_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_srar_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_srar_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_srar_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_srar_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_srar_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_srar_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_srar_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_srar_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_srar_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_srar_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_srar_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_srl_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + int32_t b_arg2 =3D BIT_POSITION(arg2, df); + return u_arg1 >> b_arg2; +} + +void helper_msa_srl_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_srl_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_srl_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_srl_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_srl_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_srl_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_srl_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_srl_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_srl_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_srl_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_srl_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_srl_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_srl_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_srl_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_srl_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_srl_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_srl_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_srl_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_srl_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_srl_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_srl_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_srl_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_srl_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_srl_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_srl_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_srl_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_srl_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_srl_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_srl_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_srl_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_srl_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_srl_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_srl_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_srl_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_srlr_df(uint32_t df, int64_t arg1, int64_t arg2) +{ + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + int32_t b_arg2 =3D BIT_POSITION(arg2, df); + if (b_arg2 =3D=3D 0) { + return u_arg1; + } else { + uint64_t r_bit =3D (u_arg1 >> (b_arg2 - 1)) & 1; + return (u_arg1 >> b_arg2) + r_bit; + } +} + +void helper_msa_srlr_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_srlr_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_srlr_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_srlr_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_srlr_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_srlr_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_srlr_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_srlr_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_srlr_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_srlr_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_srlr_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_srlr_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_srlr_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_srlr_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_srlr_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_srlr_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_srlr_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_srlr_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_srlr_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_srlr_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_srlr_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_srlr_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_srlr_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_srlr_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_srlr_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_srlr_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_srlr_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_srlr_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_srlr_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_srlr_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_srlr_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_srlr_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_srlr_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_srlr_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} =20 =20 #define MSA_FN_IMM8(FUNC, DEST, OPERATION) \ @@ -3617,25 +3992,6 @@ void helper_msa_ldi_df(CPUMIPSState *env, uint32_t d= f, uint32_t wd, } } =20 -static inline int64_t msa_sll_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - int32_t b_arg2 =3D BIT_POSITION(arg2, df); - return arg1 << b_arg2; -} - -static inline int64_t msa_sra_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - int32_t b_arg2 =3D BIT_POSITION(arg2, df); - return arg1 >> b_arg2; -} - -static inline int64_t msa_srl_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - int32_t b_arg2 =3D BIT_POSITION(arg2, df); - return u_arg1 >> b_arg2; -} - static inline int64_t msa_sat_s_df(uint32_t df, int64_t arg, uint32_t m) { return arg < M_MIN_INT(m + 1) ? M_MIN_INT(m + 1) : @@ -3650,29 +4006,6 @@ static inline int64_t msa_sat_u_df(uint32_t df, int6= 4_t arg, uint32_t m) M_MAX_UINT(m + 1); } =20 -static inline int64_t msa_srar_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - int32_t b_arg2 =3D BIT_POSITION(arg2, df); - if (b_arg2 =3D=3D 0) { - return arg1; - } else { - int64_t r_bit =3D (arg1 >> (b_arg2 - 1)) & 1; - return (arg1 >> b_arg2) + r_bit; - } -} - -static inline int64_t msa_srlr_df(uint32_t df, int64_t arg1, int64_t arg2) -{ - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - int32_t b_arg2 =3D BIT_POSITION(arg2, df); - if (b_arg2 =3D=3D 0) { - return u_arg1; - } else { - uint64_t r_bit =3D (u_arg1 >> (b_arg2 - 1)) & 1; - return (u_arg1 >> b_arg2) + r_bit; - } -} - #define MSA_BINOP_IMMU_DF(helper, func) \ void helper_msa_ ## helper ## _df(CPUMIPSState *env, uint32_t df, uint32_t= wd, \ uint32_t ws, uint32_t u5) \ @@ -3995,9 +4328,6 @@ void helper_msa_ ## func ## _df(CPUMIPSState *env, ui= nt32_t df, \ } \ } =20 -MSA_BINOP_DF(sll) -MSA_BINOP_DF(sra) -MSA_BINOP_DF(srl) MSA_BINOP_DF(subv) MSA_BINOP_DF(subs_s) MSA_BINOP_DF(subs_u) @@ -4008,8 +4338,6 @@ MSA_BINOP_DF(asub_u) MSA_BINOP_DF(mulv) MSA_BINOP_DF(dotp_s) MSA_BINOP_DF(dotp_u) -MSA_BINOP_DF(srar) -MSA_BINOP_DF(srlr) MSA_BINOP_DF(hsub_s) MSA_BINOP_DF(hsub_u) =20 diff --git a/target/mips/translate.c b/target/mips/translate.c index 9e8e973..7cdf68d 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28915,7 +28915,84 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) } break; case OPC_SLL_df: - gen_helper_msa_sll_df(cpu_env, tdf, twd, tws, twt); + switch (df) { + case DF_BYTE: + gen_helper_msa_sll_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_sll_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_sll_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_sll_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_SRA_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_sra_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_sra_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_sra_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_sra_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_SRAR_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_srar_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_srar_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_srar_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_srar_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_SRL_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_srl_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_srl_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_srl_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_srl_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_SRLR_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_srlr_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_srlr_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_srlr_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_srlr_d(cpu_env, twd, tws, twt); + break; + } break; case OPC_SUBS_S_df: gen_helper_msa_subs_s_df(cpu_env, tdf, twd, tws, twt); @@ -28929,9 +29006,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_VSHF_df: gen_helper_msa_vshf_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_SRA_df: - gen_helper_msa_sra_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBV_df: gen_helper_msa_subv_df(cpu_env, tdf, twd, tws, twt); break; @@ -28944,12 +29018,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_SPLAT_df: gen_helper_msa_splat_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_SRAR_df: - gen_helper_msa_srar_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_SRL_df: - gen_helper_msa_srl_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBSUS_U_df: gen_helper_msa_subsus_u_df(cpu_env, tdf, twd, tws, twt); break; @@ -28959,9 +29027,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCont= ext *ctx) case OPC_PCKEV_df: gen_helper_msa_pckev_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_SRLR_df: - gen_helper_msa_srlr_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBSUU_S_df: gen_helper_msa_subsuu_s_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571828085; cv=none; d=zoho.com; s=zohoarc; b=Y4OKINRItb7xQo6MSTfCik2BgPzAh17VsLvRquPkB4MciBMmFYVs/qKBL8tCjFTT8l9ozUR3GNHzJMXXbLO4T2qk+0dTi3/HmPb8M5m9uzjmOxQY+5aa55d73rYK8wj4k2sZSDVUKC+bfcgWn07JOr03KKtqhJzTPcwRIcSH8Rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571828085; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=nKqx+yGrZL1/wVlDgOAJx0BI2dWzE67S9lUR9duFo1c=; b=QGWDPi1x5lvYORKhcBbq0WvFog69DKxutEpRvJcmYInAGd7B20x7aP3K2br1ThO8oypU6M2DVnUuId3PtHVnY49qzhwYWsfyqDsFcScANQdb6RUMCx/VknDYUqpbl4kfu9hZb1Lpcw7U1gJNVAR/LeHCy4Vd961Uf4etp2ksAQ4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571828085083585.6731123546822; Wed, 23 Oct 2019 03:54:45 -0700 (PDT) Received: from localhost ([::1]:60286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEHq-0004V7-TB for importer@patchew.org; Wed, 23 Oct 2019 06:54:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43090) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq1-00011k-HC for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpx-000321-VP for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35654 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002ws-In for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 680991A2098; Wed, 23 Oct 2019 12:24:40 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 3AC8B1A22BA; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 10/14] target/mips: msa: Split helpers for PCK. Date: Wed, 23 Oct 2019 12:23:43 +0200 Message-Id: <1571826227-10583-11-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic --- target/mips/helper.h | 11 +- target/mips/msa_helper.c | 386 +++++++++++++++++++++++++------------------= ---- target/mips/translate.c | 38 ++++- 3 files changed, 249 insertions(+), 186 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index f779404..7bb13d5 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -967,6 +967,15 @@ DEF_HELPER_4(msa_nor_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_or_v, void, env, i32, i32, i32) DEF_HELPER_4(msa_xor_v, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_pckev_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckev_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckev_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckev_d, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckod_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckod_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckod_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_pckod_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_sll_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_sll_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_sll_w, void, env, i32, i32, i32) @@ -1049,8 +1058,6 @@ DEF_HELPER_5(msa_dpsub_s_df, void, env, i32, i32, i32= , i32) DEF_HELPER_5(msa_dpsub_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_sld_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_splat_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_pckev_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_pckod_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_vshf_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_s_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_hsub_u_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 38ff1da..2400632 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -3430,7 +3430,214 @@ void helper_msa_move_v(CPUMIPSState *env, uint32_t = wd, uint32_t ws) * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Pack group helpers here */ + +void helper_msa_pckev_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[8] =3D pws->b[9]; + pwd->b[10] =3D pws->b[13]; + pwd->b[12] =3D pws->b[1]; + pwd->b[14] =3D pws->b[5]; + pwd->b[0] =3D pwt->b[9]; + pwd->b[2] =3D pwt->b[13]; + pwd->b[4] =3D pwt->b[1]; + pwd->b[6] =3D pwt->b[5]; + pwd->b[9] =3D pws->b[11]; + pwd->b[13] =3D pws->b[3]; + pwd->b[1] =3D pwt->b[11]; + pwd->b[5] =3D pwt->b[3]; + pwd->b[11] =3D pws->b[15]; + pwd->b[3] =3D pwt->b[15]; + pwd->b[15] =3D pws->b[7]; + pwd->b[7] =3D pwt->b[7]; +#else + pwd->b[15] =3D pws->b[14]; + pwd->b[13] =3D pws->b[10]; + pwd->b[11] =3D pws->b[6]; + pwd->b[9] =3D pws->b[2]; + pwd->b[7] =3D pwt->b[14]; + pwd->b[5] =3D pwt->b[10]; + pwd->b[3] =3D pwt->b[6]; + pwd->b[1] =3D pwt->b[2]; + pwd->b[14] =3D pws->b[12]; + pwd->b[10] =3D pws->b[4]; + pwd->b[6] =3D pwt->b[12]; + pwd->b[2] =3D pwt->b[4]; + pwd->b[12] =3D pws->b[8]; + pwd->b[4] =3D pwt->b[8]; + pwd->b[8] =3D pws->b[0]; + pwd->b[0] =3D pwt->b[0]; +#endif +} + +void helper_msa_pckev_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[4] =3D pws->h[5]; + pwd->h[6] =3D pws->h[1]; + pwd->h[0] =3D pwt->h[5]; + pwd->h[2] =3D pwt->h[1]; + pwd->h[5] =3D pws->h[7]; + pwd->h[1] =3D pwt->h[7]; + pwd->h[7] =3D pws->h[3]; + pwd->h[3] =3D pwt->h[3]; +#else + pwd->h[7] =3D pws->h[6]; + pwd->h[5] =3D pws->h[2]; + pwd->h[3] =3D pwt->h[6]; + pwd->h[1] =3D pwt->h[2]; + pwd->h[6] =3D pws->h[4]; + pwd->h[2] =3D pwt->h[4]; + pwd->h[4] =3D pws->h[0]; + pwd->h[0] =3D pwt->h[0]; +#endif +} + +void helper_msa_pckev_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[2] =3D pws->w[3]; + pwd->w[0] =3D pwt->w[3]; + pwd->w[3] =3D pws->w[1]; + pwd->w[1] =3D pwt->w[1]; +#else + pwd->w[3] =3D pws->w[2]; + pwd->w[1] =3D pwt->w[2]; + pwd->w[2] =3D pws->w[0]; + pwd->w[0] =3D pwt->w[0]; +#endif +} + +void helper_msa_pckev_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[1] =3D pws->d[0]; + pwd->d[0] =3D pwt->d[0]; +} + + +void helper_msa_pckod_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->b[7] =3D pwt->b[6]; + pwd->b[5] =3D pwt->b[2]; + pwd->b[3] =3D pwt->b[14]; + pwd->b[1] =3D pwt->b[10]; + pwd->b[15] =3D pws->b[6]; + pwd->b[13] =3D pws->b[2]; + pwd->b[11] =3D pws->b[14]; + pwd->b[9] =3D pws->b[10]; + pwd->b[6] =3D pwt->b[4]; + pwd->b[2] =3D pwt->b[12]; + pwd->b[14] =3D pws->b[4]; + pwd->b[10] =3D pws->b[12]; + pwd->b[4] =3D pwt->b[0]; + pwd->b[12] =3D pws->b[0]; + pwd->b[0] =3D pwt->b[8]; + pwd->b[8] =3D pws->b[8]; +#else + pwd->b[0] =3D pwt->b[1]; + pwd->b[2] =3D pwt->b[5]; + pwd->b[4] =3D pwt->b[9]; + pwd->b[6] =3D pwt->b[13]; + pwd->b[8] =3D pws->b[1]; + pwd->b[10] =3D pws->b[5]; + pwd->b[12] =3D pws->b[9]; + pwd->b[14] =3D pws->b[13]; + pwd->b[1] =3D pwt->b[3]; + pwd->b[5] =3D pwt->b[11]; + pwd->b[9] =3D pws->b[3]; + pwd->b[13] =3D pws->b[11]; + pwd->b[3] =3D pwt->b[7]; + pwd->b[11] =3D pws->b[7]; + pwd->b[7] =3D pwt->b[15]; + pwd->b[15] =3D pws->b[15]; +#endif + +} + +void helper_msa_pckod_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->h[3] =3D pwt->h[2]; + pwd->h[1] =3D pwt->h[6]; + pwd->h[7] =3D pws->h[2]; + pwd->h[5] =3D pws->h[6]; + pwd->h[2] =3D pwt->h[0]; + pwd->h[6] =3D pws->h[0]; + pwd->h[0] =3D pwt->h[4]; + pwd->h[4] =3D pws->h[4]; +#else + pwd->h[0] =3D pwt->h[1]; + pwd->h[2] =3D pwt->h[5]; + pwd->h[4] =3D pws->h[1]; + pwd->h[6] =3D pws->h[5]; + pwd->h[1] =3D pwt->h[3]; + pwd->h[5] =3D pws->h[3]; + pwd->h[3] =3D pwt->h[7]; + pwd->h[7] =3D pws->h[7]; +#endif +} + +void helper_msa_pckod_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + +#if defined(HOST_WORDS_BIGENDIAN) + pwd->w[1] =3D pwt->w[0]; + pwd->w[3] =3D pws->w[0]; + pwd->w[0] =3D pwt->w[2]; + pwd->w[2] =3D pws->w[2]; +#else + pwd->w[0] =3D pwt->w[1]; + pwd->w[2] =3D pws->w[1]; + pwd->w[1] =3D pwt->w[3]; + pwd->w[3] =3D pws->w[3]; +#endif +} + +void helper_msa_pckod_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D pwt->d[1]; + pwd->d[1] =3D pws->d[1]; +} =20 =20 /* @@ -4675,183 +4882,6 @@ MSA_FN_DF(vshf_df) #undef MSA_FN_DF =20 =20 -void helper_msa_pckev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[8] =3D pws->b[9]; - pwd->b[10] =3D pws->b[13]; - pwd->b[12] =3D pws->b[1]; - pwd->b[14] =3D pws->b[5]; - pwd->b[0] =3D pwt->b[9]; - pwd->b[2] =3D pwt->b[13]; - pwd->b[4] =3D pwt->b[1]; - pwd->b[6] =3D pwt->b[5]; - pwd->b[9] =3D pws->b[11]; - pwd->b[13] =3D pws->b[3]; - pwd->b[1] =3D pwt->b[11]; - pwd->b[5] =3D pwt->b[3]; - pwd->b[11] =3D pws->b[15]; - pwd->b[3] =3D pwt->b[15]; - pwd->b[15] =3D pws->b[7]; - pwd->b[7] =3D pwt->b[7]; -#else - pwd->b[15] =3D pws->b[14]; - pwd->b[13] =3D pws->b[10]; - pwd->b[11] =3D pws->b[6]; - pwd->b[9] =3D pws->b[2]; - pwd->b[7] =3D pwt->b[14]; - pwd->b[5] =3D pwt->b[10]; - pwd->b[3] =3D pwt->b[6]; - pwd->b[1] =3D pwt->b[2]; - pwd->b[14] =3D pws->b[12]; - pwd->b[10] =3D pws->b[4]; - pwd->b[6] =3D pwt->b[12]; - pwd->b[2] =3D pwt->b[4]; - pwd->b[12] =3D pws->b[8]; - pwd->b[4] =3D pwt->b[8]; - pwd->b[8] =3D pws->b[0]; - pwd->b[0] =3D pwt->b[0]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[4] =3D pws->h[5]; - pwd->h[6] =3D pws->h[1]; - pwd->h[0] =3D pwt->h[5]; - pwd->h[2] =3D pwt->h[1]; - pwd->h[5] =3D pws->h[7]; - pwd->h[1] =3D pwt->h[7]; - pwd->h[7] =3D pws->h[3]; - pwd->h[3] =3D pwt->h[3]; -#else - pwd->h[7] =3D pws->h[6]; - pwd->h[5] =3D pws->h[2]; - pwd->h[3] =3D pwt->h[6]; - pwd->h[1] =3D pwt->h[2]; - pwd->h[6] =3D pws->h[4]; - pwd->h[2] =3D pwt->h[4]; - pwd->h[4] =3D pws->h[0]; - pwd->h[0] =3D pwt->h[0]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[2] =3D pws->w[3]; - pwd->w[0] =3D pwt->w[3]; - pwd->w[3] =3D pws->w[1]; - pwd->w[1] =3D pwt->w[1]; -#else - pwd->w[3] =3D pws->w[2]; - pwd->w[1] =3D pwt->w[2]; - pwd->w[2] =3D pws->w[0]; - pwd->w[0] =3D pwt->w[0]; -#endif - break; - case DF_DOUBLE: - pwd->d[1] =3D pws->d[0]; - pwd->d[0] =3D pwt->d[0]; - break; - default: - assert(0); - } -} - -void helper_msa_pckod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, - uint32_t ws, uint32_t wt) -{ - wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); - wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); - wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); - - switch (df) { - case DF_BYTE: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->b[7] =3D pwt->b[6]; - pwd->b[5] =3D pwt->b[2]; - pwd->b[3] =3D pwt->b[14]; - pwd->b[1] =3D pwt->b[10]; - pwd->b[15] =3D pws->b[6]; - pwd->b[13] =3D pws->b[2]; - pwd->b[11] =3D pws->b[14]; - pwd->b[9] =3D pws->b[10]; - pwd->b[6] =3D pwt->b[4]; - pwd->b[2] =3D pwt->b[12]; - pwd->b[14] =3D pws->b[4]; - pwd->b[10] =3D pws->b[12]; - pwd->b[4] =3D pwt->b[0]; - pwd->b[12] =3D pws->b[0]; - pwd->b[0] =3D pwt->b[8]; - pwd->b[8] =3D pws->b[8]; -#else - pwd->b[0] =3D pwt->b[1]; - pwd->b[2] =3D pwt->b[5]; - pwd->b[4] =3D pwt->b[9]; - pwd->b[6] =3D pwt->b[13]; - pwd->b[8] =3D pws->b[1]; - pwd->b[10] =3D pws->b[5]; - pwd->b[12] =3D pws->b[9]; - pwd->b[14] =3D pws->b[13]; - pwd->b[1] =3D pwt->b[3]; - pwd->b[5] =3D pwt->b[11]; - pwd->b[9] =3D pws->b[3]; - pwd->b[13] =3D pws->b[11]; - pwd->b[3] =3D pwt->b[7]; - pwd->b[11] =3D pws->b[7]; - pwd->b[7] =3D pwt->b[15]; - pwd->b[15] =3D pws->b[15]; -#endif - break; - case DF_HALF: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->h[3] =3D pwt->h[2]; - pwd->h[1] =3D pwt->h[6]; - pwd->h[7] =3D pws->h[2]; - pwd->h[5] =3D pws->h[6]; - pwd->h[2] =3D pwt->h[0]; - pwd->h[6] =3D pws->h[0]; - pwd->h[0] =3D pwt->h[4]; - pwd->h[4] =3D pws->h[4]; -#else - pwd->h[0] =3D pwt->h[1]; - pwd->h[2] =3D pwt->h[5]; - pwd->h[4] =3D pws->h[1]; - pwd->h[6] =3D pws->h[5]; - pwd->h[1] =3D pwt->h[3]; - pwd->h[5] =3D pws->h[3]; - pwd->h[3] =3D pwt->h[7]; - pwd->h[7] =3D pws->h[7]; -#endif - break; - case DF_WORD: -#if defined(HOST_WORDS_BIGENDIAN) - pwd->w[1] =3D pwt->w[0]; - pwd->w[3] =3D pws->w[0]; - pwd->w[0] =3D pwt->w[2]; - pwd->w[2] =3D pws->w[2]; -#else - pwd->w[0] =3D pwt->w[1]; - pwd->w[2] =3D pws->w[1]; - pwd->w[1] =3D pwt->w[3]; - pwd->w[3] =3D pws->w[3]; -#endif - break; - case DF_DOUBLE: - pwd->d[0] =3D pwt->d[1]; - pwd->d[1] =3D pws->d[1]; - break; - default: - assert(0); - } -} - - void helper_msa_sldi_df(CPUMIPSState *env, uint32_t df, uint32_t wd, uint32_t ws, uint32_t n) { diff --git a/target/mips/translate.c b/target/mips/translate.c index 7cdf68d..a57e0da 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28914,6 +28914,38 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_PCKEV_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_pckev_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_pckev_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_pckev_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_pckev_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_PCKOD_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_pckod_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_pckod_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_pckod_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_pckod_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_SLL_df: switch (df) { case DF_BYTE: @@ -29024,15 +29056,9 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_MSUBV_df: gen_helper_msa_msubv_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_PCKEV_df: - gen_helper_msa_pckev_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_SUBSUU_S_df: gen_helper_msa_subsuu_s_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_PCKOD_df: - gen_helper_msa_pckod_df(cpu_env, tdf, twd, tws, twt); - break; case OPC_ASUB_S_df: gen_helper_msa_asub_s_df(cpu_env, tdf, twd, tws, twt); break; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571829091; cv=none; d=zoho.com; s=zohoarc; b=AaPq5PEoXTBNxINkKzukVmm/zJzjKeK9P66j2T6qDgdoTxjLAdpY7dwI7gDA0zEsGsm7OAaI49o+R8NYLs3Cv4YFlTAwzDAe9aLWvU062Q2aLMI+Aa/7kUsM39/vC8R3Tc3epd1GPu1KnjxFLi8s9a4aw0LtHHHF9zhNUCEFT6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571829091; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=aVDZaIVYuKSOdIGJUZGHJwEKsnLewC7Y7uV6qLnCEp4=; b=NHOjBuyLVxbaMDG5xHPwXEM/EkMkXvSurprSam5ixsHLMVag8yI7+RRov1inSInuyvxe3O6j+txMQUSfjLmEL3SWlbfoztHBD0GTrUIGSjurkpJYL9F2nrEK40NNuwJARoV+n/5g+t7IQLNWKFOe/ZjarQ8khzVcSC/A3jsiafE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157182909160832.462679235604924; Wed, 23 Oct 2019 04:11:31 -0700 (PDT) Received: from localhost ([::1]:60494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEY6-0008Sd-Bt for importer@patchew.org; Wed, 23 Oct 2019 07:11:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43047) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq0-00010o-0B for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpy-000329-0R for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:55 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35646 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002wh-JC for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 396441A21B6; Wed, 23 Oct 2019 12:24:40 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 65B971A216D; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 11/14] target/mips: msa: Split helpers for HSUB_. Date: Wed, 23 Oct 2019 12:23:44 +0200 Message-Id: <1571826227-10583-12-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/helper.h | 10 ++++- target/mips/msa_helper.c | 108 +++++++++++++++++++++++++++++++++++++++++--= ---- target/mips/translate.c | 32 +++++++++++--- 3 files changed, 129 insertions(+), 21 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index 7bb13d5..d7c4bbf 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -945,6 +945,14 @@ DEF_HELPER_4(msa_mod_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_hsub_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hsub_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hsub_s_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_hsub_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hsub_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_hsub_u_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_ilvev_b, void, env, i32, i32, i32) DEF_HELPER_4(msa_ilvev_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_ilvev_w, void, env, i32, i32, i32) @@ -1059,8 +1067,6 @@ DEF_HELPER_5(msa_dpsub_u_df, void, env, i32, i32, i32= , i32) DEF_HELPER_5(msa_sld_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_splat_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_vshf_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_hsub_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_hsub_u_df, void, env, i32, i32, i32, i32) =20 DEF_HELPER_5(msa_sldi_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_splati_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 2400632..ae9e8e0 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -2888,7 +2888,101 @@ void helper_msa_mod_u_d(CPUMIPSState *env, * +---------------+------------------------------------------------------= ----+ */ =20 -/* TODO: insert Int Subtract group helpers here */ +/* TODO: insert the rest of Int Subtract group helpers here */ + + +static inline int64_t msa_hsub_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + return SIGNED_ODD(arg1, df) - SIGNED_EVEN(arg2, df); +} + +void helper_msa_hsub_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_hsub_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_hsub_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_hsub_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_hsub_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_hsub_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_hsub_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_hsub_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_hsub_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_hsub_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_hsub_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_hsub_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_hsub_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_hsub_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_hsub_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_hsub_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_hsub_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline int64_t msa_hsub_u_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + return UNSIGNED_ODD(arg1, df) - UNSIGNED_EVEN(arg2, df); +} + +void helper_msa_hsub_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_hsub_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_hsub_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_hsub_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_hsub_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_hsub_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_hsub_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_hsub_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_hsub_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_hsub_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_hsub_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_hsub_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_hsub_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_hsub_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_hsub_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_hsub_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_hsub_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} =20 =20 /* @@ -4450,16 +4544,6 @@ static inline void msa_sld_df(uint32_t df, wr_t *pwd, } } =20 -static inline int64_t msa_hsub_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - return SIGNED_ODD(arg1, df) - SIGNED_EVEN(arg2, df); -} - -static inline int64_t msa_hsub_u_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - return UNSIGNED_ODD(arg1, df) - UNSIGNED_EVEN(arg2, df); -} - static inline int64_t msa_mul_q_df(uint32_t df, int64_t arg1, int64_t arg2) { int64_t q_min =3D DF_MIN_INT(df); @@ -4545,8 +4629,6 @@ MSA_BINOP_DF(asub_u) MSA_BINOP_DF(mulv) MSA_BINOP_DF(dotp_s) MSA_BINOP_DF(dotp_u) -MSA_BINOP_DF(hsub_s) -MSA_BINOP_DF(hsub_u) =20 MSA_BINOP_DF(mul_q) MSA_BINOP_DF(mulr_q) diff --git a/target/mips/translate.c b/target/mips/translate.c index a57e0da..4c68c5b 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -29107,6 +29107,32 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_HSUB_S_df: + switch (df) { + case DF_HALF: + gen_helper_msa_hsub_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_hsub_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_hsub_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_HSUB_U_df: + switch (df) { + case DF_HALF: + gen_helper_msa_hsub_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_hsub_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_hsub_u_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_DOTP_S_df: gen_helper_msa_dotp_s_df(cpu_env, tdf, twd, tws, twt); break; @@ -29125,12 +29151,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_DPSUB_U_df: gen_helper_msa_dpsub_u_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_HSUB_S_df: - gen_helper_msa_hsub_s_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_HSUB_U_df: - gen_helper_msa_hsub_u_df(cpu_env, tdf, twd, tws, twt); - break; } break; default: --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571830032; cv=none; d=zoho.com; s=zohoarc; b=STsC2sAYz6JmsRuaIiJZDG2gCjm7uGEMCjZ+iv3sWEJ5deGQ2HlA8BV9bLSx2Uw+twJnx9Hny44EezZJYi0w3SXbSgO2ZVrfwBUg/2AzBsRDu96QtINpXYzyuPtfm1dPYT8dDRUsDp8R0CHTjAWGI6Lq466WNT+RjTqBScTh028= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571830032; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=WHnqNgcWgkxHjtudzcYvQpQyIGD9/YF6hs0/6AxSNF0=; b=QQGdSbDKaX8JucEzyb6hVQ/Ry10K0Csthte2Zu0PDiDmD4av08aslP3/kiwG8fAgMpsnCKWFH4PukS26d4KHJM3KDqoSF+CX4YTb0PtJ4qa4+OyTu/DTTUumMqipUT3XZPI65tA7tJw+UWf4FY9Mx2vsxi3YmlrK0zIqh/Bh+qE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571830032603329.6494141670081; Wed, 23 Oct 2019 04:27:12 -0700 (PDT) Received: from localhost ([::1]:60754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEnH-0002nO-12 for importer@patchew.org; Wed, 23 Oct 2019 07:27:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43050) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDq0-00010q-0H for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:26:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpx-00031E-Ox for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:55 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35651 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002wo-BW for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 6A3D01A216D; Wed, 23 Oct 2019 12:24:40 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 7DCDD1A21E2; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 12/14] target/mips: msa: Split helpers for ASUB_. Date: Wed, 23 Oct 2019 12:23:45 +0200 Message-Id: <1571826227-10583-13-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Achieves clearer code and slightly better performance. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/helper.h | 12 +++- target/mips/msa_helper.c | 169 ++++++++++++++++++++++++++++++++++++++++++-= ---- target/mips/translate.c | 38 +++++++++-- 3 files changed, 193 insertions(+), 26 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index d7c4bbf..7b8ad74 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -945,6 +945,16 @@ DEF_HELPER_4(msa_mod_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_mod_s_d, void, env, i32, i32, i32) =20 +DEF_HELPER_4(msa_asub_s_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_s_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_s_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_s_d, void, env, i32, i32, i32) + +DEF_HELPER_4(msa_asub_u_b, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_u_h, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_u_w, void, env, i32, i32, i32) +DEF_HELPER_4(msa_asub_u_d, void, env, i32, i32, i32) + DEF_HELPER_4(msa_hsub_s_h, void, env, i32, i32, i32) DEF_HELPER_4(msa_hsub_s_w, void, env, i32, i32, i32) DEF_HELPER_4(msa_hsub_s_d, void, env, i32, i32, i32) @@ -1053,8 +1063,6 @@ DEF_HELPER_5(msa_subs_s_df, void, env, i32, i32, i32,= i32) DEF_HELPER_5(msa_subs_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subsus_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_subsuu_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_asub_s_df, void, env, i32, i32, i32, i32) -DEF_HELPER_5(msa_asub_u_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_mulv_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_maddv_df, void, env, i32, i32, i32, i32) DEF_HELPER_5(msa_msubv_df, void, env, i32, i32, i32, i32) diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index ae9e8e0..0e39016 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -2888,6 +2888,157 @@ void helper_msa_mod_u_d(CPUMIPSState *env, * +---------------+------------------------------------------------------= ----+ */ =20 + +static inline int64_t msa_asub_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) +{ + /* signed compare */ + return (arg1 < arg2) ? + (uint64_t)(arg2 - arg1) : (uint64_t)(arg1 - arg2); +} + +void helper_msa_asub_s_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_asub_s_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_asub_s_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_asub_s_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_asub_s_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_asub_s_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_asub_s_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_asub_s_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_asub_s_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_asub_s_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_asub_s_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_asub_s_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_asub_s_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_asub_s_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_asub_s_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_asub_s_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_asub_s_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_asub_s_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_asub_s_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_asub_s_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_asub_s_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_asub_s_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_asub_s_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_asub_s_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_asub_s_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_asub_s_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_asub_s_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_asub_s_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_asub_s_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_asub_s_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_asub_s_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_asub_s_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_asub_s_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_asub_s_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + +static inline uint64_t msa_asub_u_df(uint32_t df, uint64_t arg1, uint64_t = arg2) +{ + uint64_t u_arg1 =3D UNSIGNED(arg1, df); + uint64_t u_arg2 =3D UNSIGNED(arg2, df); + /* unsigned compare */ + return (u_arg1 < u_arg2) ? + (uint64_t)(u_arg2 - u_arg1) : (uint64_t)(u_arg1 - u_arg2); +} + +void helper_msa_asub_u_b(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->b[0] =3D msa_asub_u_df(DF_BYTE, pws->b[0], pwt->b[0]); + pwd->b[1] =3D msa_asub_u_df(DF_BYTE, pws->b[1], pwt->b[1]); + pwd->b[2] =3D msa_asub_u_df(DF_BYTE, pws->b[2], pwt->b[2]); + pwd->b[3] =3D msa_asub_u_df(DF_BYTE, pws->b[3], pwt->b[3]); + pwd->b[4] =3D msa_asub_u_df(DF_BYTE, pws->b[4], pwt->b[4]); + pwd->b[5] =3D msa_asub_u_df(DF_BYTE, pws->b[5], pwt->b[5]); + pwd->b[6] =3D msa_asub_u_df(DF_BYTE, pws->b[6], pwt->b[6]); + pwd->b[7] =3D msa_asub_u_df(DF_BYTE, pws->b[7], pwt->b[7]); + pwd->b[8] =3D msa_asub_u_df(DF_BYTE, pws->b[8], pwt->b[8]); + pwd->b[9] =3D msa_asub_u_df(DF_BYTE, pws->b[9], pwt->b[9]); + pwd->b[10] =3D msa_asub_u_df(DF_BYTE, pws->b[10], pwt->b[10]); + pwd->b[11] =3D msa_asub_u_df(DF_BYTE, pws->b[11], pwt->b[11]); + pwd->b[12] =3D msa_asub_u_df(DF_BYTE, pws->b[12], pwt->b[12]); + pwd->b[13] =3D msa_asub_u_df(DF_BYTE, pws->b[13], pwt->b[13]); + pwd->b[14] =3D msa_asub_u_df(DF_BYTE, pws->b[14], pwt->b[14]); + pwd->b[15] =3D msa_asub_u_df(DF_BYTE, pws->b[15], pwt->b[15]); +} + +void helper_msa_asub_u_h(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->h[0] =3D msa_asub_u_df(DF_HALF, pws->h[0], pwt->h[0]); + pwd->h[1] =3D msa_asub_u_df(DF_HALF, pws->h[1], pwt->h[1]); + pwd->h[2] =3D msa_asub_u_df(DF_HALF, pws->h[2], pwt->h[2]); + pwd->h[3] =3D msa_asub_u_df(DF_HALF, pws->h[3], pwt->h[3]); + pwd->h[4] =3D msa_asub_u_df(DF_HALF, pws->h[4], pwt->h[4]); + pwd->h[5] =3D msa_asub_u_df(DF_HALF, pws->h[5], pwt->h[5]); + pwd->h[6] =3D msa_asub_u_df(DF_HALF, pws->h[6], pwt->h[6]); + pwd->h[7] =3D msa_asub_u_df(DF_HALF, pws->h[7], pwt->h[7]); +} + +void helper_msa_asub_u_w(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->w[0] =3D msa_asub_u_df(DF_WORD, pws->w[0], pwt->w[0]); + pwd->w[1] =3D msa_asub_u_df(DF_WORD, pws->w[1], pwt->w[1]); + pwd->w[2] =3D msa_asub_u_df(DF_WORD, pws->w[2], pwt->w[2]); + pwd->w[3] =3D msa_asub_u_df(DF_WORD, pws->w[3], pwt->w[3]); +} + +void helper_msa_asub_u_d(CPUMIPSState *env, + uint32_t wd, uint32_t ws, uint32_t wt) +{ + wr_t *pwd =3D &(env->active_fpu.fpr[wd].wr); + wr_t *pws =3D &(env->active_fpu.fpr[ws].wr); + wr_t *pwt =3D &(env->active_fpu.fpr[wt].wr); + + pwd->d[0] =3D msa_asub_u_df(DF_DOUBLE, pws->d[0], pwt->d[0]); + pwd->d[1] =3D msa_asub_u_df(DF_DOUBLE, pws->d[1], pwt->d[1]); +} + + /* TODO: insert the rest of Int Subtract group helpers here */ =20 =20 @@ -4447,22 +4598,6 @@ static inline int64_t msa_subsuu_s_df(uint32_t df, i= nt64_t arg1, int64_t arg2) } } =20 -static inline int64_t msa_asub_s_df(uint32_t df, int64_t arg1, int64_t arg= 2) -{ - /* signed compare */ - return (arg1 < arg2) ? - (uint64_t)(arg2 - arg1) : (uint64_t)(arg1 - arg2); -} - -static inline uint64_t msa_asub_u_df(uint32_t df, uint64_t arg1, uint64_t = arg2) -{ - uint64_t u_arg1 =3D UNSIGNED(arg1, df); - uint64_t u_arg2 =3D UNSIGNED(arg2, df); - /* unsigned compare */ - return (u_arg1 < u_arg2) ? - (uint64_t)(u_arg2 - u_arg1) : (uint64_t)(u_arg1 - u_arg2); -} - static inline int64_t msa_mulv_df(uint32_t df, int64_t arg1, int64_t arg2) { return arg1 * arg2; @@ -4624,8 +4759,6 @@ MSA_BINOP_DF(subs_s) MSA_BINOP_DF(subs_u) MSA_BINOP_DF(subsus_u) MSA_BINOP_DF(subsuu_s) -MSA_BINOP_DF(asub_s) -MSA_BINOP_DF(asub_u) MSA_BINOP_DF(mulv) MSA_BINOP_DF(dotp_s) MSA_BINOP_DF(dotp_u) diff --git a/target/mips/translate.c b/target/mips/translate.c index 4c68c5b..20c69d2 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28850,6 +28850,38 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) break; } break; + case OPC_ASUB_S_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_asub_s_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_asub_s_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_asub_s_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_asub_s_d(cpu_env, twd, tws, twt); + break; + } + break; + case OPC_ASUB_U_df: + switch (df) { + case DF_BYTE: + gen_helper_msa_asub_u_b(cpu_env, twd, tws, twt); + break; + case DF_HALF: + gen_helper_msa_asub_u_h(cpu_env, twd, tws, twt); + break; + case DF_WORD: + gen_helper_msa_asub_u_w(cpu_env, twd, tws, twt); + break; + case DF_DOUBLE: + gen_helper_msa_asub_u_d(cpu_env, twd, tws, twt); + break; + } + break; case OPC_ILVEV_df: switch (df) { case DF_BYTE: @@ -29059,12 +29091,6 @@ static void gen_msa_3r(CPUMIPSState *env, DisasCon= text *ctx) case OPC_SUBSUU_S_df: gen_helper_msa_subsuu_s_df(cpu_env, tdf, twd, tws, twt); break; - case OPC_ASUB_S_df: - gen_helper_msa_asub_s_df(cpu_env, tdf, twd, tws, twt); - break; - case OPC_ASUB_U_df: - gen_helper_msa_asub_u_df(cpu_env, tdf, twd, tws, twt); - break; =20 case OPC_DOTP_S_df: case OPC_DOTP_U_df: --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571828386; cv=none; d=zoho.com; s=zohoarc; b=GBFvIVSH0gvG7wQnSWNMUXdlMEA+jBYCv9G34zD6bkdNNvUYdMTcU1XP7Hbi+ebTL9OuMKy2vQnUsCuRjdNO96TUIXWcZw0iJDk3IwFnl9H62LBveKICJzxbNBOgV5gRaO+93oBYMqVrUoS8hSDjmazFsbgYw2jyhGgo5s8qtfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571828386; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HO10yrtFZFDEDlcgElioOzYA4Z3cXloTQ2lqVaQaVyw=; b=aadrxSJNtKeuUyUO0UMc5PlNiAgGoj3LRq54oJx40XKZAr2xlH+f56NCU3pH8sfZ73/bXqzdjiNkkHTlxbsSJeB8dhVHjroG4cY8KO+Zsd0xh5O+8keZRxhRiRabTneKabX1QZ9diE4uoq94DY6L71pExVEUdqE4lasEvlu9fx0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571828386944532.3246874697724; Wed, 23 Oct 2019 03:59:46 -0700 (PDT) Received: from localhost ([::1]:60362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNEMj-0000eb-LG for importer@patchew.org; Wed, 23 Oct 2019 06:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43049) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpz-00010p-VZ for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpx-00031Q-Pt for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:55 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35708 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002xi-Cp for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 694E01A2151; Wed, 23 Oct 2019 12:24:40 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id 94BBD1A214B; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 13/14] target/mips: Add support for emulation of CRC32 group of instructions Date: Wed, 23 Oct 2019 12:23:46 +0200 Message-Id: <1571826227-10583-14-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Yongbok Kim , Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Add emulation of MIPS' CRC32 (Cyclic Redundancy Check) instructions. Reuse zlib crc32() and Linux crc32c(). Note that, at the time being, there is no MIPS CPU that supports CRC32 instructions (they are an optional part of MIPS64/32 R6 anf nanoMIPS ISAs). Signed-off-by: Yongbok Kim Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Markovic --- disas/mips.c | 8 ++++++++ target/mips/helper.h | 2 ++ target/mips/op_helper.c | 22 ++++++++++++++++++++++ target/mips/translate.c | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/disas/mips.c b/disas/mips.c index dfefe5e..75c48b3 100644 --- a/disas/mips.c +++ b/disas/mips.c @@ -1409,6 +1409,14 @@ const struct mips_opcode mips_builtin_opcodes[] =3D {"dvp", "t", 0x41600024, 0xffe0ffff, TRAP|WR_t, 0, I= 32R6}, {"evp", "", 0x41600004, 0xffffffff, TRAP, 0, I= 32R6}, {"evp", "t", 0x41600004, 0xffe0ffff, TRAP|WR_t, 0, I= 32R6}, +{"crc32b", "t,v,t", 0x7c00000f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32h", "t,v,t", 0x7c00004f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32w", "t,v,t", 0x7c00008f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32d", "t,v,t", 0x7c0000cf, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 64R6}, +{"crc32cb", "t,v,t", 0x7c00010f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32ch", "t,v,t", 0x7c00014f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32cw", "t,v,t", 0x7c00018f, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 32R6}, +{"crc32cd", "t,v,t", 0x7c0001cf, 0xfc00ff3f, WR_d | RD_s | RD_t, 0, I= 64R6}, =20 /* MSA */ {"sll.b", "+d,+e,+f", 0x7800000d, 0xffe0003f, WR_VD|RD_VS|RD_VT, 0, MSA= }, diff --git a/target/mips/helper.h b/target/mips/helper.h index 7b8ad74..2095330 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -40,6 +40,8 @@ DEF_HELPER_FLAGS_1(bitswap, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_1(dbitswap, TCG_CALL_NO_RWG_SE, tl, tl) #endif =20 +DEF_HELPER_3(crc32, tl, tl, tl, i32) +DEF_HELPER_3(crc32c, tl, tl, tl, i32) DEF_HELPER_FLAGS_4(rotx, TCG_CALL_NO_RWG_SE, tl, tl, i32, i32, i32) =20 #ifndef CONFIG_USER_ONLY diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 18fcee4..3298980 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -27,6 +27,8 @@ #include "exec/memop.h" #include "sysemu/kvm.h" #include "fpu/softfloat.h" +#include "qemu/crc32c.h" +#include =20 /*************************************************************************= ****/ /* Exceptions processing helpers */ @@ -350,6 +352,26 @@ target_ulong helper_rotx(target_ulong rs, uint32_t shi= ft, uint32_t shiftx, return (int64_t)(int32_t)(uint32_t)tmp5; } =20 +/* these crc32 functions are based on target/arm/helper-a64.c */ +target_ulong helper_crc32(target_ulong val, target_ulong m, uint32_t sz) +{ + uint8_t buf[8]; + target_ulong mask =3D ((sz * 8) =3D=3D 64) ? -1ULL : ((1ULL << (sz * 8= )) - 1); + + m &=3D mask; + stq_le_p(buf, m); + return (int32_t) (crc32(val ^ 0xffffffff, buf, sz) ^ 0xffffffff); +} + +target_ulong helper_crc32c(target_ulong val, target_ulong m, uint32_t sz) +{ + uint8_t buf[8]; + target_ulong mask =3D ((sz * 8) =3D=3D 64) ? -1ULL : ((1ULL << (sz * 8= )) - 1); + m &=3D mask; + stq_le_p(buf, m); + return (int32_t) (crc32c(val, buf, sz) ^ 0xffffffff); +} + #ifndef CONFIG_USER_ONLY =20 static inline hwaddr do_translate_address(CPUMIPSState *env, diff --git a/target/mips/translate.c b/target/mips/translate.c index 20c69d2..b8e2707 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -451,6 +451,7 @@ enum { OPC_LWE =3D 0x2F | OPC_SPECIAL3, =20 /* R6 */ + OPC_CRC32 =3D 0x0F | OPC_SPECIAL3, R6_OPC_PREF =3D 0x35 | OPC_SPECIAL3, R6_OPC_CACHE =3D 0x25 | OPC_SPECIAL3, R6_OPC_LL =3D 0x36 | OPC_SPECIAL3, @@ -2547,6 +2548,7 @@ typedef struct DisasContext { bool nan2008; bool abs2008; bool saar; + bool crcp; } DisasContext; =20 #define DISAS_STOP DISAS_TARGET_0 @@ -27017,6 +27019,33 @@ static void decode_opc_special2_legacy(CPUMIPSStat= e *env, DisasContext *ctx) } } =20 +static void gen_crc32(DisasContext *ctx, int rd, int rs, int rt, int sz, + int crc32c) +{ + TCGv t0; + TCGv t1; + TCGv_i32 tsz =3D tcg_const_i32(1 << sz); + if (rd =3D=3D 0) { + /* Treat as NOP. */ + return; + } + t0 =3D tcg_temp_new(); + t1 =3D tcg_temp_new(); + + gen_load_gpr(t0, rt); + gen_load_gpr(t1, rs); + + if (crc32c) { + gen_helper_crc32c(cpu_gpr[rd], t0, t1, tsz); + } else { + gen_helper_crc32(cpu_gpr[rd], t0, t1, tsz); + } + + tcg_temp_free(t0); + tcg_temp_free(t1); + tcg_temp_free_i32(tsz); +} + static void decode_opc_special3_r6(CPUMIPSState *env, DisasContext *ctx) { int rs, rt, rd, sa; @@ -27031,6 +27060,17 @@ static void decode_opc_special3_r6(CPUMIPSState *e= nv, DisasContext *ctx) =20 op1 =3D MASK_SPECIAL3(ctx->opcode); switch (op1) { + case OPC_CRC32: + if (unlikely(!ctx->crcp) || + unlikely((extract32(ctx->opcode, 6, 2) =3D=3D 3) && + (!(ctx->hflags & MIPS_HFLAG_64))) || + unlikely((extract32(ctx->opcode, 8, 3) >=3D 2))) { + generate_exception_end(ctx, EXCP_RI); + } + gen_crc32(ctx, rt, rs, rt, + extract32(ctx->opcode, 6, 2), + extract32(ctx->opcode, 8, 3)); + break; case R6_OPC_PREF: if (rt >=3D 24) { /* hint codes 24-31 are reserved and signal RI */ @@ -30627,6 +30667,7 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) ctx->mrp =3D (env->CP0_Config5 >> CP0C5_MRP) & 1; ctx->nan2008 =3D (env->active_fpu.fcr31 >> FCR31_NAN2008) & 1; ctx->abs2008 =3D (env->active_fpu.fcr31 >> FCR31_ABS2008) & 1; + ctx->crcp =3D (env->CP0_Config5 >> CP0C5_CRCP) & 1; restore_cpu_state(env, ctx); #ifdef CONFIG_USER_ONLY ctx->mem_idx =3D MIPS_HFLAG_UM; --=20 2.7.4 From nobody Sat Apr 27 06:43:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571828766; cv=none; d=zoho.com; s=zohoarc; b=nV6pUP+YF0aUFK0AgWJC850qlyjS2jI/7rLEXd1cy4Bv6Uxb+v9vYYEdYPLDbxEdHnwBgJp74U+0zSqL/EHosgTq7INRdvVettXwLANjFvQ9adX3Y8hcYZ1VEVjCwVHB7InhN7an6i0NVAsvprIVSWunpVUJgt4tWoutVUYC1cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571828766; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=q2QM/dBYUjVoBmhL6lt2RbsMF1IxDYJ8eQvQda8NSNU=; b=Az2/woBH+UCr+Zs1P1PFWyTbFbrjUcTcF3hRDdytDUFAPN/K3Ro2B0quGkRMsdtosHr1cIFMvd9OxlyKtkZFeBuyo4jmFMqSQM1aXpCWCfZ2sTmz2VaheRu46RctglUaD2Hy5yYvV9xcBQY8iulX3LOeNmDt+N7Z40HIu0vKizY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571828766609478.53935706253867; Wed, 23 Oct 2019 04:06:06 -0700 (PDT) Received: from localhost ([::1]:60416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNESq-0003xa-7x for importer@patchew.org; Wed, 23 Oct 2019 07:06:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43042) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNDpz-00010k-Ug for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNDpx-00032E-WF for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:55 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:35870 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNDpv-0002yq-Lt for qemu-devel@nongnu.org; Wed, 23 Oct 2019 06:25:53 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 685961A1E62; Wed, 23 Oct 2019 12:24:43 +0200 (CEST) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id B1A2C1A219A; Wed, 23 Oct 2019 12:24:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH v7 14/14] target/mips: Demacro LMI decoder Date: Wed, 23 Oct 2019 12:23:47 +0200 Message-Id: <1571826227-10583-15-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1571826227-10583-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 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@rt-rk.com, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic This makes searches for instances of opcode usages easier. Signed-off-by: Aleksandar Markovic Reviewed-by: Aleksandar Rikalo --- target/mips/translate.c | 247 +++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 173 insertions(+), 74 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index b8e2707..36f57b1 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -5548,78 +5548,180 @@ static void gen_loongson_multimedia(DisasContext *= ctx, int rd, int rs, int rt) gen_load_fpr64(ctx, t0, rs); gen_load_fpr64(ctx, t1, rt); =20 -#define LMI_HELPER(UP, LO) \ - case OPC_##UP: gen_helper_##LO(t0, t0, t1); break -#define LMI_HELPER_1(UP, LO) \ - case OPC_##UP: gen_helper_##LO(t0, t0); break -#define LMI_DIRECT(UP, LO, OP) \ - case OPC_##UP: tcg_gen_##OP##_i64(t0, t0, t1); break - switch (opc) { - LMI_HELPER(PADDSH, paddsh); - LMI_HELPER(PADDUSH, paddush); - LMI_HELPER(PADDH, paddh); - LMI_HELPER(PADDW, paddw); - LMI_HELPER(PADDSB, paddsb); - LMI_HELPER(PADDUSB, paddusb); - LMI_HELPER(PADDB, paddb); - - LMI_HELPER(PSUBSH, psubsh); - LMI_HELPER(PSUBUSH, psubush); - LMI_HELPER(PSUBH, psubh); - LMI_HELPER(PSUBW, psubw); - LMI_HELPER(PSUBSB, psubsb); - LMI_HELPER(PSUBUSB, psubusb); - LMI_HELPER(PSUBB, psubb); - - LMI_HELPER(PSHUFH, pshufh); - LMI_HELPER(PACKSSWH, packsswh); - LMI_HELPER(PACKSSHB, packsshb); - LMI_HELPER(PACKUSHB, packushb); - - LMI_HELPER(PUNPCKLHW, punpcklhw); - LMI_HELPER(PUNPCKHHW, punpckhhw); - LMI_HELPER(PUNPCKLBH, punpcklbh); - LMI_HELPER(PUNPCKHBH, punpckhbh); - LMI_HELPER(PUNPCKLWD, punpcklwd); - LMI_HELPER(PUNPCKHWD, punpckhwd); - - LMI_HELPER(PAVGH, pavgh); - LMI_HELPER(PAVGB, pavgb); - LMI_HELPER(PMAXSH, pmaxsh); - LMI_HELPER(PMINSH, pminsh); - LMI_HELPER(PMAXUB, pmaxub); - LMI_HELPER(PMINUB, pminub); - - LMI_HELPER(PCMPEQW, pcmpeqw); - LMI_HELPER(PCMPGTW, pcmpgtw); - LMI_HELPER(PCMPEQH, pcmpeqh); - LMI_HELPER(PCMPGTH, pcmpgth); - LMI_HELPER(PCMPEQB, pcmpeqb); - LMI_HELPER(PCMPGTB, pcmpgtb); - - LMI_HELPER(PSLLW, psllw); - LMI_HELPER(PSLLH, psllh); - LMI_HELPER(PSRLW, psrlw); - LMI_HELPER(PSRLH, psrlh); - LMI_HELPER(PSRAW, psraw); - LMI_HELPER(PSRAH, psrah); - - LMI_HELPER(PMULLH, pmullh); - LMI_HELPER(PMULHH, pmulhh); - LMI_HELPER(PMULHUH, pmulhuh); - LMI_HELPER(PMADDHW, pmaddhw); - - LMI_HELPER(PASUBUB, pasubub); - LMI_HELPER_1(BIADD, biadd); - LMI_HELPER_1(PMOVMSKB, pmovmskb); - - LMI_DIRECT(PADDD, paddd, add); - LMI_DIRECT(PSUBD, psubd, sub); - LMI_DIRECT(XOR_CP2, xor, xor); - LMI_DIRECT(NOR_CP2, nor, nor); - LMI_DIRECT(AND_CP2, and, and); - LMI_DIRECT(OR_CP2, or, or); + case OPC_PADDSH: + gen_helper_paddsh(t0, t0, t1); + break; + case OPC_PADDUSH: + gen_helper_paddush(t0, t0, t1); + break; + case OPC_PADDH: + gen_helper_paddh(t0, t0, t1); + break; + case OPC_PADDW: + gen_helper_paddw(t0, t0, t1); + break; + case OPC_PADDSB: + gen_helper_paddsb(t0, t0, t1); + break; + case OPC_PADDUSB: + gen_helper_paddusb(t0, t0, t1); + break; + case OPC_PADDB: + gen_helper_paddb(t0, t0, t1); + break; + + case OPC_PSUBSH: gen_helper_psubsh(t0, t0, t1); + break; + case OPC_PSUBUSH: + gen_helper_psubush(t0, t0, t1); + break; + case OPC_PSUBH: + gen_helper_psubh(t0, t0, t1); + break; + case OPC_PSUBW: + gen_helper_psubw(t0, t0, t1); + break; + case OPC_PSUBSB: + gen_helper_psubsb(t0, t0, t1); + break; + case OPC_PSUBUSB: + gen_helper_psubusb(t0, t0, t1); + break; + case OPC_PSUBB: + gen_helper_psubb(t0, t0, t1); + break; + + case OPC_PSHUFH: + gen_helper_pshufh(t0, t0, t1); + break; + case OPC_PACKSSWH: + gen_helper_packsswh(t0, t0, t1); + break; + case OPC_PACKSSHB: + gen_helper_packsshb(t0, t0, t1); + break; + case OPC_PACKUSHB: + gen_helper_packushb(t0, t0, t1); + break; + + case OPC_PUNPCKLHW: + gen_helper_punpcklhw(t0, t0, t1); + break; + case OPC_PUNPCKHHW: + gen_helper_punpckhhw(t0, t0, t1); + break; + case OPC_PUNPCKLBH: + gen_helper_punpcklbh(t0, t0, t1); + break; + case OPC_PUNPCKHBH: + gen_helper_punpckhbh(t0, t0, t1); + break; + case OPC_PUNPCKLWD: + gen_helper_punpcklwd(t0, t0, t1); + break; + case OPC_PUNPCKHWD: + gen_helper_punpckhwd(t0, t0, t1); + break; + + case OPC_PAVGH: + gen_helper_pavgh(t0, t0, t1); + break; + case OPC_PAVGB: + gen_helper_pavgb(t0, t0, t1); + break; + case OPC_PMAXSH: + gen_helper_pmaxsh(t0, t0, t1); + break; + case OPC_PMINSH: + gen_helper_pminsh(t0, t0, t1); + break; + case OPC_PMAXUB: + gen_helper_pmaxub(t0, t0, t1); + break; + case OPC_PMINUB: + gen_helper_pminub(t0, t0, t1); + break; + + case OPC_PCMPEQW: + gen_helper_pcmpeqw(t0, t0, t1); + break; + case OPC_PCMPGTW: + gen_helper_pcmpgtw(t0, t0, t1); + break; + case OPC_PCMPEQH: + gen_helper_pcmpeqh(t0, t0, t1); + break; + case OPC_PCMPGTH: + gen_helper_pcmpgth(t0, t0, t1); + break; + case OPC_PCMPEQB: + gen_helper_pcmpeqb(t0, t0, t1); + break; + case OPC_PCMPGTB: + gen_helper_pcmpgtb(t0, t0, t1); + break; + + case OPC_PSLLW: + gen_helper_psllw(t0, t0, t1); + break; + case OPC_PSLLH: + gen_helper_psllh(t0, t0, t1); + break; + case OPC_PSRLW: + gen_helper_psrlw(t0, t0, t1); + break; + case OPC_PSRLH: + gen_helper_psrlh(t0, t0, t1); + break; + case OPC_PSRAW: + gen_helper_psraw(t0, t0, t1); + break; + case OPC_PSRAH: + gen_helper_psrah(t0, t0, t1); + break; + + case OPC_PMULLH: + gen_helper_pmullh(t0, t0, t1); + break; + case OPC_PMULHH: + gen_helper_pmulhh(t0, t0, t1); + break; + case OPC_PMULHUH: + gen_helper_pmulhuh(t0, t0, t1); + break; + case OPC_PMADDHW: + gen_helper_pmaddhw(t0, t0, t1); + break; + + case OPC_PASUBUB: + gen_helper_pasubub(t0, t0, t1); + break; + case OPC_BIADD: + gen_helper_biadd(t0, t0); + break; + case OPC_PMOVMSKB: + gen_helper_pmovmskb(t0, t0); + break; + + case OPC_PADDD: + tcg_gen_add_i64(t0, t0, t1); + break; + case OPC_PSUBD: + tcg_gen_sub_i64(t0, t0, t1); + break; + case OPC_XOR_CP2: + tcg_gen_xor_i64(t0, t0, t1); + break; + case OPC_NOR_CP2: + tcg_gen_nor_i64(t0, t0, t1); + break; + case OPC_AND_CP2: + tcg_gen_and_i64(t0, t0, t1); + break; + case OPC_OR_CP2: + tcg_gen_or_i64(t0, t0, t1); + break; =20 case OPC_PANDN: tcg_gen_andc_i64(t0, t1, t0); @@ -5772,9 +5874,6 @@ static void gen_loongson_multimedia(DisasContext *ctx= , int rd, int rs, int rt) return; } =20 -#undef LMI_HELPER -#undef LMI_DIRECT - gen_store_fpr64(ctx, t0, rd); =20 tcg_temp_free_i64(t0); --=20 2.7.4