Skip to content

Some missed PSX CD block items saving. #14932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheLostNinja wants to merge 8 commits into
base: master
Choose a base branch
from
+65 −29
Open

Some missed PSX CD block items saving. #14932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12f8d85
Update psxcd.cpp
TheLostNinja Feb 7, 2026
39111e0
Update psxcd.cpp
TheLostNinja Feb 7, 2026
84f1648
spu.cpp: Keeping to patch up the "holes" in state saves.
TheLostNinja Feb 9, 2026
445c4fc
Update psx.cpp
TheLostNinja Feb 9, 2026
2568822
Update psx.cpp
TheLostNinja Feb 9, 2026
f5b5dbb
Update psx.cpp
TheLostNinja Feb 9, 2026
c3cf293
Update mdec.cpp
TheLostNinja Feb 10, 2026
5079e98
Update mdec.cpp
TheLostNinja Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/devices/cpu/psx/mdec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,17 @@ void psxmdec_device::device_start()
p_n_b5[ n + 512 ] = ( 255 >> 3 ) << 10;
}

save_item( NAME( n_0_command ) );
save_item( NAME( n_0_address ) );
save_item( NAME( n_0_size ) );
save_item( NAME( n_1_command ) );
save_item( NAME( n_1_status ) );
save_item( NAME( p_n_quantize_y ) );
save_item( NAME( p_n_quantize_uv ) );
save_item( NAME( p_n_cos ) );
save_item(NAME(n_0_command));
save_item(NAME(n_0_address));
save_item(NAME(n_0_size));
save_item(NAME(n_1_command));
save_item(NAME(n_1_status));
save_item(NAME(p_n_quantize_y));
save_item(NAME(p_n_quantize_uv));
save_item(NAME(p_n_cos));
save_item(NAME(n_decoded));
save_item(NAME(n_offset));
save_item(NAME(p_n_output));
}

[[maybe_unused]] static inline void psxwriteword( uint32_t *p_n_psxram, uint32_t n_address, uint16_t n_data )
Expand Down
54 changes: 33 additions & 21 deletions src/devices/cpu/psx/psx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,27 +1840,39 @@ void psxcpu_device::device_start()
m_program->cache(m_instruction);
m_program->specific(m_data);

save_item( NAME( m_op ) );
save_item( NAME( m_pc ) );
save_item( NAME( m_delayv ) );
save_item( NAME( m_delayr ) );
save_item( NAME( m_hi ) );
save_item( NAME( m_lo ) );
save_item( NAME( m_biu ) );
save_item( NAME( m_r ) );
save_item( NAME( m_cp0r ) );
save_item( NAME( m_gte.m_cp2cr ) );
save_item( NAME( m_gte.m_cp2dr ) );
save_item( NAME( m_icacheTag ) );
save_item( NAME( m_icache ) );
save_item( NAME( m_dcache ) );
save_item( NAME( m_multiplier_operation ) );
save_item( NAME( m_multiplier_operand1 ) );
save_item( NAME( m_multiplier_operand2 ) );
save_item( NAME( m_exp_base ) );
save_item( NAME( m_exp_config ) );
save_item( NAME( m_ram_config ) );
save_item( NAME( m_rom_config ) );
save_item(NAME(m_op));
save_item(NAME(m_pc));
save_item(NAME(m_icount));
save_item(NAME(m_com_delay));
save_item(NAME(m_delayv));
save_item(NAME(m_delayr));
save_item(NAME(m_hi));
save_item(NAME(m_lo));
save_item(NAME(m_berr));
save_item(NAME(m_biu));
save_item(NAME(m_r));
save_item(NAME(m_cp0r));
save_item(NAME(m_gte.m_cp2cr));
save_item(NAME(m_gte.m_cp2dr));
save_item(NAME(m_sf));
save_item(NAME(m_mac0));
save_item(NAME(m_mac1));
save_item(NAME(m_mac2));
save_item(NAME(m_mac3));
save_item(NAME(m_icacheTag));
save_item(NAME(m_icache));
save_item(NAME(m_dcache));
save_item(NAME(m_multiplier_operation));
save_item(NAME(m_multiplier_operand1));
save_item(NAME(m_multiplier_operand2));
save_item(NAME(m_bus_attached));
save_item(NAME(m_bad_byte_address_mask));
save_item(NAME(m_bad_half_address_mask));
save_item(NAME(m_bad_word_address_mask));
save_item(NAME(m_exp_base));
save_item(NAME(m_exp_config));
save_item(NAME(m_ram_config));
save_item(NAME(m_rom_config));

state_add( STATE_GENPC, "GENPC", m_pc ).noshow();
state_add( STATE_GENPCBASE, "CURPC", m_pc ).noshow();
Expand Down
11 changes: 11 additions & 0 deletions src/devices/sound/spu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,14 +979,25 @@ void spu_device::device_start()

// register save state stuff
save_item(NAME(reg)); // this covers all spureg.* plus the reverb parameter block
save_item(NAME(taddr));
save_item(NAME(xa_cnt));
save_item(NAME(cdda_cnt));
save_item(NAME(xa_freq));
save_item(NAME(cdda_freq));
save_item(NAME(xa_channels));
save_item(NAME(xa_spf));
save_item(NAME(xa_out_ptr));
save_item(NAME(cur_frame_sample));
save_item(NAME(cur_generate_sample));
save_item(NAME(dirty_flags));
save_item(NAME(m_cd_out_ptr));
save_item(NAME(xa_playing));
save_item(NAME(cdda_playing));
save_item(NAME(output_head));
save_item(NAME(output_tail));
save_item(NAME(output_size));
save_item(NAME(noise_t));
save_item(NAME(noise_cur));
save_pointer(NAME(spu_ram), spu_ram_size);

save_item(NAME(xa_buffer->head));
Expand Down
2 changes: 2 additions & 0 deletions src/devices/video/psx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,8 @@ void psxgpu_device::psx_gpu_init( int n_gputype )
save_item(NAME(n_gpuinfo));
save_item(NAME(n_lightgun_x));
save_item(NAME(n_lightgun_y));
save_item(NAME(n_screenwidth));
save_item(NAME(n_screenheight));
save_item(NAME(m_n_tx));
save_item(NAME(m_n_ty));
save_item(NAME(n_abr));
Expand Down
8 changes: 8 additions & 0 deletions src/mame/sony/psxcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,21 @@ void psxcd_device::device_start()
save_item(NAME(m_transbuf));
save_item(NAME(loc.w));
save_item(NAME(curpos.w));
save_item(NAME(m_regs.sr));
save_item(NAME(m_regs.ir));
save_item(NAME(m_regs.imr));
save_item(NAME(m_regs.vol.ll));
save_item(NAME(m_regs.vol.lr));
save_item(NAME(m_regs.vol.rl));
save_item(NAME(m_regs.vol.rr));
save_item(NAME(open));
save_item(NAME(m_mute));
save_item(NAME(m_dmaload));
save_item(NAME(next_read_event));
save_item(NAME(next_sector_t));
save_item(NAME(autopause_sector));
save_item(NAME(m_param_count));
save_item(NAME(m_timerinuse));
}

void psxcd_device::device_stop()
Expand Down
Loading