archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 03:08:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

VSH Improvements (#13172)

Browse source 
* sys_prx: Implement PRX LIB register syscall

* VSH: partial log spam fix

* sys_process reboot fix

* Implement sys_memory_container_destroy_parent_with_childs

* sys_net: Implement SO_RCVTIMEO/SO_SENDTIMEO

* VSH: Implement sys_rsx_context_free

* PPU LLVM: distinguish PPU cache exec also by address

Fixes referencing multiple PRX.

* UI: Do not report size of apps inside /dev_flash
This commit is contained in:
Elad Ashkenazi 2023-01-09 19:03:01 +02:00 • committed by GitHub
parent 8ec1a5627d
commit 0946e5945f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 268 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

92
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -546,7 +546,7 @@ namespace rsx
if (dma_address)
{
ctrl = vm::_ptr<RsxDmaControl>(dma_address);
m_rsx_thread_exiting = false;
rsx_thread_running = true;
}
if (g_cfg.savestate.start_paused)
@ -712,7 +712,14 @@ namespace rsx
thread_ctrl::wait_for(1000);
}
on_task();
do
{
on_task();
state -= cpu_flag::ret;
}
while (!is_stopped());
on_exit();
}
@ -778,8 +785,11 @@ namespace rsx
rsx::overlays::reset_performance_overlay();
g_fxo->get<rsx::dma_manager>().init();
on_init_thread();
if (!is_initialized)
{
g_fxo->get<rsx::dma_manager>().init();
on_init_thread();
}
is_initialized = true;
is_initialized.notify_all();
@ -797,10 +807,16 @@ namespace rsx
const u64 event_flags = unsent_gcm_events.exchange(0);
Emu.CallFromMainThread([]{ Emu.RunPPU(); });
if (Emu.IsStarting())
{
Emu.CallFromMainThread([]
{
Emu.RunPPU();
});
}
// Wait for startup (TODO)
while (m_rsx_thread_exiting || Emu.IsPaused())
while (!rsx_thread_running || Emu.IsPaused())
{
// Execute backend-local tasks first
do_local_task(performance_counters.state);
@ -835,7 +851,7 @@ namespace rsx
return;
}
g_fxo->init<named_thread>("VBlank Thread", [this]()
g_fxo->get<vblank_thread>().set_thread(std::make_shared<named_thread<std::function<void()>>>("VBlank Thread", [this]()
{
// See sys_timer_usleep for details
#ifdef __linux__
@ -882,7 +898,7 @@ namespace rsx
vblank_rate = g_cfg.video.vblank_rate;
vblank_period = 1'000'000 + u64{g_cfg.video.vblank_ntsc.get()} * 1000;
}
post_vblank_event(post_event_time);
}
}
@ -909,7 +925,16 @@ namespace rsx
start_time = rsx::uclock() - start_time;
}
}
});
}));
struct join_vblank
{
~join_vblank() noexcept
{
g_fxo->get<vblank_thread>() = thread_state::finished;
}
} join_vblank_obj{};
// Raise priority above other threads
thread_ctrl::scoped_priority high_prio(+1);
@ -925,6 +950,11 @@ namespace rsx
if (external_interrupt_lock)
{
wait_pause();
if (!rsx_thread_running)
{
return;
}
}
// Note a possible rollback address
@ -967,6 +997,7 @@ namespace rsx
do_local_task(rsx::FIFO_state::lock_wait);
g_fxo->get<rsx::dma_manager>().join();
g_fxo->get<vblank_thread>() = thread_state::finished;
state += cpu_flag::exit;
}
@ -1266,6 +1297,21 @@ namespace rsx
m_invalidated_memory_range = utils::address_range::start_end(0x2 << 28, constants::local_mem_base + local_mem_size - 1);
handle_invalidated_memory_range();
}
else if (new_get_put != umax && state != FIFO_state::lock_wait)
{
const u64 get_put = new_get_put.exchange(u64{umax});
// Recheck in case aborted externally
if (get_put != umax)
{
vm::_ref<atomic_be_t<u64>>(dma_address + ::offset32(&RsxDmaControl::put)).release(get_put);
fifo_ctrl->set_get(static_cast<u32>(get_put));
fifo_ctrl->abort();
fifo_ret_addr = RSX_CALL_STACK_EMPTY;
last_known_code_start = static_cast<u32>(get_put);
sync_point_request.release(true);
}
}
}
std::array<u32, 4> thread::get_color_surface_addresses() const
@ -2387,11 +2433,12 @@ namespace rsx
dma_address = ctrlAddress;
ctrl = vm::_ptr<RsxDmaControl>(ctrlAddress);
flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;
fifo_ret_addr = RSX_CALL_STACK_EMPTY;
vm::write32(device_addr + 0x30, 1);
std::memset(display_buffers, 0, sizeof(display_buffers));
m_rsx_thread_exiting = false;
rsx_thread_running = true;
}
std::pair<u32, u32> thread::calculate_memory_requirements(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count)
@ -3098,7 +3145,7 @@ namespace rsx
// we must block until RSX has invalidated the memory
// or lock m_mtx_task and do it ourselves
if (m_rsx_thread_exiting)
if (!rsx_thread_running)
return;
reader_lock lock(m_mtx_task);
@ -3117,7 +3164,7 @@ namespace rsx
void thread::on_notify_memory_unmapped(u32 address, u32 size)
{
if (!m_rsx_thread_exiting && address < rsx::constants::local_mem_base)
if (rsx_thread_running && address < rsx::constants::local_mem_base)
{
if (!isHLE)
{
@ -3245,7 +3292,7 @@ namespace rsx
external_interrupt_ack.store(true);
while (external_interrupt_lock)
while (external_interrupt_lock && (cpu_flag::ret - state))
{
// TODO: Investigate non busy-spinning method
utils::pause();
@ -3253,7 +3300,7 @@ namespace rsx
external_interrupt_ack.store(false);
}
while (external_interrupt_lock);
while (external_interrupt_lock && (cpu_flag::ret - state));
}
u32 thread::get_load()
@ -3734,4 +3781,19 @@ namespace rsx
frame_times.push_back(frame_time_t{preempt_count, current_time, current_tsc});
}
}
void vblank_thread::set_thread(std::shared_ptr<named_thread<std::function<void()>>> thread)
{
std::swap(m_thread, thread);
}
vblank_thread& vblank_thread::operator=(thread_state state)
{
if (m_thread)
{
*m_thread = state;
}
return *this;
}
} // namespace rsx