Mirror
/
icsharpcode-ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Add StackTypes.il

pull/960/head
Daniel Grunwald 8 years ago
parent
88c8f324f8
commit
06227f280c
4 changed files with 244 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
  2. 7
      ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
  3. 7
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  4. 218
      ICSharpCode.Decompiler.Tests/TestCases/Correctness/StackTypes.il

25
ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs
View File

@ -156,10 +156,15 @@ namespace ICSharpCode.Decompiler.Tests
}
[Test]
public void BitNot()
public void BitNot([Values(false, true)] bool force32Bit)
{
RunIL("BitNot.il");
RunIL("BitNot.il", CompilerOptions.UseDebug | CompilerOptions.Force32Bit, AssemblerOptions.Force32Bit);
CompilerOptions compiler = CompilerOptions.UseDebug;
AssemblerOptions asm = AssemblerOptions.None;
if (force32Bit) {
compiler |= CompilerOptions.Force32Bit;
asm |= AssemblerOptions.Force32Bit;
}
RunIL("BitNot.il", compiler, asm);
}
[Test]
@ -168,6 +173,18 @@ namespace ICSharpCode.Decompiler.Tests
RunIL("Jmp.il");
}
[Test]
public void StackTypes([Values(false, true)] bool force32Bit)
{
CompilerOptions compiler = CompilerOptions.UseDebug;
AssemblerOptions asm = AssemblerOptions.None;
if (force32Bit) {
compiler |= CompilerOptions.Force32Bit;
asm |= AssemblerOptions.Force32Bit;
}
RunIL("StackTypes.il", compiler, asm);
}
[Test]
public void UnsafeCode([ValueSource("defaultOptions")] CompilerOptions options)
{
@ -209,7 +226,7 @@ namespace ICSharpCode.Decompiler.Tests
{
RunCS(options: options);
}
void RunCS([CallerMemberName] string testName = null, CompilerOptions options = CompilerOptions.UseDebug)
{
string testFileName = testName + ".cs";

7
ICSharpCode.Decompiler.Tests/Helpers/Tester.cs
View File

@ -67,6 +67,10 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
string ilasmPath = Path.Combine(Environment.GetEnvironmentVariable("windir"), @"Microsoft.NET\Framework\v4.0.30319\ilasm.exe");
string outputFile = Path.Combine(Path.GetDirectoryName(sourceFileName), Path.GetFileNameWithoutExtension(sourceFileName));
string otherOptions = " ";
if (options.HasFlag(AssemblerOptions.Force32Bit)) {
outputFile += ".32";
otherOptions += "/32BitPreferred ";
}
if (options.HasFlag(AssemblerOptions.Library)) {
outputFile += ".dll";
otherOptions += "/dll ";
@ -79,9 +83,6 @@ namespace ICSharpCode.Decompiler.Tests.Helpers
if (options.HasFlag(AssemblerOptions.UseDebug)) {
otherOptions += "/debug ";
}
if (options.HasFlag(AssemblerOptions.Force32Bit)) {
otherOptions += "/32BitPreferred ";
}
ProcessStartInfo info = new ProcessStartInfo(ilasmPath);
info.Arguments = $"/nologo {otherOptions}/output=\"{outputFile}\" \"{sourceFileName}\"";

7
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
View File

@ -45,6 +45,7 @@
<ItemGroup>
<None Include="TestCases\Correctness\Jmp.il" />
<None Include="TestCases\Correctness\StackTypes.il" />
<None Include="TestCases\ILPretty\FSharpLoops.fs" />
<None Include="TestCases\ILPretty\FSharpLoops_Debug.il" />
<None Include="TestCases\ILPretty\FSharpLoops_Release.il" />
@ -134,12 +135,6 @@
<ItemGroup>
<None Include="TestCases\ILPretty\Issue646.il" />
<None Include="TestCases\Pretty\HelloWorld.il">
<DependentUpon>HelloWorld.cs</DependentUpon>
</None>
<None Include="TestCases\Pretty\InlineAssignmentTest.il">
<DependentUpon>InlineAssignmentTest.cs</DependentUpon>
</None>
<None Include="TestCases\ILPretty\Issue379.il" />
<None Include="TestCases\Pretty\Readme.txt" />
</ItemGroup>

218
ICSharpCode.Decompiler.Tests/TestCases/Correctness/StackTypes.il
View File

@ -0,0 +1,218 @@
.assembly extern mscorlib
{
.publickeytoken = ( b7 7a 5c 56 19 34 e0 89 )
.ver 4:0:0:0
}
.assembly 'StackTypes'
{
.ver 0:0:0:0
}
.module StackTypes.exe
.corflags 0x00000001 // ILOnly
.class private auto ansi abstract sealed beforefieldinit Program
extends [mscorlib]System.Object
{
.method public hidebysig static void Main (string[] args) cil managed
{
.maxstack 8
.entrypoint
//call void Program::Int32OrNativeTests()
ret
} // end of method Main
/*
.method public static void Int32OrNativeTests()
{
ldstr "Int32OrNative(0x7fffffff, false) = {0}"
ldc.i4 0x7fffffff
ldc.i4 0
call native int Program::Int32OrNative(int32, bool)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldstr "Int32OrNative(0x7fffffff, true) = {0}"
ldc.i4 0x7fffffff
ldc.i4 1
call native int Program::Int32OrNative(int32, bool)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldstr "Int32OrNative(-1, false) = {0}"
ldc.i4.m1
ldc.i4 0
call native int Program::Int32OrNative(int32, bool)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldstr "Int32OrNative(-1, true) = {0}"
ldc.i4.m1
ldc.i4 1
call native int Program::Int32OrNative(int32, bool)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldstr "Int32OrNativeLoopStyle(0x7fffffff):"
call void [mscorlib]System.Console::WriteLine(string)
ldc.i4 0x7fffffff
call void Program::Int32OrNativeLoopStyle(int32)
ldstr "Int32OrNativeLoopStyle(-1):"
call void [mscorlib]System.Console::WriteLine(string)
ldc.i4.m1
call void Program::Int32OrNativeLoopStyle(int32)
ldstr "Int32OrNativeDeadCode(0x7fffffff) = {0}"
ldc.i4 0x7fffffff
call native int Program::Int32OrNativeDeadCode(int32)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldstr "Int32OrNativeDeadCode(-1) = {0}"
ldc.i4.m1
call native int Program::Int32OrNativeDeadCode(int32)
box native int
call void [mscorlib]System.Console::WriteLine(string, object)
ldc.i4 0x7fffffff
call void Program::RunInt32OrNativeMultiUse(int32)
ldc.i4.m1
call void Program::RunInt32OrNativeMultiUse(int32)
ret
}
.method public static native int Int32OrNative(int32 val, bool use_native)
{
ldarg.1
brtrue use_native_int
use_i4:
ldarg.0
br after_if
after_if:
ldc.i4.1
add
ret
use_native_int:
ldarg.0
conv.u
br after_if
}
.method public static void Int32OrNativeLoopStyle(int32 val)
{
.locals init (
int32 i
)
ldarg.0
loop:
ldc.i4.1
add
call void Program::Print(native int)
ldloc.0
brtrue end
ldc.i4.1
stloc.0
ldarg.0
conv.u
br loop
end:
ret
}
.method public static native int Int32OrNativeDeadCode(int32 val)
{
use_i4:
ldarg.0
br after_if
after_if:
ldc.i4.1
add
ret
use_native_int: // dead code
ldarg.0
conv.u
br after_if
}
.method public static void RunInt32OrNativeMultiUse(int32 val)
{
ldstr "RunInt32OrNativeMultiUse({0}, push_i: false, use2: false) = {1}"
ldarg val
box int32
ldarg val
ldc.i4 0 // push_i
ldc.i4 0 // use2
call native int Program::Int32OrNativeMultiUse(int32 val, bool push_i, bool use2)
box native int
call void [mscorlib]System.Console::WriteLine(string, object, object)
ldstr "RunInt32OrNativeMultiUse({0}, push_i: false, use2: true) = {1}"
ldarg val
box int32
ldarg val
ldc.i4 0 // push_i
ldc.i4 1 // use2
call native int Program::Int32OrNativeMultiUse(int32 val, bool push_i, bool use2)
box native int
call void [mscorlib]System.Console::WriteLine(string, object, object)
ldstr "RunInt32OrNativeMultiUse({0}, push_i: true, use2: false) = {1}"
ldarg val
box int32
ldarg val
ldc.i4 1 // push_i
ldc.i4 0 // use2
call native int Program::Int32OrNativeMultiUse(int32 val, bool push_i, bool use2)
box native int
call void [mscorlib]System.Console::WriteLine(string, object, object)
ldstr "RunInt32OrNativeMultiUse({0}, push_i: true, use2: true) = {1}"
ldarg val
box int32
ldarg val
ldc.i4 1 // push_i
ldc.i4 1 // use2
call native int Program::Int32OrNativeMultiUse(int32 val, bool push_i, bool use2)
box native int
call void [mscorlib]System.Console::WriteLine(string, object, object)
ret
}
.method public static native int Int32OrNativeMultiUse(int32 val, bool push_i, bool use2)
{
ldarg.1
brtrue push_i
br push_i4
push_i4:
ldarg.0
ldarg.2
brtrue use2
br use1
push_i:
ldarg.0
conv.u
br use1
use1:
ldc.i4.1
add
ret
use2:
ldc.i4.2
add
ret
}
*/
.method public static void Print(native int val)
{
ldarg.0
box native int
call void [mscorlib]System.Console::WriteLine(object)
ret
}
}
Write Preview
Loading…
Cancel
Save