ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1595 from davidgfnet/modemregression 

Fix Modem & serialization regression
This commit is contained in:
David G. F 2019-05-10 20:35:40 +02:00 committed by GitHub
parent afcd7a08a3 c0f21b7551
commit 3e57c80944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
core/serialize.cpp
View File

@ -1050,18 +1050,19 @@ bool dc_serialize(void **data, unsigned int *total_size)
REICAST_S(sch_list[modem_sched].tag) ;
REICAST_S(sch_list[modem_sched].start) ;
REICAST_S(sch_list[modem_sched].end) ;
#else
int modem_dummy = 0;
REICAST_S(modem_dummy);
REICAST_S(modem_dummy);
REICAST_S(modem_dummy);
#endif
REICAST_S(SCIF_SCFSR2);
REICAST_S(SCIF_SCFRDR2);
REICAST_S(SCIF_SCFDR2);
REICAST_S(BSC_PDTRA);
REICAST_SA(tmu_shift,3);
REICAST_SA(tmu_mask,3);
REICAST_SA(tmu_mask64,3);
@ -1069,14 +1070,8 @@ bool dc_serialize(void **data, unsigned int *total_size)
REICAST_SA(tmu_ch_base,3);
REICAST_SA(tmu_ch_base64,3);
REICAST_SA(CCN_QACR_TR,2);
REICAST_SA(UTLB,64);
REICAST_SA(ITLB,4);
#if defined(NO_MMU)
@ -1086,8 +1081,6 @@ bool dc_serialize(void **data, unsigned int *total_size)
REICAST_S(mmu_error_TT);
#endif
REICAST_S(NullDriveDiscType);
REICAST_SA(q_subchannel,96);
@ -1129,22 +1122,16 @@ bool dc_serialize(void **data, unsigned int *total_size)
REICAST_S(div_som_reg2);
REICAST_S(div_som_reg3);
REICAST_S(LastAddr);
REICAST_S(LastAddr_min);
REICAST_SA(block_hash,1024);
REICAST_SA(RegisterWrite,sh4_reg_count);
REICAST_SA(RegisterRead,sh4_reg_count);
REICAST_S(fallback_blocks);
REICAST_S(total_blocks);
REICAST_S(REMOVED_OPS);
REICAST_SA(kcode,4);
REICAST_SA(rt,4);
REICAST_SA(lt,4);
@ -1245,12 +1232,7 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
//this is one-time init, no updates - don't need to serialize
//extern _vmem_handler area0_handler;
REICAST_USA(reply_11,16) ;
REICAST_USA(reply_11,16);
REICAST_US(sns_asc);
REICAST_US(sns_ascq);
@ -1364,8 +1346,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_USA(mem_b.data, mem_b.size);
REICAST_US(IRLPriority);
REICAST_USA(InterruptEnvId,32);
REICAST_USA(InterruptBit,32);
@ -1374,9 +1354,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_US(interrupt_vmask);
REICAST_US(decoded_srimask);
REICAST_US(i) ;
if ( i == 0 )
do_sqw_nommu = &do_sqw_nommu_area_3 ;
@ -1401,9 +1378,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_US(old_rm);
REICAST_US(old_dn);
REICAST_US(sh4_sched_ffb);
REICAST_US(sh4_sched_intr);
@ -1452,18 +1426,19 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_US(sch_list[modem_sched].tag) ;
REICAST_US(sch_list[modem_sched].start) ;
REICAST_US(sch_list[modem_sched].end) ;
#else
int modem_dummy;
REICAST_US(modem_dummy);
REICAST_US(modem_dummy);
REICAST_US(modem_dummy);
#endif
REICAST_US(SCIF_SCFSR2);
REICAST_US(SCIF_SCFRDR2);
REICAST_US(SCIF_SCFDR2);
REICAST_US(BSC_PDTRA);
REICAST_USA(tmu_shift,3);
REICAST_USA(tmu_mask,3);
REICAST_USA(tmu_mask64,3);
@ -1471,14 +1446,8 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_USA(tmu_ch_base,3);
REICAST_USA(tmu_ch_base64,3);
REICAST_USA(CCN_QACR_TR,2);
REICAST_USA(UTLB,64);
REICAST_USA(ITLB,4);
#if defined(NO_MMU)
@ -1488,9 +1457,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_US(mmu_error_TT);
#endif
REICAST_US(NullDriveDiscType);
REICAST_USA(q_subchannel,96);
@ -1545,9 +1511,6 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
REICAST_US(div_som_reg2);
REICAST_US(div_som_reg3);
//REICAST_USA(CodeCache,CODE_SIZE) ;
//REICAST_USA(SH4_TCB,CODE_SIZE+4096);
REICAST_US(LastAddr);
@ -1611,7 +1574,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_US(timers[i].m_step);
}
REICAST_USA(aica_ram.data,aica_ram.size) ;
REICAST_US(VREG);
REICAST_US(ARMRST);
@ -1619,8 +1581,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_USA(aica_reg,0x8000);
REICAST_USA(volume_lut,16);
REICAST_USA(tl_lut,256 + 768);
REICAST_USA(AEG_ATT_SPS,64);
@ -1635,14 +1595,11 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_USA(mxlr,64);
REICAST_US(samples_gen);
register_unserialize(sb_regs, data, total_size) ;
REICAST_US(SB_ISTNRM);
REICAST_US(SB_FFST_rc);
REICAST_US(SB_FFST);
//this is one-time init, no updates - don't need to serialize
//extern RomChip sys_rom;
REICAST_US(sys_nvmem.size);
@ -1754,8 +1711,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_USA(mem_b.data, mem_b.size);
REICAST_US(IRLPriority);
REICAST_USA(InterruptEnvId,32);
REICAST_USA(InterruptBit,32);
@ -1764,9 +1719,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_US(interrupt_vmask);
REICAST_US(decoded_srimask);
REICAST_US(i) ;
if ( i == 0 )
do_sqw_nommu = &do_sqw_nommu_area_3 ;
@ -1842,6 +1794,11 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_US(sch_list[modem_sched].tag) ;
REICAST_US(sch_list[modem_sched].start) ;
REICAST_US(sch_list[modem_sched].end) ;
#else
int modem_dummy;
REICAST_US(modem_dummy);
REICAST_US(modem_dummy);
REICAST_US(modem_dummy);
#endif
REICAST_US(SCIF_SCFSR2);
@ -1879,8 +1836,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
#endif
REICAST_US(NullDriveDiscType);
REICAST_USA(q_subchannel,96);
@ -1896,7 +1851,6 @@ bool dc_unserialize(void **data, unsigned int *total_size)
// REICAST_US(i); // VRAM_MASK
REICAST_US(naomi_updates);
REICAST_US(i); // BoardID
REICAST_US(GSerialBuffer);
@ -1935,25 +1889,18 @@ bool dc_unserialize(void **data, unsigned int *total_size)
REICAST_US(div_som_reg2);
REICAST_US(div_som_reg3);
//REICAST_USA(CodeCache,CODE_SIZE) ;
//REICAST_USA(SH4_TCB,CODE_SIZE+4096);
REICAST_US(LastAddr);
REICAST_US(LastAddr_min);
REICAST_USA(block_hash,1024);
REICAST_USA(RegisterWrite,sh4_reg_count);
REICAST_USA(RegisterRead,sh4_reg_count);
REICAST_US(fallback_blocks);
REICAST_US(total_blocks);
REICAST_US(REMOVED_OPS);
REICAST_USA(kcode,4);
REICAST_USA(rt,4);
REICAST_USA(lt,4);

1
shell/android-studio/reicast/src/main/jni/Android.mk
View File

@ -22,6 +22,7 @@ WEBUI := 1
USE_GLES := 1
CHD5_LZMA := 1
CHD5_FLAC := 1
USE_MODEM := 1
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
NOT_ARM := 1

2
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -2546,6 +2546,7 @@
TARGET_NO_AREC,
XBYAK_NO_OP_NAMES,
TARGET_NO_OPENMP,
ENABLE_MODEM,
CHD5_LZMA,
_7ZIP_ST,
CHD5_FLAC,
@ -2602,6 +2603,7 @@
TARGET_NO_AREC,
XBYAK_NO_OP_NAMES,
TARGET_NO_OPENMP,
ENABLE_MODEM,
CHD5_LZMA,
_7ZIP_ST,
CHD5_FLAC,