From 35e1e44a1107c73a3aaccb0eff44757c602afdac Mon Sep 17 00:00:00 2001 From: aliaspider Date: Mon, 8 Dec 2014 22:55:41 +0100 Subject: [PATCH 01/13] fix binary name for the x86 target on non windows platforms. --- x86/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/x86/Makefile b/x86/Makefile index 276996d..319a4a7 100644 --- a/x86/Makefile +++ b/x86/Makefile @@ -10,17 +10,27 @@ AS = as PREFIX = /usr OBJS = main.o cpu.o memory.o video.o input.o sound.o \ cpu_threaded.o gui.o x86_stub.o cheats.o zip.o -BIN ?= gpsp.exe # Platform specific definitions +ifeq ($(shell uname -a),) +EXE_EXT = .exe +else ifneq ($(findstring MINGW,$(shell uname -a)),) +EXE_EXT = .exe +else +EXE_EXT = +endif + +BIN ?= gpsp$(EXE_EXT) + VPATH += .. CFLAGS += -DPC_BUILD -Wall -m32 INCLUDES = -I${PREFIX}/include `sdl-config --cflags` -LIBS = -L${PREFIX}/lib `sdl-config --libs` -lz -m32 +LIBS = -L${PREFIX}/lib32 `sdl-config --libs` -lz -m32 # Compilation: + .SUFFIXES: .c .S all: ${BIN} From 365077772d3d8d5d479febd0388d7e74ef08d508 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Mon, 8 Dec 2014 22:56:33 +0100 Subject: [PATCH 02/13] start implementing the libretro interface. (not working yet) --- Makefile | 66 ++ libco.h | 37 + libco/amd64.c | 161 ++++ libco/armeabi.c | 95 +++ libco/fiber.c | 58 ++ libco/libco.c | 21 + libco/ppc.c | 407 ++++++++++ libco/sjlj.c | 115 +++ libco/ucontext.c | 81 ++ libco/x86.c | 117 +++ libretro.c | 291 +++++++ libretro.h | 1926 ++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 3375 insertions(+) create mode 100644 Makefile create mode 100644 libco.h create mode 100644 libco/amd64.c create mode 100644 libco/armeabi.c create mode 100644 libco/fiber.c create mode 100644 libco/libco.c create mode 100644 libco/ppc.c create mode 100644 libco/sjlj.c create mode 100644 libco/ucontext.c create mode 100644 libco/x86.c create mode 100644 libretro.c create mode 100644 libretro.h diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3be6a1e --- /dev/null +++ b/Makefile @@ -0,0 +1,66 @@ +TARGET := gpsp_libretro.so + +CC = gcc +AR = psp-ar +STATIC_LINKING = 0 + +CFLAGS += -fPIC +CFLAGS += -DPC_BUILD -Wall -m32 +CFLAGS += -D__LIBRETRO__ + + +ifeq ($(DEBUG), 1) +OPTIMIZE := -O0 -g +OPTIMIZE_SAFE := -O0 -g +else +OPTIMIZE := -O3 +OPTIMIZE_SAFE := -O2 +endif + + +OBJS := main.o +OBJS += cpu.o +OBJS += memory.o +OBJS += video.o +OBJS += input.o +OBJS += sound.o +OBJS += cpu_threaded.o + +OBJS += x86_stub.o +OBJS += cheats.o +OBJS += zip.o + +OBJS += libretro.o + + + +ASFLAGS = $(CFLAGS) +INCDIRS := -I. +LDFLAGS += -shared -m32 +LDLIBS += -lz + + +all: $(TARGET) + +$(TARGET): $(OBJS) +ifeq ($(STATIC_LINKING), 1) + $(AR) rcs $@ $(OBJS) +else + $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) $(LDLIBS) +endif + +%.o: %.c + $(CC) -c -o $@ $< $(CFLAGS) $(OPTIMIZE) $(INCDIRS) + +cpu.o: cpu.c + $(CC) -c -o $@ $< $(CFLAGS) -Wno-unused-variable -Wno-unused-label $(OPTIMIZE_SAFE) $(INCDIRS) + +%.o: %.S + $(CC) -c -o $@ $< $(ASFLAGS) $(OPTIMIZE) + +clean: +# rm -f main.o cpu.o memory.o video.o input.o sound.o cpu_threaded.o x86_stub.o cheats.o zip.o libretro.o + rm -f $(OBJS) + rm -f $(TARGET) + +.PHONY: $(TARGET) clean diff --git a/libco.h b/libco.h new file mode 100644 index 0000000..1464804 --- /dev/null +++ b/libco.h @@ -0,0 +1,37 @@ +/* + libco + version: 0.16 (2010-12-24) + license: public domain +*/ + +#ifndef LIBCO_H +#define LIBCO_H + +#ifdef LIBCO_C + #ifdef LIBCO_MP + #define thread_local __thread + #else + #define thread_local + #endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void* cothread_t; + +cothread_t co_active(void); + +cothread_t co_create(unsigned int, void (*)(void)); + +void co_delete(cothread_t); + +void co_switch(cothread_t); + +#ifdef __cplusplus +} +#endif + +/* ifndef LIBCO_H */ +#endif diff --git a/libco/amd64.c b/libco/amd64.c new file mode 100644 index 0000000..5d74bf6 --- /dev/null +++ b/libco/amd64.c @@ -0,0 +1,161 @@ +/* + libco.amd64 (2009-10-12) + author: byuu + license: public domain +*/ + +#define LIBCO_C +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +static thread_local long long co_active_buffer[64]; +static thread_local cothread_t co_active_handle = 0; +static void (*co_swap)(cothread_t, cothread_t) = 0; + +#ifdef _WIN32 +//ABI: Win64 +static unsigned char co_swap_function[] = { + 0x48, 0x89, 0x22, /* mov [rdx],rsp */ + 0x48, 0x8b, 0x21, /* mov rsp,[rcx] */ + 0x58, /* pop rax */ + 0x48, 0x89, 0x6a, 0x08, /* mov [rdx+0x8],rbp */ + 0x48, 0x89, 0x72, 0x10, /* mov [rdx+0x10],rsi */ + 0x48, 0x89, 0x7a, 0x18, /* mov [rdx+0x18],rdi */ + 0x48, 0x89, 0x5a, 0x20, /* mov [rdx+0x20],rbx */ + 0x4c, 0x89, 0x62, 0x28, /* mov [rdx+0x28],r12 */ + 0x4c, 0x89, 0x6a, 0x30, /* mov [rdx+0x30],r13 */ + 0x4c, 0x89, 0x72, 0x38, /* mov [rdx+0x38],r14 */ + 0x4c, 0x89, 0x7a, 0x40, /* mov [rdx+0x40],r15 */ + 0x48, 0x81, 0xc2, 0x80, 0x00, 0x00, 0x00, /* add rdx,0x80 */ + 0x48, 0x83, 0xe2, 0xf0, /* and rdx,-0x10 */ + 0x0f, 0x29, 0x32, /* movaps [rdx],xmm6 */ + 0x0f, 0x29, 0x7a, 0x10, /* movaps [rdx+0x10],xmm7 */ + 0x44, 0x0f, 0x29, 0x42, 0x20, /* movaps [rdx+0x20],xmm8 */ + 0x44, 0x0f, 0x29, 0x4a, 0x30, /* movaps [rdx+0x30],xmm9 */ + 0x44, 0x0f, 0x29, 0x52, 0x40, /* movaps [rdx+0x40],xmm10 */ + 0x44, 0x0f, 0x29, 0x5a, 0x50, /* movaps [rdx+0x50],xmm11 */ + 0x44, 0x0f, 0x29, 0x62, 0x60, /* movaps [rdx+0x60],xmm12 */ + 0x44, 0x0f, 0x29, 0x6a, 0x70, /* movaps [rdx+0x70],xmm13 */ + 0x44, 0x0f, 0x29, 0xb2, 0x80, 0x00, 0x00, 0x00, /* movaps [rdx+0x80],xmm14 */ + 0x44, 0x0f, 0x29, 0xba, 0x90, 0x00, 0x00, 0x00, /* movaps [rdx+0x90],xmm15 */ + 0x48, 0x8b, 0x69, 0x08, /* mov rbp,[rcx+0x8] */ + 0x48, 0x8b, 0x71, 0x10, /* mov rsi,[rcx+0x10] */ + 0x48, 0x8b, 0x79, 0x18, /* mov rdi,[rcx+0x18] */ + 0x48, 0x8b, 0x59, 0x20, /* mov rbx,[rcx+0x20] */ + 0x4c, 0x8b, 0x61, 0x28, /* mov r12,[rcx+0x28] */ + 0x4c, 0x8b, 0x69, 0x30, /* mov r13,[rcx+0x30] */ + 0x4c, 0x8b, 0x71, 0x38, /* mov r14,[rcx+0x38] */ + 0x4c, 0x8b, 0x79, 0x40, /* mov r15,[rcx+0x40] */ + 0x48, 0x81, 0xc1, 0x80, 0x00, 0x00, 0x00, /* add rcx,0x80 */ + 0x48, 0x83, 0xe1, 0xf0, /* and rcx,-0x10 */ + 0x0f, 0x29, 0x31, /* movaps [rcx],xmm6 */ + 0x0f, 0x29, 0x79, 0x10, /* movaps [rcx+0x10],xmm7 */ + 0x44, 0x0f, 0x29, 0x41, 0x20, /* movaps [rcx+0x20],xmm8 */ + 0x44, 0x0f, 0x29, 0x49, 0x30, /* movaps [rcx+0x30],xmm9 */ + 0x44, 0x0f, 0x29, 0x51, 0x40, /* movaps [rcx+0x40],xmm10 */ + 0x44, 0x0f, 0x29, 0x59, 0x50, /* movaps [rcx+0x50],xmm11 */ + 0x44, 0x0f, 0x29, 0x61, 0x60, /* movaps [rcx+0x60],xmm12 */ + 0x44, 0x0f, 0x29, 0x69, 0x70, /* movaps [rcx+0x70],xmm13 */ + 0x44, 0x0f, 0x29, 0xb1, 0x80, 0x00, 0x00, 0x00, /* movaps [rcx+0x80],xmm14 */ + 0x44, 0x0f, 0x29, 0xb9, 0x90, 0x00, 0x00, 0x00, /* movaps [rcx+0x90],xmm15 */ + 0xff, 0xe0, /* jmp rax */ +}; + +#include + +void co_init(void) +{ + DWORD old_privileges; + VirtualProtect(co_swap_function, + sizeof(co_swap_function), PAGE_EXECUTE_READWRITE, &old_privileges); +} +#else +//ABI: SystemV +static unsigned char co_swap_function[] = { + 0x48, 0x89, 0x26, /* mov [rsi],rsp */ + 0x48, 0x8b, 0x27, /* mov rsp,[rdi] */ + 0x58, /* pop rax */ + 0x48, 0x89, 0x6e, 0x08, /* mov [rsi+0x08],rbp */ + 0x48, 0x89, 0x5e, 0x10, /* mov [rsi+0x10],rbx */ + 0x4c, 0x89, 0x66, 0x18, /* mov [rsi+0x18],r12 */ + 0x4c, 0x89, 0x6e, 0x20, /* mov [rsi+0x20],r13 */ + 0x4c, 0x89, 0x76, 0x28, /* mov [rsi+0x28],r14 */ + 0x4c, 0x89, 0x7e, 0x30, /* mov [rsi+0x30],r15 */ + 0x48, 0x8b, 0x6f, 0x08, /* mov rbp,[rdi+0x08] */ + 0x48, 0x8b, 0x5f, 0x10, /* mov rbx,[rdi+0x10] */ + 0x4c, 0x8b, 0x67, 0x18, /* mov r12,[rdi+0x18] */ + 0x4c, 0x8b, 0x6f, 0x20, /* mov r13,[rdi+0x20] */ + 0x4c, 0x8b, 0x77, 0x28, /* mov r14,[rdi+0x28] */ + 0x4c, 0x8b, 0x7f, 0x30, /* mov r15,[rdi+0x30] */ + 0xff, 0xe0, /* jmp rax */ +}; + +#include +#include + +void co_init(void) +{ + unsigned long long addr = (unsigned long long)co_swap_function; + unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE)); + unsigned long long size = (addr - base) + sizeof(co_swap_function); + mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC); +} +#endif + +static void crash(void) +{ + assert(0); /* called only if cothread_t entrypoint returns */ +} + +cothread_t co_active(void) +{ + if (!co_active_handle) + co_active_handle = &co_active_buffer; + return co_active_handle; +} + +cothread_t co_create(unsigned int size, void (*entrypoint)(void)) +{ + cothread_t handle; + + if(!co_swap) + { + co_init(); + co_swap = (void (*)(cothread_t, cothread_t))co_swap_function; + } + + if (!co_active_handle) + co_active_handle = &co_active_buffer; + size += 512; /* allocate additional space for storage */ + size &= ~15; /* align stack to 16-byte boundary */ + + if(handle = (cothread_t)malloc(size)) + { + long long *p = (long long*)((char*)handle + size); /* seek to top of stack */ + *--p = (long long)crash; /* crash if entrypoint returns */ + *--p = (long long)entrypoint; /* start of function */ + *(long long*)handle = (long long)p; /* stack pointer */ + } + + return handle; +} + +void co_delete(cothread_t handle) +{ + free(handle); +} + +void co_switch(cothread_t handle) +{ + register cothread_t co_previous_handle = co_active_handle; + co_swap(co_active_handle = handle, co_previous_handle); +} + +#ifdef __cplusplus +} +#endif diff --git a/libco/armeabi.c b/libco/armeabi.c new file mode 100644 index 0000000..c9b68d0 --- /dev/null +++ b/libco/armeabi.c @@ -0,0 +1,95 @@ +/* + libco.armeabi (2013-04-05) + author: Themaister + license: public domain +*/ + +#define LIBCO_C +#include +#include +#include +#include +#include + +#ifndef IOS +#include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +static thread_local uint32_t co_active_buffer[64]; +static thread_local cothread_t co_active_handle; + +asm ( + ".arm\n" + ".align 4\n" + ".globl co_switch_arm\n" + ".globl _co_switch_arm\n" + "co_switch_arm:\n" + "_co_switch_arm:\n" + " stmia r1!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, lr}\n" + " ldmia r0!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, pc}\n" + ); + +/* ASM */ +void co_switch_arm(cothread_t handle, cothread_t current); + +static void crash(void) +{ + /* Called only if cothread_t entrypoint returns. */ + assert(0); +} + +cothread_t co_create(unsigned int size, void (*entrypoint)(void)) +{ + size = (size + 1023) & ~1023; + cothread_t handle = 0; +#if HAVE_POSIX_MEMALIGN >= 1 + if (posix_memalign(&handle, 1024, size + 256) < 0) + return 0; +#else + handle = memalign(1024, size + 256); +#endif + + if (!handle) + return handle; + + uint32_t *ptr = (uint32_t*)handle; + /* Non-volatiles. */ + ptr[0] = 0; /* r4 */ + ptr[1] = 0; /* r5 */ + ptr[2] = 0; /* r6 */ + ptr[3] = 0; /* r7 */ + ptr[4] = 0; /* r8 */ + ptr[5] = 0; /* r9 */ + ptr[6] = 0; /* r10 */ + ptr[7] = 0; /* r11 */ + ptr[8] = (uintptr_t)ptr + size + 256 - 4; /* r13, stack pointer */ + ptr[9] = (uintptr_t)entrypoint; /* r15, PC (link register r14 gets saved here). */ + return handle; +} + +cothread_t co_active(void) +{ + if (!co_active_handle) + co_active_handle = co_active_buffer; + return co_active_handle; +} + +void co_delete(cothread_t handle) +{ + free(handle); +} + +void co_switch(cothread_t handle) +{ + cothread_t co_previous_handle = co_active(); + co_switch_arm(co_active_handle = handle, co_previous_handle); +} + +#ifdef __cplusplus +} +#endif + diff --git a/libco/fiber.c b/libco/fiber.c new file mode 100644 index 0000000..90ba115 --- /dev/null +++ b/libco/fiber.c @@ -0,0 +1,58 @@ +/* + libco.win (2008-01-28) + authors: Nach, byuu + license: public domain +*/ + +#define LIBCO_C +#include +#define WINVER 0x0400 +#define _WIN32_WINNT 0x0400 +#define WIN32_LEAN_AND_MEAN +#include + +#ifdef __cplusplus +extern "C" { +#endif + +static thread_local cothread_t co_active_ = 0; + +static void __stdcall co_thunk(void *coentry) +{ + ((void (*)(void))coentry)(); +} + +cothread_t co_active(void) +{ + if(!co_active_) + { + ConvertThreadToFiber(0); + co_active_ = GetCurrentFiber(); + } + return co_active_; +} + +cothread_t co_create(unsigned int heapsize, void (*coentry)(void)) +{ + if(!co_active_) + { + ConvertThreadToFiber(0); + co_active_ = GetCurrentFiber(); + } + return (cothread_t)CreateFiber(heapsize, co_thunk, (void*)coentry); +} + +void co_delete(cothread_t cothread) +{ + DeleteFiber(cothread); +} + +void co_switch(cothread_t cothread) +{ + co_active_ = cothread; + SwitchToFiber(cothread); +} + +#ifdef __cplusplus +} +#endif diff --git a/libco/libco.c b/libco/libco.c new file mode 100644 index 0000000..63126d3 --- /dev/null +++ b/libco/libco.c @@ -0,0 +1,21 @@ +/* + libco + auto-selection module + license: public domain +*/ + +#if defined(__GNUC__) && defined(__i386__) || (defined(_MSC_VER) && defined(_M_IX86)) + #include "x86.c" +#elif defined(__GNUC__) && defined(__amd64__) || (defined(_MSC_VER) && defined(_M_AMD64)) + #include "amd64.c" +#elif defined(__GNUC__) && defined(_ARCH_PPC) + #include "ppc.c" +#elif defined(__GNUC__) && (defined(__ARM_EABI__) || defined(__arm__)) + #include "armeabi.c" +#elif defined(__GNUC__) + #include "sjlj.c" +#elif defined(_MSC_VER) + #include "fiber.c" +#else + #error "libco: unsupported processor, compiler or operating system" +#endif diff --git a/libco/ppc.c b/libco/ppc.c new file mode 100644 index 0000000..f6cb536 --- /dev/null +++ b/libco/ppc.c @@ -0,0 +1,407 @@ +/* + libco.ppc (2010-10-17) + author: blargg + license: public domain +*/ + +/* PowerPC 32/64 using embedded or external asm, with optional +floating-point and AltiVec save/restore */ + +#define LIBCO_C +#include +#include +#include +#include + +#define LIBCO_MPROTECT (__unix__ && !LIBCO_PPC_ASM) + +#if LIBCO_MPROTECT + #include + #include +#endif + +/* State format (offsets in 32-bit words) + ++0 Pointer to swap code + Rest of function descriptor for entry function ++8 PC ++10 SP + Special regs + GPRs + FPRs + VRs + stack +*/ + +enum { state_size = 1024 }; +enum { above_stack = 2048 }; +enum { stack_align = 256 }; + +static thread_local cothread_t co_active_handle = 0; + +/**** Determine environment ****/ + +#define LIBCO_PPC64 (_ARCH_PPC64 || __PPC64__ || __ppc64__ || __powerpc64__) + +/* Whether function calls are indirect through a descriptor, +or are directly to function */ +#ifndef LIBCO_PPCDESC + #if !_CALL_SYSV && (_CALL_AIX || _CALL_AIXDESC || LIBCO_PPC64) + #define LIBCO_PPCDESC 1 + #endif +#endif + +#ifdef LIBCO_PPC_ASM + + #ifdef __cplusplus + extern "C" + #endif + + /* Swap code is in ppc.S */ + void co_swap_asm( cothread_t, cothread_t ); + #define CO_SWAP_ASM( x, y ) co_swap_asm( x, y ) + +#else + +/* Swap code is here in array. Please leave dieassembly comments, +as they make it easy to see what it does, and reorder instructions +if one wants to see whether that improves performance. */ +static const uint32_t libco_ppc_code [] = { +#if LIBCO_PPC64 + 0x7d000026, /* mfcr r8 */ + 0xf8240028, /* std r1,40(r4) */ + 0x7d2802a6, /* mflr r9 */ + 0xf9c40048, /* std r14,72(r4) */ + 0xf9e40050, /* std r15,80(r4) */ + 0xfa040058, /* std r16,88(r4) */ + 0xfa240060, /* std r17,96(r4) */ + 0xfa440068, /* std r18,104(r4) */ + 0xfa640070, /* std r19,112(r4) */ + 0xfa840078, /* std r20,120(r4) */ + 0xfaa40080, /* std r21,128(r4) */ + 0xfac40088, /* std r22,136(r4) */ + 0xfae40090, /* std r23,144(r4) */ + 0xfb040098, /* std r24,152(r4) */ + 0xfb2400a0, /* std r25,160(r4) */ + 0xfb4400a8, /* std r26,168(r4) */ + 0xfb6400b0, /* std r27,176(r4) */ + 0xfb8400b8, /* std r28,184(r4) */ + 0xfba400c0, /* std r29,192(r4) */ + 0xfbc400c8, /* std r30,200(r4) */ + 0xfbe400d0, /* std r31,208(r4) */ + 0xf9240020, /* std r9,32(r4) */ + 0xe8e30020, /* ld r7,32(r3) */ + 0xe8230028, /* ld r1,40(r3) */ + 0x48000009, /* bl 1 */ + 0x7fe00008, /* trap */ + 0x91040030,/*1:stw r8,48(r4) */ + 0x80c30030, /* lwz r6,48(r3) */ + 0x7ce903a6, /* mtctr r7 */ + 0xe9c30048, /* ld r14,72(r3) */ + 0xe9e30050, /* ld r15,80(r3) */ + 0xea030058, /* ld r16,88(r3) */ + 0xea230060, /* ld r17,96(r3) */ + 0xea430068, /* ld r18,104(r3) */ + 0xea630070, /* ld r19,112(r3) */ + 0xea830078, /* ld r20,120(r3) */ + 0xeaa30080, /* ld r21,128(r3) */ + 0xeac30088, /* ld r22,136(r3) */ + 0xeae30090, /* ld r23,144(r3) */ + 0xeb030098, /* ld r24,152(r3) */ + 0xeb2300a0, /* ld r25,160(r3) */ + 0xeb4300a8, /* ld r26,168(r3) */ + 0xeb6300b0, /* ld r27,176(r3) */ + 0xeb8300b8, /* ld r28,184(r3) */ + 0xeba300c0, /* ld r29,192(r3) */ + 0xebc300c8, /* ld r30,200(r3) */ + 0xebe300d0, /* ld r31,208(r3) */ + 0x7ccff120, /* mtcr r6 */ +#else + 0x7d000026, /* mfcr r8 */ + 0x90240028, /* stw r1,40(r4) */ + 0x7d2802a6, /* mflr r9 */ + 0x91a4003c, /* stw r13,60(r4) */ + 0x91c40040, /* stw r14,64(r4) */ + 0x91e40044, /* stw r15,68(r4) */ + 0x92040048, /* stw r16,72(r4) */ + 0x9224004c, /* stw r17,76(r4) */ + 0x92440050, /* stw r18,80(r4) */ + 0x92640054, /* stw r19,84(r4) */ + 0x92840058, /* stw r20,88(r4) */ + 0x92a4005c, /* stw r21,92(r4) */ + 0x92c40060, /* stw r22,96(r4) */ + 0x92e40064, /* stw r23,100(r4) */ + 0x93040068, /* stw r24,104(r4) */ + 0x9324006c, /* stw r25,108(r4) */ + 0x93440070, /* stw r26,112(r4) */ + 0x93640074, /* stw r27,116(r4) */ + 0x93840078, /* stw r28,120(r4) */ + 0x93a4007c, /* stw r29,124(r4) */ + 0x93c40080, /* stw r30,128(r4) */ + 0x93e40084, /* stw r31,132(r4) */ + 0x91240020, /* stw r9,32(r4) */ + 0x80e30020, /* lwz r7,32(r3) */ + 0x80230028, /* lwz r1,40(r3) */ + 0x48000009, /* bl 1 */ + 0x7fe00008, /* trap */ + 0x91040030,/*1:stw r8,48(r4) */ + 0x80c30030, /* lwz r6,48(r3) */ + 0x7ce903a6, /* mtctr r7 */ + 0x81a3003c, /* lwz r13,60(r3) */ + 0x81c30040, /* lwz r14,64(r3) */ + 0x81e30044, /* lwz r15,68(r3) */ + 0x82030048, /* lwz r16,72(r3) */ + 0x8223004c, /* lwz r17,76(r3) */ + 0x82430050, /* lwz r18,80(r3) */ + 0x82630054, /* lwz r19,84(r3) */ + 0x82830058, /* lwz r20,88(r3) */ + 0x82a3005c, /* lwz r21,92(r3) */ + 0x82c30060, /* lwz r22,96(r3) */ + 0x82e30064, /* lwz r23,100(r3) */ + 0x83030068, /* lwz r24,104(r3) */ + 0x8323006c, /* lwz r25,108(r3) */ + 0x83430070, /* lwz r26,112(r3) */ + 0x83630074, /* lwz r27,116(r3) */ + 0x83830078, /* lwz r28,120(r3) */ + 0x83a3007c, /* lwz r29,124(r3) */ + 0x83c30080, /* lwz r30,128(r3) */ + 0x83e30084, /* lwz r31,132(r3) */ + 0x7ccff120, /* mtcr r6 */ +#endif + +#ifndef LIBCO_PPC_NOFP + 0xd9c400e0, /* stfd f14,224(r4) */ + 0xd9e400e8, /* stfd f15,232(r4) */ + 0xda0400f0, /* stfd f16,240(r4) */ + 0xda2400f8, /* stfd f17,248(r4) */ + 0xda440100, /* stfd f18,256(r4) */ + 0xda640108, /* stfd f19,264(r4) */ + 0xda840110, /* stfd f20,272(r4) */ + 0xdaa40118, /* stfd f21,280(r4) */ + 0xdac40120, /* stfd f22,288(r4) */ + 0xdae40128, /* stfd f23,296(r4) */ + 0xdb040130, /* stfd f24,304(r4) */ + 0xdb240138, /* stfd f25,312(r4) */ + 0xdb440140, /* stfd f26,320(r4) */ + 0xdb640148, /* stfd f27,328(r4) */ + 0xdb840150, /* stfd f28,336(r4) */ + 0xdba40158, /* stfd f29,344(r4) */ + 0xdbc40160, /* stfd f30,352(r4) */ + 0xdbe40168, /* stfd f31,360(r4) */ + 0xc9c300e0, /* lfd f14,224(r3) */ + 0xc9e300e8, /* lfd f15,232(r3) */ + 0xca0300f0, /* lfd f16,240(r3) */ + 0xca2300f8, /* lfd f17,248(r3) */ + 0xca430100, /* lfd f18,256(r3) */ + 0xca630108, /* lfd f19,264(r3) */ + 0xca830110, /* lfd f20,272(r3) */ + 0xcaa30118, /* lfd f21,280(r3) */ + 0xcac30120, /* lfd f22,288(r3) */ + 0xcae30128, /* lfd f23,296(r3) */ + 0xcb030130, /* lfd f24,304(r3) */ + 0xcb230138, /* lfd f25,312(r3) */ + 0xcb430140, /* lfd f26,320(r3) */ + 0xcb630148, /* lfd f27,328(r3) */ + 0xcb830150, /* lfd f28,336(r3) */ + 0xcba30158, /* lfd f29,344(r3) */ + 0xcbc30160, /* lfd f30,352(r3) */ + 0xcbe30168, /* lfd f31,360(r3) */ +#endif + +#ifdef __ALTIVEC__ + 0x7ca042a6, /* mfvrsave r5 */ + 0x39040180, /* addi r8,r4,384 */ + 0x39240190, /* addi r9,r4,400 */ + 0x70a00fff, /* andi. r0,r5,4095 */ + 0x90a40034, /* stw r5,52(r4) */ + 0x4182005c, /* beq- 2 */ + 0x7e8041ce, /* stvx v20,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7ea049ce, /* stvx v21,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7ec041ce, /* stvx v22,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7ee049ce, /* stvx v23,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f0041ce, /* stvx v24,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7f2049ce, /* stvx v25,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f4041ce, /* stvx v26,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7f6049ce, /* stvx v27,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f8041ce, /* stvx v28,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7fa049ce, /* stvx v29,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7fc041ce, /* stvx v30,r0,r8 */ + 0x7fe049ce, /* stvx v31,r0,r9 */ + 0x80a30034,/*2:lwz r5,52(r3) */ + 0x39030180, /* addi r8,r3,384 */ + 0x39230190, /* addi r9,r3,400 */ + 0x70a00fff, /* andi. r0,r5,4095 */ + 0x7ca043a6, /* mtvrsave r5 */ + 0x4d820420, /* beqctr */ + 0x7e8040ce, /* lvx v20,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7ea048ce, /* lvx v21,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7ec040ce, /* lvx v22,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7ee048ce, /* lvx v23,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f0040ce, /* lvx v24,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7f2048ce, /* lvx v25,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f4040ce, /* lvx v26,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7f6048ce, /* lvx v27,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7f8040ce, /* lvx v28,r0,r8 */ + 0x39080020, /* addi r8,r8,32 */ + 0x7fa048ce, /* lvx v29,r0,r9 */ + 0x39290020, /* addi r9,r9,32 */ + 0x7fc040ce, /* lvx v30,r0,r8 */ + 0x7fe048ce, /* lvx v31,r0,r9 */ +#endif + + 0x4e800420, /* bctr */ +}; + + #if LIBCO_PPCDESC + /* Function call goes through indirect descriptor */ + #define CO_SWAP_ASM( x, y ) \ + ((void (*)( cothread_t, cothread_t )) (uintptr_t) x)( x, y ) + #else + /* Function call goes directly to code */ + #define CO_SWAP_ASM( x, y ) \ + ((void (*)( cothread_t, cothread_t )) (uintptr_t) libco_ppc_code)( x, y ) + #endif + +#endif + +static uint32_t* co_create_( unsigned size, uintptr_t entry ) +{ + uint32_t* t = (uint32_t*) malloc( size ); + + (void) entry; + + #if LIBCO_PPCDESC + if ( t ) + { + /* Copy entry's descriptor */ + memcpy( t, (void*) entry, sizeof (void*) * 3 ); + + /* Set function pointer to swap routine */ + #ifdef LIBCO_PPC_ASM + *(const void**) t = *(void**) &co_swap_asm; + #else + *(const void**) t = libco_ppc_code; + #endif + } + #endif + + return t; +} + +cothread_t co_create( unsigned int size, void (*entry_)( void ) ) +{ + uintptr_t entry = (uintptr_t) entry_; + uint32_t* t = NULL; + + /* Be sure main thread was successfully allocated */ + if ( co_active() ) + { + size += state_size + above_stack + stack_align; + t = co_create_( size, entry ); + } + + if ( t ) + { + uintptr_t sp; + int shift; + + /* Save current registers into new thread, so that any special ones will + have proper values when thread is begun */ + CO_SWAP_ASM( t, t ); + + #if LIBCO_PPCDESC + /* Get real address */ + entry = (uintptr_t) *(void**) entry; + #endif + + /* Put stack near end of block, and align */ + sp = (uintptr_t) t + size - above_stack; + sp -= sp % stack_align; + + /* On PPC32, we save and restore GPRs as 32 bits. For PPC64, we + save and restore them as 64 bits, regardless of the size the ABI + uses. So, we manually write pointers at the proper size. We always + save and restore at the same address, and since PPC is big-endian, + we must put the low byte first on PPC32. */ + + /* If uintptr_t is 32 bits, >>32 is undefined behavior, so we do two shifts + and don't have to care how many bits uintptr_t is. */ + #if LIBCO_PPC64 + shift = 16; + #else + shift = 0; + #endif + + /* Set up so entry will be called on next swap */ + t [8] = (uint32_t) (entry >> shift >> shift); + t [9] = (uint32_t) entry; + + t [10] = (uint32_t) (sp >> shift >> shift); + t [11] = (uint32_t) sp; + } + + return t; +} + +void co_delete( cothread_t t ) +{ + free(t); +} + +static void co_init_( void ) +{ +#if LIBCO_MPROTECT + /* TODO: pre- and post-pad PPC code so that this doesn't make other + data executable and writable */ + long page_size = sysconf( _SC_PAGESIZE ); + if ( page_size > 0 ) + { + uintptr_t align = page_size; + uintptr_t begin = (uintptr_t) libco_ppc_code; + uintptr_t end = begin + sizeof libco_ppc_code; + + /* Align beginning and end */ + end += align - 1; + end -= end % align; + begin -= begin % align; + + mprotect( (void*) begin, end - begin, PROT_READ | PROT_WRITE | PROT_EXEC ); + } +#endif + + co_active_handle = co_create_( state_size, (uintptr_t) &co_switch ); +} + +cothread_t co_active(void) +{ + if (!co_active_handle) + co_init_(); + + return co_active_handle; +} + +void co_switch(cothread_t t) +{ + cothread_t old = co_active_handle; + co_active_handle = t; + + CO_SWAP_ASM( t, old ); +} diff --git a/libco/sjlj.c b/libco/sjlj.c new file mode 100644 index 0000000..f074714 --- /dev/null +++ b/libco/sjlj.c @@ -0,0 +1,115 @@ +/* + libco.sjlj (2008-01-28) + author: Nach + license: public domain +*/ + +/* + * Note this was designed for UNIX systems. Based on ideas expressed in a paper + * by Ralf Engelschall. + * For SJLJ on other systems, one would want to rewrite springboard() and + * co_create() and hack the jmb_buf stack pointer. + */ + +#define LIBCO_C +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct +{ + sigjmp_buf context; + void (*coentry)(void); + void *stack; +} cothread_struct; + +static thread_local cothread_struct co_primary; +static thread_local cothread_struct *creating, *co_running = 0; + +static void springboard(int ignored) +{ + if(sigsetjmp(creating->context, 0)) + co_running->coentry(); +} + +cothread_t co_active(void) +{ + if (!co_running) + co_running = &co_primary; + return (cothread_t)co_running; +} + +cothread_t co_create(unsigned int size, void (*coentry)(void)) +{ + if(!co_running) + co_running = &co_primary; + + cothread_struct *thread = (cothread_struct*)malloc(sizeof(cothread_struct)); + + if(thread) + { + struct sigaction handler; + struct sigaction old_handler; + + stack_t stack; + stack_t old_stack; + + thread->coentry = thread->stack = 0; + + stack.ss_flags = 0; + stack.ss_size = size; + thread->stack = stack.ss_sp = malloc(size); + + if(stack.ss_sp && !sigaltstack(&stack, &old_stack)) + { + handler.sa_handler = springboard; + handler.sa_flags = SA_ONSTACK; + sigemptyset(&handler.sa_mask); + creating = thread; + + if(!sigaction(SIGUSR1, &handler, &old_handler)) + { + if(!raise(SIGUSR1)) + thread->coentry = coentry; + sigaltstack(&old_stack, 0); + sigaction(SIGUSR1, &old_handler, 0); + } + } + + if(thread->coentry != coentry) + { + co_delete(thread); + thread = 0; + } + } + + return (cothread_t)thread; +} + +void co_delete(cothread_t cothread) +{ + if(cothread) + { + if(((cothread_struct*)cothread)->stack) + free(((cothread_struct*)cothread)->stack); + free(cothread); + } +} + +void co_switch(cothread_t cothread) +{ + if(!sigsetjmp(co_running->context, 0)) + { + co_running = (cothread_struct*)cothread; + siglongjmp(co_running->context, 1); + } +} + +#ifdef __cplusplus +} +#endif diff --git a/libco/ucontext.c b/libco/ucontext.c new file mode 100644 index 0000000..3e21816 --- /dev/null +++ b/libco/ucontext.c @@ -0,0 +1,81 @@ +/* + libco.ucontext (2008-01-28) + author: Nach + license: public domain +*/ + +/* + * WARNING: the overhead of POSIX ucontext is very high, + * assembly versions of libco or libco_sjlj should be much faster + * + * This library only exists for two reasons: + * 1 - as an initial test for the viability of a ucontext implementation + * 2 - to demonstrate the power and speed of libco over existing implementations, + * such as pth (which defaults to wrapping ucontext on unix targets) + * + * Use this library only as a *last resort* + */ + +#define LIBCO_C +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +static thread_local ucontext_t co_primary; +static thread_local ucontext_t *co_running = 0; + +cothread_t co_active(void) +{ + if (!co_running) + co_running = &co_primary; + return (cothread_t)co_running; +} + +cothread_t co_create(unsigned int heapsize, void (*coentry)(void)) +{ + if (!co_running) + co_running = &co_primary; + ucontext_t *thread = (ucontext_t*)malloc(sizeof(ucontext_t)); + + if(thread) + { + if((!getcontext(thread) && !(thread->uc_stack.ss_sp = 0)) && (thread->uc_stack.ss_sp = malloc(heapsize))) + { + thread->uc_link = co_running; + thread->uc_stack.ss_size = heapsize; + makecontext(thread, coentry, 0); + } + else + { + co_delete((cothread_t)thread); + thread = 0; + } + } + return (cothread_t)thread; +} + +void co_delete(cothread_t cothread) +{ + if (!cothread) + return; + + if(((ucontext_t*)cothread)->uc_stack.ss_sp) + free(((ucontext_t*)cothread)->uc_stack.ss_sp); + free(cothread); +} + +void co_switch(cothread_t cothread) +{ + ucontext_t *old_thread = co_running; + + co_running = (ucontext_t*)cothread; + swapcontext(old_thread, co_running); +} + +#ifdef __cplusplus +} +#endif diff --git a/libco/x86.c b/libco/x86.c new file mode 100644 index 0000000..5daffd9 --- /dev/null +++ b/libco/x86.c @@ -0,0 +1,117 @@ +/* + libco.x86 (2009-10-12) + author: byuu + license: public domain +*/ + +#define LIBCO_C +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(_MSC_VER) + #define fastcall __fastcall +#elif defined(__GNUC__) + #define fastcall __attribute__((fastcall)) +#else + #error "libco: please define fastcall macro" +#endif + +static thread_local long co_active_buffer[64]; +static thread_local cothread_t co_active_handle = 0; +static void (fastcall *co_swap)(cothread_t, cothread_t) = 0; + +//ABI: fastcall +static unsigned char co_swap_function[] = { + 0x89, 0x22, /* mov [edx],esp */ + 0x8b, 0x21, /* mov esp,[ecx] */ + 0x58, /* pop eax */ + 0x89, 0x6a, 0x04, /* mov [edx+0x04],ebp */ + 0x89, 0x72, 0x08, /* mov [edx+0x08],esi */ + 0x89, 0x7a, 0x0c, /* mov [edx+0x0c],edi */ + 0x89, 0x5a, 0x10, /* mov [edx+0x10],ebx */ + 0x8b, 0x69, 0x04, /* mov ebp,[ecx+0x04] */ + 0x8b, 0x71, 0x08, /* mov esi,[ecx+0x08] */ + 0x8b, 0x79, 0x0c, /* mov edi,[ecx+0x0c] */ + 0x8b, 0x59, 0x10, /* mov ebx,[ecx+0x10] */ + 0xff, 0xe0, /* jmp eax */ +}; + +#ifdef _WIN32 +#include + +void co_init(void) +{ + DWORD old_privileges; + VirtualProtect(co_swap_function, + sizeof co_swap_function, PAGE_EXECUTE_READWRITE, &old_privileges); +} +#else +#include +#include + +void co_init(void) +{ + unsigned long addr = (unsigned long)co_swap_function; + unsigned long base = addr - (addr % sysconf(_SC_PAGESIZE)); + unsigned long size = (addr - base) + sizeof co_swap_function; + mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC); +} +#endif + +static void crash(void) +{ + assert(0); /* called only if cothread_t entrypoint returns */ +} + +cothread_t co_active(void) +{ + if(!co_active_handle) + co_active_handle = &co_active_buffer; + return co_active_handle; +} + +cothread_t co_create(unsigned int size, void (*entrypoint)(void)) +{ + cothread_t handle; + if(!co_swap) + { + co_init(); + co_swap = (void (fastcall*)(cothread_t, cothread_t))co_swap_function; + } + + if(!co_active_handle) + co_active_handle = &co_active_buffer; + + size += 256; /* allocate additional space for storage */ + size &= ~15; /* align stack to 16-byte boundary */ + + if(handle = (cothread_t)malloc(size)) + { + long *p = (long*)((char*)handle + size); /* seek to top of stack */ + *--p = (long)crash; /* crash if entrypoint returns */ + *--p = (long)entrypoint; /* start of function */ + *(long*)handle = (long)p; /* stack pointer */ + } + + return handle; +} + +void co_delete(cothread_t handle) +{ + free(handle); +} + +void co_switch(cothread_t handle) +{ + register cothread_t co_previous_handle = co_active_handle; + co_swap(co_active_handle = handle, co_previous_handle); +} + +#ifdef __cplusplus +} +#endif diff --git a/libretro.c b/libretro.c new file mode 100644 index 0000000..56a4ccf --- /dev/null +++ b/libretro.c @@ -0,0 +1,291 @@ + + +#include +#include +#include +#include "common.h" +#include "libco.h" + +static retro_log_printf_t log_cb; +static retro_video_refresh_t video_cb; +static retro_input_poll_t input_poll_cb; +static retro_environment_t environ_cb; + +struct retro_perf_callback perf_cb; + +static cothread_t main_thread; +static cothread_t cpu_thread; + +void switch_to_main_thread(void) +{ + co_switch(main_thread); +} + +static inline void switch_to_cpu_thread(void) +{ + co_switch(cpu_thread); +} + +static void cpu_thread_entry(void) +{ + execute_arm_translate(reg[EXECUTE_CYCLES]); +} + +static inline void init_context_switch(void) +{ + main_thread = co_active(); + cpu_thread = co_create(0x20000, cpu_thread_entry); +} + +static inline void deinit_context_switch(void) +{ + co_delete(cpu_thread); +} + +void retro_get_system_info(struct retro_system_info *info) +{ + info->library_name = "TempGBA"; + info->library_version = "v0.0.1"; + info->need_fullpath = true; + info->block_extract = false; + info->valid_extensions = "gba|bin|agb|gbz" ; +} + + +void retro_get_system_av_info(struct retro_system_av_info *info) +{ + info->geometry.base_width = GBA_SCREEN_WIDTH; + info->geometry.base_height = GBA_SCREEN_HEIGHT; + info->geometry.max_width = GBA_SCREEN_WIDTH; + info->geometry.max_height = GBA_SCREEN_HEIGHT; + info->geometry.aspect_ratio = 0; + info->timing.fps = ((float) CPU_FREQUENCY) / (308 * 228 * 4); // 59.72750057 hz + info->timing.sample_rate = SOUND_FREQUENCY; +// info->timing.sample_rate = 32 * 1024; +} + + +void retro_init() +{ + init_gamepak_buffer(); + init_sound(); +} + +void retro_deinit() +{ + perf_cb.perf_log(); + quit_gba(); +} + +void retro_set_environment(retro_environment_t cb) +{ + struct retro_log_callback log; + + environ_cb = cb; + + if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log)) + log_cb = log.log; + else + log_cb = NULL; + + environ_cb(RETRO_ENVIRONMENT_GET_PERF_INTERFACE, &perf_cb); + +} + +void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; } +void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; } + +void retro_set_controller_port_device(unsigned port, unsigned device) {} + +void retro_reset() +{ + deinit_context_switch(); + + update_backup(); + reset_gba(); + + init_context_switch(); +} + + +size_t retro_serialize_size() +{ + return SAVESTATE_SIZE; +} + +bool retro_serialize(void *data, size_t size) +{ + if (size < SAVESTATE_SIZE) + return false; + + gba_save_state(data); + + return true; +} + +bool retro_unserialize(const void *data, size_t size) +{ + if (size < SAVESTATE_SIZE) + return false; + + gba_load_state(data); + + return true; +} + +void retro_cheat_reset() {} +void retro_cheat_set(unsigned index, bool enabled, const char *code) {} + +void error_msg(const char *text) +{ + if (log_cb) + log_cb(RETRO_LOG_ERROR, text); +} + +void info_msg(const char *text) +{ + if (log_cb) + log_cb(RETRO_LOG_INFO, text); +} + +static void extract_directory(char *buf, const char *path, size_t size) +{ + strncpy(buf, path, size - 1); + buf[size - 1] = '\0'; + + char *base = strrchr(buf, '/'); + + if (base) + *base = '\0'; + else + strncpy(buf, ".", size); +} + +bool retro_load_game(const struct retro_game_info *info) +{ + char filename_bios[MAX_PATH]; + const char *dir = NULL; + + enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; + if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) + { + if (log_cb) + log_cb(RETRO_LOG_INFO, "[TempGBA]: 0RGB1555 is not supported.\n"); + return false; + } + + extract_directory(main_path,info->path,sizeof(main_path)); + + if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) + strncpy(filename_bios, dir, sizeof(filename_bios)); + else + strncpy(filename_bios, main_path, sizeof(filename_bios)); + + strncat(filename_bios, "/gba_bios.bin",sizeof(filename_bios)); + + + if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) + strncpy(dir_save, dir, sizeof(dir_save)); + else + strncpy(dir_save, main_path, sizeof(dir_save)); + + strncat(dir_save, "/",sizeof(dir_save)); + + strncat(main_path, "/",sizeof(main_path)); + + if (load_bios(filename_bios) < 0) + { + error_msg("Could not load BIOS image file.\n"); + return false; + } + + gamepak_filename[0] = 0; + + if (load_gamepak(info->path) < 0) + { + error_msg("Could not load the game file.\n"); + return false; + } + + reset_gba(); + + init_context_switch(); + + return true; +} + + +bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info) +{ return false; } + +void retro_unload_game() +{ + deinit_context_switch(); + update_backup(); +} + +unsigned retro_get_region() { return RETRO_REGION_NTSC; } + +void *retro_get_memory_data(unsigned id) +{ +// switch (id) +// { +// case RETRO_MEMORY_SAVE_RAM: +// return gamepak_backup; +// } + + return 0; +} + +size_t retro_get_memory_size(unsigned id) +{ +// switch (id) +// { +// case RETRO_MEMORY_SAVE_RAM: +// switch(backup_type) +// { +// case BACKUP_SRAM: +// return sram_size; + +// case BACKUP_FLASH: +// return flash_size; + +// case BACKUP_EEPROM: +// return eeprom_size; + +// case BACKUP_NONE: +// return 0x0; + +// default: +// return 0x8000; +// } +// } + + return 0; +} + +static void check_variables(void) +{ + +} + +void retro_run() +{ + bool updated = false; + + input_poll_cb(); + + switch_to_cpu_thread(); + + update_input(); + + render_audio(); + + video_cb(GBA_FRAME_TEXTURE, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, 512); + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) + check_variables(); + +} + +unsigned retro_api_version() { return RETRO_API_VERSION; } diff --git a/libretro.h b/libretro.h new file mode 100644 index 0000000..16c274a --- /dev/null +++ b/libretro.h @@ -0,0 +1,1926 @@ +/* Copyright (C) 2010-2014 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this libretro API header (libretro.h). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef LIBRETRO_H__ +#define LIBRETRO_H__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef __cplusplus +#if defined(_MSC_VER) && !defined(SN_TARGET_PS3) +/* Hack applied for MSVC when compiling in C89 mode + * as it isn't C99-compliant. */ +#define bool unsigned char +#define true 1 +#define false 0 +#else +#include +#endif +#endif + +/* Used for checking API/ABI mismatches that can break libretro + * implementations. + * It is not incremented for compatible changes to the API. + */ +#define RETRO_API_VERSION 1 + +/* + * Libretro's fundamental device abstractions. + * + * Libretro's input system consists of some standardized device types, + * such as a joypad (with/without analog), mouse, keyboard, lightgun + * and a pointer. + * + * The functionality of these devices are fixed, and individual cores + * map their own concept of a controller to libretro's abstractions. + * This makes it possible for frontends to map the abstract types to a + * real input device, and not having to worry about binding input + * correctly to arbitrary controller layouts. + */ + +#define RETRO_DEVICE_TYPE_SHIFT 8 +#define RETRO_DEVICE_MASK ((1 << RETRO_DEVICE_TYPE_SHIFT) - 1) +#define RETRO_DEVICE_SUBCLASS(base, id) (((id + 1) << RETRO_DEVICE_TYPE_SHIFT) | base) + +/* Input disabled. */ +#define RETRO_DEVICE_NONE 0 + +/* The JOYPAD is called RetroPad. It is essentially a Super Nintendo + * controller, but with additional L2/R2/L3/R3 buttons, similar to a + * PS1 DualShock. */ +#define RETRO_DEVICE_JOYPAD 1 + +/* The mouse is a simple mouse, similar to Super Nintendo's mouse. + * X and Y coordinates are reported relatively to last poll (poll callback). + * It is up to the libretro implementation to keep track of where the mouse + * pointer is supposed to be on the screen. + * The frontend must make sure not to interfere with its own hardware + * mouse pointer. + */ +#define RETRO_DEVICE_MOUSE 2 + +/* KEYBOARD device lets one poll for raw key pressed. + * It is poll based, so input callback will return with the current + * pressed state. + * For event/text based keyboard input, see + * RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK. + */ +#define RETRO_DEVICE_KEYBOARD 3 + +/* Lightgun X/Y coordinates are reported relatively to last poll, + * similar to mouse. */ +#define RETRO_DEVICE_LIGHTGUN 4 + +/* The ANALOG device is an extension to JOYPAD (RetroPad). + * Similar to DualShock it adds two analog sticks. + * This is treated as a separate device type as it returns values in the + * full analog range of [-0x8000, 0x7fff]. Positive X axis is right. + * Positive Y axis is down. + * Only use ANALOG type when polling for analog values of the axes. + */ +#define RETRO_DEVICE_ANALOG 5 + +/* Abstracts the concept of a pointing mechanism, e.g. touch. + * This allows libretro to query in absolute coordinates where on the + * screen a mouse (or something similar) is being placed. + * For a touch centric device, coordinates reported are the coordinates + * of the press. + * + * Coordinates in X and Y are reported as: + * [-0x7fff, 0x7fff]: -0x7fff corresponds to the far left/top of the screen, + * and 0x7fff corresponds to the far right/bottom of the screen. + * The "screen" is here defined as area that is passed to the frontend and + * later displayed on the monitor. + * + * The frontend is free to scale/resize this screen as it sees fit, however, + * (X, Y) = (-0x7fff, -0x7fff) will correspond to the top-left pixel of the + * game image, etc. + * + * To check if the pointer coordinates are valid (e.g. a touch display + * actually being touched), PRESSED returns 1 or 0. + * + * If using a mouse on a desktop, PRESSED will usually correspond to the + * left mouse button, but this is a frontend decision. + * PRESSED will only return 1 if the pointer is inside the game screen. + * + * For multi-touch, the index variable can be used to successively query + * more presses. + * If index = 0 returns true for _PRESSED, coordinates can be extracted + * with _X, _Y for index = 0. One can then query _PRESSED, _X, _Y with + * index = 1, and so on. + * Eventually _PRESSED will return false for an index. No further presses + * are registered at this point. */ +#define RETRO_DEVICE_POINTER 6 + +/* Buttons for the RetroPad (JOYPAD). + * The placement of these is equivalent to placements on the + * Super Nintendo controller. + * L2/R2/L3/R3 buttons correspond to the PS1 DualShock. */ +#define RETRO_DEVICE_ID_JOYPAD_B 0 +#define RETRO_DEVICE_ID_JOYPAD_Y 1 +#define RETRO_DEVICE_ID_JOYPAD_SELECT 2 +#define RETRO_DEVICE_ID_JOYPAD_START 3 +#define RETRO_DEVICE_ID_JOYPAD_UP 4 +#define RETRO_DEVICE_ID_JOYPAD_DOWN 5 +#define RETRO_DEVICE_ID_JOYPAD_LEFT 6 +#define RETRO_DEVICE_ID_JOYPAD_RIGHT 7 +#define RETRO_DEVICE_ID_JOYPAD_A 8 +#define RETRO_DEVICE_ID_JOYPAD_X 9 +#define RETRO_DEVICE_ID_JOYPAD_L 10 +#define RETRO_DEVICE_ID_JOYPAD_R 11 +#define RETRO_DEVICE_ID_JOYPAD_L2 12 +#define RETRO_DEVICE_ID_JOYPAD_R2 13 +#define RETRO_DEVICE_ID_JOYPAD_L3 14 +#define RETRO_DEVICE_ID_JOYPAD_R3 15 + +/* Index / Id values for ANALOG device. */ +#define RETRO_DEVICE_INDEX_ANALOG_LEFT 0 +#define RETRO_DEVICE_INDEX_ANALOG_RIGHT 1 +#define RETRO_DEVICE_ID_ANALOG_X 0 +#define RETRO_DEVICE_ID_ANALOG_Y 1 + +/* Id values for MOUSE. */ +#define RETRO_DEVICE_ID_MOUSE_X 0 +#define RETRO_DEVICE_ID_MOUSE_Y 1 +#define RETRO_DEVICE_ID_MOUSE_LEFT 2 +#define RETRO_DEVICE_ID_MOUSE_RIGHT 3 +#define RETRO_DEVICE_ID_MOUSE_WHEELUP 4 +#define RETRO_DEVICE_ID_MOUSE_WHEELDOWN 5 +#define RETRO_DEVICE_ID_MOUSE_MIDDLE 6 + +/* Id values for LIGHTGUN types. */ +#define RETRO_DEVICE_ID_LIGHTGUN_X 0 +#define RETRO_DEVICE_ID_LIGHTGUN_Y 1 +#define RETRO_DEVICE_ID_LIGHTGUN_TRIGGER 2 +#define RETRO_DEVICE_ID_LIGHTGUN_CURSOR 3 +#define RETRO_DEVICE_ID_LIGHTGUN_TURBO 4 +#define RETRO_DEVICE_ID_LIGHTGUN_PAUSE 5 +#define RETRO_DEVICE_ID_LIGHTGUN_START 6 + +/* Id values for POINTER. */ +#define RETRO_DEVICE_ID_POINTER_X 0 +#define RETRO_DEVICE_ID_POINTER_Y 1 +#define RETRO_DEVICE_ID_POINTER_PRESSED 2 + +/* Returned from retro_get_region(). */ +#define RETRO_REGION_NTSC 0 +#define RETRO_REGION_PAL 1 + +/* Id values for LANGUAGE */ +enum retro_language +{ + RETRO_LANGUAGE_ENGLISH = 0, + RETRO_LANGUAGE_JAPANESE = 1, + RETRO_LANGUAGE_FRENCH = 2, + RETRO_LANGUAGE_SPANISH = 3, + RETRO_LANGUAGE_GERMAN = 4, + RETRO_LANGUAGE_ITALIAN = 5, + RETRO_LANGUAGE_DUTCH = 6, + RETRO_LANGUAGE_PORTUGUESE = 7, + RETRO_LANGUAGE_RUSSIAN = 8, + RETRO_LANGUAGE_KOREAN = 9, + RETRO_LANGUAGE_CHINESE_TRADITIONAL = 10, + RETRO_LANGUAGE_CHINESE_SIMPLIFIED = 11, + RETRO_LANGUAGE_LAST, + + /* Ensure sizeof(enum) == sizeof(int) */ + RETRO_LANGUAGE_DUMMY = INT_MAX +}; + +/* Passed to retro_get_memory_data/size(). + * If the memory type doesn't apply to the + * implementation NULL/0 can be returned. + */ +#define RETRO_MEMORY_MASK 0xff + +/* Regular save RAM. This RAM is usually found on a game cartridge, + * backed up by a battery. + * If save game data is too complex for a single memory buffer, + * the SAVE_DIRECTORY (preferably) or SYSTEM_DIRECTORY environment + * callback can be used. */ +#define RETRO_MEMORY_SAVE_RAM 0 + +/* Some games have a built-in clock to keep track of time. + * This memory is usually just a couple of bytes to keep track of time. + */ +#define RETRO_MEMORY_RTC 1 + +/* System ram lets a frontend peek into a game systems main RAM. */ +#define RETRO_MEMORY_SYSTEM_RAM 2 + +/* Video ram lets a frontend peek into a game systems video RAM (VRAM). */ +#define RETRO_MEMORY_VIDEO_RAM 3 + +/* Keysyms used for ID in input state callback when polling RETRO_KEYBOARD. */ +enum retro_key +{ + RETROK_UNKNOWN = 0, + RETROK_FIRST = 0, + RETROK_BACKSPACE = 8, + RETROK_TAB = 9, + RETROK_CLEAR = 12, + RETROK_RETURN = 13, + RETROK_PAUSE = 19, + RETROK_ESCAPE = 27, + RETROK_SPACE = 32, + RETROK_EXCLAIM = 33, + RETROK_QUOTEDBL = 34, + RETROK_HASH = 35, + RETROK_DOLLAR = 36, + RETROK_AMPERSAND = 38, + RETROK_QUOTE = 39, + RETROK_LEFTPAREN = 40, + RETROK_RIGHTPAREN = 41, + RETROK_ASTERISK = 42, + RETROK_PLUS = 43, + RETROK_COMMA = 44, + RETROK_MINUS = 45, + RETROK_PERIOD = 46, + RETROK_SLASH = 47, + RETROK_0 = 48, + RETROK_1 = 49, + RETROK_2 = 50, + RETROK_3 = 51, + RETROK_4 = 52, + RETROK_5 = 53, + RETROK_6 = 54, + RETROK_7 = 55, + RETROK_8 = 56, + RETROK_9 = 57, + RETROK_COLON = 58, + RETROK_SEMICOLON = 59, + RETROK_LESS = 60, + RETROK_EQUALS = 61, + RETROK_GREATER = 62, + RETROK_QUESTION = 63, + RETROK_AT = 64, + RETROK_LEFTBRACKET = 91, + RETROK_BACKSLASH = 92, + RETROK_RIGHTBRACKET = 93, + RETROK_CARET = 94, + RETROK_UNDERSCORE = 95, + RETROK_BACKQUOTE = 96, + RETROK_a = 97, + RETROK_b = 98, + RETROK_c = 99, + RETROK_d = 100, + RETROK_e = 101, + RETROK_f = 102, + RETROK_g = 103, + RETROK_h = 104, + RETROK_i = 105, + RETROK_j = 106, + RETROK_k = 107, + RETROK_l = 108, + RETROK_m = 109, + RETROK_n = 110, + RETROK_o = 111, + RETROK_p = 112, + RETROK_q = 113, + RETROK_r = 114, + RETROK_s = 115, + RETROK_t = 116, + RETROK_u = 117, + RETROK_v = 118, + RETROK_w = 119, + RETROK_x = 120, + RETROK_y = 121, + RETROK_z = 122, + RETROK_DELETE = 127, + + RETROK_KP0 = 256, + RETROK_KP1 = 257, + RETROK_KP2 = 258, + RETROK_KP3 = 259, + RETROK_KP4 = 260, + RETROK_KP5 = 261, + RETROK_KP6 = 262, + RETROK_KP7 = 263, + RETROK_KP8 = 264, + RETROK_KP9 = 265, + RETROK_KP_PERIOD = 266, + RETROK_KP_DIVIDE = 267, + RETROK_KP_MULTIPLY = 268, + RETROK_KP_MINUS = 269, + RETROK_KP_PLUS = 270, + RETROK_KP_ENTER = 271, + RETROK_KP_EQUALS = 272, + + RETROK_UP = 273, + RETROK_DOWN = 274, + RETROK_RIGHT = 275, + RETROK_LEFT = 276, + RETROK_INSERT = 277, + RETROK_HOME = 278, + RETROK_END = 279, + RETROK_PAGEUP = 280, + RETROK_PAGEDOWN = 281, + + RETROK_F1 = 282, + RETROK_F2 = 283, + RETROK_F3 = 284, + RETROK_F4 = 285, + RETROK_F5 = 286, + RETROK_F6 = 287, + RETROK_F7 = 288, + RETROK_F8 = 289, + RETROK_F9 = 290, + RETROK_F10 = 291, + RETROK_F11 = 292, + RETROK_F12 = 293, + RETROK_F13 = 294, + RETROK_F14 = 295, + RETROK_F15 = 296, + + RETROK_NUMLOCK = 300, + RETROK_CAPSLOCK = 301, + RETROK_SCROLLOCK = 302, + RETROK_RSHIFT = 303, + RETROK_LSHIFT = 304, + RETROK_RCTRL = 305, + RETROK_LCTRL = 306, + RETROK_RALT = 307, + RETROK_LALT = 308, + RETROK_RMETA = 309, + RETROK_LMETA = 310, + RETROK_LSUPER = 311, + RETROK_RSUPER = 312, + RETROK_MODE = 313, + RETROK_COMPOSE = 314, + + RETROK_HELP = 315, + RETROK_PRINT = 316, + RETROK_SYSREQ = 317, + RETROK_BREAK = 318, + RETROK_MENU = 319, + RETROK_POWER = 320, + RETROK_EURO = 321, + RETROK_UNDO = 322, + + RETROK_LAST, + + RETROK_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */ +}; + +enum retro_mod +{ + RETROKMOD_NONE = 0x0000, + + RETROKMOD_SHIFT = 0x01, + RETROKMOD_CTRL = 0x02, + RETROKMOD_ALT = 0x04, + RETROKMOD_META = 0x08, + + RETROKMOD_NUMLOCK = 0x10, + RETROKMOD_CAPSLOCK = 0x20, + RETROKMOD_SCROLLOCK = 0x40, + + RETROKMOD_DUMMY = INT_MAX /* Ensure sizeof(enum) == sizeof(int) */ +}; + +/* If set, this call is not part of the public libretro API yet. It can + * change or be removed at any time. */ +#define RETRO_ENVIRONMENT_EXPERIMENTAL 0x10000 +/* Environment callback to be used internally in frontend. */ +#define RETRO_ENVIRONMENT_PRIVATE 0x20000 + +/* Environment commands. */ +#define RETRO_ENVIRONMENT_SET_ROTATION 1 /* const unsigned * -- + * Sets screen rotation of graphics. + * Is only implemented if rotation can be accelerated by hardware. + * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180, + * 270 degrees counter-clockwise respectively. + */ +#define RETRO_ENVIRONMENT_GET_OVERSCAN 2 /* bool * -- + * Boolean value whether or not the implementation should use overscan, + * or crop away overscan. + */ +#define RETRO_ENVIRONMENT_GET_CAN_DUPE 3 /* bool * -- + * Boolean value whether or not frontend supports frame duping, + * passing NULL to video frame callback. + */ + + /* Environ 4, 5 are no longer supported (GET_VARIABLE / SET_VARIABLES), + * and reserved to avoid possible ABI clash. + */ + +#define RETRO_ENVIRONMENT_SET_MESSAGE 6 /* const struct retro_message * -- + * Sets a message to be displayed in implementation-specific manner + * for a certain amount of 'frames'. + * Should not be used for trivial messages, which should simply be + * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a + * fallback, stderr). + */ +#define RETRO_ENVIRONMENT_SHUTDOWN 7 /* N/A (NULL) -- + * Requests the frontend to shutdown. + * Should only be used if game has a specific + * way to shutdown the game from a menu item or similar. + */ +#define RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL 8 + /* const unsigned * -- + * Gives a hint to the frontend how demanding this implementation + * is on a system. E.g. reporting a level of 2 means + * this implementation should run decently on all frontends + * of level 2 and up. + * + * It can be used by the frontend to potentially warn + * about too demanding implementations. + * + * The levels are "floating". + * + * This function can be called on a per-game basis, + * as certain games an implementation can play might be + * particularly demanding. + * If called, it should be called in retro_load_game(). + */ +#define RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY 9 + /* const char ** -- + * Returns the "system" directory of the frontend. + * This directory can be used to store system specific + * content such as BIOSes, configuration data, etc. + * The returned value can be NULL. + * If so, no such directory is defined, + * and it's up to the implementation to find a suitable directory. + * + * NOTE: Some cores used this folder also for "save" data such as + * memory cards, etc, for lack of a better place to put it. + * This is now discouraged, and if possible, cores should try to + * use the new GET_SAVE_DIRECTORY. + */ +#define RETRO_ENVIRONMENT_SET_PIXEL_FORMAT 10 + /* const enum retro_pixel_format * -- + * Sets the internal pixel format used by the implementation. + * The default pixel format is RETRO_PIXEL_FORMAT_0RGB1555. + * This pixel format however, is deprecated (see enum retro_pixel_format). + * If the call returns false, the frontend does not support this pixel + * format. + * + * This function should be called inside retro_load_game() or + * retro_get_system_av_info(). + */ +#define RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS 11 + /* const struct retro_input_descriptor * -- + * Sets an array of retro_input_descriptors. + * It is up to the frontend to present this in a usable way. + * The array is terminated by retro_input_descriptor::description + * being set to NULL. + * This function can be called at any time, but it is recommended + * to call it as early as possible. + */ +#define RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK 12 + /* const struct retro_keyboard_callback * -- + * Sets a callback function used to notify core about keyboard events. + */ +#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE 13 + /* const struct retro_disk_control_callback * -- + * Sets an interface which frontend can use to eject and insert + * disk images. + * This is used for games which consist of multiple images and + * must be manually swapped out by the user (e.g. PSX). + */ +#define RETRO_ENVIRONMENT_SET_HW_RENDER 14 + /* struct retro_hw_render_callback * -- + * Sets an interface to let a libretro core render with + * hardware acceleration. + * Should be called in retro_load_game(). + * If successful, libretro cores will be able to render to a + * frontend-provided framebuffer. + * The size of this framebuffer will be at least as large as + * max_width/max_height provided in get_av_info(). + * If HW rendering is used, pass only RETRO_HW_FRAME_BUFFER_VALID or + * NULL to retro_video_refresh_t. + */ +#define RETRO_ENVIRONMENT_GET_VARIABLE 15 + /* struct retro_variable * -- + * Interface to acquire user-defined information from environment + * that cannot feasibly be supported in a multi-system way. + * 'key' should be set to a key which has already been set by + * SET_VARIABLES. + * 'data' will be set to a value or NULL. + */ +#define RETRO_ENVIRONMENT_SET_VARIABLES 16 + /* const struct retro_variable * -- + * Allows an implementation to signal the environment + * which variables it might want to check for later using + * GET_VARIABLE. + * This allows the frontend to present these variables to + * a user dynamically. + * This should be called as early as possible (ideally in + * retro_set_environment). + * + * 'data' points to an array of retro_variable structs + * terminated by a { NULL, NULL } element. + * retro_variable::key should be namespaced to not collide + * with other implementations' keys. E.g. A core called + * 'foo' should use keys named as 'foo_option'. + * retro_variable::value should contain a human readable + * description of the key as well as a '|' delimited list + * of expected values. + * + * The number of possible options should be very limited, + * i.e. it should be feasible to cycle through options + * without a keyboard. + * + * First entry should be treated as a default. + * + * Example entry: + * { "foo_option", "Speed hack coprocessor X; false|true" } + * + * Text before first ';' is description. This ';' must be + * followed by a space, and followed by a list of possible + * values split up with '|'. + * + * Only strings are operated on. The possible values will + * generally be displayed and stored as-is by the frontend. + */ +#define RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE 17 + /* bool * -- + * Result is set to true if some variables are updated by + * frontend since last call to RETRO_ENVIRONMENT_GET_VARIABLE. + * Variables should be queried with GET_VARIABLE. + */ +#define RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME 18 + /* const bool * -- + * If true, the libretro implementation supports calls to + * retro_load_game() with NULL as argument. + * Used by cores which can run without particular game data. + * This should be called within retro_set_environment() only. + */ +#define RETRO_ENVIRONMENT_GET_LIBRETRO_PATH 19 + /* const char ** -- + * Retrieves the absolute path from where this libretro + * implementation was loaded. + * NULL is returned if the libretro was loaded statically + * (i.e. linked statically to frontend), or if the path cannot be + * determined. + * Mostly useful in cooperation with SET_SUPPORT_NO_GAME as assets can + * be loaded without ugly hacks. + */ + + /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK. + * It was not used by any known core at the time, + * and was removed from the API. */ +#define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22 + /* const struct retro_audio_callback * -- + * Sets an interface which is used to notify a libretro core about audio + * being available for writing. + * The callback can be called from any thread, so a core using this must + * have a thread safe audio implementation. + * It is intended for games where audio and video are completely + * asynchronous and audio can be generated on the fly. + * This interface is not recommended for use with emulators which have + * highly synchronous audio. + * + * The callback only notifies about writability; the libretro core still + * has to call the normal audio callbacks + * to write audio. The audio callbacks must be called from within the + * notification callback. + * The amount of audio data to write is up to the implementation. + * Generally, the audio callback will be called continously in a loop. + * + * Due to thread safety guarantees and lack of sync between audio and + * video, a frontend can selectively disallow this interface based on + * internal configuration. A core using this interface must also + * implement the "normal" audio interface. + * + * A libretro core using SET_AUDIO_CALLBACK should also make use of + * SET_FRAME_TIME_CALLBACK. + */ +#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21 + /* const struct retro_frame_time_callback * -- + * Lets the core know how much time has passed since last + * invocation of retro_run(). + * The frontend can tamper with the timing to fake fast-forward, + * slow-motion, frame stepping, etc. + * In this case the delta time will use the reference value + * in frame_time_callback.. + */ +#define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23 + /* struct retro_rumble_interface * -- + * Gets an interface which is used by a libretro core to set + * state of rumble motors in controllers. + * A strong and weak motor is supported, and they can be + * controlled indepedently. + */ +#define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24 + /* uint64_t * -- + * Gets a bitmask telling which device type are expected to be + * handled properly in a call to retro_input_state_t. + * Devices which are not handled or recognized always return + * 0 in retro_input_state_t. + * Example bitmask: caps = (1 << RETRO_DEVICE_JOYPAD) | (1 << RETRO_DEVICE_ANALOG). + * Should only be called in retro_run(). + */ +#define RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE (25 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_sensor_interface * -- + * Gets access to the sensor interface. + * The purpose of this interface is to allow + * setting state related to sensors such as polling rate, + * enabling/disable it entirely, etc. + * Reading sensor state is done via the normal + * input_state_callback API. + */ +#define RETRO_ENVIRONMENT_GET_CAMERA_INTERFACE (26 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_camera_callback * -- + * Gets an interface to a video camera driver. + * A libretro core can use this interface to get access to a + * video camera. + * New video frames are delivered in a callback in same + * thread as retro_run(). + * + * GET_CAMERA_INTERFACE should be called in retro_load_game(). + * + * Depending on the camera implementation used, camera frames + * will be delivered as a raw framebuffer, + * or as an OpenGL texture directly. + * + * The core has to tell the frontend here which types of + * buffers can be handled properly. + * An OpenGL texture can only be handled when using a + * libretro GL core (SET_HW_RENDER). + * It is recommended to use a libretro GL core when + * using camera interface. + * + * The camera is not started automatically. The retrieved start/stop + * functions must be used to explicitly + * start and stop the camera driver. + */ +#define RETRO_ENVIRONMENT_GET_LOG_INTERFACE 27 + /* struct retro_log_callback * -- + * Gets an interface for logging. This is useful for + * logging in a cross-platform way + * as certain platforms cannot use use stderr for logging. + * It also allows the frontend to + * show logging information in a more suitable way. + * If this interface is not used, libretro cores should + * log to stderr as desired. + */ +#define RETRO_ENVIRONMENT_GET_PERF_INTERFACE 28 + /* struct retro_perf_callback * -- + * Gets an interface for performance counters. This is useful + * for performance logging in a cross-platform way and for detecting + * architecture-specific features, such as SIMD support. + */ +#define RETRO_ENVIRONMENT_GET_LOCATION_INTERFACE 29 + /* struct retro_location_callback * -- + * Gets access to the location interface. + * The purpose of this interface is to be able to retrieve + * location-based information from the host device, + * such as current latitude / longitude. + */ +#define RETRO_ENVIRONMENT_GET_CONTENT_DIRECTORY 30 + /* const char ** -- + * Returns the "content" directory of the frontend. + * This directory can be used to store specific assets that the + * core relies upon, such as art assets, + * input data, etc etc. + * The returned value can be NULL. + * If so, no such directory is defined, + * and it's up to the implementation to find a suitable directory. + */ +#define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31 + /* const char ** -- + * Returns the "save" directory of the frontend. + * This directory can be used to store SRAM, memory cards, + * high scores, etc, if the libretro core + * cannot use the regular memory interface (retro_get_memory_data()). + * + * NOTE: libretro cores used to check GET_SYSTEM_DIRECTORY for + * similar things before. + * They should still check GET_SYSTEM_DIRECTORY if they want to + * be backwards compatible. + * The path here can be NULL. It should only be non-NULL if the + * frontend user has set a specific save path. + */ +#define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32 + /* const struct retro_system_av_info * -- + * Sets a new av_info structure. This can only be called from + * within retro_run(). + * This should *only* be used if the core is completely altering the + * internal resolutions, aspect ratios, timings, sampling rate, etc. + * Calling this can require a full reinitialization of video/audio + * drivers in the frontend, + * + * so it is important to call it very sparingly, and usually only with + * the users explicit consent. + * An eventual driver reinitialize will happen so that video and + * audio callbacks + * happening after this call within the same retro_run() call will + * target the newly initialized driver. + * + * This callback makes it possible to support configurable resolutions + * in games, which can be useful to + * avoid setting the "worst case" in max_width/max_height. + * + * ***HIGHLY RECOMMENDED*** Do not call this callback every time + * resolution changes in an emulator core if it's + * expected to be a temporary change, for the reasons of possible + * driver reinitialization. + * This call is not a free pass for not trying to provide + * correct values in retro_get_system_av_info(). If you need to change + * things like aspect ratio or nominal width/height, + * use RETRO_ENVIRONMENT_SET_GEOMETRY, which is a softer variant + * of SET_SYSTEM_AV_INFO. + * + * If this returns false, the frontend does not acknowledge a + * changed av_info struct. + */ +#define RETRO_ENVIRONMENT_SET_PROC_ADDRESS_CALLBACK 33 + /* const struct retro_get_proc_address_interface * -- + * Allows a libretro core to announce support for the + * get_proc_address() interface. + * This interface allows for a standard way to extend libretro where + * use of environment calls are too indirect, + * e.g. for cases where the frontend wants to call directly into the core. + * + * If a core wants to expose this interface, SET_PROC_ADDRESS_CALLBACK + * **MUST** be called from within retro_set_environment(). + */ +#define RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO 34 + /* const struct retro_subsystem_info * -- + * This environment call introduces the concept of libretro "subsystems". + * A subsystem is a variant of a libretro core which supports + * different kinds of games. + * The purpose of this is to support e.g. emulators which might + * have special needs, e.g. Super Nintendo's Super GameBoy, Sufami Turbo. + * It can also be used to pick among subsystems in an explicit way + * if the libretro implementation is a multi-system emulator itself. + * + * Loading a game via a subsystem is done with retro_load_game_special(), + * and this environment call allows a libretro core to expose which + * subsystems are supported for use with retro_load_game_special(). + * A core passes an array of retro_game_special_info which is terminated + * with a zeroed out retro_game_special_info struct. + * + * If a core wants to use this functionality, SET_SUBSYSTEM_INFO + * **MUST** be called from within retro_set_environment(). + */ +#define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35 + /* const struct retro_controller_info * -- + * This environment call lets a libretro core tell the frontend + * which controller types are recognized in calls to + * retro_set_controller_port_device(). + * + * Some emulators such as Super Nintendo + * support multiple lightgun types which must be specifically + * selected from. + * It is therefore sometimes necessary for a frontend to be able + * to tell the core about a special kind of input device which is + * not covered by the libretro input API. + * + * In order for a frontend to understand the workings of an input device, + * it must be a specialized type + * of the generic device types already defined in the libretro API. + * + * Which devices are supported can vary per input port. + * The core must pass an array of const struct retro_controller_info which + * is terminated with a blanked out struct. Each element of the struct + * corresponds to an ascending port index to + * retro_set_controller_port_device(). + * Even if special device types are set in the libretro core, + * libretro should only poll input based on the base input device types. + */ +#define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* const struct retro_memory_map * -- + * This environment call lets a libretro core tell the frontend + * about the memory maps this core emulates. + * This can be used to implement, for example, cheats in a core-agnostic way. + * + * Should only be used by emulators; it doesn't make much sense for + * anything else. + * It is recommended to expose all relevant pointers through + * retro_get_memory_* as well. + * + * Can be called from retro_init and retro_load_game. + */ +#define RETRO_ENVIRONMENT_SET_GEOMETRY 37 + /* const struct retro_game_geometry * -- + * This environment call is similar to SET_SYSTEM_AV_INFO for changing + * video parameters, but provides a guarantee that drivers will not be + * reinitialized. + * This can only be called from within retro_run(). + * + * The purpose of this call is to allow a core to alter nominal + * width/heights as well as aspect ratios on-the-fly, which can be + * useful for some emulators to change in run-time. + * + * max_width/max_height arguments are ignored and cannot be changed + * with this call as this could potentially require a reinitialization or a + * non-constant time operation. + * If max_width/max_height are to be changed, SET_SYSTEM_AV_INFO is required. + * + * A frontend must guarantee that this environment call completes in + * constant time. + */ +#define RETRO_ENVIRONMENT_GET_USERNAME 38 + /* const char ** + * Returns the specified username of the frontend, if specified by the user. + * This username can be used as a nickname for a core that has online facilities + * or any other mode where personalization of the user is desirable. + * The returned value can be NULL. + * If this environ callback is used by a core that requires a valid username, + * a default username should be specified by the core. + */ +#define RETRO_ENVIRONMENT_GET_LANGUAGE 39 + /* unsigned * -- + * Returns the specified language of the frontend, if specified by the user. + * It can be used by the core for localization purposes. + */ + +#define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */ +#define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */ +#define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */ +#define RETRO_MEMDESC_ALIGN_4 (2 << 16) +#define RETRO_MEMDESC_ALIGN_8 (3 << 16) +#define RETRO_MEMDESC_MINSIZE_2 (1 << 24) /* All memory in this region is accessed at least 2 bytes at the time. */ +#define RETRO_MEMDESC_MINSIZE_4 (2 << 24) +#define RETRO_MEMDESC_MINSIZE_8 (3 << 24) +struct retro_memory_descriptor +{ + uint64_t flags; + + /* Pointer to the start of the relevant ROM or RAM chip. + * It's strongly recommended to use 'offset' if possible, rather than + * doing math on the pointer. + * + * If the same byte is mapped my multiple descriptors, their descriptors + * must have the same pointer. + * If 'start' does not point to the first byte in the pointer, put the + * difference in 'offset' instead. + * + * May be NULL if there's nothing usable here (e.g. hardware registers and + * open bus). No flags should be set if the pointer is NULL. + * It's recommended to minimize the number of descriptors if possible, + * but not mandatory. */ + void *ptr; + size_t offset; + + /* This is the location in the emulated address space + * where the mapping starts. */ + size_t start; + + /* Which bits must be same as in 'start' for this mapping to apply. + * The first memory descriptor to claim a certain byte is the one + * that applies. + * A bit which is set in 'start' must also be set in this. + * Can be zero, in which case each byte is assumed mapped exactly once. + * In this case, 'len' must be a power of two. */ + size_t select; + + /* If this is nonzero, the set bits are assumed not connected to the + * memory chip's address pins. */ + size_t disconnect; + + /* This one tells the size of the current memory area. + * If, after start+disconnect are applied, the address is higher than + * this, the highest bit of the address is cleared. + * + * If the address is still too high, the next highest bit is cleared. + * Can be zero, in which case it's assumed to be infinite (as limited + * by 'select' and 'disconnect'). */ + size_t len; + + /* To go from emulated address to physical address, the following + * order applies: + * Subtract 'start', pick off 'disconnect', apply 'len', add 'offset'. + * + * The address space name must consist of only a-zA-Z0-9_-, + * should be as short as feasible (maximum length is 8 plus the NUL), + * and may not be any other address space plus one or more 0-9A-F + * at the end. + * However, multiple memory descriptors for the same address space is + * allowed, and the address space name can be empty. NULL is treated + * as empty. + * + * Address space names are case sensitive, but avoid lowercase if possible. + * The same pointer may exist in multiple address spaces. + * + * Examples: + * blank+blank - valid (multiple things may be mapped in the same namespace) + * 'Sp'+'Sp' - valid (multiple things may be mapped in the same namespace) + * 'A'+'B' - valid (neither is a prefix of each other) + * 'S'+blank - valid ('S' is not in 0-9A-F) + * 'a'+blank - valid ('a' is not in 0-9A-F) + * 'a'+'A' - valid (neither is a prefix of each other) + * 'AR'+blank - valid ('R' is not in 0-9A-F) + * 'ARB'+blank - valid (the B can't be part of the address either, because + * there is no namespace 'AR') + * blank+'B' - not valid, because it's ambigous which address space B1234 + * would refer to. + * The length can't be used for that purpose; the frontend may want + * to append arbitrary data to an address, without a separator. */ + const char *addrspace; +}; + +/* The frontend may use the largest value of 'start'+'select' in a + * certain namespace to infer the size of the address space. + * + * If the address space is larger than that, a mapping with .ptr=NULL + * should be at the end of the array, with .select set to all ones for + * as long as the address space is big. + * + * Sample descriptors (minus .ptr, and RETRO_MEMFLAG_ on the flags): + * SNES WRAM: + * .start=0x7E0000, .len=0x20000 + * (Note that this must be mapped before the ROM in most cases; some of the + * ROM mappers + * try to claim $7E0000, or at least $7E8000.) + * SNES SPC700 RAM: + * .addrspace="S", .len=0x10000 + * SNES WRAM mirrors: + * .flags=MIRROR, .start=0x000000, .select=0xC0E000, .len=0x2000 + * .flags=MIRROR, .start=0x800000, .select=0xC0E000, .len=0x2000 + * SNES WRAM mirrors, alternate equivalent descriptor: + * .flags=MIRROR, .select=0x40E000, .disconnect=~0x1FFF + * (Various similar constructions can be created by combining parts of + * the above two.) + * SNES LoROM (512KB, mirrored a couple of times): + * .flags=CONST, .start=0x008000, .select=0x408000, .disconnect=0x8000, .len=512*1024 + * .flags=CONST, .start=0x400000, .select=0x400000, .disconnect=0x8000, .len=512*1024 + * SNES HiROM (4MB): + * .flags=CONST, .start=0x400000, .select=0x400000, .len=4*1024*1024 + * .flags=CONST, .offset=0x8000, .start=0x008000, .select=0x408000, .len=4*1024*1024 + * SNES ExHiROM (8MB): + * .flags=CONST, .offset=0, .start=0xC00000, .select=0xC00000, .len=4*1024*1024 + * .flags=CONST, .offset=4*1024*1024, .start=0x400000, .select=0xC00000, .len=4*1024*1024 + * .flags=CONST, .offset=0x8000, .start=0x808000, .select=0xC08000, .len=4*1024*1024 + * .flags=CONST, .offset=4*1024*1024+0x8000, .start=0x008000, .select=0xC08000, .len=4*1024*1024 + * Clarify the size of the address space: + * .ptr=NULL, .select=0xFFFFFF + * .len can be implied by .select in many of them, but was included for clarity. + */ + +struct retro_memory_map +{ + const struct retro_memory_descriptor *descriptors; + unsigned num_descriptors; +}; + +struct retro_controller_description +{ + /* Human-readable description of the controller. Even if using a generic + * input device type, this can be set to the particular device type the + * core uses. */ + const char *desc; + + /* Device type passed to retro_set_controller_port_device(). If the device + * type is a sub-class of a generic input device type, use the + * RETRO_DEVICE_SUBCLASS macro to create an ID. + * + * E.g. RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 1). */ + unsigned id; +}; + +struct retro_controller_info +{ + const struct retro_controller_description *types; + unsigned num_types; +}; + +struct retro_subsystem_memory_info +{ + /* The extension associated with a memory type, e.g. "psram". */ + const char *extension; + + /* The memory type for retro_get_memory(). This should be at + * least 0x100 to avoid conflict with standardized + * libretro memory types. */ + unsigned type; +}; + +struct retro_subsystem_rom_info +{ + /* Describes what the content is (SGB BIOS, GB ROM, etc). */ + const char *desc; + + /* Same definition as retro_get_system_info(). */ + const char *valid_extensions; + + /* Same definition as retro_get_system_info(). */ + bool need_fullpath; + + /* Same definition as retro_get_system_info(). */ + bool block_extract; + + /* This is set if the content is required to load a game. + * If this is set to false, a zeroed-out retro_game_info can be passed. */ + bool required; + + /* Content can have multiple associated persistent + * memory types (retro_get_memory()). */ + const struct retro_subsystem_memory_info *memory; + unsigned num_memory; +}; + +struct retro_subsystem_info +{ + /* Human-readable string of the subsystem type, e.g. "Super GameBoy" */ + const char *desc; + + /* A computer friendly short string identifier for the subsystem type. + * This name must be [a-z]. + * E.g. if desc is "Super GameBoy", this can be "sgb". + * This identifier can be used for command-line interfaces, etc. + */ + const char *ident; + + /* Infos for each content file. The first entry is assumed to be the + * "most significant" content for frontend purposes. + * E.g. with Super GameBoy, the first content should be the GameBoy ROM, + * as it is the most "significant" content to a user. + * If a frontend creates new file paths based on the content used + * (e.g. savestates), it should use the path for the first ROM to do so. */ + const struct retro_subsystem_rom_info *roms; + + /* Number of content files associated with a subsystem. */ + unsigned num_roms; + + /* The type passed to retro_load_game_special(). */ + unsigned id; +}; + +typedef void (*retro_proc_address_t)(void); + +/* libretro API extension functions: + * (None here so far). + * + * Get a symbol from a libretro core. + * Cores should only return symbols which are actual + * extensions to the libretro API. + * + * Frontends should not use this to obtain symbols to standard + * libretro entry points (static linking or dlsym). + * + * The symbol name must be equal to the function name, + * e.g. if void retro_foo(void); exists, the symbol must be called "retro_foo". + * The returned function pointer must be cast to the corresponding type. + */ +typedef retro_proc_address_t (*retro_get_proc_address_t)(const char *sym); + +struct retro_get_proc_address_interface +{ + retro_get_proc_address_t get_proc_address; +}; + +enum retro_log_level +{ + RETRO_LOG_DEBUG = 0, + RETRO_LOG_INFO, + RETRO_LOG_WARN, + RETRO_LOG_ERROR, + + RETRO_LOG_DUMMY = INT_MAX +}; + +/* Logging function. Takes log level argument as well. */ +typedef void (*retro_log_printf_t)(enum retro_log_level level, + const char *fmt, ...); + +struct retro_log_callback +{ + retro_log_printf_t log; +}; + +/* Performance related functions */ + +/* ID values for SIMD CPU features */ +#define RETRO_SIMD_SSE (1 << 0) +#define RETRO_SIMD_SSE2 (1 << 1) +#define RETRO_SIMD_VMX (1 << 2) +#define RETRO_SIMD_VMX128 (1 << 3) +#define RETRO_SIMD_AVX (1 << 4) +#define RETRO_SIMD_NEON (1 << 5) +#define RETRO_SIMD_SSE3 (1 << 6) +#define RETRO_SIMD_SSSE3 (1 << 7) +#define RETRO_SIMD_MMX (1 << 8) +#define RETRO_SIMD_MMXEXT (1 << 9) +#define RETRO_SIMD_SSE4 (1 << 10) +#define RETRO_SIMD_SSE42 (1 << 11) +#define RETRO_SIMD_AVX2 (1 << 12) +#define RETRO_SIMD_VFPU (1 << 13) +#define RETRO_SIMD_PS (1 << 14) +#define RETRO_SIMD_AES (1 << 15) + +typedef uint64_t retro_perf_tick_t; +typedef int64_t retro_time_t; + +struct retro_perf_counter +{ + const char *ident; + retro_perf_tick_t start; + retro_perf_tick_t total; + retro_perf_tick_t call_cnt; + + bool registered; +}; + +/* Returns current time in microseconds. + * Tries to use the most accurate timer available. + */ +typedef retro_time_t (*retro_perf_get_time_usec_t)(void); + +/* A simple counter. Usually nanoseconds, but can also be CPU cycles. + * Can be used directly if desired (when creating a more sophisticated + * performance counter system). + * */ +typedef retro_perf_tick_t (*retro_perf_get_counter_t)(void); + +/* Returns a bit-mask of detected CPU features (RETRO_SIMD_*). */ +typedef uint64_t (*retro_get_cpu_features_t)(void); + +/* Asks frontend to log and/or display the state of performance counters. + * Performance counters can always be poked into manually as well. + */ +typedef void (*retro_perf_log_t)(void); + +/* Register a performance counter. + * ident field must be set with a discrete value and other values in + * retro_perf_counter must be 0. + * Registering can be called multiple times. To avoid calling to + * frontend redundantly, you can check registered field first. */ +typedef void (*retro_perf_register_t)(struct retro_perf_counter *counter); + +/* Starts a registered counter. */ +typedef void (*retro_perf_start_t)(struct retro_perf_counter *counter); + +/* Stops a registered counter. */ +typedef void (*retro_perf_stop_t)(struct retro_perf_counter *counter); + +/* For convenience it can be useful to wrap register, start and stop in macros. + * E.g.: + * #ifdef LOG_PERFORMANCE + * #define RETRO_PERFORMANCE_INIT(perf_cb, name) static struct retro_perf_counter name = {#name}; if (!name.registered) perf_cb.perf_register(&(name)) + * #define RETRO_PERFORMANCE_START(perf_cb, name) perf_cb.perf_start(&(name)) + * #define RETRO_PERFORMANCE_STOP(perf_cb, name) perf_cb.perf_stop(&(name)) + * #else + * ... Blank macros ... + * #endif + * + * These can then be used mid-functions around code snippets. + * + * extern struct retro_perf_callback perf_cb; * Somewhere in the core. + * + * void do_some_heavy_work(void) + * { + * RETRO_PERFORMANCE_INIT(cb, work_1; + * RETRO_PERFORMANCE_START(cb, work_1); + * heavy_work_1(); + * RETRO_PERFORMANCE_STOP(cb, work_1); + * + * RETRO_PERFORMANCE_INIT(cb, work_2); + * RETRO_PERFORMANCE_START(cb, work_2); + * heavy_work_2(); + * RETRO_PERFORMANCE_STOP(cb, work_2); + * } + * + * void retro_deinit(void) + * { + * perf_cb.perf_log(); * Log all perf counters here for example. + * } + */ + +struct retro_perf_callback +{ + retro_perf_get_time_usec_t get_time_usec; + retro_get_cpu_features_t get_cpu_features; + + retro_perf_get_counter_t get_perf_counter; + retro_perf_register_t perf_register; + retro_perf_start_t perf_start; + retro_perf_stop_t perf_stop; + retro_perf_log_t perf_log; +}; + +/* FIXME: Document the sensor API and work out behavior. + * It will be marked as experimental until then. + */ +enum retro_sensor_action +{ + RETRO_SENSOR_ACCELEROMETER_ENABLE = 0, + RETRO_SENSOR_ACCELEROMETER_DISABLE, + + RETRO_SENSOR_DUMMY = INT_MAX +}; + +/* Id values for SENSOR types. */ +#define RETRO_SENSOR_ACCELEROMETER_X 0 +#define RETRO_SENSOR_ACCELEROMETER_Y 1 +#define RETRO_SENSOR_ACCELEROMETER_Z 2 + +typedef bool (*retro_set_sensor_state_t)(unsigned port, + enum retro_sensor_action action, unsigned rate); + +typedef float (*retro_sensor_get_input_t)(unsigned port, unsigned id); + +struct retro_sensor_interface +{ + retro_set_sensor_state_t set_sensor_state; + retro_sensor_get_input_t get_sensor_input; +}; + +enum retro_camera_buffer +{ + RETRO_CAMERA_BUFFER_OPENGL_TEXTURE = 0, + RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER, + + RETRO_CAMERA_BUFFER_DUMMY = INT_MAX +}; + +/* Starts the camera driver. Can only be called in retro_run(). */ +typedef bool (*retro_camera_start_t)(void); + +/* Stops the camera driver. Can only be called in retro_run(). */ +typedef void (*retro_camera_stop_t)(void); + +/* Callback which signals when the camera driver is initialized + * and/or deinitialized. + * retro_camera_start_t can be called in initialized callback. + */ +typedef void (*retro_camera_lifetime_status_t)(void); + +/* A callback for raw framebuffer data. buffer points to an XRGB8888 buffer. + * Width, height and pitch are similar to retro_video_refresh_t. + * First pixel is top-left origin. + */ +typedef void (*retro_camera_frame_raw_framebuffer_t)(const uint32_t *buffer, + unsigned width, unsigned height, size_t pitch); + +/* A callback for when OpenGL textures are used. + * + * texture_id is a texture owned by camera driver. + * Its state or content should be considered immutable, except for things like + * texture filtering and clamping. + * + * texture_target is the texture target for the GL texture. + * These can include e.g. GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE, and possibly + * more depending on extensions. + * + * affine points to a packed 3x3 column-major matrix used to apply an affine + * transform to texture coordinates. (affine_matrix * vec3(coord_x, coord_y, 1.0)) + * After transform, normalized texture coord (0, 0) should be bottom-left + * and (1, 1) should be top-right (or (width, height) for RECTANGLE). + * + * GL-specific typedefs are avoided here to avoid relying on gl.h in + * the API definition. + */ +typedef void (*retro_camera_frame_opengl_texture_t)(unsigned texture_id, + unsigned texture_target, const float *affine); + +struct retro_camera_callback +{ + /* Set by libretro core. + * Example bitmask: caps = (1 << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE) | (1 << RETRO_CAMERA_BUFFER_RAW_FRAMEBUFFER). + */ + uint64_t caps; + + unsigned width; /* Desired resolution for camera. Is only used as a hint. */ + unsigned height; + retro_camera_start_t start; /* Set by frontend. */ + retro_camera_stop_t stop; /* Set by frontend. */ + + /* Set by libretro core if raw framebuffer callbacks will be used. */ + retro_camera_frame_raw_framebuffer_t frame_raw_framebuffer; + /* Set by libretro core if OpenGL texture callbacks will be used. */ + retro_camera_frame_opengl_texture_t frame_opengl_texture; + + /* Set by libretro core. Called after camera driver is initialized and + * ready to be started. + * Can be NULL, in which this callback is not called. + */ + retro_camera_lifetime_status_t initialized; + + /* Set by libretro core. Called right before camera driver is + * deinitialized. + * Can be NULL, in which this callback is not called. + */ + retro_camera_lifetime_status_t deinitialized; +}; + +/* Sets the interval of time and/or distance at which to update/poll + * location-based data. + * + * To ensure compatibility with all location-based implementations, + * values for both interval_ms and interval_distance should be provided. + * + * interval_ms is the interval expressed in milliseconds. + * interval_distance is the distance interval expressed in meters. + */ +typedef void (*retro_location_set_interval_t)(unsigned interval_ms, + unsigned interval_distance); + +/* Start location services. The device will start listening for changes to the + * current location at regular intervals (which are defined with + * retro_location_set_interval_t). */ +typedef bool (*retro_location_start_t)(void); + +/* Stop location services. The device will stop listening for changes + * to the current location. */ +typedef void (*retro_location_stop_t)(void); + +/* Get the position of the current location. Will set parameters to + * 0 if no new location update has happened since the last time. */ +typedef bool (*retro_location_get_position_t)(double *lat, double *lon, + double *horiz_accuracy, double *vert_accuracy); + +/* Callback which signals when the location driver is initialized + * and/or deinitialized. + * retro_location_start_t can be called in initialized callback. + */ +typedef void (*retro_location_lifetime_status_t)(void); + +struct retro_location_callback +{ + retro_location_start_t start; + retro_location_stop_t stop; + retro_location_get_position_t get_position; + retro_location_set_interval_t set_interval; + + retro_location_lifetime_status_t initialized; + retro_location_lifetime_status_t deinitialized; +}; + +enum retro_rumble_effect +{ + RETRO_RUMBLE_STRONG = 0, + RETRO_RUMBLE_WEAK = 1, + + RETRO_RUMBLE_DUMMY = INT_MAX +}; + +/* Sets rumble state for joypad plugged in port 'port'. + * Rumble effects are controlled independently, + * and setting e.g. strong rumble does not override weak rumble. + * Strength has a range of [0, 0xffff]. + * + * Returns true if rumble state request was honored. + * Calling this before first retro_run() is likely to return false. */ +typedef bool (*retro_set_rumble_state_t)(unsigned port, + enum retro_rumble_effect effect, uint16_t strength); + +struct retro_rumble_interface +{ + retro_set_rumble_state_t set_rumble_state; +}; + +/* Notifies libretro that audio data should be written. */ +typedef void (*retro_audio_callback_t)(void); + +/* True: Audio driver in frontend is active, and callback is + * expected to be called regularily. + * False: Audio driver in frontend is paused or inactive. + * Audio callback will not be called until set_state has been + * called with true. + * Initial state is false (inactive). + */ +typedef void (*retro_audio_set_state_callback_t)(bool enabled); + +struct retro_audio_callback +{ + retro_audio_callback_t callback; + retro_audio_set_state_callback_t set_state; +}; + +/* Notifies a libretro core of time spent since last invocation + * of retro_run() in microseconds. + * + * It will be called right before retro_run() every frame. + * The frontend can tamper with timing to support cases like + * fast-forward, slow-motion and framestepping. + * + * In those scenarios the reference frame time value will be used. */ +typedef int64_t retro_usec_t; +typedef void (*retro_frame_time_callback_t)(retro_usec_t usec); +struct retro_frame_time_callback +{ + retro_frame_time_callback_t callback; + /* Represents the time of one frame. It is computed as + * 1000000 / fps, but the implementation will resolve the + * rounding to ensure that framestepping, etc is exact. */ + retro_usec_t reference; +}; + +/* Pass this to retro_video_refresh_t if rendering to hardware. + * Passing NULL to retro_video_refresh_t is still a frame dupe as normal. + * */ +#define RETRO_HW_FRAME_BUFFER_VALID ((void*)-1) + +/* Invalidates the current HW context. + * Any GL state is lost, and must not be deinitialized explicitly. + * If explicit deinitialization is desired by the libretro core, + * it should implement context_destroy callback. + * If called, all GPU resources must be reinitialized. + * Usually called when frontend reinits video driver. + * Also called first time video driver is initialized, + * allowing libretro core to initialize resources. + */ +typedef void (*retro_hw_context_reset_t)(void); + +/* Gets current framebuffer which is to be rendered to. + * Could change every frame potentially. + */ +typedef uintptr_t (*retro_hw_get_current_framebuffer_t)(void); + +/* Get a symbol from HW context. */ +typedef retro_proc_address_t (*retro_hw_get_proc_address_t)(const char *sym); + +enum retro_hw_context_type +{ + RETRO_HW_CONTEXT_NONE = 0, + /* OpenGL 2.x. Driver can choose to use latest compatibility context. */ + RETRO_HW_CONTEXT_OPENGL = 1, + /* OpenGL ES 2.0. */ + RETRO_HW_CONTEXT_OPENGLES2 = 2, + /* Modern desktop core GL context. Use version_major/ + * version_minor fields to set GL version. */ + RETRO_HW_CONTEXT_OPENGL_CORE = 3, + /* OpenGL ES 3.0 */ + RETRO_HW_CONTEXT_OPENGLES3 = 4, + /* OpenGL ES 3.1+. Set version_major/version_minor. For GLES2 and GLES3, + * use the corresponding enums directly. */ + RETRO_HW_CONTEXT_OPENGLES_VERSION = 5, + + RETRO_HW_CONTEXT_DUMMY = INT_MAX +}; + +struct retro_hw_render_callback +{ + /* Which API to use. Set by libretro core. */ + enum retro_hw_context_type context_type; + + /* Called when a context has been created or when it has been reset. + * An OpenGL context is only valid after context_reset() has been called. + * + * When context_reset is called, OpenGL resources in the libretro + * implementation are guaranteed to be invalid. + * + * It is possible that context_reset is called multiple times during an + * application lifecycle. + * If context_reset is called without any notification (context_destroy), + * the OpenGL context was lost and resources should just be recreated + * without any attempt to "free" old resources. + */ + retro_hw_context_reset_t context_reset; + + /* Set by frontend. */ + retro_hw_get_current_framebuffer_t get_current_framebuffer; + + /* Set by frontend. */ + retro_hw_get_proc_address_t get_proc_address; + + /* Set if render buffers should have depth component attached. */ + bool depth; + + /* Set if stencil buffers should be attached. */ + bool stencil; + + /* If depth and stencil are true, a packed 24/8 buffer will be added. + * Only attaching stencil is invalid and will be ignored. */ + + /* Use conventional bottom-left origin convention. If false, + * standard libretro top-left origin semantics are used. */ + bool bottom_left_origin; + + /* Major version number for core GL context or GLES 3.1+. */ + unsigned version_major; + + /* Minor version number for core GL context or GLES 3.1+. */ + unsigned version_minor; + + /* If this is true, the frontend will go very far to avoid + * resetting context in scenarios like toggling fullscreen, etc. + */ + bool cache_context; + + /* The reset callback might still be called in extreme situations + * such as if the context is lost beyond recovery. + * + * For optimal stability, set this to false, and allow context to be + * reset at any time. + */ + + /* A callback to be called before the context is destroyed in a + * controlled way by the frontend. */ + retro_hw_context_reset_t context_destroy; + + /* OpenGL resources can be deinitialized cleanly at this step. + * context_destroy can be set to NULL, in which resources will + * just be destroyed without any notification. + * + * Even when context_destroy is non-NULL, it is possible that + * context_reset is called without any destroy notification. + * This happens if context is lost by external factors (such as + * notified by GL_ARB_robustness). + * + * In this case, the context is assumed to be already dead, + * and the libretro implementation must not try to free any OpenGL + * resources in the subsequent context_reset. + */ + + /* Creates a debug context. */ + bool debug_context; +}; + +/* Callback type passed in RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK. + * Called by the frontend in response to keyboard events. + * down is set if the key is being pressed, or false if it is being released. + * keycode is the RETROK value of the char. + * character is the text character of the pressed key. (UTF-32). + * key_modifiers is a set of RETROKMOD values or'ed together. + * + * The pressed/keycode state can be indepedent of the character. + * It is also possible that multiple characters are generated from a + * single keypress. + * Keycode events should be treated separately from character events. + * However, when possible, the frontend should try to synchronize these. + * If only a character is posted, keycode should be RETROK_UNKNOWN. + * + * Similarily if only a keycode event is generated with no corresponding + * character, character should be 0. + */ +typedef void (*retro_keyboard_event_t)(bool down, unsigned keycode, + uint32_t character, uint16_t key_modifiers); + +struct retro_keyboard_callback +{ + retro_keyboard_event_t callback; +}; + +/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE. + * Should be set for implementations which can swap out multiple disk + * images in runtime. + * + * If the implementation can do this automatically, it should strive to do so. + * However, there are cases where the user must manually do so. + * + * Overview: To swap a disk image, eject the disk image with + * set_eject_state(true). + * Set the disk index with set_image_index(index). Insert the disk again + * with set_eject_state(false). + */ + +/* If ejected is true, "ejects" the virtual disk tray. + * When ejected, the disk image index can be set. + */ +typedef bool (*retro_set_eject_state_t)(bool ejected); + +/* Gets current eject state. The initial state is 'not ejected'. */ +typedef bool (*retro_get_eject_state_t)(void); + +/* Gets current disk index. First disk is index 0. + * If return value is >= get_num_images(), no disk is currently inserted. + */ +typedef unsigned (*retro_get_image_index_t)(void); + +/* Sets image index. Can only be called when disk is ejected. + * The implementation supports setting "no disk" by using an + * index >= get_num_images(). + */ +typedef bool (*retro_set_image_index_t)(unsigned index); + +/* Gets total number of images which are available to use. */ +typedef unsigned (*retro_get_num_images_t)(void); + +struct retro_game_info; + +/* Replaces the disk image associated with index. + * Arguments to pass in info have same requirements as retro_load_game(). + * Virtual disk tray must be ejected when calling this. + * + * Replacing a disk image with info = NULL will remove the disk image + * from the internal list. + * As a result, calls to get_image_index() can change. + * + * E.g. replace_image_index(1, NULL), and previous get_image_index() + * returned 4 before. + * Index 1 will be removed, and the new index is 3. + */ +typedef bool (*retro_replace_image_index_t)(unsigned index, + const struct retro_game_info *info); + +/* Adds a new valid index (get_num_images()) to the internal disk list. + * This will increment subsequent return values from get_num_images() by 1. + * This image index cannot be used until a disk image has been set + * with replace_image_index. */ +typedef bool (*retro_add_image_index_t)(void); + +struct retro_disk_control_callback +{ + retro_set_eject_state_t set_eject_state; + retro_get_eject_state_t get_eject_state; + + retro_get_image_index_t get_image_index; + retro_set_image_index_t set_image_index; + retro_get_num_images_t get_num_images; + + retro_replace_image_index_t replace_image_index; + retro_add_image_index_t add_image_index; +}; + +enum retro_pixel_format +{ + /* 0RGB1555, native endian. + * 0 bit must be set to 0. + * This pixel format is default for compatibility concerns only. + * If a 15/16-bit pixel format is desired, consider using RGB565. */ + RETRO_PIXEL_FORMAT_0RGB1555 = 0, + + /* XRGB8888, native endian. + * X bits are ignored. */ + RETRO_PIXEL_FORMAT_XRGB8888 = 1, + + /* RGB565, native endian. + * This pixel format is the recommended format to use if a 15/16-bit + * format is desired as it is the pixel format that is typically + * available on a wide range of low-power devices. + * + * It is also natively supported in APIs like OpenGL ES. */ + RETRO_PIXEL_FORMAT_RGB565 = 2, + + /* Ensure sizeof() == sizeof(int). */ + RETRO_PIXEL_FORMAT_UNKNOWN = INT_MAX +}; + +struct retro_message +{ + const char *msg; /* Message to be displayed. */ + unsigned frames; /* Duration in frames of message. */ +}; + +/* Describes how the libretro implementation maps a libretro input bind + * to its internal input system through a human readable string. + * This string can be used to better let a user configure input. */ +struct retro_input_descriptor +{ + /* Associates given parameters with a description. */ + unsigned port; + unsigned device; + unsigned index; + unsigned id; + + /* Human readable description for parameters. + * The pointer must remain valid until + * retro_unload_game() is called. */ + const char *description; +}; + +struct retro_system_info +{ + /* All pointers are owned by libretro implementation, and pointers must + * remain valid until retro_deinit() is called. */ + + const char *library_name; /* Descriptive name of library. Should not + * contain any version numbers, etc. */ + const char *library_version; /* Descriptive version of core. */ + + const char *valid_extensions; /* A string listing probably content + * extensions the core will be able to + * load, separated with pipe. + * I.e. "bin|rom|iso". + * Typically used for a GUI to filter + * out extensions. */ + + /* If true, retro_load_game() is guaranteed to provide a valid pathname + * in retro_game_info::path. + * ::data and ::size are both invalid. + * + * If false, ::data and ::size are guaranteed to be valid, but ::path + * might not be valid. + * + * This is typically set to true for libretro implementations that must + * load from file. + * Implementations should strive for setting this to false, as it allows + * the frontend to perform patching, etc. */ + bool need_fullpath; + + /* If true, the frontend is not allowed to extract any archives before + * loading the real content. + * Necessary for certain libretro implementations that load games + * from zipped archives. */ + bool block_extract; +}; + +struct retro_game_geometry +{ + unsigned base_width; /* Nominal video width of game. */ + unsigned base_height; /* Nominal video height of game. */ + unsigned max_width; /* Maximum possible width of game. */ + unsigned max_height; /* Maximum possible height of game. */ + + float aspect_ratio; /* Nominal aspect ratio of game. If + * aspect_ratio is <= 0.0, an aspect ratio + * of base_width / base_height is assumed. + * A frontend could override this setting, + * if desired. */ +}; + +struct retro_system_timing +{ + double fps; /* FPS of video content. */ + double sample_rate; /* Sampling rate of audio. */ +}; + +struct retro_system_av_info +{ + struct retro_game_geometry geometry; + struct retro_system_timing timing; +}; + +struct retro_variable +{ + /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE. + * If NULL, obtains the complete environment string if more + * complex parsing is necessary. + * The environment string is formatted as key-value pairs + * delimited by semicolons as so: + * "key1=value1;key2=value2;..." + */ + const char *key; + + /* Value to be obtained. If key does not exist, it is set to NULL. */ + const char *value; +}; + +struct retro_game_info +{ + const char *path; /* Path to game, UTF-8 encoded. + * Usually used as a reference. + * May be NULL if rom was loaded from stdin + * or similar. + * retro_system_info::need_fullpath guaranteed + * that this path is valid. */ + const void *data; /* Memory buffer of loaded game. Will be NULL + * if need_fullpath was set. */ + size_t size; /* Size of memory buffer. */ + const char *meta; /* String of implementation specific meta-data. */ +}; + +/* Callbacks */ + +/* Environment callback. Gives implementations a way of performing + * uncommon tasks. Extensible. */ +typedef bool (*retro_environment_t)(unsigned cmd, void *data); + +/* Render a frame. Pixel format is 15-bit 0RGB1555 native endian + * unless changed (see RETRO_ENVIRONMENT_SET_PIXEL_FORMAT). + * + * Width and height specify dimensions of buffer. + * Pitch specifices length in bytes between two lines in buffer. + * + * For performance reasons, it is highly recommended to have a frame + * that is packed in memory, i.e. pitch == width * byte_per_pixel. + * Certain graphic APIs, such as OpenGL ES, do not like textures + * that are not packed in memory. + */ +typedef void (*retro_video_refresh_t)(const void *data, unsigned width, + unsigned height, size_t pitch); + +/* Renders a single audio frame. Should only be used if implementation + * generates a single sample at a time. + * Format is signed 16-bit native endian. + */ +typedef void (*retro_audio_sample_t)(int16_t left, int16_t right); + +/* Renders multiple audio frames in one go. + * + * One frame is defined as a sample of left and right channels, interleaved. + * I.e. int16_t buf[4] = { l, r, l, r }; would be 2 frames. + * Only one of the audio callbacks must ever be used. + */ +typedef size_t (*retro_audio_sample_batch_t)(const int16_t *data, + size_t frames); + +/* Polls input. */ +typedef void (*retro_input_poll_t)(void); + +/* Queries for input for player 'port'. device will be masked with + * RETRO_DEVICE_MASK. + * + * Specialization of devices such as RETRO_DEVICE_JOYPAD_MULTITAP that + * have been set with retro_set_controller_port_device() + * will still use the higher level RETRO_DEVICE_JOYPAD to request input. + */ +typedef int16_t (*retro_input_state_t)(unsigned port, unsigned device, + unsigned index, unsigned id); + +/* Sets callbacks. retro_set_environment() is guaranteed to be called + * before retro_init(). + * + * The rest of the set_* functions are guaranteed to have been called + * before the first call to retro_run() is made. */ +void retro_set_environment(retro_environment_t); +void retro_set_video_refresh(retro_video_refresh_t); +void retro_set_audio_sample(retro_audio_sample_t); +void retro_set_audio_sample_batch(retro_audio_sample_batch_t); +void retro_set_input_poll(retro_input_poll_t); +void retro_set_input_state(retro_input_state_t); + +/* Library global initialization/deinitialization. */ +void retro_init(void); +void retro_deinit(void); + +/* Must return RETRO_API_VERSION. Used to validate ABI compatibility + * when the API is revised. */ +unsigned retro_api_version(void); + +/* Gets statically known system info. Pointers provided in *info + * must be statically allocated. + * Can be called at any time, even before retro_init(). */ +void retro_get_system_info(struct retro_system_info *info); + +/* Gets information about system audio/video timings and geometry. + * Can be called only after retro_load_game() has successfully completed. + * NOTE: The implementation of this function might not initialize every + * variable if needed. + * E.g. geom.aspect_ratio might not be initialized if core doesn't + * desire a particular aspect ratio. */ +void retro_get_system_av_info(struct retro_system_av_info *info); + +/* Sets device to be used for player 'port'. + * By default, RETRO_DEVICE_JOYPAD is assumed to be plugged into all + * available ports. + * Setting a particular device type is not a guarantee that libretro cores + * will only poll input based on that particular device type. It is only a + * hint to the libretro core when a core cannot automatically detect the + * appropriate input device type on its own. It is also relevant when a + * core can change its behavior depending on device type. */ +void retro_set_controller_port_device(unsigned port, unsigned device); + +/* Resets the current game. */ +void retro_reset(void); + +/* Runs the game for one video frame. + * During retro_run(), input_poll callback must be called at least once. + * + * If a frame is not rendered for reasons where a game "dropped" a frame, + * this still counts as a frame, and retro_run() should explicitly dupe + * a frame if GET_CAN_DUPE returns true. + * In this case, the video callback can take a NULL argument for data. + */ +void retro_run(void); + +/* Returns the amount of data the implementation requires to serialize + * internal state (save states). + * Between calls to retro_load_game() and retro_unload_game(), the + * returned size is never allowed to be larger than a previous returned + * value, to ensure that the frontend can allocate a save state buffer once. + */ +size_t retro_serialize_size(void); + +/* Serializes internal state. If failed, or size is lower than + * retro_serialize_size(), it should return false, true otherwise. */ +bool retro_serialize(void *data, size_t size); +bool retro_unserialize(const void *data, size_t size); + +void retro_cheat_reset(void); +void retro_cheat_set(unsigned index, bool enabled, const char *code); + +/* Loads a game. */ +bool retro_load_game(const struct retro_game_info *game); + +/* Loads a "special" kind of game. Should not be used, + * except in extreme cases. */ +bool retro_load_game_special( + unsigned game_type, + const struct retro_game_info *info, size_t num_info +); + +/* Unloads a currently loaded game. */ +void retro_unload_game(void); + +/* Gets region of game. */ +unsigned retro_get_region(void); + +/* Gets region of memory. */ +void *retro_get_memory_data(unsigned id); +size_t retro_get_memory_size(unsigned id); + +#ifdef __cplusplus +} +#endif + +#endif From 8f9b841f721bbfbc74590267e57e0bb4744ae63f Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 00:17:28 +0100 Subject: [PATCH 03/13] can compile --- Makefile | 4 +- common.h | 10 +++++ cpu.c | 4 ++ input.c | 5 ++- libretro.c | 62 +++++++++++++++++++++--------- main.c | 13 ++++++- main.h | 6 ++- memory.c | 24 +++++++++++- memory.h | 3 +- sound.c | 51 +++++++++++++++++++++++- sound.h | 111 ++++++++++++++++++++++++++++------------------------- video.c | 14 +++++-- video.h | 4 ++ zip.c | 2 +- zip.h | 2 +- 15 files changed, 228 insertions(+), 87 deletions(-) diff --git a/Makefile b/Makefile index 3be6a1e..a9aab37 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ CC = gcc AR = psp-ar STATIC_LINKING = 0 -CFLAGS += -fPIC +CFLAGS += -fPIC -Werror-implicit-function-declaration CFLAGS += -DPC_BUILD -Wall -m32 CFLAGS += -D__LIBRETRO__ @@ -26,7 +26,7 @@ OBJS += input.o OBJS += sound.o OBJS += cpu_threaded.o -OBJS += x86_stub.o +OBJS += x86/x86_stub.o OBJS += cheats.o OBJS += zip.o diff --git a/common.h b/common.h index 5e4be0d..24f99bd 100644 --- a/common.h +++ b/common.h @@ -103,8 +103,16 @@ #include #include +#else +#ifdef __LIBRETRO__ + +#define GBA_SCREEN_WIDTH (240) +#define GBA_SCREEN_HEIGHT (160) +#define GBA_SCREEN_PITCH (240) + #else #include "SDL.h" +#endif #ifdef ARM_ARCH #define function_cc @@ -210,7 +218,9 @@ typedef u32 fixed8_24; #include #include #include +#ifndef __LIBRETRO__ #include "SDL.h" +#endif #include "cpu.h" #include "memory.h" #include "video.h" diff --git a/cpu.c b/cpu.c index d8ea5db..4397568 100644 --- a/cpu.c +++ b/cpu.c @@ -4146,8 +4146,10 @@ void function_cc step_debug(u32 pc, u32 cycles) { u32 key = 0; +#ifndef __LIBRETRO__ SDL_LockMutex(sound_mutex); SDL_PauseAudio(1); +#endif if(output_field >= num_output_fields) { @@ -4281,8 +4283,10 @@ void function_cc step_debug(u32 pc, u32 cycles) quit(); } +#ifndef __LIBRETRO__ SDL_PauseAudio(0); SDL_UnlockMutex(sound_mutex); +#endif } last_instruction = reg[REG_PC]; diff --git a/input.c b/input.c index 06a8f8a..a2f147f 100644 --- a/input.c +++ b/input.c @@ -343,10 +343,11 @@ void init_input() sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG); } -#endif +#elif defined(__LIBRETRO__) +/* todo */ -#if defined(PC_BUILD) +#elif defined(PC_BUILD) u32 key_map(SDLKey key_sym) { diff --git a/libretro.c b/libretro.c index 56a4ccf..ae427e6 100644 --- a/libretro.c +++ b/libretro.c @@ -5,6 +5,11 @@ #include #include "common.h" #include "libco.h" +#include "libretro.h" + +#ifndef MAX_PATH +#define MAX_PATH (512) +#endif static retro_log_printf_t log_cb; static retro_video_refresh_t video_cb; @@ -28,7 +33,7 @@ static inline void switch_to_cpu_thread(void) static void cpu_thread_entry(void) { - execute_arm_translate(reg[EXECUTE_CYCLES]); + execute_arm_translate(execute_cycles); } static inline void init_context_switch(void) @@ -42,6 +47,26 @@ static inline void deinit_context_switch(void) co_delete(cpu_thread); } +#ifdef PERF_TEST + +extern struct retro_perf_callback perf_cb; + +#define RETRO_PERFORMANCE_INIT(X) \ + static struct retro_perf_counter X = {#X}; \ + do { \ + if (!(X).registered) \ + perf_cb.perf_register(&(X)); \ + } while(0) + +#define RETRO_PERFORMANCE_START(X) perf_cb.perf_start(&(X)) +#define RETRO_PERFORMANCE_STOP(X) perf_cb.perf_stop(&(X)) +#else +#define RETRO_PERFORMANCE_INIT(X) +#define RETRO_PERFORMANCE_START(X) +#define RETRO_PERFORMANCE_STOP(X) + +#endif + void retro_get_system_info(struct retro_system_info *info) { info->library_name = "TempGBA"; @@ -59,8 +84,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info) info->geometry.max_width = GBA_SCREEN_WIDTH; info->geometry.max_height = GBA_SCREEN_HEIGHT; info->geometry.aspect_ratio = 0; - info->timing.fps = ((float) CPU_FREQUENCY) / (308 * 228 * 4); // 59.72750057 hz - info->timing.sample_rate = SOUND_FREQUENCY; + info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz + info->timing.sample_rate = 44100; // info->timing.sample_rate = 32 * 1024; } @@ -68,13 +93,13 @@ void retro_get_system_av_info(struct retro_system_av_info *info) void retro_init() { init_gamepak_buffer(); - init_sound(); + init_sound(1); } void retro_deinit() { perf_cb.perf_log(); - quit_gba(); + memory_term(); } void retro_set_environment(retro_environment_t cb) @@ -110,27 +135,28 @@ void retro_reset() size_t retro_serialize_size() { - return SAVESTATE_SIZE; +// return SAVESTATE_SIZE; + return 0; } bool retro_serialize(void *data, size_t size) { - if (size < SAVESTATE_SIZE) +// if (size < SAVESTATE_SIZE) return false; - gba_save_state(data); +// gba_save_state(data); - return true; +// return true; } bool retro_unserialize(const void *data, size_t size) { - if (size < SAVESTATE_SIZE) +// if (size < SAVESTATE_SIZE) return false; - gba_load_state(data); +// gba_load_state(data); - return true; +// return true; } void retro_cheat_reset() {} @@ -184,12 +210,12 @@ bool retro_load_game(const struct retro_game_info *info) strncat(filename_bios, "/gba_bios.bin",sizeof(filename_bios)); - if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) - strncpy(dir_save, dir, sizeof(dir_save)); - else - strncpy(dir_save, main_path, sizeof(dir_save)); +// if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) +// strncpy(dir_save, dir, sizeof(dir_save)); +// else +// strncpy(dir_save, main_path, sizeof(dir_save)); - strncat(dir_save, "/",sizeof(dir_save)); +// strncat(dir_save, "/",sizeof(dir_save)); strncat(main_path, "/",sizeof(main_path)); @@ -281,7 +307,7 @@ void retro_run() render_audio(); - video_cb(GBA_FRAME_TEXTURE, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, 512); + video_cb(gba_screen_pixels, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, GBA_SCREEN_PITCH * 2); if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) check_variables(); diff --git a/main.c b/main.c index b09f472..b6729ed 100644 --- a/main.c +++ b/main.c @@ -18,6 +18,7 @@ */ #include "common.h" +#include #ifdef PSP_BUILD @@ -773,6 +774,8 @@ void synchronize() */ } +#elif defined(__LIBRETRO__) + #else u32 real_frame_count = 0; @@ -870,6 +873,8 @@ void quit() sound_exit(); +#ifndef __LIBRETRO__ + #ifdef REGISTER_USAGE_ANALYZE print_register_usage(); #endif @@ -885,6 +890,8 @@ void quit() exit(0); #endif + +#endif } void reset_gba() @@ -919,7 +926,7 @@ void get_ticks_us(u64 *tick_return) #else -u32 file_length(char *dummy, FILE *fp) +u32 file_length(const char *dummy, FILE *fp) { u32 length; @@ -930,7 +937,9 @@ u32 file_length(char *dummy, FILE *fp) return length; } -#ifdef PC_BUILD +#ifdef __LIBRETRO__ + +#elif defined(PC_BUILD) void delay_us(u32 us_count) { diff --git a/main.h b/main.h index 96739dc..ab57067 100644 --- a/main.h +++ b/main.h @@ -90,7 +90,11 @@ extern u32 clock_speed; u32 update_gba(); void reset_gba(); +#ifdef __LIBRETRO__ +#define synchronize() +#else void synchronize(); +#endif void quit(); void delay_us(u32 us_count); void get_ticks_us(u64 *tick_return); @@ -105,7 +109,7 @@ u32 file_length(char *filename, s32 dummy); #else -u32 file_length(char *dummy, FILE *fp); +u32 file_length(const char *dummy, FILE *fp); #endif diff --git a/memory.c b/memory.c index 5e5752a..56e0fbc 100644 --- a/memory.c +++ b/memory.c @@ -2115,7 +2115,7 @@ s32 load_game_config(char *gamepak_title, char *gamepak_code, char *gamepak_make return -1; } -s32 load_gamepak_raw(char *name) +s32 load_gamepak_raw(const char *name) { file_open(gamepak_file, name, read); @@ -2160,7 +2160,7 @@ char gamepak_code[5]; char gamepak_maker[3]; char gamepak_filename[512]; -u32 load_gamepak(char *name) +u32 load_gamepak(const char *name) { char *dot_position = strrchr(name, '.'); s32 file_size; @@ -3119,6 +3119,26 @@ void init_memory() bios_read_protect = 0xe129f000; } +void memory_term(void) +{ + if (file_check_valid(gamepak_file_large)) + { + file_close(gamepak_file_large); + } + + if (gamepak_memory_map != NULL) + { + free(gamepak_memory_map); + gamepak_memory_map = NULL; + } + + if (gamepak_rom != NULL) + { + free(gamepak_rom); + gamepak_rom = NULL; + } +} + void bios_region_read_allow() { memory_map_read[0] = bios_rom; diff --git a/memory.h b/memory.h index 5e65821..5ac599a 100644 --- a/memory.h +++ b/memory.h @@ -175,13 +175,14 @@ extern char gamepak_filename[512]; cpu_alert_type dma_transfer(dma_transfer_type *dma); u8 *memory_region(u32 address, u32 *memory_limit); -u32 load_gamepak(char *name); +u32 load_gamepak(const char *name); u32 load_backup(char *name); s32 load_bios(char *name); void update_backup(); void update_backup_force(); void init_memory(); void init_gamepak_buffer(); +void memory_term(void); void bios_region_read_allow(); void bios_region_read_protect(); u8 *load_gamepak_page(u32 physical_index); diff --git a/sound.c b/sound.c index 5593bbe..4794ce2 100644 --- a/sound.c +++ b/sound.c @@ -19,7 +19,9 @@ #include "common.h" +#ifndef __LIBRETRO__ #include +#endif u32 global_enable_audio = 1; direct_sound_struct direct_sound_channel[2]; @@ -27,8 +29,10 @@ gbc_sound_struct gbc_sound_channel[4]; u32 sound_frequency = 44100; +#ifndef __LIBRETRO__ SDL_mutex *sound_mutex; static SDL_cond *sound_cv; +#endif #ifdef PSP_BUILD u32 audio_buffer_size_number = 1; @@ -44,7 +48,9 @@ static u32 sound_buffer_base; static u32 sound_last_cpu_ticks; static fixed16_16 gbc_sound_tick_step; +#ifndef __LIBRETRO__ static u32 sound_exit_flag; +#endif // Queue 1, 2, or 4 samples to the top of the DS FIFO, wrap around circularly @@ -447,6 +453,7 @@ void update_gbc_sound(u32 cpu_ticks) gbc_sound_partial_ticks &= 0xFFFF; } +#ifndef __LIBRETRO__ SDL_LockMutex(sound_mutex); if(synchronize_flag) { @@ -487,6 +494,7 @@ void update_gbc_sound(u32 cpu_ticks) } } +#endif if(sound_on == 1) { gs = gbc_sound_channel + 0; @@ -562,9 +570,11 @@ void update_gbc_sound(u32 cpu_ticks) gbc_sound_buffer_index = (gbc_sound_buffer_index + (buffer_ticks * 2)) % BUFFER_SIZE; +#ifndef __LIBRETRO__ SDL_UnlockMutex(sound_mutex); SDL_CondSignal(sound_cv); +#endif } #define sound_copy_normal() \ @@ -595,7 +605,7 @@ void update_gbc_sound(u32 cpu_ticks) } \ -void sound_callback(void *userdata, Uint8 *stream, int length) +void sound_callback(void *userdata, u8 *stream, int length) { u32 sample_length = length / 2; u32 _length; @@ -604,6 +614,7 @@ void sound_callback(void *userdata, Uint8 *stream, int length) s16 *source; s32 current_sample; +#ifndef __LIBRETRO__ SDL_LockMutex(sound_mutex); while(((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) < @@ -611,6 +622,7 @@ void sound_callback(void *userdata, Uint8 *stream, int length) { SDL_CondWait(sound_cv, sound_mutex); } +#endif if(global_enable_audio) { @@ -645,9 +657,11 @@ void sound_callback(void *userdata, Uint8 *stream, int length) } } +#ifndef __LIBRETRO__ SDL_CondSignal(sound_cv); SDL_UnlockMutex(sound_mutex); +#endif } // Special thanks to blarrg for the LSFR frequency used in Meridian, as posted @@ -689,7 +703,9 @@ void reset_sound() gbc_sound_struct *gs = gbc_sound_channel; u32 i; +#ifndef __LIBRETRO__ SDL_LockMutex(sound_mutex); +#endif sound_on = 0; sound_buffer_base = 0; @@ -723,13 +739,16 @@ void reset_sound() gs->active_flag = 0; } +#ifndef __LIBRETRO__ SDL_UnlockMutex(sound_mutex); +#endif } void sound_exit() { gbc_sound_buffer_index = (sound_buffer_base + audio_buffer_size) % BUFFER_SIZE; +#ifndef __LIBRETRO__ SDL_PauseAudio(1); sound_exit_flag = 1; SDL_CondSignal(sound_cv); @@ -739,10 +758,12 @@ void sound_exit() sound_mutex = NULL; SDL_DestroyCond(sound_cv); sound_cv = NULL; +#endif } void init_sound(int need_reset) { +#ifndef __LIBRETRO__ SDL_AudioSpec sound_settings; sound_exit_flag = 0; @@ -777,6 +798,8 @@ void init_sound(int need_reset) audio_buffer_size_number++; #ifndef PSP_BUILD printf("audio: freq %d, size %d\n", sound_frequency, audio_buffer_size); +#endif + #endif gbc_sound_tick_step = @@ -788,7 +811,9 @@ void init_sound(int need_reset) if (need_reset) reset_sound(); +#ifndef __LIBRETRO__ SDL_PauseAudio(0); +#endif } #define sound_savestate_builder(type) \ @@ -811,3 +836,27 @@ void sound_##type##_savestate(file_tag_type savestate_file) \ sound_savestate_builder(read); sound_savestate_builder(write_mem); + +#ifdef __LIBRETRO__ +#include "libretro.h" + +static retro_audio_sample_batch_t audio_batch_cb; +void retro_set_audio_sample(retro_audio_sample_t cb) { } +void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audio_batch_cb = cb; } + +void render_audio(void) +{ + static s16 stream_base[1024]; + u32 _length; + s16 *source; + u32 i; + s32 current_sample; + + while (((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) > 512) { + sound_copy(sound_buffer_base, 512, normal); + audio_batch_cb(stream_base, 256); + sound_buffer_base += 512; + } +} +#endif + diff --git a/sound.h b/sound.h index 5b76e53..72c84ba 100644 --- a/sound.h +++ b/sound.h @@ -25,79 +25,79 @@ #define GBA_XTAL 16777216.0f #define GBA_60HZ_RATE 16853760.0f /* 228*(272+960)*60 */ -#if !defined(PSP_BUILD) - // run GBA at 60Hz (~0.5% faster) to better match host display - #define GBC_BASE_RATE GBA_60HZ_RATE +#if !defined(PSP_BUILD) && !defined(__LIBRETRO__) +// run GBA at 60Hz (~0.5% faster) to better match host display +#define GBC_BASE_RATE GBA_60HZ_RATE #else - #define GBC_BASE_RATE GBA_XTAL +#define GBC_BASE_RATE GBA_XTAL #endif typedef enum { - DIRECT_SOUND_INACTIVE, - DIRECT_SOUND_RIGHT, - DIRECT_SOUND_LEFT, - DIRECT_SOUND_LEFTRIGHT + DIRECT_SOUND_INACTIVE, + DIRECT_SOUND_RIGHT, + DIRECT_SOUND_LEFT, + DIRECT_SOUND_LEFTRIGHT } direct_sound_status_type; typedef enum { - DIRECT_SOUND_VOLUME_50, - DIRECT_SOUND_VOLUME_100 + DIRECT_SOUND_VOLUME_50, + DIRECT_SOUND_VOLUME_100 } direct_sound_volume_type; typedef struct { - s8 fifo[32]; - u32 fifo_base; - u32 fifo_top; - fixed8_24 fifo_fractional; - // The + 1 is to give some extra room for linear interpolation - // when wrapping around. - u32 buffer_index; - direct_sound_status_type status; - direct_sound_volume_type volume; - u32 last_cpu_ticks; + s8 fifo[32]; + u32 fifo_base; + u32 fifo_top; + fixed8_24 fifo_fractional; + // The + 1 is to give some extra room for linear interpolation + // when wrapping around. + u32 buffer_index; + direct_sound_status_type status; + direct_sound_volume_type volume; + u32 last_cpu_ticks; } direct_sound_struct; typedef enum { - GBC_SOUND_INACTIVE, - GBC_SOUND_RIGHT, - GBC_SOUND_LEFT, - GBC_SOUND_LEFTRIGHT + GBC_SOUND_INACTIVE, + GBC_SOUND_RIGHT, + GBC_SOUND_LEFT, + GBC_SOUND_LEFTRIGHT } gbc_sound_status_type; typedef struct { - u32 rate; - fixed16_16 frequency_step; - fixed16_16 sample_index; - fixed16_16 tick_counter; - u32 total_volume; - u32 envelope_initial_volume; - u32 envelope_volume; - u32 envelope_direction; - u32 envelope_status; - u32 envelope_step; - u32 envelope_ticks; - u32 envelope_initial_ticks; - u32 sweep_status; - u32 sweep_direction; - u32 sweep_ticks; - u32 sweep_initial_ticks; - u32 sweep_shift; - u32 length_status; - u32 length_ticks; - u32 noise_type; - u32 wave_type; - u32 wave_bank; - u32 wave_volume; - gbc_sound_status_type status; - u32 active_flag; - u32 master_enable; - s8 *sample_data; + u32 rate; + fixed16_16 frequency_step; + fixed16_16 sample_index; + fixed16_16 tick_counter; + u32 total_volume; + u32 envelope_initial_volume; + u32 envelope_volume; + u32 envelope_direction; + u32 envelope_status; + u32 envelope_step; + u32 envelope_ticks; + u32 envelope_initial_ticks; + u32 sweep_status; + u32 sweep_direction; + u32 sweep_ticks; + u32 sweep_initial_ticks; + u32 sweep_shift; + u32 length_status; + u32 length_ticks; + u32 noise_type; + u32 wave_type; + u32 wave_bank; + u32 wave_volume; + gbc_sound_status_type status; + u32 active_flag; + u32 master_enable; + s8* sample_data; } gbc_sound_struct; extern direct_sound_struct direct_sound_channel[2]; @@ -116,7 +116,9 @@ extern u32 global_enable_audio; extern u32 enable_low_pass_filter; extern u32 audio_buffer_size_number; -extern SDL_mutex *sound_mutex; +#ifndef __LIBRETRO__ +extern SDL_mutex* sound_mutex; +#endif void sound_timer_queue8(u32 channel, u8 value); void sound_timer_queue16(u32 channel, u16 value); @@ -128,6 +130,11 @@ void init_sound(int need_reset); void sound_write_mem_savestate(file_tag_type savestate_file); void sound_read_savestate(file_tag_type savestate_file); +#ifdef __LIBRETRO__ +void render_audio(void); +#endif + + #ifdef IN_MEMORY_C #define gbc_sound_tone_control_low(channel, address) \ diff --git a/video.c b/video.c index c89ebbe..3df1532 100644 --- a/video.c +++ b/video.c @@ -86,8 +86,13 @@ static void Ge_Finish_Callback(int id, void *arg) #define get_screen_pitch() \ screen_pitch \ -#else +#elif defined(__LIBRETRO__) +u16 gba_screen_pixels[GBA_SCREEN_PITCH * GBA_SCREEN_HEIGHT]; +#define get_screen_pixels() gba_screen_pixels +#define get_screen_pitch() GBA_SCREEN_PITCH + +#else SDL_Surface *screen; const u32 video_scale = 1; @@ -96,6 +101,7 @@ const u32 video_scale = 1; #define get_screen_pitch() \ (screen->pitch / 2) \ +#endif #endif @@ -3303,7 +3309,7 @@ void flip_screen() } } -#else +#elif !defined(__LIBRETRO__) #define integer_scale_copy_2() \ current_scanline_ptr[x2] = current_pixel; \ @@ -3476,7 +3482,7 @@ void init_video() GE_CMD(NOP, 0); } -#else +#elif !defined(__LIBRETRO__) void init_video() { @@ -3593,7 +3599,7 @@ void clear_screen(u16 color) sceGuSync(0, 0); */ } -#else +#elif !defined(__LIBRETRO__) void video_resolution_large() { diff --git a/video.h b/video.h index 9831e8c..c54682f 100644 --- a/video.h +++ b/video.h @@ -103,4 +103,8 @@ extern video_filter_type2 screen_filter2; void set_gba_resolution(video_scale_type scale); +#ifdef __LIBRETRO__ +extern u16 gba_screen_pixels[GBA_SCREEN_PITCH * GBA_SCREEN_HEIGHT]; +#endif + #endif diff --git a/zip.c b/zip.c index 6e52d49..2025b35 100644 --- a/zip.c +++ b/zip.c @@ -43,7 +43,7 @@ struct SZIPFileHeader s16 ExtraFieldLength; } __attribute__((packed)); -u32 load_file_zip(char *filename) +u32 load_file_zip(const char *filename) { struct SZIPFileHeader data; char tmp[1024]; diff --git a/zip.h b/zip.h index c562ece..12a51ee 100644 --- a/zip.h +++ b/zip.h @@ -20,7 +20,7 @@ #ifndef ZIP_H #define ZIP_H -u32 load_file_zip(char *filename); +u32 load_file_zip(const char *filename); #endif From 38158f67e2d8a9c8c43b3b3598a56f3d86a727f8 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 01:00:31 +0100 Subject: [PATCH 04/13] show undefined referances. add link.T --- Makefile | 2 +- link.T | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 link.T diff --git a/Makefile b/Makefile index a9aab37..3152bf3 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ OBJS += libretro.o ASFLAGS = $(CFLAGS) INCDIRS := -I. -LDFLAGS += -shared -m32 +LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T LDLIBS += -lz diff --git a/link.T b/link.T new file mode 100644 index 0000000..a90d3a8 --- /dev/null +++ b/link.T @@ -0,0 +1,6 @@ +{ + global: retro_*; + local: *; +}; + + From 50df6df600745247af98d0f6ed52f80043c9922b Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 01:59:02 +0100 Subject: [PATCH 05/13] fix undefined referances. --- Makefile | 1 + common.h | 2 ++ input.c | 24 +++++++++++++++++++++++- input.h | 22 ++++++++++++++++++++++ libretro.c | 9 +++++++++ main.c | 10 +++++++++- memory.c | 2 ++ video.c | 2 ++ video.h | 2 ++ 9 files changed, 72 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3152bf3..4ddb89f 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ OBJS += cheats.o OBJS += zip.o OBJS += libretro.o +OBJS += libco/libco.o diff --git a/common.h b/common.h index 24f99bd..dfcef6a 100644 --- a/common.h +++ b/common.h @@ -110,6 +110,8 @@ #define GBA_SCREEN_HEIGHT (160) #define GBA_SCREEN_PITCH (240) +void switch_to_main_thread(void); + #else #include "SDL.h" #endif diff --git a/input.c b/input.c index a2f147f..51e70cf 100644 --- a/input.c +++ b/input.c @@ -345,7 +345,29 @@ void init_input() #elif defined(__LIBRETRO__) -/* todo */ +static retro_input_state_t input_state_cb; +void retro_set_input_state(retro_input_state_t cb) { input_state_cb = cb; } + +u32 update_input(void) +{ +// return; + unsigned i; + uint32_t new_key = 0; + + if (!input_state_cb) + return 0; + + for (i = 0; i < sizeof(btn_map) / sizeof(map); i++) + new_key |= input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, btn_map[i].retropad) ? btn_map[i].gba : 0; + + if ((new_key | key) != key) + trigger_key(new_key); + + key = new_key; + io_registers[REG_P1] = (~key) & 0x3FF; + + return 0; +} #elif defined(PC_BUILD) diff --git a/input.h b/input.h index c5636bf..9427cc7 100644 --- a/input.h +++ b/input.h @@ -82,6 +82,28 @@ gui_action_type get_gui_input_fs_hold(u32 button_id); void input_write_mem_savestate(file_tag_type savestate_file); void input_read_savestate(file_tag_type savestate_file); +#ifdef __LIBRETRO__ +#include "libretro.h" + +typedef struct +{ + unsigned retropad ; + input_buttons_type gba; +} map; +static const map btn_map[] = { + { RETRO_DEVICE_ID_JOYPAD_L, BUTTON_L }, + { RETRO_DEVICE_ID_JOYPAD_R, BUTTON_R }, + { RETRO_DEVICE_ID_JOYPAD_DOWN, BUTTON_DOWN }, + { RETRO_DEVICE_ID_JOYPAD_UP, BUTTON_UP }, + { RETRO_DEVICE_ID_JOYPAD_LEFT, BUTTON_LEFT }, + { RETRO_DEVICE_ID_JOYPAD_RIGHT, BUTTON_RIGHT }, + { RETRO_DEVICE_ID_JOYPAD_START, BUTTON_START }, + { RETRO_DEVICE_ID_JOYPAD_SELECT, BUTTON_SELECT }, + { RETRO_DEVICE_ID_JOYPAD_B, BUTTON_B }, + { RETRO_DEVICE_ID_JOYPAD_A, BUTTON_A } +}; +#endif + extern u32 gamepad_config_map[]; extern u32 global_enable_analog; extern u32 analog_sensitivity_level; diff --git a/libretro.c b/libretro.c index ae427e6..381a471 100644 --- a/libretro.c +++ b/libretro.c @@ -21,6 +21,15 @@ struct retro_perf_callback perf_cb; static cothread_t main_thread; static cothread_t cpu_thread; +/* to be removed */ +u32 savestate_slot = 0; +void get_savestate_filename_noshot(u32 slot, char *name_buffer) +{ + (void) slot; + sprintf(name_buffer, "dummy.svs"); +} +/* ------------ */ + void switch_to_main_thread(void) { co_switch(main_thread); diff --git a/main.c b/main.c index b6729ed..49d2ae4 100644 --- a/main.c +++ b/main.c @@ -214,6 +214,7 @@ void init_main() flush_translation_cache_bios(); } +#ifndef __LIBRETRO__ int main(int argc, char *argv[]) { char bios_filename[512]; @@ -384,6 +385,7 @@ int main(int argc, char *argv[]) #endif return 0; } +#endif void print_memory_stats(u32 *counter, u32 *region_stats, char *stats_str) { @@ -625,6 +627,12 @@ u32 update_gba() flush_ram_count = 0; #endif +#ifdef __LIBRETRO__ + switch_to_main_thread(); + + update_gbc_sound(cpu_ticks); + gbc_sound_update = 0; +#else if(update_input()) continue; @@ -645,7 +653,7 @@ u32 update_gba() if(update_backup_flag) update_backup(); - +#endif process_cheats(); event_cycles++; diff --git a/memory.c b/memory.c index 56e0fbc..033312c 100644 --- a/memory.c +++ b/memory.c @@ -2197,7 +2197,9 @@ u32 load_gamepak(const char *name) gamepak_maker[2] = 0; load_game_config(gamepak_title, gamepak_code, gamepak_maker); +#ifndef __LIBRETRO__ load_game_config_file(); +#endif change_ext(gamepak_filename, cheats_filename, ".cht"); add_cheats(cheats_filename); diff --git a/video.c b/video.c index 3df1532..96ef006 100644 --- a/video.c +++ b/video.c @@ -3387,6 +3387,7 @@ void flip_screen() #endif +#ifndef __LIBRETRO__ u32 frame_to_render; void update_screen() @@ -3394,6 +3395,7 @@ void update_screen() if(!skip_next_frame) flip_screen(); } +#endif #ifdef PSP_BUILD diff --git a/video.h b/video.h index c54682f..18720bd 100644 --- a/video.h +++ b/video.h @@ -21,7 +21,9 @@ #define VIDEO_H void update_scanline(); +#ifndef __LIBRETRO__ void update_screen(); +#endif void init_video(); void video_resolution_large(); void video_resolution_small(); From 3510bfb5281f8c98fc8ddd97eb9e7aed35f879ab Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 02:11:22 +0100 Subject: [PATCH 06/13] hide some warnings --- Makefile | 3 +++ main.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 4ddb89f..4228d97 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,9 @@ endif cpu.o: cpu.c $(CC) -c -o $@ $< $(CFLAGS) -Wno-unused-variable -Wno-unused-label $(OPTIMIZE_SAFE) $(INCDIRS) +cpu_threaded.o: cpu_threaded.c + $(CC) -c -o $@ $< $(CFLAGS) -Wno-unused-variable -Wno-unused-label $(OPTIMIZE_SAFE) $(INCDIRS) + %.o: %.S $(CC) -c -o $@ $< $(ASFLAGS) $(OPTIMIZE) diff --git a/main.c b/main.c index 49d2ae4..0e05f04 100644 --- a/main.c +++ b/main.c @@ -514,8 +514,10 @@ void trigger_ext_event() event_number++; } +#ifndef __LIBRETRO__ static u32 fps = 60; static u32 frames_drawn = 60; +#endif u32 update_gba() { From 3cc3944725700c957b006de6f5a2ee2944d2f525 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 02:43:59 +0100 Subject: [PATCH 07/13] add debug build option to x86 standalone target. --- libretro.c | 1 + main.h | 1 + video.c | 1 - x86/Makefile | 38 +++++++++++++++++++++++--------------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/libretro.c b/libretro.c index 381a471..abe130d 100644 --- a/libretro.c +++ b/libretro.c @@ -43,6 +43,7 @@ static inline void switch_to_cpu_thread(void) static void cpu_thread_entry(void) { execute_arm_translate(execute_cycles); + execute_arm(execute_cycles); } static inline void init_context_switch(void) diff --git a/main.h b/main.h index ab57067..2a81cec 100644 --- a/main.h +++ b/main.h @@ -92,6 +92,7 @@ u32 update_gba(); void reset_gba(); #ifdef __LIBRETRO__ #define synchronize() +void init_main(); #else void synchronize(); #endif diff --git a/video.c b/video.c index 96ef006..14018b3 100644 --- a/video.c +++ b/video.c @@ -101,7 +101,6 @@ const u32 video_scale = 1; #define get_screen_pitch() \ (screen->pitch / 2) \ -#endif #endif diff --git a/x86/Makefile b/x86/Makefile index 319a4a7..53d2dd8 100644 --- a/x86/Makefile +++ b/x86/Makefile @@ -8,8 +8,8 @@ STRIP = strip AS = as PREFIX = /usr -OBJS = main.o cpu.o memory.o video.o input.o sound.o \ - cpu_threaded.o gui.o x86_stub.o cheats.o zip.o +OBJS = ../main.o ../cpu.o ../memory.o ../video.o ../input.o ../sound.o \ + ../cpu_threaded.o ../gui.o x86_stub.o ../cheats.o ../zip.o # Platform specific definitions @@ -23,30 +23,38 @@ endif BIN ?= gpsp$(EXE_EXT) -VPATH += .. CFLAGS += -DPC_BUILD -Wall -m32 -INCLUDES = -I${PREFIX}/include `sdl-config --cflags` -LIBS = -L${PREFIX}/lib32 `sdl-config --libs` -lz -m32 +INCLUDES = -I$(PREFIX)/include `sdl-config --cflags` +LIBS = -L$(PREFIX)/lib32 `sdl-config --libs` -lz -m32 # Compilation: +ifeq ($(DEBUG), 1) +OPTIMIZE := -O0 -g +OPTIMIZE_SAFE := -O0 -g +else +OPTIMIZE := -O3 +OPTIMIZE_SAFE := -O2 +endif -.SUFFIXES: .c .S - -all: ${BIN} +all: $(BIN) %.o: %.c - ${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $< + $(CC) $(CFLAGS) $(OPTIMIZE) $(INCLUDES) -c -o $@ $< %.o: %.S - ${CC} ${CFLAGS} -c -o $@ $< + $(CC) $(CFLAGS) $(OPTIMIZE) -c -o $@ $< -cpu.o cpu_threaded.o: CFLAGS += -Wno-unused-variable -Wno-unused-label +../cpu.o: ../cpu.c + $(CC) -c -o $@ $< $(CFLAGS) -Wno-unused-variable -Wno-unused-label $(OPTIMIZE_SAFE) $(INCLUDES) -${BIN}: ${OBJS} - ${CC} ${OBJS} ${LIBS} -o ${BIN} -# ${STRIP} ${BIN} +../cpu_threaded.o: ../cpu_threaded.c + $(CC) -c -o $@ $< $(CFLAGS) -Wno-unused-variable -Wno-unused-label $(OPTIMIZE_SAFE) $(INCLUDES) + + +$(BIN): $(OBJS) + $(CC) $(OBJS) $(LIBS) -o $(BIN) clean: - rm -f *.o ${BIN} + rm -f $(OBJS) $(BIN) From b69fee8b3139eb26405c20aa3adde166f9034b59 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 05:16:09 +0100 Subject: [PATCH 08/13] video output now works in statically linked builds. core can't be used as a shared library yet due to the dynarec not working when compiled with -fPIC --- Makefile | 12 ++++++++---- cpu.c | 2 +- gui.c | 6 +++--- libretro.c | 14 +++++++++++--- main.c | 2 +- memory.c | 6 +++--- memory.h | 4 ++-- sound.c | 2 ++ 8 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 4228d97..0297ace 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -TARGET := gpsp_libretro.so +TARGET := gpsp_libretro CC = gcc AR = psp-ar STATIC_LINKING = 0 -CFLAGS += -fPIC -Werror-implicit-function-declaration +CFLAGS += -Werror-implicit-function-declaration CFLAGS += -DPC_BUILD -Wall -m32 CFLAGS += -D__LIBRETRO__ @@ -33,14 +33,18 @@ OBJS += zip.o OBJS += libretro.o OBJS += libco/libco.o - +ifeq ($(STATIC_LINKING), 1) +TARGET := $(TARGET).a +else +TARGET := $(TARGET).so +CFLAGS += -fPIC +endif ASFLAGS = $(CFLAGS) INCDIRS := -I. LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T LDLIBS += -lz - all: $(TARGET) $(TARGET): $(OBJS) diff --git a/cpu.c b/cpu.c index 4397568..942bb2f 100644 --- a/cpu.c +++ b/cpu.c @@ -4274,7 +4274,7 @@ void function_cc step_debug(u32 pc, u32 cycles) u16 *current_screen = copy_screen(); get_savestate_filename_noshot(savestate_slot, current_savestate_filename); - save_state(current_savestate_filename, current_screen); + gba_save_state(current_savestate_filename, current_screen); free(current_screen); break; } diff --git a/gui.c b/gui.c index d97b0a2..62a48c3 100644 --- a/gui.c +++ b/gui.c @@ -1150,7 +1150,7 @@ u32 menu(u16 *original_screen) { get_savestate_filename_noshot(savestate_slot, current_savestate_filename); - save_state(current_savestate_filename, original_screen); + gba_save_state(current_savestate_filename, original_screen); } menu_change_state(); } @@ -1159,7 +1159,7 @@ u32 menu(u16 *original_screen) { if(!first_load) { - load_state(current_savestate_filename); + gba_load_state(current_savestate_filename); return_value = 1; repeat = 0; } @@ -1171,7 +1171,7 @@ u32 menu(u16 *original_screen) char load_filename[512]; if(load_file(file_ext, load_filename) != -1) { - load_state(load_filename); + gba_load_state(load_filename); return_value = 1; repeat = 0; } diff --git a/libretro.c b/libretro.c index abe130d..875e935 100644 --- a/libretro.c +++ b/libretro.c @@ -227,17 +227,25 @@ bool retro_load_game(const struct retro_game_info *info) // strncat(dir_save, "/",sizeof(dir_save)); - strncat(main_path, "/",sizeof(main_path)); +// strncat(main_path, "/",sizeof(main_path)); - if (load_bios(filename_bios) < 0) + if (load_bios(filename_bios) != 0) { error_msg("Could not load BIOS image file.\n"); return false; } + if(bios_rom[0] != 0x18) + { + info_msg("You have an incorrect BIOS image.\n"); + info_msg("While many games will work fine, some will not. It\n"); + info_msg("is strongly recommended that you obtain the\n"); + info_msg("correct BIOS file.\n"); + } + gamepak_filename[0] = 0; - if (load_gamepak(info->path) < 0) + if (load_gamepak(info->path) != 0) { error_msg("Could not load the game file.\n"); return false; diff --git a/main.c b/main.c index 0e05f04..f019d21 100644 --- a/main.c +++ b/main.c @@ -439,7 +439,7 @@ void trigger_ext_event() get_savestate_filename_noshot(savestate_slot, current_savestate_filename); - load_state(current_savestate_filename); + gba_load_state(current_savestate_filename); switch(event_number) { diff --git a/memory.c b/memory.c index 033312c..d1966d3 100644 --- a/memory.c +++ b/memory.c @@ -3160,7 +3160,7 @@ void bios_region_read_protect() sound_##type##_savestate(savestate_file); \ video_##type##_savestate(savestate_file) \ -void load_state(char *savestate_filename) +void gba_load_state(char *savestate_filename) { file_open(savestate_file, savestate_filename, read); if(file_check_valid(savestate_file)) @@ -3196,7 +3196,7 @@ void load_state(char *savestate_filename) { reset_gba(); // Okay, so this takes a while, but for now it works. - load_state(savestate_filename); + gba_load_state(savestate_filename); } else { @@ -3229,7 +3229,7 @@ void load_state(char *savestate_filename) u8 savestate_write_buffer[506947]; u8 *write_mem_ptr; -void save_state(char *savestate_filename, u16 *screen_capture) +void gba_save_state(char *savestate_filename, u16 *screen_capture) { write_mem_ptr = savestate_write_buffer; file_open(savestate_file, savestate_filename, write); diff --git a/memory.h b/memory.h index 5ac599a..4812188 100644 --- a/memory.h +++ b/memory.h @@ -188,8 +188,8 @@ void bios_region_read_protect(); u8 *load_gamepak_page(u32 physical_index); void memory_write_mem_savestate(file_tag_type savestate_file); void memory_read_savestate(file_tag_type savestate_file); -void load_state(char *savestate_filename); -void save_state(char *savestate_filename, u16 *screen_capture); +void gba_load_state(char *savestate_filename); +void gba_save_state(char *savestate_filename, u16 *screen_capture); extern u8 *gamepak_rom; extern u32 gamepak_ram_buffer_size; diff --git a/sound.c b/sound.c index 4794ce2..1683f9f 100644 --- a/sound.c +++ b/sound.c @@ -852,6 +852,8 @@ void render_audio(void) u32 i; s32 current_sample; + return; + while (((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) > 512) { sound_copy(sound_buffer_base, 512, normal); audio_batch_cb(stream_base, 256); From cd185c849b428b2d673fe94809b3ec62f376c0cb Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 05:36:30 +0100 Subject: [PATCH 09/13] enable sound ( still broken ) --- libretro.c | 3 +-- sound.c | 16 +++++++++------- sound.h | 8 +++++++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libretro.c b/libretro.c index 875e935..7191f2e 100644 --- a/libretro.c +++ b/libretro.c @@ -95,8 +95,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info) info->geometry.max_height = GBA_SCREEN_HEIGHT; info->geometry.aspect_ratio = 0; info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz - info->timing.sample_rate = 44100; -// info->timing.sample_rate = 32 * 1024; + info->timing.sample_rate = GBA_SOUND_FREQUENCY; } diff --git a/sound.c b/sound.c index 1683f9f..5d7d475 100644 --- a/sound.c +++ b/sound.c @@ -27,7 +27,11 @@ u32 global_enable_audio = 1; direct_sound_struct direct_sound_channel[2]; gbc_sound_struct gbc_sound_channel[4]; +#ifdef __LIBRETRO__ +u32 sound_frequency = GBA_SOUND_FREQUENCY; +#else u32 sound_frequency = 44100; +#endif #ifndef __LIBRETRO__ SDL_mutex *sound_mutex; @@ -604,7 +608,7 @@ void update_gbc_sound(u32 cpu_ticks) source[i] = 0; \ } \ - +#ifndef __LIBRETRO__ void sound_callback(void *userdata, u8 *stream, int length) { u32 sample_length = length / 2; @@ -614,7 +618,6 @@ void sound_callback(void *userdata, u8 *stream, int length) s16 *source; s32 current_sample; -#ifndef __LIBRETRO__ SDL_LockMutex(sound_mutex); while(((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) < @@ -622,7 +625,6 @@ void sound_callback(void *userdata, u8 *stream, int length) { SDL_CondWait(sound_cv, sound_mutex); } -#endif if(global_enable_audio) { @@ -657,12 +659,11 @@ void sound_callback(void *userdata, u8 *stream, int length) } } -#ifndef __LIBRETRO__ SDL_CondSignal(sound_cv); SDL_UnlockMutex(sound_mutex); -#endif } +#endif // Special thanks to blarrg for the LSFR frequency used in Meridian, as posted // on the forum at http://meridian.overclocked.org: @@ -852,12 +853,13 @@ void render_audio(void) u32 i; s32 current_sample; - return; +// return; - while (((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) > 512) { + while (((gbc_sound_buffer_index - sound_buffer_base) & BUFFER_SIZE_MASK) > 512) { sound_copy(sound_buffer_base, 512, normal); audio_batch_cb(stream_base, 256); sound_buffer_base += 512; + sound_buffer_base &= BUFFER_SIZE_MASK; } } #endif diff --git a/sound.h b/sound.h index 72c84ba..029fb55 100644 --- a/sound.h +++ b/sound.h @@ -20,7 +20,13 @@ #ifndef SOUND_H #define SOUND_H -#define BUFFER_SIZE 65536 +#define BUFFER_SIZE (1 << 16) +#define BUFFER_SIZE_MASK (BUFFER_SIZE - 1) + +#ifdef __LIBRETRO__ +#define GBA_SOUND_FREQUENCY (64 * 1024) +#endif + #define GBA_XTAL 16777216.0f #define GBA_60HZ_RATE 16853760.0f /* 228*(272+960)*60 */ From a859afadfdbdc1449d039f66b957487342ef8e1a Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 05:47:45 +0100 Subject: [PATCH 10/13] fix sound --- Makefile | 2 +- sound.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0297ace..6d5b019 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ cpu_threaded.o: cpu_threaded.c $(CC) -c -o $@ $< $(ASFLAGS) $(OPTIMIZE) clean: -# rm -f main.o cpu.o memory.o video.o input.o sound.o cpu_threaded.o x86_stub.o cheats.o zip.o libretro.o +# rm -f main.o memory.o input.o sound.o cpu_threaded.o x86_stub.o cheats.o zip.o libretro.o rm -f $(OBJS) rm -f $(TARGET) diff --git a/sound.c b/sound.c index 5d7d475..8e1f261 100644 --- a/sound.c +++ b/sound.c @@ -847,16 +847,14 @@ void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audio_batch_c void render_audio(void) { - static s16 stream_base[1024]; + static s16 stream_base[512]; u32 _length; s16 *source; u32 i; s32 current_sample; -// return; - while (((gbc_sound_buffer_index - sound_buffer_base) & BUFFER_SIZE_MASK) > 512) { - sound_copy(sound_buffer_base, 512, normal); + sound_copy(sound_buffer_base, 1024, normal); audio_batch_cb(stream_base, 256); sound_buffer_base += 512; sound_buffer_base &= BUFFER_SIZE_MASK; From 1a6a13680119d40bb20f1bd8a7e62a76c6b16d58 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 09:54:33 +0100 Subject: [PATCH 11/13] dynamic recompiler now works when the core is compiled as a shared library. --- Makefile | 2 +- cpu.h | 6 ++ cpu_threaded.c | 17 +++-- libretro.c | 179 +++++++++++++++++++++++++++++-------------------- 4 files changed, 126 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 6d5b019..0d428ba 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ endif ASFLAGS = $(CFLAGS) INCDIRS := -I. -LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T +LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T -fPIC LDLIBS += -lz all: $(TARGET) diff --git a/cpu.h b/cpu.h index f19d202..facac44 100644 --- a/cpu.h +++ b/cpu.h @@ -152,9 +152,15 @@ s32 translate_block_thumb(u32 pc, translation_region_type translation_region, #endif +#ifdef __LIBRETRO__ +extern u8* rom_translation_cache; +extern u8* ram_translation_cache; +extern u8* bios_translation_cache; +#else extern u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; extern u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE]; extern u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE]; +#endif extern u8 *rom_translation_ptr; extern u8 *ram_translation_ptr; extern u8 *bios_translation_ptr; diff --git a/cpu_threaded.c b/cpu_threaded.c index db7155c..a490e38 100644 --- a/cpu_threaded.c +++ b/cpu_threaded.c @@ -23,18 +23,27 @@ #include "common.h" +#ifdef __LIBRETRO__ +u8* rom_translation_cache; +u8* ram_translation_cache; +u8* bios_translation_cache; +u8 *rom_translation_ptr; +u8 *ram_translation_ptr; +u8 *bios_translation_ptr; +#else u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]; -u8 *rom_translation_ptr = rom_translation_cache; - u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE]; +u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE]; +u8 *rom_translation_ptr = rom_translation_cache; u8 *ram_translation_ptr = ram_translation_cache; +u8 *bios_translation_ptr = bios_translation_cache; +#endif + u32 iwram_code_min = 0xFFFFFFFF; u32 iwram_code_max = 0xFFFFFFFF; u32 ewram_code_min = 0xFFFFFFFF; u32 ewram_code_max = 0xFFFFFFFF; -u8 bios_translation_cache[BIOS_TRANSLATION_CACHE_SIZE]; -u8 *bios_translation_ptr = bios_translation_cache; u32 *rom_branch_hash[ROM_BRANCH_HASH_SIZE]; diff --git a/libretro.c b/libretro.c index 7191f2e..f240b21 100644 --- a/libretro.c +++ b/libretro.c @@ -23,10 +23,10 @@ static cothread_t cpu_thread; /* to be removed */ u32 savestate_slot = 0; -void get_savestate_filename_noshot(u32 slot, char *name_buffer) +void get_savestate_filename_noshot(u32 slot, char* name_buffer) { - (void) slot; - sprintf(name_buffer, "dummy.svs"); + (void) slot; + sprintf(name_buffer, "dummy.svs"); } /* ------------ */ @@ -77,7 +77,7 @@ extern struct retro_perf_callback perf_cb; #endif -void retro_get_system_info(struct retro_system_info *info) +void retro_get_system_info(struct retro_system_info* info) { info->library_name = "TempGBA"; info->library_version = "v0.0.1"; @@ -87,28 +87,45 @@ void retro_get_system_info(struct retro_system_info *info) } -void retro_get_system_av_info(struct retro_system_av_info *info) +void retro_get_system_av_info(struct retro_system_av_info* info) { info->geometry.base_width = GBA_SCREEN_WIDTH; info->geometry.base_height = GBA_SCREEN_HEIGHT; info->geometry.max_width = GBA_SCREEN_WIDTH; info->geometry.max_height = GBA_SCREEN_HEIGHT; info->geometry.aspect_ratio = 0; - info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz + // 59.72750057 hz + info->timing.fps = ((float)(16 * 1024 * 1024)) / (308 * 228 * 4); info->timing.sample_rate = GBA_SOUND_FREQUENCY; } +#include void retro_init() { init_gamepak_buffer(); init_sound(1); + + rom_translation_cache = mmap(NULL, ROM_TRANSLATION_CACHE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0); + ram_translation_cache = mmap(NULL, RAM_TRANSLATION_CACHE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0); + bios_translation_cache = mmap(NULL, BIOS_TRANSLATION_CACHE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, -1, 0); + + rom_translation_ptr = rom_translation_cache; + ram_translation_ptr = ram_translation_cache; + bios_translation_ptr = bios_translation_cache; } void retro_deinit() { perf_cb.perf_log(); memory_term(); + + munmap(rom_translation_cache, ROM_TRANSLATION_CACHE_SIZE); + munmap(ram_translation_cache, RAM_TRANSLATION_CACHE_SIZE); + munmap(bios_translation_cache, BIOS_TRANSLATION_CACHE_SIZE); } void retro_set_environment(retro_environment_t cb) @@ -126,8 +143,14 @@ void retro_set_environment(retro_environment_t cb) } -void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; } -void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; } +void retro_set_video_refresh(retro_video_refresh_t cb) +{ + video_cb = cb; +} +void retro_set_input_poll(retro_input_poll_t cb) +{ + input_poll_cb = cb; +} void retro_set_controller_port_device(unsigned port, unsigned device) {} @@ -144,51 +167,51 @@ void retro_reset() size_t retro_serialize_size() { -// return SAVESTATE_SIZE; + // return SAVESTATE_SIZE; return 0; } -bool retro_serialize(void *data, size_t size) +bool retro_serialize(void* data, size_t size) { -// if (size < SAVESTATE_SIZE) - return false; + // if (size < SAVESTATE_SIZE) + return false; -// gba_save_state(data); + // gba_save_state(data); -// return true; + // return true; } -bool retro_unserialize(const void *data, size_t size) +bool retro_unserialize(const void* data, size_t size) { -// if (size < SAVESTATE_SIZE) - return false; + // if (size < SAVESTATE_SIZE) + return false; -// gba_load_state(data); + // gba_load_state(data); -// return true; + // return true; } void retro_cheat_reset() {} -void retro_cheat_set(unsigned index, bool enabled, const char *code) {} +void retro_cheat_set(unsigned index, bool enabled, const char* code) {} -void error_msg(const char *text) +void error_msg(const char* text) { if (log_cb) log_cb(RETRO_LOG_ERROR, text); } -void info_msg(const char *text) +void info_msg(const char* text) { if (log_cb) log_cb(RETRO_LOG_INFO, text); } -static void extract_directory(char *buf, const char *path, size_t size) +static void extract_directory(char* buf, const char* path, size_t size) { strncpy(buf, path, size - 1); buf[size - 1] = '\0'; - char *base = strrchr(buf, '/'); + char* base = strrchr(buf, '/'); if (base) *base = '\0'; @@ -196,10 +219,10 @@ static void extract_directory(char *buf, const char *path, size_t size) strncpy(buf, ".", size); } -bool retro_load_game(const struct retro_game_info *info) +bool retro_load_game(const struct retro_game_info* info) { char filename_bios[MAX_PATH]; - const char *dir = NULL; + const char* dir = NULL; enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) @@ -209,45 +232,45 @@ bool retro_load_game(const struct retro_game_info *info) return false; } - extract_directory(main_path,info->path,sizeof(main_path)); + extract_directory(main_path, info->path, sizeof(main_path)); if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir) strncpy(filename_bios, dir, sizeof(filename_bios)); else strncpy(filename_bios, main_path, sizeof(filename_bios)); - strncat(filename_bios, "/gba_bios.bin",sizeof(filename_bios)); + strncat(filename_bios, "/gba_bios.bin", sizeof(filename_bios)); -// if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) -// strncpy(dir_save, dir, sizeof(dir_save)); -// else -// strncpy(dir_save, main_path, sizeof(dir_save)); + // if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) + // strncpy(dir_save, dir, sizeof(dir_save)); + // else + // strncpy(dir_save, main_path, sizeof(dir_save)); -// strncat(dir_save, "/",sizeof(dir_save)); + // strncat(dir_save, "/",sizeof(dir_save)); -// strncat(main_path, "/",sizeof(main_path)); + // strncat(main_path, "/",sizeof(main_path)); if (load_bios(filename_bios) != 0) { - error_msg("Could not load BIOS image file.\n"); - return false; + error_msg("Could not load BIOS image file.\n"); + return false; } - if(bios_rom[0] != 0x18) + if (bios_rom[0] != 0x18) { - info_msg("You have an incorrect BIOS image.\n"); - info_msg("While many games will work fine, some will not. It\n"); - info_msg("is strongly recommended that you obtain the\n"); - info_msg("correct BIOS file.\n"); + info_msg("You have an incorrect BIOS image.\n"); + info_msg("While many games will work fine, some will not. It\n"); + info_msg("is strongly recommended that you obtain the\n"); + info_msg("correct BIOS file.\n"); } gamepak_filename[0] = 0; if (load_gamepak(info->path) != 0) { - error_msg("Could not load the game file.\n"); - return false; + error_msg("Could not load the game file.\n"); + return false; } reset_gba(); @@ -258,8 +281,11 @@ bool retro_load_game(const struct retro_game_info *info) } -bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info) -{ return false; } +bool retro_load_game_special(unsigned game_type, + const struct retro_game_info* info, size_t num_info) +{ + return false; +} void retro_unload_game() { @@ -267,42 +293,45 @@ void retro_unload_game() update_backup(); } -unsigned retro_get_region() { return RETRO_REGION_NTSC; } - -void *retro_get_memory_data(unsigned id) +unsigned retro_get_region() { -// switch (id) -// { -// case RETRO_MEMORY_SAVE_RAM: -// return gamepak_backup; -// } + return RETRO_REGION_NTSC; +} + +void* retro_get_memory_data(unsigned id) +{ + // switch (id) + // { + // case RETRO_MEMORY_SAVE_RAM: + // return gamepak_backup; + // } return 0; } size_t retro_get_memory_size(unsigned id) { -// switch (id) -// { -// case RETRO_MEMORY_SAVE_RAM: -// switch(backup_type) -// { -// case BACKUP_SRAM: -// return sram_size; + // switch (id) + // { + // case RETRO_MEMORY_SAVE_RAM: + // switch(backup_type) + // { + // case BACKUP_SRAM: + // return sram_size; -// case BACKUP_FLASH: -// return flash_size; + // case BACKUP_FLASH: + // return flash_size; -// case BACKUP_EEPROM: -// return eeprom_size; + // case BACKUP_EEPROM: + // return eeprom_size; -// case BACKUP_NONE: -// return 0x0; + // case BACKUP_NONE: + // return 0x0; -// default: -// return 0x8000; -// } -// } + // default: + // return 0x8000; + // } + // } return 0; } @@ -324,11 +353,15 @@ void retro_run() render_audio(); - video_cb(gba_screen_pixels, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, GBA_SCREEN_PITCH * 2); + video_cb(gba_screen_pixels, GBA_SCREEN_WIDTH, GBA_SCREEN_HEIGHT, + GBA_SCREEN_PITCH * 2); if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) - check_variables(); + check_variables(); } -unsigned retro_api_version() { return RETRO_API_VERSION; } +unsigned retro_api_version() +{ + return RETRO_API_VERSION; +} From d8a9fca756bf96a8fdf626d8bf0cb48bafaae6c2 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 10:13:44 +0100 Subject: [PATCH 12/13] -fPIC wasn't necessary afterall, and compiling without it increases fps by about 10%. --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0d428ba..c70231c 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,11 @@ ifeq ($(STATIC_LINKING), 1) TARGET := $(TARGET).a else TARGET := $(TARGET).so -CFLAGS += -fPIC endif ASFLAGS = $(CFLAGS) INCDIRS := -I. -LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T -fPIC +LDFLAGS += -shared -m32 -Wl,--no-undefined -Wl,--version-script=link.T LDLIBS += -lz all: $(TARGET) @@ -67,7 +66,7 @@ cpu_threaded.o: cpu_threaded.c $(CC) -c -o $@ $< $(ASFLAGS) $(OPTIMIZE) clean: -# rm -f main.o memory.o input.o sound.o cpu_threaded.o x86_stub.o cheats.o zip.o libretro.o +# rm -f main.o memory.o input.o sound.o x86_stub.o cheats.o zip.o libretro.o rm -f $(OBJS) rm -f $(TARGET) From e2d6ea9082a5ff977f834eda0bbb2362397422df Mon Sep 17 00:00:00 2001 From: aliaspider Date: Tue, 9 Dec 2014 10:18:05 +0100 Subject: [PATCH 13/13] fix display name/version. --- libretro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libretro.c b/libretro.c index f240b21..649a7b8 100644 --- a/libretro.c +++ b/libretro.c @@ -79,8 +79,8 @@ extern struct retro_perf_callback perf_cb; void retro_get_system_info(struct retro_system_info* info) { - info->library_name = "TempGBA"; - info->library_version = "v0.0.1"; + info->library_name = "gpSP"; + info->library_version = "v0.91"; info->need_fullpath = true; info->block_extract = false; info->valid_extensions = "gba|bin|agb|gbz" ;