diff options
| author | Ficture Seven <FICTURE7@gmail.com> | 2020-08-05 02:52:33 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 08:52:33 +1000 |
| commit | ee22517d92c48eab9643b6fc8ce4dac2b7e95f57 (patch) | |
| tree | 5df92a3e83f9daafba44ad11862683af8185ffaf /ARMeilleure/Translation/EmitterContext.cs | |
| parent | a33dc2f4919f7fdc8ea9db41c4c70c38cedfd3df (diff) | |
Improve branch operations (#1442)
* Add Compare instruction
* Add BranchIf instruction
* Use test when BranchIf & Compare against 0
* Propagate Compare into BranchIfTrue/False use
- Propagate Compare operations into their BranchIfTrue/False use and
turn these into a BranchIf.
- Clean up Comparison enum.
* Replace BranchIfTrue/False with BranchIf
* Use BranchIf in EmitPtPointerLoad
- Using BranchIf early instead of BranchIfTrue/False improves LCQ and
reduces the amount of work needed by the Optimizer.
EmitPtPointerLoader was a/the big producer of BranchIfTrue/False.
- Fix asserts firing when assembling BitwiseAnd because of type
mismatch in EmitStoreExclusive. This is harmless and should not
cause any diffs.
* Increment PPTC interval version
* Improve IRDumper for BranchIf & Compare
* Use BranchIf in EmitNativeCall
* Clean up
* Do not emit test when immediately preceded by and
Diffstat (limited to 'ARMeilleure/Translation/EmitterContext.cs')
| -rw-r--r-- | ARMeilleure/Translation/EmitterContext.cs | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/ARMeilleure/Translation/EmitterContext.cs b/ARMeilleure/Translation/EmitterContext.cs index 7abab9e1..a6cc55df 100644 --- a/ARMeilleure/Translation/EmitterContext.cs +++ b/ARMeilleure/Translation/EmitterContext.cs @@ -62,18 +62,21 @@ namespace ARMeilleure.Translation BranchToLabel(label); } - public void BranchIfFalse(Operand label, Operand op1) + public void BranchIf(Operand label, Operand op1, Operand op2, Comparison comp) { - Add(Instruction.BranchIfFalse, null, op1); + Add(Instruction.BranchIf, null, op1, op2, Const((int)comp)); BranchToLabel(label); } - public void BranchIfTrue(Operand label, Operand op1) + public void BranchIfFalse(Operand label, Operand op1) { - Add(Instruction.BranchIfTrue, null, op1); + BranchIf(label, op1, Const(op1.Type, 0), Comparison.Equal); + } - BranchToLabel(label); + public void BranchIfTrue(Operand label, Operand op1) + { + BranchIf(label, op1, Const(op1.Type, 0), Comparison.NotEqual); } public Operand ByteSwap(Operand op1) @@ -243,54 +246,59 @@ namespace ARMeilleure.Translation return Add(Instruction.DivideUI, Local(op1.Type), op1, op2); } + public Operand ICompare(Operand op1, Operand op2, Comparison comp) + { + return Add(Instruction.Compare, Local(OperandType.I32), op1, op2, Const((int)comp)); + } + public Operand ICompareEqual(Operand op1, Operand op2) { - return Add(Instruction.CompareEqual, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.Equal); } public Operand ICompareGreater(Operand op1, Operand op2) { - return Add(Instruction.CompareGreater, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.Greater); } public Operand ICompareGreaterOrEqual(Operand op1, Operand op2) { - return Add(Instruction.CompareGreaterOrEqual, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.GreaterOrEqual); } public Operand ICompareGreaterOrEqualUI(Operand op1, Operand op2) { - return Add(Instruction.CompareGreaterOrEqualUI, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.GreaterOrEqualUI); } public Operand ICompareGreaterUI(Operand op1, Operand op2) { - return Add(Instruction.CompareGreaterUI, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.GreaterUI); } public Operand ICompareLess(Operand op1, Operand op2) { - return Add(Instruction.CompareLess, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.Less); } public Operand ICompareLessOrEqual(Operand op1, Operand op2) { - return Add(Instruction.CompareLessOrEqual, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.LessOrEqual); } public Operand ICompareLessOrEqualUI(Operand op1, Operand op2) { - return Add(Instruction.CompareLessOrEqualUI, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.LessOrEqualUI); } public Operand ICompareLessUI(Operand op1, Operand op2) { - return Add(Instruction.CompareLessUI, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.LessUI); } public Operand ICompareNotEqual(Operand op1, Operand op2) { - return Add(Instruction.CompareNotEqual, Local(OperandType.I32), op1, op2); + return ICompare(op1, op2, Comparison.NotEqual); } public Operand Load(OperandType type, Operand address) |