From 2cb00fe0655e9f6b010905db321d1e040d37cb75 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 14 Apr 2013 04:08:06 -0700 Subject: [PATCH] Move GBA load/stores internal to gba.c --- src/gba.c | 10 ++++++++++ src/gba.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gba.c b/src/gba.c index 22820f7f5..6648ecdf0 100644 --- a/src/gba.c +++ b/src/gba.c @@ -10,6 +10,16 @@ static const char* GBA_CANNOT_MMAP = "Could not map memory"; +static int32_t GBALoad32(struct ARMMemory* memory, uint32_t address); +static int16_t GBALoad16(struct ARMMemory* memory, uint32_t address); +static uint16_t GBALoadU16(struct ARMMemory* memory, uint32_t address); +static int8_t GBALoad8(struct ARMMemory* memory, uint32_t address); +static uint8_t GBALoadU8(struct ARMMemory* memory, uint32_t address); + +static void GBAStore32(struct ARMMemory* memory, uint32_t address, int32_t value); +static void GBAStore16(struct ARMMemory* memory, uint32_t address, int16_t value); +static void GBAStore8(struct ARMMemory* memory, uint32_t address, int8_t value); + static void GBASetActiveRegion(struct ARMMemory* memory, uint32_t region); static void GBAHitStub(struct ARMBoard* board, uint32_t opcode); diff --git a/src/gba.h b/src/gba.h index df7b9c78f..52c979af1 100644 --- a/src/gba.h +++ b/src/gba.h @@ -112,14 +112,4 @@ void GBAAttachDebugger(struct GBA* gba, struct ARMDebugger* debugger); void GBALoadROM(struct GBA* gba, int fd); -int32_t GBALoad32(struct ARMMemory* memory, uint32_t address); -int16_t GBALoad16(struct ARMMemory* memory, uint32_t address); -uint16_t GBALoadU16(struct ARMMemory* memory, uint32_t address); -int8_t GBALoad8(struct ARMMemory* memory, uint32_t address); -uint8_t GBALoadU8(struct ARMMemory* memory, uint32_t address); - -void GBAStore32(struct ARMMemory* memory, uint32_t address, int32_t value); -void GBAStore16(struct ARMMemory* memory, uint32_t address, int16_t value); -void GBAStore8(struct ARMMemory* memory, uint32_t address, int8_t value); - #endif