JIT: Generic instruction merging #1834
Merged
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
FioraAeterna
force-pushed
the
genericinstmerging
branch
2 times, most recently
from
7e5b667
to
727e914
Compare
FioraAeterna
changed the title
|
It's kind of scary that we were missing merging safety checks in mfspr... Looks good. |
|
@FioraAeterna: This comment grants you the permission to merge this pull request whenever you think it is ready. After addressing the remaining comments, click this link to merge. Arcane. @dolphin-emu-bot allowmerge |
FioraAeterna
force-pushed
the
genericinstmerging
branch
from
727e914
to
16ce1f0
Compare
Now it should be easier to merge more than 2-instruction-long sequences. Also correct some minor inconsistencies in behavior between instruction merging cases.
FioraAeterna
force-pushed
the
genericinstmerging
branch
from
16ce1f0
to
e8cfcd3
Compare
FioraAeterna
changed the title
|
I've rebased this so that it's not on top of forwardbranches and checked a half dozen games and it seems to work okay. |
dolphin-emu-bot
added a commit
that referenced
this pull request
Jan 11, 2015
JIT: Generic instruction merging
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.
Suggestion cannot be applied right now. Please check back later.
This should make it much simpler and cleaner to merge more than two instructions in a row.