Fix crash when using DSP LLE with CPU interpreter (or fastmem off) #8731
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pokechu22
force-pushed
the
dsp-lle-cpu-int-crash
branch
3 times, most recently
from
f2d1d7b
to
8dd397a
Compare
Pokechu22
changed the title
Pokechu22
force-pushed
the
dsp-lle-cpu-int-crash
branch
2 times, most recently
from
c27d2f5
to
7a03bd8
Compare
leoetlino
reviewed
May 3, 2020
| memcpy(dst, code, size); | ||
| for (size_t i = 0; i < size / 2; i++) | ||
| dst[i] = Common::swap16(dst[i]); | ||
| Host::DMAToDSP(g_dsp.iram + dsp_addr / 2, addr, size); |
There was a problem hiding this comment.
Is the mask not needed anymore?
There was a problem hiding this comment.
Assuming you're referring to g_dsp.cpu_ram[addr & 0x0fffffff], I don't think it is; CopyFromEmuSwapped uses Memory::GetPointer and it does its own masking (though with a different mask).
Perhaps Memory::GetPointerForRange would be better, but it's not public.
Pokechu22
force-pushed
the
dsp-lle-cpu-int-crash
branch
from
7a03bd8
to
a5c867a
Compare
Pokechu22
force-pushed
the
dsp-lle-cpu-int-crash
branch
from
a5c867a
to
1ca3710
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Fixes #11980.
Memory::physical_basedoes not exist when fastmem is disabled.Note that I remove some SSSE3 code (originally added 9 years ago in 559fb74). My machine is too old to support SSSE3, so I haven't tested the performance impact, but I don't think it's likely to make a difference in this one case (since it's not used by DSP HLE). If it actually does matter, then
CopyFromEmuSwappedandCopyToEmuSwappedshould be changed to use it instead.