Skip to content

Updated ILGroup #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated ILGroup #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
757250d
Update ILGroup.cs
Diamantino-Op Jun 10, 2022
aae771b
Merge branch 'CosmosOS:master' into master
Diamantino-Op Jun 10, 2022
36ce51e
s
Diamantino-Op Jun 29, 2022
9e51354
Merge branch 'CosmosOS:master' into master
Diamantino-Op Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Cosmos.IL2CPU/ILOpCodes/OpNone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ public override void DoInterpretStackTypes()
{
throw new Exception("Wrong value type: " + StackPopTypes[0].FullName);
}
if (!ILOp.IsPointer(StackPopTypes[1]) && StackPopTypes[1] != typeof(int))
if (!ILOp.IsPointer(StackPopTypes[1]) && StackPopTypes[1] != typeof(long) && StackPopTypes[1] != typeof(int))
{
throw new Exception("Wrong Pointer type: " + StackPopTypes[1].FullName);
}
Expand Down
10 changes: 8 additions & 2 deletions source/Cosmos.IL2CPU/MethodAnalysis/ILGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,17 @@ public static List<ILGroup> GenerateGroups(ILMethod aMethod, DebugInfo.SequenceP
}

// Initialse the datastructure with the first opcode

var list = aMethod.Code.Select(c => c.Value.Position).ToList();
// Analyse op codes
foreach (var (_, opGroup) in groups)
foreach (var (val, opGroup) in groups)
{

while (true)
{
var analysing = opGroup.OpCodes.Last();

list.Remove(analysing.Position);

analysed++;

var done = true;
Expand Down Expand Up @@ -120,6 +123,9 @@ public static List<ILGroup> GenerateGroups(ILMethod aMethod, DebugInfo.SequenceP
}
}

aMethod.Code = aMethod.Code.Where(c => !list.Contains(c.Key)).ToDictionary(i => i.Key, i => i.Value);
aMethod.Length = aMethod.Code.Count;

if(analysed != aMethod.Length)
{
throw new Exception("GenerateGroups --- Did not reach all instructions in method");
Expand Down