dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-27 22:12:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from CosmosOS/master

Browse source 
Merge
This commit is contained in:
Cyber4 2015-11-18 15:58:27 -05:00
commit 2e0ac5f13f
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
View file

@ -522,6 +522,15 @@ namespace Cosmos.IL2CPU.ILOpCodes {
if (!StackPopTypes.Contains(null))
{
// PopTypes set, but PushType not yet, so fill it.
if ((StackPopTypes[0] == typeof(bool) && StackPopTypes[1] == typeof(Int32)) ||
(StackPopTypes[0] == typeof(Int32) && StackPopTypes[1] == typeof(bool)))
{
StackPushTypes[0] = typeof(Int32);
aSituationChanged = true;
return;
}
if ((StackPopTypes[0] == typeof (IntPtr) && StackPopTypes[1] == typeof (UInt32*))
|| (StackPopTypes[0] == typeof (uint*) && StackPopTypes[1] == typeof (IntPtr)))
{