From da49b598b92f414fb66c347ad05340676663357f Mon Sep 17 00:00:00 2001 From: redcode Date: Mon, 11 Jan 2016 08:24:08 +0100 Subject: [PATCH] More compatible pointer arithmetic. --- Z80.CPU/v1.0/sources/Z80.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Z80.CPU/v1.0/sources/Z80.c b/Z80.CPU/v1.0/sources/Z80.c index 98584f2..9048127 100644 --- a/Z80.CPU/v1.0/sources/Z80.c +++ b/Z80.CPU/v1.0/sources/Z80.c @@ -8,6 +8,7 @@ Copyright © 1999-2015 Manuel Sainz de Baranda y Goñi. Released under the terms of the GNU General Public License v3. */ #include +#include #ifdef CPU_Z80_BUILDING_DYNAMIC # define CPU_Z80_API Z_API_EXPORT @@ -294,7 +295,7 @@ static zuint8 const w_table[4] = { #define R_16(name, table, offset) \ Z_INLINE zuint16 *name(Z80 *object) \ - {return ((void *)object) + table[(BYTE(offset) & 48) >> 4];} + {return Z_BOP(zuint16 *, object, table[(BYTE(offset) & 48) >> 4]);} R_16(__ss____0, s_table, 0) R_16(__ss____1, s_table, 1) @@ -606,7 +607,7 @@ Z_INLINE zuint8 _m______(Z80 *object, zuint8 offset, zuint8 value) #define G3(value) __ggg___ (object, 3, value) #define M1(value) _m______ (object, 1, value) #define M3(value) _m______ (object, 3, value) -#define WW (*(zuint16 *)((void *)object + w_table[(BYTE1 >> 4) & 3])) +#define WW (*Z_BOP(zuint16 *, object, w_table[(BYTE1 >> 4) & 3])) /* MARK: - Macros & Functions: Reusable Code */