mirror of https://github.com/icsharpcode/ILSpy.git
Daniel Grunwald
11 years ago
9 changed files with 444 additions and 337 deletions
@ -0,0 +1,42 @@
@@ -0,0 +1,42 @@
|
||||
using System; |
||||
using System.Collections.Generic; |
||||
using System.Diagnostics; |
||||
using System.Linq; |
||||
using System.Text; |
||||
using System.Threading.Tasks; |
||||
|
||||
namespace ICSharpCode.Decompiler.IL |
||||
{ |
||||
partial class Branch : SimpleInstruction |
||||
{ |
||||
public readonly int TargetILOffset; |
||||
|
||||
/// <summary>
|
||||
/// Pops the specified number of arguments from the evaluation stack during the branching operation.
|
||||
/// Note that the Branch instruction does not set InstructionFlags.MayPop -- the pop instead is considered
|
||||
/// to happen after the branch was taken.
|
||||
/// </summary>
|
||||
public int PopCount; |
||||
|
||||
public Branch(int targetILOffset) : base(OpCode.Branch) |
||||
{ |
||||
this.TargetILOffset = targetILOffset; |
||||
} |
||||
|
||||
public string TargetLabel { |
||||
get { return CecilExtensions.OffsetToString(TargetILOffset); } |
||||
} |
||||
|
||||
public override void WriteTo(ITextOutput output) |
||||
{ |
||||
output.Write(OpCode); |
||||
output.Write(' '); |
||||
output.WriteReference(TargetLabel, TargetILOffset, isLocal: true); |
||||
if (PopCount != 0) { |
||||
output.Write(" (pop "); |
||||
output.Write(PopCount.ToString()); |
||||
output.Write(')'); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
@ -1,156 +0,0 @@
@@ -1,156 +0,0 @@
|
||||
using System; |
||||
using System.Collections.Generic; |
||||
using System.Diagnostics; |
||||
using System.Linq; |
||||
using System.Text; |
||||
using System.Threading.Tasks; |
||||
|
||||
namespace ICSharpCode.Decompiler.IL |
||||
{ |
||||
/// <summary>
|
||||
/// Base class for unconditional and conditional branches.
|
||||
/// </summary>
|
||||
public abstract class BranchInstruction : ILInstruction |
||||
{ |
||||
public readonly int TargetILOffset; |
||||
|
||||
protected BranchInstruction(OpCode opCode, int targetILOffset) : base(opCode) |
||||
{ |
||||
this.TargetILOffset = targetILOffset; |
||||
} |
||||
|
||||
public string TargetLabel { |
||||
get { return CecilExtensions.OffsetToString(TargetILOffset); } |
||||
} |
||||
|
||||
public override void WriteTo(ITextOutput output) |
||||
{ |
||||
output.Write(OpCode.ToString()); |
||||
output.Write(' '); |
||||
output.WriteReference(TargetLabel, TargetILOffset, isLocal: true); |
||||
} |
||||
} |
||||
|
||||
partial class Branch |
||||
{ |
||||
public override TAccumulate AggregateChildren<TSource, TAccumulate>(TAccumulate initial, ILVisitor<TSource> visitor, Func<TAccumulate, TSource, TAccumulate> func) |
||||
{ |
||||
return initial; |
||||
} |
||||
|
||||
public override void TransformChildren(ILVisitor<ILInstruction> visitor) |
||||
{ |
||||
} |
||||
|
||||
internal override ILInstruction Inline(InstructionFlags flagsBefore, Stack<ILInstruction> instructionStack, out bool finished) |
||||
{ |
||||
finished = true; |
||||
return this; |
||||
} |
||||
} |
||||
|
||||
partial class ConditionalBranch |
||||
{ |
||||
ILInstruction condition; |
||||
|
||||
public ConditionalBranch(ILInstruction condition, int targetILOffset) : base(OpCode.ConditionalBranch, targetILOffset) |
||||
{ |
||||
this.Condition = condition; |
||||
} |
||||
|
||||
public ILInstruction Condition { |
||||
get { |
||||
return condition; |
||||
} |
||||
set { |
||||
ValidateArgument(value); |
||||
SetChildInstruction(ref condition, value); |
||||
} |
||||
} |
||||
|
||||
public override TAccumulate AggregateChildren<TSource, TAccumulate>(TAccumulate initial, ILVisitor<TSource> visitor, Func<TAccumulate, TSource, TAccumulate> func) |
||||
{ |
||||
return func(initial, condition.AcceptVisitor(visitor)); |
||||
} |
||||
|
||||
public override void TransformChildren(ILVisitor<ILInstruction> visitor) |
||||
{ |
||||
this.Condition = condition.AcceptVisitor(visitor); |
||||
} |
||||
|
||||
internal override ILInstruction Inline(InstructionFlags flagsBefore, Stack<ILInstruction> instructionStack, out bool finished) |
||||
{ |
||||
this.Condition = condition.Inline(flagsBefore, instructionStack, out finished); |
||||
return this; |
||||
} |
||||
|
||||
protected override InstructionFlags ComputeFlags() |
||||
{ |
||||
return condition.Flags | InstructionFlags.MayBranch; |
||||
} |
||||
} |
||||
|
||||
/* |
||||
/// <summary>
|
||||
/// Special instruction for unresolved branches.
|
||||
/// Created by ILReader phase, replaced with TODO when building basic blocks.
|
||||
/// </summary>
|
||||
class ConditionalBranch(public ILInstruction Condition, int targetILOffset) : Branch(OpCode.ConditionalBranch, targetILOffset) |
||||
{ |
||||
public override bool IsPeeking { get { return Condition.IsPeeking; } } |
||||
|
||||
public override void WriteTo(ITextOutput output) |
||||
{ |
||||
base.WriteTo(output); |
||||
output.Write('('); |
||||
Condition.WriteTo(output); |
||||
output.Write(')'); |
||||
} |
||||
|
||||
public override void TransformChildren(Func<ILInstruction, ILInstruction> transformFunc) |
||||
{ |
||||
Condition = transformFunc(Condition); |
||||
} |
||||
|
||||
internal override ILInstruction Inline(InstructionFlags flagsBefore, Stack<ILInstruction> instructionStack, out bool finished) |
||||
{ |
||||
Condition = Condition.Inline(flagsBefore, instructionStack, out finished); |
||||
return this; |
||||
} |
||||
|
||||
public override InstructionFlags Flags |
||||
{ |
||||
get { return InstructionFlags.MayJump | Condition.Flags; } |
||||
} |
||||
} |
||||
|
||||
class ReturnVoidInstruction() : SimpleInstruction(OpCode.Ret) |
||||
{ |
||||
public override bool IsEndReachable { get { return false; } } |
||||
|
||||
public override InstructionFlags Flags |
||||
{ |
||||
get { return InstructionFlags.MayJump; } |
||||
} |
||||
} |
||||
|
||||
class ReturnInstruction() : UnaryInstruction(OpCode.Ret) |
||||
{ |
||||
public override bool IsEndReachable { get { return false; } } |
||||
|
||||
public override InstructionFlags Flags |
||||
{ |
||||
get { return InstructionFlags.MayJump | Operand.Flags; } |
||||
} |
||||
} |
||||
|
||||
class ThrowInstruction() : UnaryInstruction(OpCode.Throw) |
||||
{ |
||||
public override bool IsEndReachable { get { return false; } } |
||||
|
||||
public override InstructionFlags Flags |
||||
{ |
||||
get { return InstructionFlags.MayJump | Operand.Flags; } |
||||
} |
||||
}*/ |
||||
} |
||||
@ -0,0 +1,116 @@
@@ -0,0 +1,116 @@
|
||||
// Copyright (c) 2014 Daniel Grunwald
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||
// software and associated documentation files (the "Software"), to deal in the Software
|
||||
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
||||
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
||||
// to whom the Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all copies or
|
||||
// substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
||||
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
|
||||
using System; |
||||
using System.Collections.Generic; |
||||
|
||||
namespace ICSharpCode.Decompiler.IL |
||||
{ |
||||
partial class IfInstruction : ILInstruction |
||||
{ |
||||
ILInstruction condition; |
||||
ILInstruction trueInst; |
||||
ILInstruction falseInst; |
||||
|
||||
public IfInstruction(ILInstruction condition, ILInstruction trueInst, ILInstruction falseInst = null) : base(OpCode.IfInstruction) |
||||
{ |
||||
this.Condition = condition; |
||||
this.TrueInst = trueInst; |
||||
this.FalseInst = falseInst ?? new Nop(); |
||||
} |
||||
|
||||
public ILInstruction Condition { |
||||
get { return condition; } |
||||
set { |
||||
ValidateArgument(value); |
||||
SetChildInstruction(ref condition, value); |
||||
} |
||||
} |
||||
|
||||
public ILInstruction TrueInst { |
||||
get { return trueInst; } |
||||
set { |
||||
if (value == null) |
||||
throw new ArgumentNullException(); |
||||
SetChildInstruction(ref trueInst, value); |
||||
} |
||||
} |
||||
|
||||
public ILInstruction FalseInst { |
||||
get { return falseInst; } |
||||
set { |
||||
if (value == null) |
||||
throw new ArgumentNullException(); |
||||
SetChildInstruction(ref falseInst, value); |
||||
} |
||||
} |
||||
|
||||
public override StackType ResultType { |
||||
get { |
||||
return trueInst.ResultType; |
||||
} |
||||
} |
||||
|
||||
public override TAccumulate AggregateChildren<TSource, TAccumulate>(TAccumulate initial, ILVisitor<TSource> visitor, Func<TAccumulate, TSource, TAccumulate> func) |
||||
{ |
||||
TAccumulate value = initial; |
||||
value = func(value, condition.AcceptVisitor(visitor)); |
||||
value = func(value, trueInst.AcceptVisitor(visitor)); |
||||
value = func(value, falseInst.AcceptVisitor(visitor)); |
||||
return value; |
||||
} |
||||
|
||||
public override void TransformChildren(ILVisitor<ILInstruction> visitor) |
||||
{ |
||||
this.Condition = condition.AcceptVisitor(visitor); |
||||
this.TrueInst = trueInst.AcceptVisitor(visitor); |
||||
this.FalseInst = falseInst.AcceptVisitor(visitor); |
||||
} |
||||
|
||||
internal override ILInstruction Inline(InstructionFlags flagsBefore, Stack<ILInstruction> instructionStack, out bool finished) |
||||
{ |
||||
this.Condition = condition.Inline(flagsBefore, instructionStack, out finished); |
||||
// don't continue inlining if this instruction still contains peek/pop instructions
|
||||
if (HasFlag(InstructionFlags.MayPeek | InstructionFlags.MayPop)) |
||||
finished = false; |
||||
return this; |
||||
} |
||||
|
||||
protected override InstructionFlags ComputeFlags() |
||||
{ |
||||
// the endpoint of the 'if' is only unreachable if both branches have an unreachable endpoint
|
||||
const InstructionFlags combineWithAnd = InstructionFlags.EndPointUnreachable; |
||||
InstructionFlags trueFlags = trueInst.Flags; |
||||
InstructionFlags falseFlags = falseInst.Flags; |
||||
return condition.Flags | (trueFlags & falseFlags) | ((trueFlags | falseFlags) & ~combineWithAnd); |
||||
} |
||||
|
||||
public override void WriteTo(ITextOutput output) |
||||
{ |
||||
output.Write(OpCode); |
||||
output.Write(" ("); |
||||
condition.WriteTo(output); |
||||
output.Write(") "); |
||||
trueInst.WriteTo(output); |
||||
if (falseInst.OpCode != OpCode.Nop) { |
||||
output.Write(" else "); |
||||
falseInst.WriteTo(output); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue