diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-04-09 11:56:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-09 16:56:50 +0200 |
| commit | 26a881176eb6513a98889648e0d5b7fe647cd0e3 (patch) | |
| tree | 752c8df876fcf72e72944bef18294940f421bca9 | |
| parent | e44a43c7e1ee0b25ef93a9419dbd6ac2eb7665b5 (diff) | |
Fix tail merge from block with conditional jump to multiple returns (#3267)1.1.100
* Fix tail merge from block with conditional jump to multiple returns
* PPTC version bump
| -rw-r--r-- | ARMeilleure/CodeGen/Optimizations/TailMerge.cs | 2 | ||||
| -rw-r--r-- | ARMeilleure/Signal/NativeSignalHandler.cs | 2 | ||||
| -rw-r--r-- | ARMeilleure/Translation/PTC/Ptc.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ARMeilleure/CodeGen/Optimizations/TailMerge.cs b/ARMeilleure/CodeGen/Optimizations/TailMerge.cs index f85b9c69..e94df159 100644 --- a/ARMeilleure/CodeGen/Optimizations/TailMerge.cs +++ b/ARMeilleure/CodeGen/Optimizations/TailMerge.cs @@ -59,7 +59,7 @@ namespace ARMeilleure.CodeGen.Optimizations BasicBlock fromPred = from.Predecessors.Count == 1 ? from.Predecessors[0] : null; // If the block is empty, we can try to append to the predecessor and avoid unnecessary jumps. - if (from.Operations.Count == 0 && fromPred != null) + if (from.Operations.Count == 0 && fromPred != null && fromPred.SuccessorsCount == 1) { for (int i = 0; i < fromPred.SuccessorsCount; i++) { diff --git a/ARMeilleure/Signal/NativeSignalHandler.cs b/ARMeilleure/Signal/NativeSignalHandler.cs index 9f14dd6b..8cb2ee98 100644 --- a/ARMeilleure/Signal/NativeSignalHandler.cs +++ b/ARMeilleure/Signal/NativeSignalHandler.cs @@ -191,7 +191,7 @@ namespace ARMeilleure.Signal // Is the fault address within this tracked region? Operand inRange = context.BitwiseAnd( context.ICompare(faultAddress, rangeAddress, Comparison.GreaterOrEqualUI), - context.ICompare(faultAddress, rangeEndAddress, Comparison.Less) + context.ICompare(faultAddress, rangeEndAddress, Comparison.LessUI) ); // Only call tracking if in range. diff --git a/ARMeilleure/Translation/PTC/Ptc.cs b/ARMeilleure/Translation/PTC/Ptc.cs index 35bbc56e..43f3b08b 100644 --- a/ARMeilleure/Translation/PTC/Ptc.cs +++ b/ARMeilleure/Translation/PTC/Ptc.cs @@ -27,7 +27,7 @@ namespace ARMeilleure.Translation.PTC private const string OuterHeaderMagicString = "PTCohd\0\0"; private const string InnerHeaderMagicString = "PTCihd\0\0"; - private const uint InternalVersion = 3193; //! To be incremented manually for each change to the ARMeilleure project. + private const uint InternalVersion = 3267; //! To be incremented manually for each change to the ARMeilleure project. private const string ActualDir = "0"; private const string BackupDir = "1"; |