ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace ffs() calls with ctz32()

This commit is contained in:
Stefan Schmidt 2018-10-08 09:57:09 +02:00 committed by Matt
parent 7d500c46e6
commit 1c6bb37bec
4 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xbox/mcpx_apu.c
View File

@ -121,12 +121,12 @@ static const struct {
#define MCPX_HW_MAX_VOICES 256
#define GET_MASK(v, mask) (((v) & (mask)) >> (ffs(mask) - 1))
#define GET_MASK(v, mask) (((v) & (mask)) >> ctz32(mask))
#define SET_MASK(v, mask, val) \
do { \
(v) &= ~(mask); \
(v) |= ((val) << (ffs(mask) - 1)) & (mask); \
(v) |= ((val) << ctz32(mask)) & (mask); \
} while (0)
// #define MCPX_DEBUG
@ -181,7 +181,7 @@ static uint32_t voice_get_mask(MCPXAPUState *d,
hwaddr voice = d->regs[NV_PAPU_VPVADDR]
+ voice_handle * NV_PAVS_SIZE;
return (ldl_le_phys(&address_space_memory, voice + offset) & mask)
>> (ffs(mask) - 1);
>> ctz32(mask);
}
static void voice_set_mask(MCPXAPUState *d,
unsigned int voice_handle,
@ -194,7 +194,7 @@ static void voice_set_mask(MCPXAPUState *d,
+ voice_handle * NV_PAVS_SIZE;
uint32_t v = ldl_le_phys(&address_space_memory, voice + offset) & ~mask;
stl_le_phys(&address_space_memory, voice + offset,
v | ((val << (ffs(mask) - 1)) & mask));
v | ((val << ctz32(mask)) & mask));
}
static void update_irq(MCPXAPUState *d)

20
hw/xbox/nv2a/nv2a.c
View File

@ -41,26 +41,6 @@
#include "hw/xbox/nv2a/nv2a.h"
#ifdef __WINNT__
// HACK: mingw-w64 doesn't provide ffs, for now we just shove it here
// TODO: decide on a better location
int ffs(register int valu)
{
register int bit;
if (valu == 0) {
return 0;
}
for (bit = 1; !(valu & 1); bit++) {
valu >>= 1;
}
return bit;
}
#endif
#define DEFINE_PROTO(n) \
uint64_t n##_read(void *opaque, hwaddr addr, unsigned int size); \
void n##_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size);

4
hw/xbox/nv2a/nv2a_int.h
View File

@ -38,14 +38,14 @@
#include "hw/xbox/nv2a/nv2a_debug.h"
#include "hw/xbox/nv2a/nv2a_regs.h"
#define GET_MASK(v, mask) (((v) & (mask)) >> (ffs(mask) - 1))
#define GET_MASK(v, mask) (((v) & (mask)) >> ctz32(mask))
#define SET_MASK(v, mask, val) \
({ \
const unsigned int __val = (val); \
const unsigned int __mask = (mask); \
(v) &= ~(__mask); \
(v) |= ((__val) << (ffs(__mask) - 1)) & (__mask); \
(v) |= ((__val) << ctz32(__mask)) & (__mask); \
})
#define CASE_4(v, step) \

2
hw/xbox/nv2a/nv2a_pfifo.c
View File

@ -459,7 +459,7 @@ static uint32_t ramht_hash(NV2AState *d, uint32_t handle)
1 << (GET_MASK(d->pfifo.regs[NV_PFIFO_RAMHT], NV_PFIFO_RAMHT_SIZE)+12);
/* XXX: Think this is different to what nouveau calculates... */
unsigned int bits = ffs(ramht_size)-2;
unsigned int bits = ctz32(ramht_size)-1;
uint32_t hash = 0;
while (handle) {