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

Fix ThumbRelocator IT block eoi logic #430

Merged
merged 1 commit into from May 18, 2020
Merged

Conversation

bet4it
Copy link
Contributor

@bet4it bet4it commented May 12, 2020

Just borrow the variable self->it_block.active as a flag.

@oleavr
Copy link
Member

oleavr commented May 14, 2020

Thanks! What does this solve for you?

@bet4it
Copy link
Contributor Author

bet4it commented May 14, 2020

I add a test about it.

@oleavr
Copy link
Member

oleavr commented May 14, 2020

@bet4it Thanks! I'm afraid this results in failing test(s) in the Stalker ARM32 test-suite. You can run it like this: ./tests/run-android-arm.sh -p /Core/Stalker

@bet4it
Copy link
Contributor Author

bet4it commented May 15, 2020

I don't have macOS, sad😅

. ../../frida-meson-env-macos-x86_64.rc

@oleavr
Copy link
Member

oleavr commented May 15, 2020

@bet4it Replace that with linux if you're on Linux. It's a (bit too) dumb script 😄

@bet4it bet4it changed the title Don't check eob when handle it_block Don't check eoi when handle it_block May 16, 2020
@bet4it
Copy link
Contributor Author

bet4it commented May 16, 2020

Now all the tests have passed. What do you think about it?

@oleavr oleavr changed the title Don't check eoi when handle it_block Fix ThumbRelocator IT block eoi logic May 18, 2020
Instructions inside the block should not result in eoi.
@oleavr oleavr merged commit 6f4a8f5 into frida:master May 18, 2020
@oleavr
Copy link
Member

oleavr commented May 18, 2020

Thanks! (Merged with a few minor style tweaks.)

@bet4it bet4it deleted the it_block branch May 18, 2020 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants