From 81295d66b59af1ca7cbd91f63c897d6f60b015b6 Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Sun, 3 Sep 2006 01:15:46 +0000
Subject: Fixed bugs on BIT,RES and SET opcode macros.  Fixed serious bug in
 POKE macro.  Changes to GEMMA.

---
 z80_private.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'z80_private.h')

diff --git a/z80_private.h b/z80_private.h
index c10b15f..58b9584 100644
--- a/z80_private.h
+++ b/z80_private.h
@@ -146,17 +146,19 @@ struct Z80
 
 #define POKE(addr,val)		do					\
 				{					\
-				    if (cpu->memctrl[(addr)/256])	\
+				    Z80Word ba=addr;			\
+				    Z80Word bv=val;			\
+				    if (cpu->memctrl[(ba)/256])		\
 				    {					\
-				    	cpu->memory[addr]=val;		\
+				    	cpu->memory[ba]=bv;		\
 				    }					\
 				} while (0)
 #define POKEW(addr,val)		do					\
 				{					\
-				    Z80Word once=val;			\
-				    Z80Word once_addr=addr;		\
-				    POKE(once_addr,once);		\
-				    POKE(once_addr+1,once>>8);		\
+				    Z80Word wa=addr;			\
+				    Z80Word wv=val;			\
+				    POKE(wa,wv);			\
+				    POKE(wa+1,wv>>8);			\
 				} while(0)
 
 #define FETCH_BYTE		(cpu->memory[cpu->PC++])
-- 
cgit v1.2.3