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

Merge pull request #77 from PathogenDavid/master

Browse source 
Added stobj stack push/pop information to OpType and some other smaller changes.
This commit is contained in:
Matthijs ter Woord 2015-04-20 18:49:51 +02:00
commit e99e9ffad9
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/Cosmos.HAL/Cosmos.HAL.csproj
View file

@ -116,6 +116,7 @@
<Compile Include="PCIDeviceBridge.cs" /> <Compile Include="PCIDeviceBridge.cs" />
<Compile Include="PCIDeviceCardbus.cs" /> <Compile Include="PCIDeviceCardbus.cs" />
<Compile Include="PCIDeviceNormal.cs" /> <Compile Include="PCIDeviceNormal.cs" />
<Compile Include="PCSpeaker.cs" />
<Compile Include="PIT.cs" /> <Compile Include="PIT.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RTC.cs" /> <Compile Include="RTC.cs" />

4
source/Cosmos.IL2CPU/ILOpCodes/OpType.cs
View file

@ -44,6 +44,8 @@ namespace Cosmos.IL2CPU.ILOpCodes {
return 1; return 1;
case Code.Unbox: case Code.Unbox:
return 1; return 1;
case Code.Stobj:
return 2;
default: default:
throw new NotImplementedException("OpCode '" + OpCode + "' not implemented! Encountered in method " + aMethod.ToString()); throw new NotImplementedException("OpCode '" + OpCode + "' not implemented! Encountered in method " + aMethod.ToString());
} }
@ -75,6 +77,8 @@ namespace Cosmos.IL2CPU.ILOpCodes {
return 1; return 1;
case Code.Unbox: case Code.Unbox:
return 1; return 1;
case Code.Stobj:
return 0;
default: default:
throw new NotImplementedException("OpCode '" + OpCode + "' not implemented!"); throw new NotImplementedException("OpCode '" + OpCode + "' not implemented!");
} }

6
source/Cosmos.IL2CPU/ILScanner.cs
View file

@ -131,6 +131,12 @@ namespace Cosmos.IL2CPU
mItems.Add(aItem); mItems.Add(aItem);
mItemsList.Add(aItem); mItemsList.Add(aItem);
MethodBase methodBaseSource = aSrc as MethodBase;
if (methodBaseSource != null)
{
aSrc = methodBaseSource.DeclaringType.ToString() + "::" + aSrc.ToString();
}
mQueue.Enqueue(new ScannerQueueItem() { Item = aItem, QueueReason = aSrcType, SourceItem = aSrc + Environment.NewLine + sourceItem }); mQueue.Enqueue(new ScannerQueueItem() { Item = aItem, QueueReason = aSrcType, SourceItem = aSrc + Environment.NewLine + sourceItem });
} }
} }