#define WRITE_MEM8(A, D) { \\r
unsigned short a = A; \\r
unsigned char d = D; \\r
- unsigned long v = z80_write_map[a >> Z80_MEM_SHIFT]; \\r
- if (v & 0x80000000) \\r
+ uptr v = z80_write_map[a >> Z80_MEM_SHIFT]; \\r
+ if (map_flag_set(v)) \\r
((z80_write_f *)(v << 1))(a, d); \\r
else \\r
*(unsigned char *)((v << 1) + a) = d; \\r