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

rsx: Implement crash-proofing for src/dst image_in address

This commit is contained in:
Eladash 2021-08-13 19:36:55 +03:00 committed by kd-11
parent 2ce164be09
commit 83624e1f68
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rpcs3/Emu/RSX/rsx_methods.cpp
View File

@ -1171,26 +1171,24 @@ namespace rsx
const u32 in_offset = in_x * in_bpp + in_pitch * in_y; const u32 in_offset = in_x * in_bpp + in_pitch * in_y;
const u32 out_offset = out_x * out_bpp + out_pitch * out_y; const u32 out_offset = out_x * out_bpp + out_pitch * out_y;
const u32 src_address = get_address(src_offset, src_dma);
const u32 dst_address = get_address(dst_offset, dst_dma);
if (src_address == dst_address &&
in_w == clip_w && in_h == clip_h &&
in_pitch == out_pitch &&
rsx::fcmp(scale_x, 1.f) && rsx::fcmp(scale_y, 1.f))
{
// NULL operation
rsx_log.warning("NV3089_IMAGE_IN: Operation writes memory onto itself with no modification (move-to-self). Will ignore.");
return;
}
const u32 src_line_length = (in_w * in_bpp); const u32 src_line_length = (in_w * in_bpp);
u32 src_address = 0;
const u32 dst_address = get_address(dst_offset, dst_dma, 1); // TODO: Add size
if (is_block_transfer && (clip_h == 1 || (in_pitch == out_pitch && src_line_length == in_pitch))) if (is_block_transfer && (clip_h == 1 || (in_pitch == out_pitch && src_line_length == in_pitch)))
{ {
const u32 nb_lines = std::min(clip_h, in_h); const u32 nb_lines = std::min(clip_h, in_h);
const u32 data_length = nb_lines * src_line_length; const u32 data_length = nb_lines * src_line_length;
src_address = get_address(src_offset, src_dma, data_length);
if (!src_address || !dst_address)
{
rsx->recover_fifo();
return;
}
rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length); rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length);
if (const auto result = rsx->read_barrier(src_address, data_length, false); if (const auto result = rsx->read_barrier(src_address, data_length, false);
@ -1207,10 +1205,28 @@ namespace rsx
{ {
const u32 data_length = in_pitch * (in_h - 1) + src_line_length; const u32 data_length = in_pitch * (in_h - 1) + src_line_length;
src_address = get_address(src_offset, src_dma, data_length);
if (!src_address || !dst_address)
{
rsx->recover_fifo();
return;
}
rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length); rsx->invalidate_fragment_program(dst_dma, dst_offset, data_length);
rsx->read_barrier(src_address, data_length, true); rsx->read_barrier(src_address, data_length, true);
} }
if (src_address == dst_address &&
in_w == clip_w && in_h == clip_h &&
in_pitch == out_pitch &&
rsx::fcmp(scale_x, 1.f) && rsx::fcmp(scale_y, 1.f))
{
// NULL operation
rsx_log.warning("NV3089_IMAGE_IN: Operation writes memory onto itself with no modification (move-to-self). Will ignore.");
return;
}
u8* pixels_src = vm::_ptr<u8>(src_address + in_offset); u8* pixels_src = vm::_ptr<u8>(src_address + in_offset);
u8* pixels_dst = vm::_ptr<u8>(dst_address + out_offset); u8* pixels_dst = vm::_ptr<u8>(dst_address + out_offset);