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

g3

Browse source
This commit is contained in:
Kudzu 2017-07-27 18:50:04 -04:00
parent 88534e9ea7
commit 83fdcbeee1
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Demos/GuessG3/GuessBootGen3.Cosmos
View file

@ -56,8 +56,8 @@
<Compile Remove="*" /> <Compile Remove="*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GuessG3\KernelGen3.csproj"> <ProjectReference Include="..\GuessG3\GuessKernelGen3.csproj">
<Name>KernelGen3</Name> <Name>GuessKernelGen3</Name>
<Project>{9e58e949-7b71-45ed-9610-11da287ee933}</Project> <Project>{9e58e949-7b71-45ed-9610-11da287ee933}</Project>
<Private>True</Private> <Private>True</Private>
</ProjectReference> </ProjectReference>

1
source/Cosmos.Build.Builder/CosmosTask.cs
View file

@ -314,7 +314,6 @@ namespace Cosmos.Build.Builder {
// //
Pack(Path.Combine(mSourcePath, "Cosmos.System"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.System"), xNugetPkgDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.System_Plugs"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.System_Plugs"), xNugetPkgDir, xVersion);
//Pack(Path.Combine(Path.Combine(mSourcePath, "Kernel"), "Cosmos.System3_Plugs"), xNugetPkgDir, xVersion);
// //
Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel"), xNugetPkgDir, xVersion);
Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir, xVersion); Pack(Path.Combine(mSourcePath, "Cosmos.Debug.Kernel.Plugs.Asm"), xNugetPkgDir, xVersion);

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

@ -291,17 +291,19 @@ namespace Cosmos.IL2CPU {
// //
// Plugs and refs in this list will be loaded absolute (or as proj refs) only. Asm resolution // Plugs and refs in this list will be loaded absolute (or as proj refs) only. Asm resolution
// will not be tried on them, but will on ASMs they reference. // will not be tried on them, but will on ASMs they reference.
//
AssemblyLoadContext.Default.Resolving += Default_Resolving; AssemblyLoadContext.Default.Resolving += Default_Resolving;
mLoadedExtensions = new List<CompilerExtensionBase>(); mLoadedExtensions = new List<CompilerExtensionBase>();
string xKernelBaseName = UseGen3Kernel ? "Cosmos.System.Boot" : "Cosmos.System.Kernel"; string xKernelBaseName = UseGen3Kernel ? "Cosmos.System.Boot" : "Cosmos.System.Kernel";
LogMessage("Kernel " + (UseGen3Kernel ? "Gen3" : "Gen2"));
LogMessage("Kernel Base: " + xKernelBaseName); LogMessage("Kernel Base: " + xKernelBaseName);
Type xKernelType = null; Type xKernelType = null;
foreach (string xRef in References) { foreach (string xRef in References) {
LogMessage("Checking Reference: " + xRef);
if (File.Exists(xRef)) { if (File.Exists(xRef)) {
LogMessage(" Exists");
var xAssembly = AssemblyLoadContext.Default.LoadFromAssemblyCacheOrPath(xRef); var xAssembly = AssemblyLoadContext.Default.LoadFromAssemblyCacheOrPath(xRef);
CompilerHelpers.Debug($"Looking for kernel in {xAssembly}"); CompilerHelpers.Debug($"Looking for kernel in {xAssembly}");

2
source/Kernel/Cosmos.System/Boot.cs
View file

@ -5,7 +5,7 @@ using System.Text;
namespace Cosmos.System { namespace Cosmos.System {
public abstract class Boot { public abstract class Boot {
// IL2CPU finds this by name and this is where Cosmos takes the hand off from the bootloader. // IL2CPU finds this method by name and this is where Cosmos takes the hand off from the bootloader.
public void EntryPoint() { public void EntryPoint() {
Run(); Run();
} }