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

Fixing Altivec lvrx and stvrx #687

Merged
merged 1 commit into from
Mar 31, 2017

Conversation

cesys
Copy link
Contributor

@cesys cesys commented Mar 31, 2017

As per analysis at xenia-project/game-compatibility#735 we need to recalculate ea and eb after the block ends and a new one begin.

@cesys
Copy link
Contributor Author

cesys commented Mar 31, 2017

Pushed fix for the check failure (line length limit violation). However, I don't know how to update the pull request.

@DrChat
Copy link
Member

DrChat commented Mar 31, 2017

Reformat your code, amend your commit, then do git push --force to this branch and the pull request will be updated.

@cesys
Copy link
Contributor Author

cesys commented Mar 31, 2017

I've already pushed the reformat code yesterday in the same branch. So the branch I created in my fork now contains two commit:

  • the fix
  • the reformat commit
    What do I do in this case?

@DrChat
Copy link
Member

DrChat commented Mar 31, 2017

Hmm - the commit hasn't shown up here which means it wasn't pushed to the branch you based the pull request off of.
Try this:

$ git checkout altivec_lvrx_stvrx_fix
$ git stash
(reformat the code)
$ git commit --amend
$ git push origin altivec_lvrx_stvrx_fix --force
$ git stash pop

@cesys
Copy link
Contributor Author

cesys commented Mar 31, 2017

Did the procedure you suggested. Waiting for the checks to go through.

@DrChat
Copy link
Member

DrChat commented Mar 31, 2017

Cool - I'll keep this as a temporary fix until we can come up with something better

Nice work 👍

@DrChat DrChat merged commit 59f9a19 into xenia-project:master Mar 31, 2017
@cesys
Copy link
Contributor Author

cesys commented Mar 31, 2017

Sure, thanks.

@Margen67 Margen67 added the cpu label Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants