update to master
This commit is contained in:
radius
commit
6d868c8f7c
2
BootROMs/agb_boot.asm
Normal file
2
BootROMs/agb_boot.asm
Normal file
@ -0,0 +1,2 @@
|
||||
AGB EQU 1
|
||||
include "cgb_boot.asm"
|
||||
@ -732,7 +732,28 @@ Preboot:
|
||||
ld a, [InputPalette]
|
||||
and a
|
||||
jr nz, .emulateDMGForCGBGame
|
||||
ld a, $11
|
||||
IF DEF(AGB)
|
||||
; Set registers to match the original AGB-CGB boot
|
||||
ld bc, $1100
|
||||
push bc
|
||||
pop af
|
||||
ld h, c
|
||||
ld b, 1
|
||||
ld c, c
|
||||
ld e, $08
|
||||
ld l, $7c
|
||||
ELSE
|
||||
; Set registers to match the original CGB boot
|
||||
ld bc, $1180
|
||||
push bc
|
||||
pop af
|
||||
ld c, 0
|
||||
ld h, c
|
||||
ld b, c
|
||||
ld c, c
|
||||
ld e, $08
|
||||
ld l, $7c
|
||||
ENDC
|
||||
ret
|
||||
|
||||
.emulateDMGForCGBGame
|
||||
|
||||
@ -11,6 +11,13 @@
|
||||
/* Todo: The general Objective-C coding style conflicts with SameBoy's. This file needs a cleanup. */
|
||||
/* Todo: Split into category files! This is so messy!!! */
|
||||
|
||||
enum model {
|
||||
MODEL_NONE,
|
||||
MODEL_DMG,
|
||||
MODEL_CGB,
|
||||
MODEL_AGB,
|
||||
};
|
||||
|
||||
@interface Document ()
|
||||
{
|
||||
/* NSTextViews freeze the entire app if they're modified too often and too quickly.
|
||||
@ -43,6 +50,7 @@
|
||||
NSMutableString *capturedOutput;
|
||||
bool logToSideView;
|
||||
bool shouldClearSideView;
|
||||
enum model current_model;
|
||||
}
|
||||
|
||||
@property GBAudioClient *audioClient;
|
||||
@ -126,6 +134,7 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
|
||||
|
||||
- (void) initDMG
|
||||
{
|
||||
current_model = MODEL_DMG;
|
||||
GB_init(&gb);
|
||||
[self initCommon];
|
||||
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"dmg_boot" ofType:@"bin"] UTF8String]);
|
||||
@ -135,8 +144,15 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
|
||||
{
|
||||
GB_init_cgb(&gb);
|
||||
[self initCommon];
|
||||
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"EmulateAGB"]) {
|
||||
current_model = MODEL_AGB;
|
||||
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"agb_boot" ofType:@"bin"] UTF8String]);
|
||||
}
|
||||
else {
|
||||
current_model = MODEL_CGB;
|
||||
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:@"cgb_boot" ofType:@"bin"] UTF8String]);
|
||||
}
|
||||
}
|
||||
|
||||
- (void) initCommon
|
||||
{
|
||||
@ -214,17 +230,20 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
|
||||
{
|
||||
[self stop];
|
||||
|
||||
if ([sender tag] == 0) {
|
||||
if ([sender tag] == MODEL_NONE) {
|
||||
GB_reset(&gb);
|
||||
}
|
||||
else {
|
||||
GB_switch_model_and_reset(&gb, [sender tag] == 2);
|
||||
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:[sender tag] == 2? @"cgb_boot" : @"dmg_boot" ofType:@"bin"] UTF8String]);
|
||||
current_model = (enum model)[sender tag];
|
||||
GB_switch_model_and_reset(&gb, current_model != MODEL_DMG);
|
||||
static NSString * const boot_names[] = {@"dmg_boot", @"cgb_boot", @"agb_boot"};
|
||||
GB_load_boot_rom(&gb, [[[NSBundle mainBundle] pathForResource:boot_names[current_model - 1] ofType:@"bin"] UTF8String]);
|
||||
}
|
||||
|
||||
if ([sender tag] != 0) {
|
||||
/* User explictly selected a model, save the preference */
|
||||
[[NSUserDefaults standardUserDefaults] setBool:[sender tag] == 1 forKey:@"EmulateDMG"];
|
||||
[[NSUserDefaults standardUserDefaults] setBool:current_model == MODEL_DMG forKey:@"EmulateDMG"];
|
||||
[[NSUserDefaults standardUserDefaults] setBool:current_model== MODEL_AGB forKey:@"EmulateAGB"];
|
||||
}
|
||||
|
||||
/* Reload the ROM, SAV and SYM files */
|
||||
@ -441,8 +460,8 @@ static void printImage(GB_gameboy_t *gb, uint32_t *image, uint8_t height,
|
||||
[(NSMenuItem*)anItem setState:(!running) || (GB_debugger_is_stopped(&gb))];
|
||||
return !GB_debugger_is_stopped(&gb);
|
||||
}
|
||||
else if ([anItem action] == @selector(reset:) && anItem.tag != 0) {
|
||||
[(NSMenuItem*)anItem setState:(anItem.tag == 1 && !GB_is_cgb(&gb)) || (anItem.tag == 2 && GB_is_cgb(&gb))];
|
||||
else if ([anItem action] == @selector(reset:) && anItem.tag != MODEL_NONE) {
|
||||
[(NSMenuItem*)anItem setState:anItem.tag == current_model];
|
||||
}
|
||||
else if ([anItem action] == @selector(toggleBlend:)) {
|
||||
[(NSMenuItem*)anItem setState:self.view.shouldBlendFrameWithPrevious];
|
||||
|
||||
@ -311,18 +311,24 @@
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="5GS-tt-E0a"/>
|
||||
<menuItem title="Gameboy" tag="1" id="vc7-yy-ARW">
|
||||
<menuItem title="Game Boy" tag="1" id="vc7-yy-ARW">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="reset:" target="-1" id="E4M-QG-ua9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Gameboy Color" tag="2" id="hdG-Bl-8nJ">
|
||||
<menuItem title="Game Boy Color" tag="2" id="hdG-Bl-8nJ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="reset:" target="-1" id="xAz-cr-0u2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Game Boy Advance" tag="3" id="7jw-B1-tf5">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="reset:" target="-1" id="xQk-4e-kd7"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="DPb-Sh-5tg"/>
|
||||
<menuItem title="Mute Sound" keyEquivalent="m" id="1UK-8n-QPP">
|
||||
<connections>
|
||||
|
||||
@ -173,10 +173,12 @@ void GB_apu_div_event(GB_gameboy_t *gb)
|
||||
|
||||
gb->apu.square_channels[i].volume_countdown = nrx2 & 7;
|
||||
|
||||
if (gb->apu.is_active[i]) {
|
||||
update_square_sample(gb, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t nr42 = gb->io_registers[GB_IO_NR42];
|
||||
|
||||
@ -192,6 +194,7 @@ void GB_apu_div_event(GB_gameboy_t *gb)
|
||||
|
||||
gb->apu.noise_channel.volume_countdown = nr42 & 7;
|
||||
|
||||
if (gb->apu.is_active[GB_NOISE]) {
|
||||
update_sample(gb, GB_NOISE,
|
||||
(gb->apu.noise_channel.lfsr & 1) ?
|
||||
gb->apu.noise_channel.current_volume : 0,
|
||||
@ -199,6 +202,7 @@ void GB_apu_div_event(GB_gameboy_t *gb)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((gb->apu.div_divider & 1) == 1) {
|
||||
for (unsigned i = GB_SQUARE_2 + 1; i--;) {
|
||||
@ -465,6 +469,7 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
|
||||
/* Globals */
|
||||
case GB_IO_NR50:
|
||||
case GB_IO_NR51:
|
||||
gb->io_registers[reg] = value;
|
||||
/* These registers affect the output of all 4 channels (but not the output of the PCM registers).*/
|
||||
/* We call update_samples with the current value so the APU output is updated with the new outputs */
|
||||
for (unsigned i = GB_N_CHANNELS; i--;) {
|
||||
@ -748,8 +753,6 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
|
||||
|
||||
case GB_IO_NR44: {
|
||||
if (value & 0x80) {
|
||||
gb->apu.noise_channel.lfsr = 0;
|
||||
|
||||
gb->apu.noise_channel.sample_countdown = (gb->apu.noise_channel.sample_length) * 2 + 6 - gb->apu.lf_div;
|
||||
|
||||
/* I'm COMPLETELY unsure about this logic, but it passes all relevant tests.
|
||||
@ -777,7 +780,7 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
|
||||
gb->apu.noise_channel.current_volume : 0,
|
||||
0);
|
||||
}
|
||||
|
||||
gb->apu.noise_channel.lfsr = 0;
|
||||
gb->apu.noise_channel.volume_countdown = gb->io_registers[GB_IO_NR42] & 7;
|
||||
|
||||
if ((gb->io_registers[GB_IO_NR42] & 0xF8) != 0) {
|
||||
|
||||
7
Makefile
7
Makefile
@ -90,9 +90,9 @@ endif
|
||||
|
||||
cocoa: $(BIN)/SameBoy.app
|
||||
quicklook: $(BIN)/SameBoy.qlgenerator
|
||||
sdl: $(SDL_TARGET) $(BIN)/SDL/dmg_boot.bin $(BIN)/SDL/cgb_boot.bin $(BIN)/SDL/LICENSE $(BIN)/SDL/registers.sym $(BIN)/SDL/background.bmp $(BIN)/SDL/Shaders
|
||||
bootroms: $(BIN)/BootROMs/cgb_boot.bin $(BIN)/BootROMs/dmg_boot.bin
|
||||
tester: $(TESTER_TARGET) $(BIN)/tester/dmg_boot.bin $(BIN)/tester/cgb_boot.bin
|
||||
sdl: $(SDL_TARGET) $(BIN)/SDL/dmg_boot.bin $(BIN)/SDL/cgb_boot.bin $(BIN)/SDL/agb_boot.bin $(BIN)/SDL/LICENSE $(BIN)/SDL/registers.sym $(BIN)/SDL/background.bmp $(BIN)/SDL/Shaders
|
||||
bootroms: $(BIN)/BootROMs/agb_boot.bin $(BIN)/BootROMs/cgb_boot.bin $(BIN)/BootROMs/dmg_boot.bin
|
||||
tester: $(TESTER_TARGET) $(BIN)/tester/dmg_boot.bin $(BIN)/tester/cgb_boot.bin $(BIN)/tester/agb_boot.bin
|
||||
all: cocoa sdl tester libretro
|
||||
|
||||
# Get a list of our source files and their respective object file targets
|
||||
@ -161,6 +161,7 @@ $(BIN)/SameBoy.app: $(BIN)/SameBoy.app/Contents/MacOS/SameBoy \
|
||||
Misc/registers.sym \
|
||||
$(BIN)/SameBoy.app/Contents/Resources/dmg_boot.bin \
|
||||
$(BIN)/SameBoy.app/Contents/Resources/cgb_boot.bin \
|
||||
$(BIN)/SameBoy.app/Contents/Resources/agb_boot.bin \
|
||||
$(patsubst %.xib,%.nib,$(addprefix $(BIN)/SameBoy.app/Contents/Resources/Base.lproj/,$(shell cd Cocoa;ls *.xib))) \
|
||||
$(BIN)/SameBoy.qlgenerator \
|
||||
Shaders
|
||||
|
||||
61
SDL/gui.c
61
SDL/gui.c
@ -60,7 +60,8 @@ configuration_t configuration =
|
||||
.color_correction_mode = GB_COLOR_CORRECTION_EMULATE_HARDWARE,
|
||||
.highpass_mode = GB_HIGHPASS_ACCURATE,
|
||||
.scaling_mode = GB_SDL_SCALING_INTEGER_FACTOR,
|
||||
.blend_frames = true
|
||||
.blend_frames = true,
|
||||
.model = MODEL_CGB
|
||||
};
|
||||
|
||||
|
||||
@ -72,7 +73,6 @@ static const char *help[] ={
|
||||
" Open Menu: Escape\n"
|
||||
" Reset: " MODIFIER_NAME "+R\n"
|
||||
" Pause: " MODIFIER_NAME "+P\n"
|
||||
" Toggle DMG/CGB: " MODIFIER_NAME "+T\n"
|
||||
" Save state: " MODIFIER_NAME "+(0-9)\n"
|
||||
" Load state: " MODIFIER_NAME "+" SHIFT_STRING "+(0-9)\n"
|
||||
#ifdef __APPLE__
|
||||
@ -225,6 +225,7 @@ static void item_help(unsigned index)
|
||||
gui_state = SHOWING_HELP;
|
||||
}
|
||||
|
||||
static void enter_emulation_menu(unsigned index);
|
||||
static void enter_graphics_menu(unsigned index);
|
||||
static void enter_controls_menu(unsigned index);
|
||||
static void enter_joypad_menu(unsigned index);
|
||||
@ -232,6 +233,7 @@ static void enter_audio_menu(unsigned index);
|
||||
|
||||
static const struct menu_item paused_menu[] = {
|
||||
{"Resume", NULL},
|
||||
{"Enumlation Options", enter_emulation_menu},
|
||||
{"Graphic Options", enter_graphics_menu},
|
||||
{"Audio Options", enter_audio_menu},
|
||||
{"Keyboard", enter_controls_menu},
|
||||
@ -243,6 +245,49 @@ static const struct menu_item paused_menu[] = {
|
||||
|
||||
static const struct menu_item *const nonpaused_menu = &paused_menu[1];
|
||||
|
||||
static void return_to_root_menu(unsigned index)
|
||||
{
|
||||
current_menu = root_menu;
|
||||
current_selection = 0;
|
||||
}
|
||||
|
||||
static void cycle_model(unsigned index)
|
||||
{
|
||||
|
||||
configuration.model++;
|
||||
if (configuration.model == MODEL_MAX) {
|
||||
configuration.model = 0;
|
||||
}
|
||||
pending_command = GB_SDL_RESET_COMMAND;
|
||||
}
|
||||
|
||||
static void cycle_model_backwards(unsigned index)
|
||||
{
|
||||
if (configuration.model == 0) {
|
||||
configuration.model = MODEL_MAX;
|
||||
}
|
||||
configuration.model--;
|
||||
pending_command = GB_SDL_RESET_COMMAND;
|
||||
}
|
||||
|
||||
const char *current_model_string(unsigned index)
|
||||
{
|
||||
return (const char *[]){"Game Boy", "Game Boy Color", "Game Boy Advance"}
|
||||
[configuration.model];
|
||||
}
|
||||
|
||||
static const struct menu_item emulation_menu[] = {
|
||||
{"Emulated Model:", cycle_model, current_model_string, cycle_model_backwards},
|
||||
{"Back", return_to_root_menu},
|
||||
{NULL,}
|
||||
};
|
||||
|
||||
static void enter_emulation_menu(unsigned index)
|
||||
{
|
||||
current_menu = emulation_menu;
|
||||
current_selection = 0;
|
||||
}
|
||||
|
||||
const char *current_scaling_mode(unsigned index)
|
||||
{
|
||||
return (const char *[]){"Fill Entire Window", "Retain Aspect Ratio", "Retain Integer Factor"}
|
||||
@ -374,12 +419,6 @@ const char *current_filter_name(unsigned index)
|
||||
return shaders[i].display_name;
|
||||
}
|
||||
|
||||
static void return_to_root_menu(unsigned index)
|
||||
{
|
||||
current_menu = root_menu;
|
||||
current_selection = 0;
|
||||
}
|
||||
|
||||
static void toggle_blend_frames(unsigned index)
|
||||
{
|
||||
configuration.blend_frames ^= true;
|
||||
@ -808,9 +847,12 @@ void run_gui(bool is_running)
|
||||
current_selection--;
|
||||
should_render = true;
|
||||
}
|
||||
else if (event.key.keysym.scancode == SDL_SCANCODE_RETURN) {
|
||||
else if (event.key.keysym.scancode == SDL_SCANCODE_RETURN && !current_menu[current_selection].backwards_handler) {
|
||||
if (current_menu[current_selection].handler) {
|
||||
current_menu[current_selection].handler(current_selection);
|
||||
if (pending_command == GB_SDL_RESET_COMMAND && !is_running) {
|
||||
pending_command = GB_SDL_NO_COMMAND;
|
||||
}
|
||||
if (pending_command) {
|
||||
if (!is_running && pending_command == GB_SDL_QUIT_COMMAND) {
|
||||
exit(0);
|
||||
@ -853,6 +895,7 @@ void run_gui(bool is_running)
|
||||
|
||||
switch (gui_state) {
|
||||
case SHOWING_DROP_MESSAGE:
|
||||
draw_text_centered(pixels, 8, "Press ESC for menu", gui_palette_native[3], gui_palette_native[0], false);
|
||||
draw_text_centered(pixels, 116, "Drop a GB or GBC", gui_palette_native[3], gui_palette_native[0], false);
|
||||
draw_text_centered(pixels, 128, "file to play", gui_palette_native[3], gui_palette_native[0], false);
|
||||
break;
|
||||
|
||||
@ -25,7 +25,6 @@ enum pending_command {
|
||||
GB_SDL_LOAD_STATE_COMMAND,
|
||||
GB_SDL_RESET_COMMAND,
|
||||
GB_SDL_NEW_FILE_COMMAND,
|
||||
GB_SDL_TOGGLE_MODEL_COMMAND,
|
||||
GB_SDL_QUIT_COMMAND,
|
||||
};
|
||||
|
||||
@ -44,6 +43,12 @@ typedef struct {
|
||||
bool swap_joysticks_bits_1_and_2;
|
||||
|
||||
char filter[32];
|
||||
enum {
|
||||
MODEL_DMG,
|
||||
MODEL_CGB,
|
||||
MODEL_AGB,
|
||||
MODEL_MAX,
|
||||
} model;
|
||||
} configuration_t;
|
||||
|
||||
extern configuration_t configuration;
|
||||
|
||||
46
SDL/main.c
46
SDL/main.c
@ -14,7 +14,6 @@
|
||||
#endif
|
||||
|
||||
GB_gameboy_t gb;
|
||||
static bool dmg = false;
|
||||
static bool paused = false;
|
||||
static uint32_t pixel_buffer_1[160*144], pixel_buffer_2[160*144];
|
||||
static uint32_t *active_pixel_buffer = pixel_buffer_1, *previous_pixel_buffer = pixel_buffer_2;
|
||||
@ -185,12 +184,6 @@ static void handle_events(GB_gameboy_t *gb)
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_SCANCODE_T:
|
||||
if (event.key.keysym.mod & MODIFIER) {
|
||||
pending_command = GB_SDL_TOGGLE_MODEL_COMMAND;
|
||||
}
|
||||
break;
|
||||
|
||||
case SDL_SCANCODE_P:
|
||||
if (event.key.keysym.mod & MODIFIER) {
|
||||
paused = !paused;
|
||||
@ -308,8 +301,7 @@ static bool handle_pending_command(void)
|
||||
}
|
||||
|
||||
case GB_SDL_RESET_COMMAND:
|
||||
GB_reset(&gb);
|
||||
return false;
|
||||
return true;
|
||||
|
||||
case GB_SDL_NO_COMMAND:
|
||||
return false;
|
||||
@ -317,10 +309,6 @@ static bool handle_pending_command(void)
|
||||
case GB_SDL_NEW_FILE_COMMAND:
|
||||
return true;
|
||||
|
||||
case GB_SDL_TOGGLE_MODEL_COMMAND:
|
||||
dmg = !dmg;
|
||||
return true;
|
||||
|
||||
case GB_SDL_QUIT_COMMAND:
|
||||
GB_save_battery(&gb, battery_save_path_ptr);
|
||||
exit(0);
|
||||
@ -333,10 +321,10 @@ static void run(void)
|
||||
pending_command = GB_SDL_NO_COMMAND;
|
||||
restart:
|
||||
if (GB_is_inited(&gb)) {
|
||||
GB_switch_model_and_reset(&gb, !dmg);
|
||||
GB_switch_model_and_reset(&gb, configuration.model != MODEL_DMG);
|
||||
}
|
||||
else {
|
||||
if (dmg) {
|
||||
if (configuration.model == MODEL_DMG) {
|
||||
GB_init(&gb);
|
||||
}
|
||||
else {
|
||||
@ -353,12 +341,8 @@ restart:
|
||||
|
||||
bool error = false;
|
||||
start_capturing_logs();
|
||||
if (dmg) {
|
||||
error = GB_load_boot_rom(&gb, executable_relative_path("dmg_boot.bin"));
|
||||
}
|
||||
else {
|
||||
error = GB_load_boot_rom(&gb, executable_relative_path("cgb_boot.bin"));
|
||||
}
|
||||
const char * const boot_roms[] = {"dmg_boot.bin", "cgb_boot.bin", "agb_boot.bin"};
|
||||
error = GB_load_boot_rom(&gb, executable_relative_path(boot_roms[configuration.model]));
|
||||
end_capturing_logs(true, error);
|
||||
|
||||
start_capturing_logs();
|
||||
@ -416,25 +400,13 @@ int main(int argc, char **argv)
|
||||
#define xstr(x) str(x)
|
||||
fprintf(stderr, "SameBoy v" xstr(VERSION) "\n");
|
||||
|
||||
if (argc > 3) {
|
||||
usage:
|
||||
fprintf(stderr, "Usage: %s [--dmg] [rom]\n", argv[0]);
|
||||
if (argc > 2) {
|
||||
fprintf(stderr, "Usage: %s [rom]\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
for (unsigned i = 1; i < argc; i++) {
|
||||
if (strcmp(argv[i], "--dmg") == 0) {
|
||||
if (dmg) {
|
||||
goto usage;
|
||||
}
|
||||
dmg = true;
|
||||
}
|
||||
else if (!filename) {
|
||||
filename = argv[i];
|
||||
}
|
||||
else {
|
||||
goto usage;
|
||||
}
|
||||
if (argc == 2) {
|
||||
filename = argv[1];
|
||||
}
|
||||
|
||||
signal(SIGINT, debugger_interrupt);
|
||||
|
||||
@ -11,6 +11,7 @@ SOURCES_C := $(CORE_DIR)/Core/gb.c \
|
||||
$(CORE_DIR)/Core/z80_cpu.c \
|
||||
$(CORE_DIR)/Core/joypad.c \
|
||||
$(CORE_DIR)/Core/save_state.c \
|
||||
$(CORE_DIR)/libretro/agb_boot.c \
|
||||
$(CORE_DIR)/libretro/cgb_boot.c \
|
||||
$(CORE_DIR)/libretro/dmg_boot.c \
|
||||
$(CORE_DIR)/libretro/libretro.c
|
||||
|
||||
@ -6,7 +6,8 @@
|
||||
#include <signal.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#define AUDIO_FREQUENCY 44100
|
||||
#define AUDIO_FREQUENCY 384000
|
||||
#define FRAME_RATE (0x400000 / 70224.0)
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <direct.h>
|
||||
@ -20,9 +21,9 @@
|
||||
#include "libretro.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
char slash = '\\';
|
||||
static const char slash = '\\';
|
||||
#else
|
||||
char slash = '/';
|
||||
static const char slash = '/';
|
||||
#endif
|
||||
|
||||
#define VIDEO_WIDTH 160
|
||||
@ -32,6 +33,14 @@
|
||||
char battery_save_path[512];
|
||||
char symbols_path[512];
|
||||
|
||||
enum model {
|
||||
MODEL_DMG,
|
||||
MODEL_CGB,
|
||||
MODEL_AGB
|
||||
};
|
||||
|
||||
static enum model model = MODEL_CGB;
|
||||
|
||||
static uint32_t *frame_buf;
|
||||
static struct retro_log_callback logging;
|
||||
static retro_log_printf_t log_cb;
|
||||
@ -49,8 +58,8 @@ char retro_game_path[4096];
|
||||
int RLOOP=1;
|
||||
|
||||
GB_gameboy_t gb;
|
||||
extern const unsigned char dmg_boot[], cgb_boot[];
|
||||
extern const unsigned dmg_boot_length, cgb_boot_length;
|
||||
extern const unsigned char dmg_boot[], cgb_boot[], agb_boot[];
|
||||
extern const unsigned dmg_boot_length, cgb_boot_length, agb_boot_length;
|
||||
|
||||
static void fallback_log(enum retro_log_level level, const char *fmt, ...)
|
||||
{
|
||||
@ -61,24 +70,6 @@ static void fallback_log(enum retro_log_level level, const char *fmt, ...)
|
||||
va_end(va);
|
||||
}
|
||||
|
||||
static void replace_extension(const char *src, size_t length, char *dest, const char *ext)
|
||||
{
|
||||
memcpy(dest, src, length);
|
||||
dest[length] = 0;
|
||||
|
||||
/* Remove extension */
|
||||
for (size_t i = length; i--;) {
|
||||
if (dest[i] == '/') break;
|
||||
if (dest[i] == '.') {
|
||||
dest[i] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Add new extension */
|
||||
strcat(dest, ext);
|
||||
}
|
||||
|
||||
static struct retro_rumble_interface rumble;
|
||||
|
||||
static void GB_update_keys_status(GB_gameboy_t *gb)
|
||||
@ -105,15 +96,24 @@ static void GB_update_keys_status(GB_gameboy_t *gb)
|
||||
|
||||
static void audio_callback(void *gb)
|
||||
{
|
||||
GB_apu_copy_buffer(gb, (GB_sample_t *) soundbuf, (float)AUDIO_FREQUENCY / 59.72);
|
||||
audio_batch_cb(soundbuf, (float)AUDIO_FREQUENCY / 59.72);
|
||||
size_t length = GB_apu_get_current_buffer_length(gb);
|
||||
|
||||
while (length > sizeof(soundbuf) / 4)
|
||||
{
|
||||
GB_apu_copy_buffer(gb, (GB_sample_t *) soundbuf, 1024);
|
||||
audio_batch_cb(soundbuf, 1024);
|
||||
length -= 1024;
|
||||
}
|
||||
if (length) {
|
||||
GB_apu_copy_buffer(gb, (GB_sample_t *) soundbuf, length);
|
||||
audio_batch_cb(soundbuf, length);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void vblank(GB_gameboy_t *gb)
|
||||
{
|
||||
GB_update_keys_status(gb);
|
||||
GB_set_pixels_output(gb, frame_buf);
|
||||
audio_callback(gb);
|
||||
}
|
||||
|
||||
@ -122,16 +122,6 @@ static uint32_t rgb_encode(GB_gameboy_t *gb, uint8_t r, uint8_t g, uint8_t b)
|
||||
return r<<16|g<<8|b;
|
||||
}
|
||||
|
||||
#ifndef DISABLE_DEBUGGER
|
||||
static void debugger_interrupt(int ignore)
|
||||
{
|
||||
/* ^C twice to exit */
|
||||
if (GB_debugger_is_stopped(&gb))
|
||||
exit(0);
|
||||
GB_debugger_break(&gb);
|
||||
}
|
||||
#endif
|
||||
|
||||
static retro_environment_t environ_cb;
|
||||
|
||||
void retro_init(void)
|
||||
@ -182,7 +172,7 @@ void retro_get_system_info(struct retro_system_info *info)
|
||||
void retro_get_system_av_info(struct retro_system_av_info *info)
|
||||
{
|
||||
struct retro_game_geometry geom = { VIDEO_WIDTH, VIDEO_HEIGHT,VIDEO_WIDTH, VIDEO_HEIGHT ,160.0 / 144.0 };
|
||||
struct retro_system_timing timing = { 59.72, 44100.0 };
|
||||
struct retro_system_timing timing = { FRAME_RATE, AUDIO_FREQUENCY };
|
||||
|
||||
info->geometry = geom;
|
||||
info->timing = timing;
|
||||
@ -238,138 +228,35 @@ void retro_reset(void)
|
||||
GB_reset(&gb);
|
||||
}
|
||||
|
||||
static void check_variables(void)
|
||||
static void init_for_current_model(void)
|
||||
{
|
||||
struct retro_variable var = {0};
|
||||
|
||||
var.key = "sameboy_color_correction_mode";
|
||||
var.value = NULL;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb))
|
||||
{
|
||||
if (strcmp(var.value, "off") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_DISABLED);
|
||||
else if (strcmp(var.value, "correct curves") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_CORRECT_CURVES);
|
||||
else if (strcmp(var.value, "emulate hardware") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_EMULATE_HARDWARE);
|
||||
else if (strcmp(var.value, "preserve brightness") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS);
|
||||
if (GB_is_inited(&gb)) {
|
||||
GB_switch_model_and_reset(&gb, model != MODEL_DMG);
|
||||
}
|
||||
|
||||
var.key = "sameboy_high_pass_filter_mode";
|
||||
var.value = NULL;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
{
|
||||
if (strcmp(var.value, "off") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_OFF);
|
||||
else if (strcmp(var.value, "accurate") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_ACCURATE);
|
||||
else if (strcmp(var.value, "remove dc offset") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_REMOVE_DC_OFFSET);
|
||||
else {
|
||||
if (model == MODEL_DMG) {
|
||||
GB_init(&gb);
|
||||
}
|
||||
else {
|
||||
GB_init_cgb(&gb);
|
||||
}
|
||||
}
|
||||
|
||||
void retro_run(void)
|
||||
{
|
||||
static int frames;
|
||||
size_t samples;
|
||||
|
||||
bool updated = false;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
|
||||
check_variables();
|
||||
samples = GB_apu_get_current_buffer_length(&gb);
|
||||
if (!(frames < (samples / 35112)))
|
||||
{
|
||||
GB_run_frame(&gb);
|
||||
frames ++;
|
||||
}
|
||||
else
|
||||
frames = 0;
|
||||
|
||||
video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT, VIDEO_WIDTH * sizeof(uint32_t));
|
||||
}
|
||||
|
||||
bool retro_load_game(const struct retro_game_info *info)
|
||||
{
|
||||
struct retro_input_descriptor desc[] = {
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
|
||||
{ 0 },
|
||||
};
|
||||
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
|
||||
|
||||
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
|
||||
if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
|
||||
{
|
||||
log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
snprintf(retro_game_path, sizeof(retro_game_path), "%s", info->path);
|
||||
const char *model_name = (const char *[]){"dmg", "cgb", "agb"}[model];
|
||||
const unsigned char *boot_code = (const unsigned char *[]){dmg_boot, cgb_boot, agb_boot}[model];
|
||||
unsigned boot_length = (unsigned []){dmg_boot_length, cgb_boot_length, agb_boot_length}[model];
|
||||
|
||||
char buf[256];
|
||||
int err = 0;
|
||||
if (!strstr(info->path, "gbc"))
|
||||
{
|
||||
GB_init(&gb);
|
||||
snprintf(buf, sizeof(buf), "%s%cdmg_boot.bin", retro_system_directory, slash);
|
||||
snprintf(buf, sizeof(buf), "%s%c%s_boot.bin", retro_system_directory, slash, model_name);
|
||||
log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf);
|
||||
err = GB_load_boot_rom(&gb, buf);
|
||||
|
||||
if (err) {
|
||||
GB_load_boot_rom_from_buffer(&gb, dmg_boot, dmg_boot_length);
|
||||
err = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GB_init_cgb(&gb);
|
||||
snprintf(buf, sizeof(buf), "%s%ccgb_boot.bin", retro_system_directory, slash);
|
||||
log_cb(RETRO_LOG_INFO, "Loading boot image: %s\n", buf);
|
||||
err = GB_load_boot_rom(&gb, buf);
|
||||
|
||||
if (err) {
|
||||
GB_load_boot_rom_from_buffer(&gb, cgb_boot, cgb_boot_length);
|
||||
err = 0;
|
||||
}
|
||||
}
|
||||
if (err)
|
||||
log_cb(RETRO_LOG_INFO, "Failed to load boot ROM %s %d\n", buf, err);
|
||||
(void)info;
|
||||
|
||||
if (GB_load_rom(&gb,info->path)) {
|
||||
perror("Failed to load ROM");
|
||||
exit(1);
|
||||
if (GB_load_boot_rom(&gb, buf)) {
|
||||
GB_load_boot_rom_from_buffer(&gb, boot_code, boot_length);
|
||||
}
|
||||
|
||||
GB_set_vblank_callback(&gb, (GB_vblank_callback_t) vblank);
|
||||
GB_set_user_data(&gb, (void*)NULL);
|
||||
GB_set_pixels_output(&gb,(unsigned int*)frame_buf);
|
||||
GB_set_rgb_encode_callback(&gb, rgb_encode);
|
||||
|
||||
size_t path_length = strlen(retro_game_path);
|
||||
|
||||
#ifndef DISABLE_DEBUGGER
|
||||
{
|
||||
char TMPC[512];
|
||||
sprintf(TMPC,"%s/registers.sym",retro_system_directory);
|
||||
GB_debugger_load_symbol_file(&gb, TMPC);
|
||||
}
|
||||
#endif
|
||||
|
||||
replace_extension(retro_game_path, path_length, symbols_path, ".sym");
|
||||
|
||||
#ifndef DISABLE_DEBUGGER
|
||||
GB_debugger_load_symbol_file(&gb, symbols_path);
|
||||
#endif
|
||||
|
||||
GB_set_sample_rate(&gb, AUDIO_FREQUENCY);
|
||||
|
||||
struct retro_memory_descriptor descs[7];
|
||||
@ -411,6 +298,97 @@ bool retro_load_game(const struct retro_game_info *info)
|
||||
mmaps.descriptors = descs;
|
||||
mmaps.num_descriptors = sizeof(descs) / sizeof(descs[0]);
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &mmaps);
|
||||
}
|
||||
|
||||
static void check_variables(void)
|
||||
{
|
||||
struct retro_variable var = {0};
|
||||
|
||||
var.key = "sameboy_color_correction_mode";
|
||||
var.value = NULL;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && GB_is_cgb(&gb))
|
||||
{
|
||||
if (strcmp(var.value, "off") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_DISABLED);
|
||||
else if (strcmp(var.value, "correct curves") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_CORRECT_CURVES);
|
||||
else if (strcmp(var.value, "emulate hardware") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_EMULATE_HARDWARE);
|
||||
else if (strcmp(var.value, "preserve brightness") == 0)
|
||||
GB_set_color_correction_mode(&gb, GB_COLOR_CORRECTION_PRESERVE_BRIGHTNESS);
|
||||
}
|
||||
|
||||
var.key = "sameboy_high_pass_filter_mode";
|
||||
var.value = NULL;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
{
|
||||
if (strcmp(var.value, "off") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_OFF);
|
||||
else if (strcmp(var.value, "accurate") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_ACCURATE);
|
||||
else if (strcmp(var.value, "remove dc offset") == 0)
|
||||
GB_set_highpass_filter_mode(&gb, GB_HIGHPASS_REMOVE_DC_OFFSET);
|
||||
}
|
||||
|
||||
var.key = "sameboy_model";
|
||||
var.value = NULL;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
|
||||
{
|
||||
enum model new_model = model;
|
||||
if (strcmp(var.value, "Game Boy") == 0)
|
||||
new_model = MODEL_DMG;
|
||||
else if (strcmp(var.value, "Game Boy Color") == 0)
|
||||
new_model = MODEL_CGB;
|
||||
else if (strcmp(var.value, "Game Boy Advance") == 0)
|
||||
new_model = MODEL_AGB;
|
||||
if (GB_is_inited(&gb) && new_model != model) {
|
||||
model = new_model;
|
||||
init_for_current_model();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void retro_run(void)
|
||||
{
|
||||
bool updated = false;
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
|
||||
check_variables();
|
||||
GB_run_frame(&gb);
|
||||
|
||||
video_cb(frame_buf, VIDEO_WIDTH, VIDEO_HEIGHT, VIDEO_WIDTH * sizeof(uint32_t));
|
||||
}
|
||||
|
||||
bool retro_load_game(const struct retro_game_info *info)
|
||||
{
|
||||
struct retro_input_descriptor desc[] = {
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "Left" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "Up" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "Down" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "Right" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "B" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "A" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
|
||||
{ 0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
|
||||
{ 0 },
|
||||
};
|
||||
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS, desc);
|
||||
|
||||
enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_XRGB8888;
|
||||
if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
|
||||
{
|
||||
log_cb(RETRO_LOG_INFO, "XRGB8888 is not supported.\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
snprintf(retro_game_path, sizeof(retro_game_path), "%s", info->path);
|
||||
|
||||
init_for_current_model();
|
||||
|
||||
if (GB_load_rom(&gb,info->path)) {
|
||||
log_cb(RETRO_LOG_INFO, "Failed to load ROM\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool yes = true;
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS, &yes);
|
||||
@ -420,21 +398,14 @@ bool retro_load_game(const struct retro_game_info *info)
|
||||
else
|
||||
log_cb(RETRO_LOG_INFO, "Rumble environment not supported.\n");
|
||||
|
||||
static struct retro_variable vars_cgb[] = {
|
||||
static const struct retro_variable vars[] = {
|
||||
{ "sameboy_color_correction_mode", "Color Correction; off|correct curves|emulate hardware|preserve brightness" },
|
||||
{ "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" },
|
||||
{ "sameboy_model", "Emulated Model; Game Boy Color|Game Boy Advance|Game Boy" },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static struct retro_variable vars_dmg[] = {
|
||||
{ "sameboy_high_pass_filter_mode", "High Pass Filter; off|accurate|remove dc offset" },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
if (GB_is_cgb(&gb))
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, vars_cgb);
|
||||
else
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, vars_dmg);
|
||||
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void *)vars);
|
||||
check_variables();
|
||||
|
||||
return true;
|
||||
@ -500,9 +471,6 @@ void *retro_get_memory_data(unsigned type)
|
||||
else
|
||||
data = NULL;
|
||||
break;
|
||||
default:
|
||||
data = NULL;
|
||||
break;
|
||||
}
|
||||
|
||||
return data;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user