RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Replace utils::popcnt32 with std::popcount

Browse Source 
Cleanup includes.
This commit is contained in:
Nekotekina 2020-04-13 21:58:17 +03:00
parent 032e7c0491
commit f72af2973d
5 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Utilities/asm.h
View File

@ -4,23 +4,6 @@
namespace utils
{
inline u8 popcnt32(u32 arg)
{
#ifdef _MSC_VER
const u32 a1 = arg & 0x55555555;
const u32 a2 = (arg >> 1) & 0x55555555;
const u32 a3 = a1 + a2;
const u32 b1 = a3 & 0x33333333;
const u32 b2 = (a3 >> 2) & 0x33333333;
const u32 b3 = b1 + b2;
const u32 c3 = (b3 + (b3 >> 4)) & 0x0f0f0f0f;
const u32 d3 = c3 + (c3 >> 8);
return static_cast<u8>(d3 + (d3 >> 16));
#else
return __builtin_popcount(arg);
#endif
}
// Rotate helpers
#if defined(__GNUG__)

1
rpcs3/Emu/Cell/Modules/cellSpurs.cpp
View File

@ -1,7 +1,6 @@
#include "stdafx.h"
#include "Emu/IdManager.h"
#include "Emu/Cell/PPUModule.h"
#include "Utilities/asm.h"
#include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/lv2/sys_lwmutex.h"
#include "Emu/Cell/lv2/sys_lwcond.h"

1
rpcs3/Emu/Cell/Modules/cellSync.cpp
View File

@ -1,6 +1,5 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
#include "Utilities/asm.h"
#include "Emu/Cell/lv2/sys_event.h"
#include "Emu/Cell/lv2/sys_process.h"
#include "cellSync.h"

2
rpcs3/Emu/Cell/PPUTranslator.cpp
View File

@ -236,7 +236,7 @@ Type* PPUTranslator::ScaleType(Type* type, s32 pow2)
uint scaled = type->getScalarSizeInBits();
verify(HERE), utils::popcnt32(scaled) == 1;
verify(HERE), std::popcount(scaled) == 1;
if (pow2 > 0)
{

3
rpcs3/Emu/Memory/vm.cpp
View File

@ -10,7 +10,6 @@
#include "Utilities/Thread.h"
#include "Utilities/VirtualMemory.h"
#include "Utilities/address_range.h"
#include "Utilities/asm.h"
#include "Emu/CPU/CPUThread.h"
#include "Emu/Cell/lv2/sys_memory.h"
#include "Emu/RSX/GSRender.h"
@ -1105,7 +1104,7 @@ namespace vm
if (is_write)
std::swap(src, dst);
if (size <= 16 && utils::popcnt32(size) == 1 && (addr & (size - 1)) == 0)
if (size <= 16 && std::popcount(size) == 1 && (addr & (size - 1)) == 0)
{
if (is_write)
{