From e181f8e4830c722ba8742526509b574356b0c332 Mon Sep 17 00:00:00 2001
From: Stephen Crane <jscrane@gmail.com>
Date: Thu, 5 Oct 2017 09:55:39 +0100
Subject: [PATCH] fixes for Energia IDE

---
 z80.cpp | 6 +++---
 z80.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/z80.cpp b/z80.cpp
index d7350eb..7e0550b 100644
--- a/z80.cpp
+++ b/z80.cpp
@@ -1020,17 +1020,17 @@ z80::z80(Memory &m, PortDevice<z80> &ports): CPU(m)
 	*p++ = &z80::retpo; *p++ = &z80::pophl;
 	*p++ = &z80::jppo; *p++ = &z80::exSPhl;
 	*p++ = &z80::callpo; *p++ = &z80::pushhl;
-	*p++ = &z80::and; *p++ = &z80::rst20;
+	*p++ = &z80::and_; *p++ = &z80::rst20;
 	*p++ = &z80::retpe; *p++ = &z80::jphl;
 	*p++ = &z80::jppe; *p++ = &z80::exdehl;
 	*p++ = &z80::callpe; *p++ = &z80::ed;
-	*p++ = &z80::xor; *p++ = &z80::rst28;
+	*p++ = &z80::xor_; *p++ = &z80::rst28;
 
 	// 0xf0
 	*p++ = &z80::retp; *p++ = &z80::popaf;
 	*p++ = &z80::jpp; *p++ = &z80::di;
 	*p++ = &z80::callp; *p++ = &z80::pushaf;
-	*p++ = &z80::or; *p++ = &z80::rst30;
+	*p++ = &z80::or_; *p++ = &z80::rst30;
 	*p++ = &z80::retm; *p++ = &z80::ldsphl;
 	*p++ = &z80::jpm; *p++ = &z80::ei;
 	*p++ = &z80::callm; *p++ = &z80::fd;
diff --git a/z80.h b/z80.h
index 69008e0..73abebe 100644
--- a/z80.h
+++ b/z80.h
@@ -713,7 +713,7 @@ private:
 	void exSPhl() { _exSP(HL); }
 	void callpo() { _call(!flags.P); }
 	void pushhl() { _mc(IR, 1); _push(HL); }
-	void and() { _and(_rb(PC++)); }
+	void and_() { _and(_rb(PC++)); }
 	void rst20() { _mc(IR, 11); _push(PC); PC = 0x20; }
 
 	// 0xe8
@@ -733,7 +733,7 @@ private:
 	void exdehl() { _exch(DE, HL); }
 	void callpe() { _call(flags.P); }
 	void ed();
-	void xor() { _xor(_rb(PC++)); }
+	void xor_() { _xor(_rb(PC++)); }
 	void rst28() { _mc(IR, 11); _push(PC); PC = 0x28; }
 
 	// 0xf0
@@ -743,7 +743,7 @@ private:
 	void di() { _iff1 = _iff2 = false; }
 	void callp() { _call(!flags.S); }
 	void pushaf() { _mc(IR, 1); _push(AF); }
-	void or() { _or(_rb(PC++)); }
+	void or_() { _or(_rb(PC++)); }
 	void rst30() { _mc(IR, 11); _push(PC); PC = 0x30; }
 
 	// 0xf8