diff options
| author | Marek Safar <marek.safar@gmail.com> | 2014-01-22 13:27:48 +0400 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2014-01-22 20:54:13 +0400 |
| commit | a2febcf2de87a2d4d86da572db8f18b55d7e1d56 (patch) | |
| tree | 7fb24a97a8bde2f0b19dbdb6d48071a81860d411 /mcs/class/dlr | |
| parent | 738f9c3c3848d9a5f097f12d5d9081457136f44a (diff) | |
[dlr] Fix UInt64 add/div
Diffstat (limited to 'mcs/class/dlr')
| -rw-r--r-- | mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/AddInstruction.cs | 4 | ||||
| -rw-r--r-- | mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/DivInstruction.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/AddInstruction.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/AddInstruction.cs index c6b7eb8d829..1f1775c180f 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/AddInstruction.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/AddInstruction.cs @@ -82,7 +82,7 @@ namespace Microsoft.Scripting.Interpreter { public override int Run(InterpretedFrame frame) { object l = frame.Data[frame.StackIndex - 2]; object r = frame.Data[frame.StackIndex - 1]; - frame.Data[frame.StackIndex - 2] = (UInt64)unchecked((Int16)l + (Int16)r); + frame.Data[frame.StackIndex - 2] = (UInt64)unchecked((UInt64)l + (UInt64)r); frame.StackIndex--; return +1; } @@ -193,7 +193,7 @@ namespace Microsoft.Scripting.Interpreter { public override int Run(InterpretedFrame frame) { object l = frame.Data[frame.StackIndex - 2]; object r = frame.Data[frame.StackIndex - 1]; - frame.Data[frame.StackIndex - 2] = (UInt64)checked((Int16)l + (Int16)r); + frame.Data[frame.StackIndex - 2] = (UInt64)checked((UInt64)l + (UInt64)r); frame.StackIndex--; return +1; } diff --git a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/DivInstruction.cs b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/DivInstruction.cs index 08ed47926b5..f7d14972564 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/DivInstruction.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Dynamic/Interpreter/Instructions/DivInstruction.cs @@ -82,7 +82,7 @@ namespace Microsoft.Scripting.Interpreter { public override int Run(InterpretedFrame frame) { object l = frame.Data[frame.StackIndex - 2]; object r = frame.Data[frame.StackIndex - 1]; - frame.Data[frame.StackIndex - 2] = (UInt64)((Int16)l / (Int16)r); + frame.Data[frame.StackIndex - 2] = (UInt64)((UInt64)l / (UInt64)r); frame.StackIndex--; return 1; } |