pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align with latest TomB version 1.0.0

Browse source
This commit is contained in:
Chips-fr 2015-10-11 14:23:51 +02:00
parent 3f743e49be
commit c5610e7acd
103 changed files with 66138 additions and 15463 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/include/newcpu.h
View file

@ -185,8 +185,6 @@ STATIC_INLINE uae_u32 munge24(uae_u32 x)
return x & regs.address_space_mask;
}
extern unsigned long irqcycles[15];
extern int irqdelay[15];
extern int mmu_enabled, mmu_triggered;
extern int cpu_cycles;
@ -339,6 +337,22 @@ extern void m68k_reset (int);
extern int getDivu68kCycles(uae_u32 dividend, uae_u16 divisor);
extern int getDivs68kCycles(uae_s32 dividend, uae_s16 divisor);
STATIC_INLINE int bitset_count(uae_u32 data)
{
unsigned int const MASK1 = 0x55555555;
unsigned int const MASK2 = 0x33333333;
unsigned int const MASK4 = 0x0f0f0f0f;
unsigned int const MASK6 = 0x0000003f;
unsigned int const w = (data & MASK1) + ((data >> 1) & MASK1);
unsigned int const x = (w & MASK2) + ((w >> 2) & MASK2);
unsigned int const y = ((x + (x >> 4)) & MASK4);
unsigned int const z = (y + (y >> 8));
unsigned int const c = (z + (z >> 16)) & MASK6;
return c;
}
extern void mmu_op (uae_u32, struct regstruct *regs, uae_u32);
extern void mmu_op30 (uaecptr, uae_u32, struct regstruct *regs, int, uaecptr);