ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split out macros from common.h

This commit is contained in:
Jeffrey Pfau 2014-10-11 18:18:47 -07:00
parent 4ecdcf25f5
commit 4247db81e4
41 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arm/arm.h
View File

@ -1,7 +1,7 @@
#ifndef ARM_H #ifndef ARM_H
#define ARM_H #define ARM_H
#include "common.h" #include "util/common.h"
enum { enum {
ARM_SP = 13, ARM_SP = 13,

2
src/arm/isa-arm.h
View File

@ -1,7 +1,7 @@
#ifndef ISA_ARM_H #ifndef ISA_ARM_H
#define ISA_ARM_H #define ISA_ARM_H
#include "common.h" #include "util/common.h"
#define ARM_PREFETCH_CYCLES (1 + cpu->memory.activeSeqCycles32) #define ARM_PREFETCH_CYCLES (1 + cpu->memory.activeSeqCycles32)

2
src/arm/isa-inlines.h
View File

@ -1,7 +1,7 @@
#ifndef ISA_INLINES_H #ifndef ISA_INLINES_H
#define ISA_INLINES_H #define ISA_INLINES_H
#include "common.h" #include "macros.h"
#include "arm.h" #include "arm.h"

2
src/arm/isa-thumb.h
View File

@ -1,7 +1,7 @@
#ifndef ISA_THUMB_H #ifndef ISA_THUMB_H
#define ISA_THUMB_H #define ISA_THUMB_H
#include "common.h" #include "util/common.h"
struct ARMCore; struct ARMCore;

19
src/arm/common.h → src/arm/macros.h
View File

@ -1,20 +1,7 @@
#ifndef COMMON_H #ifndef MACROS_H
#define COMMON_H #define MACROS_H
#include <ctype.h> #include "util/common.h"
#include <fcntl.h>
#include <limits.h>
#include <math.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define UNUSED(V) (void)(V)
#if defined(__PPC__) || defined(__POWERPC__) #if defined(__PPC__) || defined(__POWERPC__)
#define LOAD_32(DEST, ADDR, ARR) { \ #define LOAD_32(DEST, ADDR, ARR) { \

2
src/debugger/cli-debugger.h
View File

@ -1,7 +1,7 @@
#ifndef CLI_DEBUGGER_H #ifndef CLI_DEBUGGER_H
#define CLI_DEBUGGER_H #define CLI_DEBUGGER_H
#include "common.h" #include "util/common.h"
#include "debugger.h" #include "debugger.h"

2
src/debugger/debugger.h
View File

@ -1,7 +1,7 @@
#ifndef DEBUGGER_H #ifndef DEBUGGER_H
#define DEBUGGER_H #define DEBUGGER_H
#include "common.h" #include "util/common.h"
#include "arm.h" #include "arm.h"

2
src/debugger/gdb-stub.h
View File

@ -1,7 +1,7 @@
#ifndef GDB_STUB_H #ifndef GDB_STUB_H
#define GDB_STUB_H #define GDB_STUB_H
#include "common.h" #include "util/common.h"
#include "debugger/debugger.h" #include "debugger/debugger.h"

2
src/debugger/memory-debugger.h
View File

@ -1,7 +1,7 @@
#ifndef MEMORY_DEBUGGER_H #ifndef MEMORY_DEBUGGER_H
#define MEMORY_DEBUGGER_H #define MEMORY_DEBUGGER_H
#include "common.h" #include "util/common.h"
#include "arm.h" #include "arm.h"

2
src/debugger/parser.h
View File

@ -1,7 +1,7 @@
#ifndef PARSER_H #ifndef PARSER_H
#define PARSER_H #define PARSER_H
#include "common.h" #include "util/common.h"
#include "debugger.h" #include "debugger.h"
enum LexState { enum LexState {

3
src/gba/gba-audio.h
View File

@ -1,7 +1,8 @@
#ifndef GBA_AUDIO_H #ifndef GBA_AUDIO_H
#define GBA_AUDIO_H #define GBA_AUDIO_H
#include "common.h" #include "util/common.h"
#include "macros.h"
#include "util/circle-buffer.h" #include "util/circle-buffer.h"

2
src/gba/gba-bios.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_BIOS_H #ifndef GBA_BIOS_H
#define GBA_BIOS_H #define GBA_BIOS_H
#include "common.h" #include "util/common.h"
#include "arm.h" #include "arm.h"

2
src/gba/gba-gpio.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_GPIO_H #ifndef GBA_GPIO_H
#define GBA_GPIO_H #define GBA_GPIO_H
#include "common.h" #include "util/common.h"
#define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL) #define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL)

2
src/gba/gba-io.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_IO_H #ifndef GBA_IO_H
#define GBA_IO_H #define GBA_IO_H
#include "common.h" #include "util/common.h"
#include "gba.h" #include "gba.h"

2
src/gba/gba-memory.c
View File

@ -1,5 +1,7 @@
#include "gba-memory.h" #include "gba-memory.h"
#include "macros.h"
#include "gba-gpio.h" #include "gba-gpio.h"
#include "gba-io.h" #include "gba-io.h"
#include "gba-serialize.h" #include "gba-serialize.h"

3
src/gba/gba-memory.h
View File

@ -1,9 +1,10 @@
#ifndef GBA_MEMORY_H #ifndef GBA_MEMORY_H
#define GBA_MEMORY_H #define GBA_MEMORY_H
#include "common.h" #include "util/common.h"
#include "arm.h" #include "arm.h"
#include "macros.h"
#include "gba-gpio.h" #include "gba-gpio.h"
#include "gba-savedata.h" #include "gba-savedata.h"

2
src/gba/gba-rr.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_RR_H #ifndef GBA_RR_H
#define GBA_RR_H #define GBA_RR_H
#include "common.h" #include "util/common.h"
struct GBA; struct GBA;
struct VDir; struct VDir;

2
src/gba/gba-savedata.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_SAVEDATA_H #ifndef GBA_SAVEDATA_H
#define GBA_SAVEDATA_H #define GBA_SAVEDATA_H
#include "common.h" #include "util/common.h"
struct VFile; struct VFile;

2
src/gba/gba-sensors.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_SENSORS_H #ifndef GBA_SENSORS_H
#define GBA_SENSORS_H #define GBA_SENSORS_H
#include "common.h" #include "util/common.h"
struct GBARotationSource { struct GBARotationSource {
void (*sample)(struct GBARotationSource*); void (*sample)(struct GBARotationSource*);

2
src/gba/gba-serialize.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_SERIALIZE_H #ifndef GBA_SERIALIZE_H
#define GBA_SERIALIZE_H #define GBA_SERIALIZE_H
#include "common.h" #include "util/common.h"
#include "gba.h" #include "gba.h"

2
src/gba/gba-sio.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_SIO_H #ifndef GBA_SIO_H
#define GBA_SIO_H #define GBA_SIO_H
#include "common.h" #include "util/common.h"
enum GBASIOMode { enum GBASIOMode {
SIO_NORMAL_8 = 0, SIO_NORMAL_8 = 0,

2
src/gba/gba-thread.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_THREAD_H #ifndef GBA_THREAD_H
#define GBA_THREAD_H #define GBA_THREAD_H
#include "common.h" #include "util/common.h"
#include "gba.h" #include "gba.h"
#include "gba-input.h" #include "gba-input.h"

3
src/gba/gba-video.h
View File

@ -1,9 +1,10 @@
#ifndef GBA_VIDEO_H #ifndef GBA_VIDEO_H
#define GBA_VIDEO_H #define GBA_VIDEO_H
#include "common.h" #include "util/common.h"
#include "gba-memory.h" #include "gba-memory.h"
#include "macros.h"
#ifdef COLOR_16_BIT #ifdef COLOR_16_BIT
#define BYTES_PER_PIXEL 2 #define BYTES_PER_PIXEL 2

2
src/gba/gba.h
View File

@ -1,7 +1,7 @@
#ifndef GBA_H #ifndef GBA_H
#define GBA_H #define GBA_H
#include "common.h" #include "util/common.h"
#include "arm.h" #include "arm.h"
#include "debugger/debugger.h" #include "debugger/debugger.h"

2
src/gba/hle-bios.h
View File

@ -1,7 +1,7 @@
#ifndef HLE_BIOS_H #ifndef HLE_BIOS_H
#define HLE_BIOS_H #define HLE_BIOS_H
#include "common.h" #include "util/common.h"
extern const uint8_t hleBios[]; extern const uint8_t hleBios[];

2
src/gba/renderers/video-glsl.h
View File

@ -1,7 +1,7 @@
#ifndef VIDEO_GLSL_H #ifndef VIDEO_GLSL_H
#define VIDEO_GLSL_H #define VIDEO_GLSL_H
#include "common.h" #include "util/common.h"
#include "gba-video.h" #include "gba-video.h"

2
src/gba/renderers/video-software.h
View File

@ -1,7 +1,7 @@
#ifndef VIDEO_SOFTWARE_H #ifndef VIDEO_SOFTWARE_H
#define VIDEO_SOFTWARE_H #define VIDEO_SOFTWARE_H
#include "common.h" #include "util/common.h"
#include "gba-video.h" #include "gba-video.h"

2
src/platform/commandline.h
View File

@ -1,7 +1,7 @@
#ifndef COMMAND_LINE_H #ifndef COMMAND_LINE_H
#define COMMAND_LINE_H #define COMMAND_LINE_H
#include "common.h" #include "util/common.h"
enum DebuggerType { enum DebuggerType {
DEBUGGER_NONE = 0, DEBUGGER_NONE = 0,

2
src/platform/sdl/sdl-audio.h
View File

@ -1,7 +1,7 @@
#ifndef SDL_AUDIO_H #ifndef SDL_AUDIO_H
#define SDL_AUDIO_H #define SDL_AUDIO_H
#include "common.h" #include "util/common.h"
#include <SDL.h> #include <SDL.h>

2
src/platform/sdl/sdl-events.h
View File

@ -1,7 +1,7 @@
#ifndef SDL_EVENTS_H #ifndef SDL_EVENTS_H
#define SDL_EVENTS_H #define SDL_EVENTS_H
#include "common.h" #include "util/common.h"
#include "gba-thread.h" #include "gba-thread.h"

2
src/util/circle-buffer.h
View File

@ -1,7 +1,7 @@
#ifndef CIRCLE_BUFFER_H #ifndef CIRCLE_BUFFER_H
#define CIRCLE_BUFFER_H #define CIRCLE_BUFFER_H
#include "common.h" #include "util/common.h"
struct CircleBuffer { struct CircleBuffer {
void* data; void* data;

19
src/util/common.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef COMMON_H
#define COMMON_H
#include <ctype.h>
#include <fcntl.h>
#include <limits.h>
#include <math.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define UNUSED(V) (void)(V)
#endif

3
src/util/crc32.h
View File

@ -1,8 +1,7 @@
#ifndef CRC32_H #ifndef CRC32_H
#define CRC32_H #define CRC32_H
#include <stdint.h> #include "util/common.h"
#include <string.h>
struct VFile; struct VFile;

2
src/util/memory.h
View File

@ -1,7 +1,7 @@
#ifndef MEMORY_H #ifndef MEMORY_H
#define MEMORY_H #define MEMORY_H
#include "common.h" #include "util/common.h"
void* anonymousMemoryMap(size_t size); void* anonymousMemoryMap(size_t size);
void mappedMemoryFree(void* memory, size_t size); void mappedMemoryFree(void* memory, size_t size);

2
src/util/patch-ips.h
View File

@ -1,7 +1,7 @@
#ifndef PATCH_IPS_H #ifndef PATCH_IPS_H
#define PATCH_IPS_H #define PATCH_IPS_H
#include "common.h" #include "util/common.h"
struct Patch; struct Patch;

2
src/util/patch-ups.h
View File

@ -1,7 +1,7 @@
#ifndef PATCH_UPS_H #ifndef PATCH_UPS_H
#define PATCH_UPS_H #define PATCH_UPS_H
#include "common.h" #include "util/common.h"
struct Patch; struct Patch;

2
src/util/patch.h
View File

@ -1,7 +1,7 @@
#ifndef PATCH_H #ifndef PATCH_H
#define PATCH_H #define PATCH_H
#include "common.h" #include "util/common.h"
struct VFile; struct VFile;

2
src/util/png-io.h
View File

@ -1,7 +1,7 @@
#ifndef PNG_IO_H #ifndef PNG_IO_H
#define PNG_IO_H #define PNG_IO_H
#include "common.h" #include "util/common.h"
#ifdef USE_PNG #ifdef USE_PNG

2
src/util/socket.h
View File

@ -1,7 +1,7 @@
#ifndef SOCKET_H #ifndef SOCKET_H
#define SOCKET_H #define SOCKET_H
#include "common.h" #include "util/common.h"
#ifdef __cplusplus #ifdef __cplusplus
#define restrict __restrict__ #define restrict __restrict__

2
src/util/threading.h
View File

@ -1,7 +1,7 @@
#ifndef THREADING_H #ifndef THREADING_H
#define THREADING_H #define THREADING_H
#include "common.h" #include "util/common.h"
#ifdef USE_PTHREADS #ifdef USE_PTHREADS
#include <pthread.h> #include <pthread.h>

2
src/util/vfs.h
View File

@ -1,7 +1,7 @@
#ifndef VFS_H #ifndef VFS_H
#define VFS_H #define VFS_H
#include "common.h" #include "util/common.h"
enum { enum {
MAP_READ = 1, MAP_READ = 1,