Skip to content
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.

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

rsx: zcull fix, cellGcm regression fix after #7262, FIFO recovery improvements #7470

Merged
merged 3 commits into from Feb 14, 2020

Conversation

@elad335
Copy link
Contributor

elad335 commented Feb 11, 2020

  • Fix size argument passed to rsx::thread::read_barrier() in image_in.
  • Fix a typo in cellGcm HLE which led to memory size and io address to be x100000h as smaller as they should.
  • Make fifo call/ret recovery from unexpected stack state be the same as invalid cmd recovery, add logging for its cmd hex representation in this case.
@elad335 elad335 requested a review from kd-11 Feb 11, 2020
@elad335 elad335 force-pushed the elad335:rsx-verify branch from 5878875 to ac239b2 Feb 11, 2020
@elad335 elad335 force-pushed the elad335:rsx-verify branch from ac239b2 to a52a4a6 Feb 13, 2020
@elad335

This comment has been minimized.

Copy link
Contributor Author

elad335 commented Feb 13, 2020

Resolved.

@kd-11
kd-11 approved these changes Feb 13, 2020
Copy link
Contributor

kd-11 left a comment

Code itself is fine. However..

The bugs in HLE gcm, including those fixed in this PR make it unlikely that anyone has ever tested it, I'm curious what kind of test you usually do for these changes if any. It feels like there is a PR touching it every other week and there is no testing going on.

@elad335 elad335 force-pushed the elad335:rsx-verify branch from a52a4a6 to 4d7f9a7 Feb 13, 2020
@AniLeo AniLeo requested a review from kd-11 Feb 13, 2020
@elad335 elad335 force-pushed the elad335:rsx-verify branch 2 times, most recently from f036119 to 5c8afb7 Feb 13, 2020
elad335 added 3 commits Feb 11, 2020
TODO: Maybe consider fifo stack content when recovering.
rpcs3/Emu/RSX/RSXThread.cpp Outdated Show resolved Hide resolved
@elad335 elad335 force-pushed the elad335:rsx-verify branch from 5c8afb7 to 40da358 Feb 14, 2020
@elad335 elad335 requested a review from kd-11 Feb 14, 2020
@@ -1000,7 +1000,7 @@ namespace rsx
else
{
const u32 data_length = in_pitch * (in_h - 1) + src_line_length;
rsx->read_barrier(src_address, dst_address, true);
rsx->read_barrier(src_address, data_length, true);

This comment has been minimized.

Copy link
@kd-11

kd-11 Feb 14, 2020

Contributor

Nice catch! That's a facepalm-worthy error from me XD

@kd-11
kd-11 approved these changes Feb 14, 2020
@kd-11 kd-11 merged commit 9344b21 into RPCS3:master Feb 14, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@elad335 elad335 deleted the elad335:rsx-verify branch Feb 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.