summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/memory.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-04-20 02:38:35 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-04-20 02:38:35 +0000
commite91eb4007cadfeccef7dd26206632495f18e146a (patch)
tree4b6d8eaee84aec743c6c2b7f3bef54ef41d4bf73 /src/emu/memory.h
parent9017dbad99fed00f555580b30078d95edd44d6da (diff)
Flipped the damn mem_mask. It is no longer inverted when passed to
read/write handlers. Updated all drivers accordingly. Hope I didn't miss anything important! Blame OG and smf for goading me into it. :)
Diffstat (limited to 'src/emu/memory.h')
-rw-r--r--src/emu/memory.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 837ae0f7b00..54598177d97 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -428,24 +428,24 @@ union _addrmap64_token
/* helper macro for merging data with the memory mask */
-#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
-
-#define ACCESSING_BITS_0_7 ((~mem_mask & 0x000000ff) != 0)
-#define ACCESSING_BITS_8_15 ((~mem_mask & 0x0000ff00) != 0)
-#define ACCESSING_BITS_16_23 ((~mem_mask & 0x00ff0000) != 0)
-#define ACCESSING_BITS_24_31 ((~mem_mask & 0xff000000) != 0)
-#define ACCESSING_BITS_32_39 ((~mem_mask & U64(0x000000ff00000000)) != 0)
-#define ACCESSING_BITS_40_47 ((~mem_mask & U64(0x0000ff0000000000)) != 0)
-#define ACCESSING_BITS_48_55 ((~mem_mask & U64(0x00ff000000000000)) != 0)
-#define ACCESSING_BITS_56_63 ((~mem_mask & U64(0xff00000000000000)) != 0)
-
-#define ACCESSING_BITS_0_15 ((~mem_mask & 0x0000ffff) != 0)
-#define ACCESSING_BITS_16_31 ((~mem_mask & 0xffff0000) != 0)
-#define ACCESSING_BITS_32_47 ((~mem_mask & U64(0x0000ffff00000000)) != 0)
-#define ACCESSING_BITS_48_63 ((~mem_mask & U64(0xffff000000000000)) != 0)
-
-#define ACCESSING_BITS_0_31 ((~mem_mask & 0xffffffff) != 0)
-#define ACCESSING_BITS_32_63 ((~mem_mask & U64(0xffffffff00000000)) != 0)
+#define COMBINE_DATA(varptr) (*(varptr) = (*(varptr) & ~mem_mask) | (data & mem_mask))
+
+#define ACCESSING_BITS_0_7 ((mem_mask & 0x000000ff) != 0)
+#define ACCESSING_BITS_8_15 ((mem_mask & 0x0000ff00) != 0)
+#define ACCESSING_BITS_16_23 ((mem_mask & 0x00ff0000) != 0)
+#define ACCESSING_BITS_24_31 ((mem_mask & 0xff000000) != 0)
+#define ACCESSING_BITS_32_39 ((mem_mask & U64(0x000000ff00000000)) != 0)
+#define ACCESSING_BITS_40_47 ((mem_mask & U64(0x0000ff0000000000)) != 0)
+#define ACCESSING_BITS_48_55 ((mem_mask & U64(0x00ff000000000000)) != 0)
+#define ACCESSING_BITS_56_63 ((mem_mask & U64(0xff00000000000000)) != 0)
+
+#define ACCESSING_BITS_0_15 ((mem_mask & 0x0000ffff) != 0)
+#define ACCESSING_BITS_16_31 ((mem_mask & 0xffff0000) != 0)
+#define ACCESSING_BITS_32_47 ((mem_mask & U64(0x0000ffff00000000)) != 0)
+#define ACCESSING_BITS_48_63 ((mem_mask & U64(0xffff000000000000)) != 0)
+
+#define ACCESSING_BITS_0_31 ((mem_mask & 0xffffffff) != 0)
+#define ACCESSING_BITS_32_63 ((mem_mask & U64(0xffffffff00000000)) != 0)
/* bank switching for CPU cores */