eaw/Z80
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Namespace conventions.

Browse Source
This commit is contained in:
redcode
2015-09-11 06:24:46 +02:00
parent 39f5a23233
commit 88b7ac1c52
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h
View File

@@ -13,15 +13,15 @@ Released under the terms of the GNU General Public License v3. */
#include <Z/hardware/CPU/architecture/Z80.h>
#include <Z/types/generic functions.h>
#ifndef EMULATION_CPU_Z80_NO_SLOTS
#ifndef CPU_Z80_NO_SLOTS
# include <Z/macros/slot.h>
#endif
#if defined(BUILDING_DYNAMIC_EMULATION_CPU_Z80)
#if defined(CPU_Z80_BUILDING_DYNAMIC)
# define CPU_Z80_API Z_API_EXPORT
#elif defined(BUILDING_STATIC_EMULATION_CPU_Z80)
#elif defined(CPU_Z80_BUILDING_STATIC)
# define CPU_Z80_API Z_PUBLIC
#elif defined(USE_STATIC_EMULATION_CPU_Z80)
#elif defined(CPU_Z80_USE_STATIC)
# define CPU_Z80_API
#else
# define CPU_Z80_API Z_API
@@ -34,7 +34,7 @@ typedef struct {
zuint8 r7;
Z32Bit data;
# ifdef EMULATION_CPU_Z80_NO_SLOTS
# ifdef CPU_Z80_NO_SLOTS
void* cb_context;
struct {Z16BitAddressRead8Bit read;

4
Z80.CPU/v1.0/development/Xcode/Z80.xcodeproj/project.pbxproj
View File

@@ -8,8 +8,8 @@
/* Begin PBXBuildFile section */
6428A5751AAFC6DF00634F5D /* Z80.h in Headers */ = {isa = PBXBuildFile; fileRef = 6428A5741AAFC6DF00634F5D /* Z80.h */; settings = {ATTRIBUTES = (Public, ); }; };
6428A5771AAFC72900634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DBUILDING_DYNAMIC_EMULATION_CPU_Z80 -DEMULATION_CPU_Z80_NO_SLOTS"; }; };
6428A5801AAFEF1D00634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DBUILDING_STATIC_EMULATION_CPU_Z80 -DEMULATION_CPU_Z80_NO_SLOTS"; }; };
6428A5771AAFC72900634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DCPU_Z80_BUILDING_DYNAMIC -DCPU_Z80_NO_SLOTS"; }; };
6428A5801AAFEF1D00634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DCPU_Z80_BUILDING_STATIC -DCPU_Z80_NO_SLOTS"; }; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */

4
Z80.CPU/v1.0/sources/Z80.c
View File

@@ -22,7 +22,7 @@ typedef zuint8 (* Instruction)(Z80 *object);
/* MARK: - Macros & Functions: Callback */
#ifdef EMULATION_CPU_Z80_NO_SLOTS
#ifdef CPU_Z80_NO_SLOTS
# define CB_ACTION(name) object->cb.name
# define CB_OBJECT(name) object->cb_context
#else
@@ -1575,7 +1575,7 @@ CPU_Z80_API void z80_nmi(Z80 *object) {NMI = TRUE ;}
CPU_Z80_API void z80_irq(Z80 *object, zboolean state) {INT = state;}
#ifdef BUILDING_MODULE_EMULATION_CPU_Z80
#ifdef CPU_Z80_BUILDING_MODULE
Z_PRIVATE void after_state_readed (Z80 *object, ZZ80State *state)
{Z_Z80_STATE_R(state) = R_ALL;}