Implement IL codes for #91, #93, fix #105 #104
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| using Mono.Cecil.Cil; | ||
|
|
||
| using IL2C.Translators; | ||
| using IL2C.Metadata; | ||
|
|
||
| namespace IL2C.ILConverters | ||
| { | ||
|
|
@@ -275,7 +276,7 @@ internal abstract class ShiftConverter : InlineNoneConverter | |
| { | ||
| public abstract ShiftDirection Direction { get; } | ||
|
|
||
| public ExpressionEmitter Prepare(DecodeContext decodeContext, Func<ILocalVariableInformation, string> cast) | ||
| { | ||
| var si1 = decodeContext.PopStack(); | ||
| var si0 = decodeContext.PopStack(); | ||
|
|
@@ -287,13 +288,26 @@ public override ExpressionEmitter Prepare(DecodeContext decodeContext) | |
| si0.TargetType.FriendlyName); | ||
|
|
||
| var result = decodeContext.PushStack(si0.TargetType); | ||
|
|
||
| if (cast == null) | ||
| { | ||
| return (extractContext, _) => new[] { string.Format( | ||
| "{0} = {1} {2} {3}", | ||
| extractContext.GetSymbolName(result), | ||
| extractContext.GetSymbolName(si0), | ||
| Direction == ShiftDirection.Left ? "<<" : ">>", | ||
| extractContext.GetSymbolName(si1)) }; | ||
| } | ||
| else | ||
| { | ||
| return (extractContext, _) => new[] { string.Format( | ||
| "{0} = ({4}){1} {2} {3}", | ||
| extractContext.GetSymbolName(result), | ||
| extractContext.GetSymbolName(si0), | ||
| Direction == ShiftDirection.Left ? "<<" : ">>", | ||
| extractContext.GetSymbolName(si1), | ||
| cast(si0)) }; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -302,20 +316,35 @@ internal sealed class ShiftRightConverter : ShiftConverter | |
| public override OpCode OpCode => OpCodes.Shr; | ||
|
|
||
| public override ShiftDirection Direction => ShiftDirection.Right; | ||
|
|
||
| public override ExpressionEmitter Prepare(DecodeContext decodeContext) | ||
| { | ||
| return Prepare(decodeContext, si => si.TargetType.IsInt32StackFriendlyType ? "int32_t" : "int64_t"); | ||
| } | ||
| } | ||
|
|
||
| internal sealed class ShiftLeftConverter : ShiftConverter | ||
| { | ||
| public override OpCode OpCode => OpCodes.Shl; | ||
|
|
||
| public override ShiftDirection Direction => ShiftDirection.Left; | ||
|
|
||
| public override ExpressionEmitter Prepare(DecodeContext decodeContext) | ||
| { | ||
| return Prepare(decodeContext, null); | ||
| } | ||
| } | ||
|
|
||
| internal sealed class ShiftRightUnConverter : ShiftConverter | ||
| { | ||
| public override OpCode OpCode => OpCodes.Shr_Un; | ||
|
|
||
| public override ShiftDirection Direction => ShiftDirection.Right; | ||
|
|
||
| public override ExpressionEmitter Prepare(DecodeContext decodeContext) | ||
| { | ||
| return Prepare(decodeContext, si => si.TargetType.IsInt32StackFriendlyType ? "uint32_t" : "uint64_t"); | ||
| } | ||
| } | ||
|
|
||
| internal sealed class NegConverter : InlineNoneConverter | ||
|
There was a problem hiding this comment. @cyborgyn The 'neg' opcode calculus is serious with floating point type...
If we write the same expression in C language, I feel that the result may not be the same between C and IL (C#). Also, the current IL2C doesn't consider At this point, I think it's okay to include TODO comments and write with comment out regression test case. There was a problem hiding this comment. I wrote ckfinite(float/double) opcode implementation in C to conform with these tests https://github.com/dotnet/runtime/blob/f9a2449/src/tests/JIT/IL_Conformance/Old/Base/ckfinite.il#L52. Here is the C version: https://godbolt.org/z/vxMYrvb8d passing all conformance tests. coreclr uses the same approach by checking if all exponent bits are 1 to find out if float/double number is infinite or NaN, and emits ArithmeticException. Was looking at the place to implement it in IL2C. Note: in this case, we need the raw single/double number in binary storage variable (e.g. uint32_t and uint64_t respectively) as it is represented in IL (IEEE 754 floating-point); without converting it to C float where it may or may not conform to IEEE 754 fp (ISO C99 is relaxed on the format...). Feel free to implement ckfinite too, as this one is pretty simple. Otherwise, I'll take a stab at it; once this PR is merged. 🙂 There was a problem hiding this comment. Good news! I will include NaN handler and ckfinite implementation when after merged this PR. (Memoized: #112) |
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace IL2C.ILConverters | ||
| { | ||
| // Arithmetic Shift right (with sign) | ||
|
|
||
| // Warning!!! MSIL always operates for bit storage on Int32, or Int64 | ||
| // and as it seems, smaller unsigned values (uint8 & uint16) will never | ||
| // be able to set the int32 highest bit => they will operate as logical shift right. | ||
| // On the other hand: uint32 and uint64 are still operated as arithmetic shift. | ||
| [TestCase((byte)123, "ShrByte", (byte)123, 0)] | ||
| [TestCase((byte)0, "ShrByte", (byte)1, 1)] | ||
| [TestCase((byte)(Byte.MaxValue - 1) / 2, "ShrByte", (byte)Byte.MaxValue, 1)] | ||
| [TestCase((byte)(Byte.MaxValue - 1) / 4, "ShrByte", (byte)Byte.MaxValue, 2)] | ||
|
|
||
| [TestCase((sbyte)123, "ShrSByte", (sbyte)123, 0)] | ||
| [TestCase((sbyte)0, "ShrSByte", (sbyte)1, 1)] | ||
| [TestCase((sbyte)-1, "ShrSByte", (sbyte)-1, 1)] | ||
| [TestCase((sbyte)-1, "ShrSByte", (sbyte)-5, 10)] | ||
| [TestCase((sbyte)(SByte.MaxValue - 1) / 2, "ShrSByte", (sbyte)SByte.MaxValue, 1)] | ||
| [TestCase((sbyte)(SByte.MaxValue - 1) / 4, "ShrSByte", (sbyte)SByte.MaxValue, 2)] | ||
|
|
||
| [TestCase((short)123, "ShrShort", (short)123, 0)] | ||
| [TestCase((short)0, "ShrShort", (short)1, 1)] | ||
| [TestCase((short)-1, "ShrShort", (short)-1, 1)] | ||
| [TestCase((short)-1, "ShrShort", (short)-5, 10)] | ||
| [TestCase((short)(Int16.MaxValue - 1) / 2, "ShrShort", (short)Int16.MaxValue, 1)] | ||
| [TestCase((short)(Int16.MaxValue - 1) / 4, "ShrShort", (short)Int16.MaxValue, 2)] | ||
|
|
||
| [TestCase((ushort)123, "ShrUshort", (ushort)123, 0)] | ||
| [TestCase((ushort)0, "ShrUshort", (ushort)1, 1)] | ||
| [TestCase((ushort)(UInt16.MaxValue - 1) / 2, "ShrUshort", (ushort)UInt16.MaxValue, 1)] | ||
| [TestCase((ushort)(UInt16.MaxValue - 1) / 4, "ShrUshort", (ushort)UInt16.MaxValue, 2)] | ||
|
|
||
| [TestCase((int)123, "ShrInt", (int)123, 0)] | ||
| [TestCase((int)0, "ShrInt", (int)1, 1)] | ||
| [TestCase((int)-1, "ShrInt", (int)-1, 1)] | ||
| [TestCase((int)-1, "ShrInt", (int)-5, 10)] | ||
| [TestCase((int)(Int32.MaxValue - 1) / 2, "ShrInt", (int)Int32.MaxValue, 1)] | ||
| [TestCase((int)(Int32.MaxValue - 1) / 4, "ShrInt", (int)Int32.MaxValue, 2)] | ||
|
|
||
| [TestCase((uint)123, "ShrUInt", (uint)123, 0)] | ||
| [TestCase((uint)0, "ShrUInt", (uint)1, 1)] | ||
| [TestCase((uint)UInt32.MaxValue, "ShrUInt", (uint)UInt32.MaxValue, 1)] | ||
| [TestCase((uint)UInt32.MaxValue, "ShrUInt", (uint)UInt32.MaxValue, 2)] | ||
|
|
||
| [TestCase((long)123, "ShrLong", (long)123, 0)] | ||
| [TestCase((long)0, "ShrLong", (long)1, 1)] | ||
| [TestCase((long)-1, "ShrLong", (long)-1, 1)] | ||
| [TestCase((long)-1, "ShrLong", (long)-5, 10)] | ||
| [TestCase((long)(Int64.MaxValue - 1) / 2, "ShrLong", (long)Int64.MaxValue, 1)] | ||
| [TestCase((long)(Int64.MaxValue - 1) / 4, "ShrLong", (long)Int64.MaxValue, 2)] | ||
|
|
||
| [TestCase((ulong)123, "ShrUlong", (ulong)123, 0)] | ||
| [TestCase((ulong)0, "ShrUlong", (ulong)1, 1)] | ||
| [TestCase((ulong)UInt64.MaxValue, "ShrUlong", (ulong)UInt64.MaxValue, 1)] | ||
| [TestCase((ulong)UInt64.MaxValue, "ShrUlong", (ulong)UInt64.MaxValue, 2)] | ||
| public sealed class Shr | ||
| { | ||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern byte ShrByte(byte v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern sbyte ShrSByte(sbyte v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern short ShrShort(short v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern ushort ShrUshort(ushort v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern int ShrInt(int v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern uint ShrUInt(uint v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern long ShrLong(long v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern ulong ShrUlong(ulong v, int num); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| .class public IL2C.ILConverters.Shr | ||
| { | ||
| .method public static uint8 ShrByte(uint8 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static int8 ShrSByte(int8 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static int16 ShrShort(int16 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static uint16 ShrUshort(uint16 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static int32 ShrInt(int32 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static uint32 ShrUInt(uint32 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static int64 ShrLong(int64 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
|
|
||
| .method public static uint64 ShrUlong(uint64 v, int32 num) cil managed | ||
| { | ||
| .maxstack 2 | ||
| ldarg.0 | ||
| ldarg.1 | ||
| shr | ||
| ret | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace IL2C.ILConverters | ||
| { | ||
| // Logical Shift right (without sign) | ||
| [TestCase((byte)123, "ShrByte", (byte)123, 0)] | ||
| [TestCase((byte)0, "ShrByte", (byte)1, 1)] | ||
| [TestCase((byte)(Byte.MaxValue - 1) / 2, "ShrByte", (byte)Byte.MaxValue, 1)] | ||
| [TestCase((byte)(Byte.MaxValue - 1) / 4, "ShrByte", (byte)Byte.MaxValue, 2)] | ||
|
|
||
| [TestCase((sbyte)123, "ShrSByte", (sbyte)123, 0)] | ||
| [TestCase((sbyte)0, "ShrSByte", (sbyte)1, 1)] | ||
| [TestCase((sbyte)-1, "ShrSByte", (sbyte)-1, 1)] | ||
| [TestCase((sbyte)-1, "ShrSByte", (sbyte)-5, 10)] | ||
| [TestCase((sbyte)(SByte.MaxValue - 1) / 2, "ShrSByte", (sbyte)SByte.MaxValue, 1)] | ||
| [TestCase((sbyte)(SByte.MaxValue - 1) / 4, "ShrSByte", (sbyte)SByte.MaxValue, 2)] | ||
|
|
||
| [TestCase((short)123, "ShrShort", (short)123, 0)] | ||
| [TestCase((short)0, "ShrShort", (short)1, 1)] | ||
| [TestCase((short)-1, "ShrShort", (short)-1, 1)] | ||
| [TestCase((short)-1, "ShrShort", (short)-5, 10)] | ||
| [TestCase((short)(Int16.MaxValue - 1) / 2, "ShrShort", (short)Int16.MaxValue, 1)] | ||
| [TestCase((short)(Int16.MaxValue - 1) / 4, "ShrShort", (short)Int16.MaxValue, 2)] | ||
|
|
||
| [TestCase((ushort)123, "ShrUshort", (ushort)123, 0)] | ||
| [TestCase((ushort)0, "ShrUshort", (ushort)1, 1)] | ||
| [TestCase((ushort)(UInt16.MaxValue - 1) / 2, "ShrUshort", (ushort)UInt16.MaxValue, 1)] | ||
| [TestCase((ushort)(UInt16.MaxValue - 1) / 4, "ShrUshort", (ushort)UInt16.MaxValue, 2)] | ||
|
|
||
| [TestCase((int)123, "ShrInt", (int)123, 0)] | ||
| [TestCase((int)0, "ShrInt", (int)1, 1)] | ||
| [TestCase((int)0x7FFFFFFF, "ShrInt", (int)-1, 1)] | ||
| [TestCase((int)0x003FFFFF, "ShrInt", (int)-5, 10)] | ||
| [TestCase((int)(Int32.MaxValue - 1) / 2, "ShrInt", (int)Int32.MaxValue, 1)] | ||
| [TestCase((int)(Int32.MaxValue - 1) / 4, "ShrInt", (int)Int32.MaxValue, 2)] | ||
|
|
||
| [TestCase((uint)123, "ShrUInt", (uint)123, 0)] | ||
| [TestCase((uint)0, "ShrUInt", (uint)1, 1)] | ||
| [TestCase((uint)0x7FFFFFFF, "ShrUInt", (uint)UInt32.MaxValue, 1)] | ||
| [TestCase((uint)0x3FFFFFFF, "ShrUInt", (uint)UInt32.MaxValue, 2)] | ||
|
|
||
| [TestCase((long)123, "ShrLong", (long)123, 0)] | ||
| [TestCase((long)0, "ShrLong", (long)1, 1)] | ||
| [TestCase((long)0x7FFFFFFFFFFFFFFF, "ShrLong", (long)-1, 1)] | ||
| [TestCase((long)0x003FFFFFFFFFFFFF, "ShrLong", (long)-5, 10)] | ||
| [TestCase((long)(Int64.MaxValue - 1) / 2, "ShrLong", (long)Int64.MaxValue, 1)] | ||
| [TestCase((long)(Int64.MaxValue - 1) / 4, "ShrLong", (long)Int64.MaxValue, 2)] | ||
|
|
||
| [TestCase((ulong)123, "ShrUlong", (ulong)123, 0)] | ||
| [TestCase((ulong)0, "ShrUlong", (ulong)1, 1)] | ||
| [TestCase((ulong)0x7FFFFFFFFFFFFFFF, "ShrUlong", (ulong)UInt64.MaxValue, 1)] | ||
| [TestCase((ulong)0x3FFFFFFFFFFFFFFF, "ShrUlong", (ulong)UInt64.MaxValue, 2)] | ||
| public sealed class Shr_un | ||
| { | ||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern byte ShrByte(byte v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern sbyte ShrSByte(sbyte v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern short ShrShort(short v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern ushort ShrUshort(ushort v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern int ShrInt(int v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern uint ShrUInt(uint v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern long ShrLong(long v, int num); | ||
|
|
||
| [MethodImpl(MethodImplOptions.ForwardRef)] | ||
| public static extern ulong ShrUlong(ulong v, int num); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cyborgyn Ouch, I forgot signed integer flag :)
shropcode will understand signed bit on MSB:It case, we can use C language shift operator with signed integer type (int32_t, int64_t and intptr_t).
But
shr.unopcode:Strictly ignores MSB bit and insert zero.
ECMA-335 III.3.60 shr.un - shift integer right, unsignedsection:On IL2C side, The C language expression is having to write temporary casting unsigned integers explicitly, like:
We need regression test for shr.un (and shr) converter, require these topics:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did the temporary casting, if you look closely, and the tests are also walking through all of those tricky cases. One thing I forget, is negative shift (I never tried it, never even thought about it on any platform/language before). :) For the shift left, no magic happens, this is why it is omitted there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I found it on branch latest commit. (I took and read commit from bottom of branch...)
I approved it!
Bit off topic: The CLR (.NET Framework CLR and Core CLR) behavior is funny. Because
shrandshr.unopcode behavior isn't defined with anyint32,int64andIntPtron ECMA-335.But real regression test on CLR is passed...