//#define memprintf printf
#define memprintf(...)
-static u32 *mem_readtab;
-static u32 *mem_writetab;
-static u32 mem_iortab[(1+2+4) * 0x1000 / 4];
-static u32 mem_iowtab[(1+2+4) * 0x1000 / 4];
-static u32 mem_ffwtab[(1+2+4) * 0x1000 / 4];
-//static u32 mem_unmrtab[(1+2+4) * 0x1000 / 4];
-static u32 mem_unmwtab[(1+2+4) * 0x1000 / 4];
-
-// When this is called in a loop, and 'h' is a function pointer, clang will crash.
+static uintptr_t *mem_readtab;
+static uintptr_t *mem_writetab;
+static uintptr_t mem_iortab[(1+2+4) * 0x1000 / 4];
+static uintptr_t mem_iowtab[(1+2+4) * 0x1000 / 4];
+static uintptr_t mem_ffwtab[(1+2+4) * 0x1000 / 4];
+//static uintptr_t mem_unmrtab[(1+2+4) * 0x1000 / 4];
+static uintptr_t mem_unmwtab[(1+2+4) * 0x1000 / 4];
+
+static
#ifdef __clang__
-static __attribute__ ((noinline)) void map_item(u32 *out, const void *h, u32 flag)
-#else
-static void map_item(u32 *out, const void *h, u32 flag)
+// When this is called in a loop, and 'h' is a function pointer, clang will crash.
+__attribute__ ((noinline))
#endif
+void map_item(uintptr_t *out, const void *h, uintptr_t flag)
{
- u32 hv = (u32)h;
+ uintptr_t hv = (uintptr_t)h;
if (hv & 1) {
SysPrintf("FATAL: %p has LSB set\n", h);
abort();
}
- *out = (hv >> 1) | (flag << 31);
+ *out = (hv >> 1) | (flag << (sizeof(hv) * 8 - 1));
}
// size must be power of 2, at least 4k
#define map_l1_mem(tab, i, addr, size, base) \
- map_item(&tab[((addr)>>12) + i], (u8 *)(base) - (u32)(addr) - ((i << 12) & ~(size - 1)), 0)
+ map_item(&tab[((addr)>>12) + i], \
+ (u8 *)(base) - (u32)((addr) + ((i << 12) & ~(size - 1))), 0)
#define IOMEM32(a) (((a) & 0xfff) / 4)
#define IOMEM16(a) (0x1000/4 + (((a) & 0xfff) / 2))
sioWrite8((unsigned char)(value >> 24));
}
-#ifndef DRC_DBG
+#if !defined(DRC_DBG) && defined(__arm__)
static void map_rcnt_rcount0(u32 mode)
{
static void io_write_ireg16(u32 value)
{
- //if (Config.Sio) psxHu16ref(0x1070) |= 0x80;
- if (Config.SpuIrq) psxHu16ref(0x1070) |= 0x200;
psxHu16ref(0x1070) &= value;
}
static void io_write_ireg32(u32 value)
{
- //if (Config.Sio) psxHu32ref(0x1070) |= 0x80;
- if (Config.SpuIrq) psxHu32ref(0x1070) |= 0x200;
psxHu32ref(0x1070) &= value;
}
map_rcnt_rcount2(rcnts[2].mode);
}
-int pcsxmem_is_handler_dynamic(u_int addr)
+int pcsxmem_is_handler_dynamic(unsigned int addr)
{
if ((addr & 0xfffff000) != 0x1f801000)
return 0;
int i;
// have to map these further to keep tcache close to .text
- mem_readtab = psxMap(0x08000000, 0x200000 * 4, 0, MAP_TAG_LUTS);
+ mem_readtab = psxMap(0x08000000, 0x200000 * sizeof(mem_readtab[0]), 0, MAP_TAG_LUTS);
if (mem_readtab == NULL) {
SysPrintf("failed to map mem tables\n");
exit(1);