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

g3

Browse source
This commit is contained in:
Kudzu 2017-07-31 13:06:18 -04:00
parent 4a9ea3ae93
commit adce540d36
6 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Temp - Ignore me (or not, but dont goof me up)/Test.sln.lnk Normal file
View file

Binary file not shown.

6
Temp - Ignore me (or not, but dont goof me up)/Update G3 Plugs and Targets.bat
View file

@ -1,7 +1,7 @@
cd "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Kernel\" cd "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Kernel\"
copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll" copy "C:\source\Cosmos\source\Kernel-x86\00-CPU\Cosmos.CPU_Plugs\bin\Debug\netstandard1.5\Cosmos.CPU_Plugs.dll"
copy "C:\source\Cosmos\source\Kernel\00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll" copy "C:\source\Cosmos\source\Kernel-x86\00-CPU\Cosmos.CPU_Asm\bin\Debug\netstandard1.5\Cosmos.CPU_Asm.dll"
copy "C:\source\Cosmos\source\Kernel\80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll" copy "C:\source\Cosmos\source\Kernel-x86\80-System\Cosmos.System_Plugs\bin\Debug\netstandard1.5\Cosmos.System_Plugs.dll"
cd C:\source\Cosmos\source\Cosmos.Build.MSBuild cd C:\source\Cosmos\source\Cosmos.Build.MSBuild
copy cosmos.targets "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Build\VSIP" copy cosmos.targets "C:\Users\zilon\AppData\Roaming\Cosmos User Kit\Build\VSIP"

5
Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs
View file

@ -196,11 +196,6 @@ namespace Cosmos.TestRunner.Core
"IgnoreDebugStubAttribute:False" "IgnoreDebugStubAttribute:False"
}; };
if (UseG3Kernel)
{
xArgs.Add("UseGen3Kernel:True");
}
xArgs.AddRange(References.Select(aReference => "References:" + aReference)); xArgs.AddRange(References.Select(aReference => "References:" + aReference));
bool xUsingUserkit = false; bool xUsingUserkit = false;

22
Tests/Cosmos.TestRunner.Core/TestKernelSets.cs
View file

@ -8,21 +8,21 @@ namespace Cosmos.TestRunner.Core
public static IEnumerable<Type> GetStableKernelTypes() public static IEnumerable<Type> GetStableKernelTypes()
{ {
//yield return typeof(BoxingTests.Kernel); //yield return typeof(BoxingTests.Kernel);
yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel); //yield return typeof(Cosmos.Compiler.Tests.Bcl.Kernel);
////yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel); ////yield return typeof(Cosmos.Compiler.Tests.Encryption.Kernel);
yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel); //yield return typeof(Cosmos.Compiler.Tests.Exceptions.Kernel);
yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel); //yield return typeof(Cosmos.Compiler.Tests.LinqTests.Kernel);
yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel); //yield return typeof(Cosmos.Compiler.Tests.MethodTests.Kernel);
yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel); //yield return typeof(Cosmos.Compiler.Tests.SimpleWriteLine.Kernel);
yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel); //yield return typeof(Cosmos.Compiler.Tests.SingleEchoTest.Kernel);
yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel); //yield return typeof(Cosmos.Kernel.Tests.Fat.Kernel);
yield return typeof(Cosmos.Kernel.Tests.IO.Kernel); //yield return typeof(Cosmos.Kernel.Tests.IO.Kernel);
yield return typeof(SimpleStructsAndArraysTest.Kernel); //yield return typeof(SimpleStructsAndArraysTest.Kernel);
yield return typeof(VGACompilerCrash.Kernel); //yield return typeof(VGACompilerCrash.Kernel);
//yield return typeof(FrotzKernel.Kernel); //yield return typeof(FrotzKernel.Kernel);
//yield return typeof(KernelGen3.Boot); yield return typeof(KernelGen3.Boot);
/* Please see the notes on the kernel itself before enabling it */ /* Please see the notes on the kernel itself before enabling it */
//yield return typeof(GraphicTest.Kernel); //yield return typeof(GraphicTest.Kernel);

7
source/Cosmos.IL2CPU/CompilerEngine.cs
View file

@ -25,7 +25,7 @@ namespace Cosmos.IL2CPU {
{ {
get get
{ {
return KernelPkg == "X86G3"; return string.Equals(KernelPkg, "X86G3", StringComparison.CurrentCultureIgnoreCase);
} }
} }
public string DebugMode { get; set; } public string DebugMode { get; set; }
@ -305,7 +305,8 @@ namespace Cosmos.IL2CPU {
CompilerHelpers.Debug($"Looking for kernel in {xAssembly}"); CompilerHelpers.Debug($"Looking for kernel in {xAssembly}");
foreach (var xType in xAssembly.ExportedTypes) { foreach (var xType in xAssembly.ExportedTypes) {
if (!xType.GetTypeInfo().IsGenericTypeDefinition && !xType.GetTypeInfo().IsAbstract) { var xTypeInfo = xType.GetTypeInfo();
if (!xTypeInfo.IsGenericTypeDefinition && !xTypeInfo.IsAbstract) {
CompilerHelpers.Debug($"Checking type {xType.FullName}"); CompilerHelpers.Debug($"Checking type {xType.FullName}");
// We used to resolve with this: // We used to resolve with this:
@ -315,7 +316,7 @@ namespace Cosmos.IL2CPU {
// will force user to implement what is needed if replacing our core. But in the end this is a "not needed" feature // will force user to implement what is needed if replacing our core. But in the end this is a "not needed" feature
// and would only complicate things. // and would only complicate things.
// So for now at least, we look by name so we dont have a dependency since the method returns a MethodBase and not a Kernel instance anyway. // So for now at least, we look by name so we dont have a dependency since the method returns a MethodBase and not a Kernel instance anyway.
if (xType.GetTypeInfo().BaseType.FullName == xKernelBaseName) { if (xTypeInfo.BaseType.FullName == xKernelBaseName) {
if (xKernelType != null) { if (xKernelType != null) {
LogError($"Two kernels found: {xType.FullName} and {xKernelType.FullName}"); LogError($"Two kernels found: {xType.FullName} and {xKernelType.FullName}");
return null; return null;

2
source/Kernel-X86/90-Application/GuessBootGen3.Cosmos
View file

@ -71,7 +71,7 @@
<Project>{63843265-d889-47d2-883e-595289c99f42}</Project> <Project>{63843265-d889-47d2-883e-595289c99f42}</Project>
<Private>True</Private> <Private>True</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\GuessG3\GuessKernelGen3.csproj"> <ProjectReference Include="..\90-Application\GuessKernelGen3.csproj">
<Name>GuessKernelGen3</Name> <Name>GuessKernelGen3</Name>
<Project>{9e58e949-7b71-45ed-9610-11da287ee933}</Project> <Project>{9e58e949-7b71-45ed-9610-11da287ee933}</Project>
<Private>True</Private> <Private>True</Private>