diff options
Diffstat (limited to 'ARMeilleure/Instructions/InstEmitAluHelper.cs')
| -rw-r--r-- | ARMeilleure/Instructions/InstEmitAluHelper.cs | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/ARMeilleure/Instructions/InstEmitAluHelper.cs b/ARMeilleure/Instructions/InstEmitAluHelper.cs index 32440283..fe555767 100644 --- a/ARMeilleure/Instructions/InstEmitAluHelper.cs +++ b/ARMeilleure/Instructions/InstEmitAluHelper.cs @@ -12,6 +12,18 @@ namespace ARMeilleure.Instructions { static class InstEmitAluHelper { + public static bool ShouldSetFlags(ArmEmitterContext context) + { + IOpCode32Alu op = (IOpCode32Alu)context.CurrOp; + + if (op.SetFlags == null) + { + return !context.IsInIfThenBlock; + } + + return op.SetFlags.Value; + } + public static void EmitNZFlagsCheck(ArmEmitterContext context, Operand d) { SetFlag(context, PState.NFlag, context.ICompareLess (d, Const(d.Type, 0))); @@ -183,9 +195,9 @@ namespace ARMeilleure.Instructions switch (context.CurrOp) { // ARM32. - case OpCode32AluImm op: + case IOpCode32AluImm op: { - if (op.SetFlags && op.IsRotated) + if (ShouldSetFlags(context) && op.IsRotated) { SetFlag(context, PState.CFlag, Const((uint)op.Immediate >> 31)); } @@ -195,10 +207,8 @@ namespace ARMeilleure.Instructions case OpCode32AluImm16 op: return Const(op.Immediate); - case OpCode32AluRsImm op: return GetMShiftedByImmediate(context, op, setCarry); - case OpCode32AluRsReg op: return GetMShiftedByReg(context, op, setCarry); - - case OpCodeT16AluImm8 op: return Const(op.Immediate); + case IOpCode32AluRsImm op: return GetMShiftedByImmediate(context, op, setCarry); + case IOpCode32AluRsReg op: return GetMShiftedByReg(context, op, setCarry); case IOpCode32AluReg op: return GetIntA32(context, op.Rm); @@ -249,7 +259,7 @@ namespace ARMeilleure.Instructions } // ARM32 helpers. - public static Operand GetMShiftedByImmediate(ArmEmitterContext context, OpCode32AluRsImm op, bool setCarry) + public static Operand GetMShiftedByImmediate(ArmEmitterContext context, IOpCode32AluRsImm op, bool setCarry) { Operand m = GetIntA32(context, op.Rm); @@ -267,7 +277,7 @@ namespace ARMeilleure.Instructions if (shift != 0) { - setCarry &= op.SetFlags; + setCarry &= ShouldSetFlags(context); switch (op.ShiftType) { @@ -305,7 +315,7 @@ namespace ARMeilleure.Instructions return shift; } - public static Operand GetMShiftedByReg(ArmEmitterContext context, OpCode32AluRsReg op, bool setCarry) + public static Operand GetMShiftedByReg(ArmEmitterContext context, IOpCode32AluRsReg op, bool setCarry) { Operand m = GetIntA32(context, op.Rm); Operand s = context.ZeroExtend8(OperandType.I32, GetIntA32(context, op.Rs)); @@ -314,7 +324,7 @@ namespace ARMeilleure.Instructions Operand zeroResult = m; Operand shiftResult = m; - setCarry &= op.SetFlags; + setCarry &= ShouldSetFlags(context); switch (op.ShiftType) { |