deal with some strict aliasing issues

[picodrive.git] / pico / state.c

diff --git a/pico/state.c b/pico/state.c
index 3969e18..6c11381 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -290,7 +290,8 @@ static int state_save(void *file)
     SekPackCpu(buff, 1);\r
     if (Pico_mcd->s68k_regs[3] & 4) // 1M mode?\r
       wram_1M_to_2M(Pico_mcd->word_ram2M);\r
-    Pico_mcd->m.hint_vector = *(unsigned short *)(Pico_mcd->bios + 0x72);\r
+    memcpy(&Pico_mcd->m.hint_vector, Pico_mcd->bios + 0x72,\r
+      sizeof(Pico_mcd->m.hint_vector));\r
 \r
     CHECKED_WRITE_BUFF(CHUNK_S68K,     buff);\r
     CHECKED_WRITE_BUFF(CHUNK_PRG_RAM,  Pico_mcd->prg_ram);\r
@@ -318,13 +319,13 @@ static int state_save(void *file)
 \r
     sh2_pack(&sh2s[0], cpubuff);\r
     CHECKED_WRITE_BUFF(CHUNK_MSH2,      cpubuff);\r
-    CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, Pico32xMem->data_array[0]);\r
-    CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, Pico32xMem->sh2_peri_regs[0]);\r
+    CHECKED_WRITE_BUFF(CHUNK_MSH2_DATA, sh2s[0].data_array);\r
+    CHECKED_WRITE_BUFF(CHUNK_MSH2_PERI, sh2s[0].peri_regs);\r
 \r
     sh2_pack(&sh2s[1], cpubuff);\r
     CHECKED_WRITE_BUFF(CHUNK_SSH2,      cpubuff);\r
-    CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, Pico32xMem->data_array[1]);\r
-    CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, Pico32xMem->sh2_peri_regs[1]);\r
+    CHECKED_WRITE_BUFF(CHUNK_SSH2_DATA, sh2s[1].data_array);\r
+    CHECKED_WRITE_BUFF(CHUNK_SSH2_PERI, sh2s[1].peri_regs);\r
 \r
     CHECKED_WRITE_BUFF(CHUNK_32XSYS,    Pico32x);\r
     CHECKED_WRITE_BUFF(CHUNK_M68K_BIOS, Pico32xMem->m68k_rom);\r
@@ -470,10 +471,10 @@ static int state_load(void *file)
         sh2_unpack(&sh2s[1], buff_sh2);\r
         break;\r
 \r
-      case CHUNK_MSH2_DATA:   CHECKED_READ_BUFF(Pico32xMem->data_array[0]); break;\r
-      case CHUNK_MSH2_PERI:   CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[0]); break;\r
-      case CHUNK_SSH2_DATA:   CHECKED_READ_BUFF(Pico32xMem->data_array[1]); break;\r
-      case CHUNK_SSH2_PERI:   CHECKED_READ_BUFF(Pico32xMem->sh2_peri_regs[1]); break;\r
+      case CHUNK_MSH2_DATA:   CHECKED_READ_BUFF(sh2s[0].data_array); break;\r
+      case CHUNK_MSH2_PERI:   CHECKED_READ_BUFF(sh2s[0].peri_regs); break;\r
+      case CHUNK_SSH2_DATA:   CHECKED_READ_BUFF(sh2s[1].data_array); break;\r
+      case CHUNK_SSH2_PERI:   CHECKED_READ_BUFF(sh2s[1].peri_regs); break;\r
       case CHUNK_32XSYS:      CHECKED_READ_BUFF(Pico32x); break;\r
       case CHUNK_M68K_BIOS:   CHECKED_READ_BUFF(Pico32xMem->m68k_rom); break;\r
       case CHUNK_MSH2_BIOS:   CHECKED_READ_BUFF(Pico32xMem->sh2_rom_m); break;\r