Move constant to the right-hand side in comparison operations #4339
+18
−2
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.
Comparing a variable to a constant is usually done by writing the variable on the left-hand and the constant on the right-hand side of the expression. Ghidra's decompiler is sometimes able to conform its C output to this rule for expressions in
if
blocks by re-ordering the branches and negating the condition, so that e.g.5 < a
gets negated to!(5 < a)
and becomesa < 6
.This PR extends this logic to work anywhere in the decompilation output by checking if the left-hand side is a constant, and if it is, swapping the left-hand and right-hand sides and converting the operation (e.g. from
<
to>
).Side note: this PR might make the logic that re-orders
if
blocks and negates the expression obsolete, but I have kept it in as to leave the PR as clean as possible.