summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blastem.c26
-rw-r--r--blastem.h3
-rw-r--r--gst.c1
-rw-r--r--io.c2
-rw-r--r--menu.c28
-rw-r--r--menu.s6815
6 files changed, 66 insertions, 9 deletions
diff --git a/blastem.c b/blastem.c
index 4bc841d..7676eda 100644
--- a/blastem.c
+++ b/blastem.c
@@ -191,7 +191,6 @@ void adjust_int_cycle(m68k_context * context, vdp_context * v_context)
}
int break_on_sync = 0;
-int save_state = 0;
char *save_state_path;
//#define DO_DEBUG_PRINT
@@ -294,7 +293,7 @@ m68k_context * sync_components(m68k_context * context, uint32_t address)
vdp_int_ack(v_context);
context->int_ack = 0;
}
- if (!address && (break_on_sync || save_state)) {
+ if (!address && (break_on_sync || gen->save_state)) {
context->sync_cycle = context->current_cycle + 1;
}
adjust_int_cycle(context, v_context);
@@ -303,16 +302,29 @@ m68k_context * sync_components(m68k_context * context, uint32_t address)
break_on_sync = 0;
debugger(context, address);
}
- if (save_state && (z_context->pc || (!z_context->reset && !z_context->busreq))) {
- save_state = 0;
+ if (gen->save_state && (z_context->pc || (!z_context->reset && !z_context->busreq))) {
+ uint8_t slot = gen->save_state - 1;
+ gen->save_state = 0;
//advance Z80 core to the start of an instruction
while (!z_context->pc)
{
sync_z80(z_context, z_context->current_cycle + MCLKS_PER_Z80);
}
- save_gst(gen, save_state_path, address);
- printf("Saved state to %s\n", save_state_path);
- } else if(save_state) {
+ char *save_path;
+ if (slot == QUICK_SAVE_SLOT) {
+ save_path = save_state_path;
+ } else {
+ char slotname[] = "slot_0.gst";
+ slotname[5] = '0' + slot;
+ char const *parts[] = {gen->save_dir, "/", slotname};
+ save_path = alloc_concat_m(3, parts);
+ }
+ save_gst(gen, save_path, address);
+ printf("Saved state to %s\n", save_path);
+ if (slot != QUICK_SAVE_SLOT) {
+ free(save_path);
+ }
+ } else if(gen->save_state) {
context->sync_cycle = context->current_cycle + 1;
}
}
diff --git a/blastem.h b/blastem.h
index eaf56cc..ea9e86a 100644
--- a/blastem.h
+++ b/blastem.h
@@ -48,17 +48,18 @@ struct genesis_context {
io_port ports[3];
uint8_t bus_busy;
uint8_t should_exit;
+ uint8_t save_state;
eeprom_state eeprom;
};
extern genesis_context * genesis;
extern int headless;
extern int break_on_sync;
-extern int save_state;
extern tern_node * config;
#define RAM_WORDS 32 * 1024
#define Z80_RAM_BYTES 8 * 1024
+#define QUICK_SAVE_SLOT 10
extern uint16_t *cart;
extern uint16_t *ram;
diff --git a/gst.c b/gst.c
index 48dbd0e..533c147 100644
--- a/gst.c
+++ b/gst.c
@@ -95,6 +95,7 @@ uint32_t m68k_load_gst(m68k_context * context, FILE * gstfile)
}
fseek(gstfile, GST_68K_RAM, SEEK_SET);
for (int i = 0; i < (32*1024);) {
+ //FIXME: Need to deal with code in RAM that has potentially changed after this
if (fread(buffer, 1, sizeof(buffer), gstfile) != sizeof(buffer)) {
fputs("Failed to read 68K RAM from savestate\n", stderr);
return 0;
diff --git a/io.c b/io.c
index c1e879a..aaa38cf 100644
--- a/io.c
+++ b/io.c
@@ -349,7 +349,7 @@ void handle_binding_up(keybinding * binding)
break_on_sync = 1;
break;
case UI_SAVE_STATE:
- save_state = 1;
+ genesis->save_state = QUICK_SAVE_SLOT+1;
break;
case UI_NEXT_SPEED:
current_speed++;
diff --git a/menu.c b/menu.c
index b978b90..da72b49 100644
--- a/menu.c
+++ b/menu.c
@@ -7,6 +7,8 @@
#include "menu.h"
#include "backend.h"
#include "util.h"
+#include "gst.h"
+#include "m68k_internal.h" //needed for get_native_address_trans, should be eliminated once handling of PC is cleaned up
uint16_t menu_read_w(uint32_t address, void * context)
@@ -273,6 +275,32 @@ void * menu_write_w(uint32_t address, void * context, uint16_t value)
}
copy_to_guest(m68k, dst, buffer, cur-buffer);
break;
+ case 5:
+ //save state
+ if (gen->next_context) {
+ gen->next_context->save_state = dst + 1;
+ }
+ m68k->should_return = 1;
+ break;
+ case 6:
+ //load state
+ if (gen->next_context && gen->next_context->save_dir) {
+ char numslotname[] = "slot_0.gst";
+ char *slotname;
+ if (dst == QUICK_SAVE_SLOT) {
+ slotname = "quicksave.gst";
+ } else {
+ numslotname[5] = '0' + dst;
+ slotname = numslotname;
+ }
+ char const *parts[] = {gen->next_context->save_dir, "/", slotname};
+ char *gstpath = alloc_concat_m(3, parts);
+ uint32_t pc = load_gst(gen->next_context, gstpath);
+ free(gstpath);
+ gen->next_context->m68k->resume_pc = get_native_address_trans(gen->next_context->m68k, pc);
+ }
+ m68k->should_return = 1;
+ break;
}
default:
fprintf(stderr, "WARNING: write to undefined menu port %X\n", address);
diff --git a/menu.s68 b/menu.s68
index 606e017..7a7727d 100644
--- a/menu.s68
+++ b/menu.s68
@@ -192,6 +192,7 @@ mouse_shown rs.b 1
last_mbuttons rs.b 1
num_menu rs.b 1
num_slots rs.b 1
+port_off rs.b 1
int_6:
@@ -353,6 +354,8 @@ select_entry:
add.w d0, d0
tst.b num_menu.w
bne .select_menu_button
+ tst.b num_slots.w
+ bne .select_save_slot
lea page_index.w, a2
move.l (0, a2, d0.w), a2
tst.b (-1, a2)
@@ -368,6 +371,16 @@ select_entry:
move.l (0, a2, d0.w), a2
addq #6, a7
jmp (a2)
+.select_save_slot:
+ lea menu_port, a3
+ moveq #0, d0
+ move.b port_off.w, d0
+ add.w d0, a3
+ move.b selected.w, d0
+ move.l d0, (a3)
+ addq #6, a7
+ jmp show_pause_menu
+
enter_dir:
lea menu_port+4, a3
move.l a2, (a3)
@@ -977,12 +990,14 @@ show_save_slots:
rts
save_state:
+ move.b #(5*4), port_off.w
bsr show_save_slots
.wait
stop #$2500
bra .wait
load_state:
+ move.b #(6*4), port_off.w
bsr show_save_slots
.wait
stop #$2500
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 14:04:20 +0000