Update ASoftFallback.cs

This commit is contained in:
LDj3SNuD 2018-10-13 22:39:32 +02:00 committed by GitHub
commit 38b021410c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -407,52 +407,36 @@ namespace ChocolArm64.Instruction
public static ulong CountLeadingZeros(ulong Value, int Size) // Size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.). public static ulong CountLeadingZeros(ulong Value, int Size) // Size is 8, 16, 32 or 64 (SIMD&FP or Base Inst.).
{ {
if (Lzcnt.IsSupported && Size >= 32) if (Value == 0ul)
{ {
return Size == 32 return (ulong)Size;
? (ulong)Lzcnt.LeadingZeroCount((uint)Value)
: Lzcnt.LeadingZeroCount(Value);
} }
else
int NibbleIdx = Size;
int PreCount, Count = 0;
do
{ {
if (Value == 0ul) NibbleIdx -= 4;
{ PreCount = ClzNibbleTbl[(Value >> NibbleIdx) & 0b1111];
return (ulong)Size; Count += PreCount;
}
int NibbleIdx = Size;
int PreCount, Count = 0;
do
{
NibbleIdx -= 4;
PreCount = ClzNibbleTbl[(Value >> NibbleIdx) & 0b1111];
Count += PreCount;
}
while (PreCount == 4);
return (ulong)Count;
} }
while (PreCount == 4);
return (ulong)Count;
} }
public static ulong CountSetBits8(ulong Value) // "Size" is 8 (SIMD&FP Inst.). public static ulong CountSetBits8(ulong Value) // "Size" is 8 (SIMD&FP Inst.).
{ {
if (Popcnt.IsSupported) if (Value == 0xfful)
{ {
return (ulong)Popcnt.PopCount(Value); return 8ul;
} }
else
{
if (Value == 0xfful)
{
return 8ul;
}
Value = ((Value >> 1) & 0x55ul) + (Value & 0x55ul); Value = ((Value >> 1) & 0x55ul) + (Value & 0x55ul);
Value = ((Value >> 2) & 0x33ul) + (Value & 0x33ul); Value = ((Value >> 2) & 0x33ul) + (Value & 0x33ul);
return (Value >> 4) + (Value & 0x0ful); return (Value >> 4) + (Value & 0x0ful);
}
} }
#endregion #endregion