Gen3

datascientist1976 · Jul 21, 2017 · ff1c942 · ff1c942
1 parent 0011128
commit ff1c942
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/Demos/Guess/GuessKernelBootGen3.Cosmos b/Demos/Guess/GuessKernelBootGen3.Cosmos
@@ -0,0 +1,63 @@
+<Project Sdk="Microsoft.Net.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net462</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <UseGen3Kernel>True</UseGen3Kernel>
+    <BinFormat>elf</BinFormat>
+    <DebugEnabled>False</DebugEnabled>
+    <DebugMode>Source</DebugMode>
+    <TraceMode>User</TraceMode>
+    <EnableGDB>False</EnableGDB>
+    <StartCosmosGDB>False</StartCosmosGDB>
+    <Deployment>ISO</Deployment>
+    <VisualStudioDebugPort>Pipe: Cosmos\Serial</VisualStudioDebugPort>
+    <StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
+    <StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
+    <IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
+    <CosmosDebugPort>Serial: COM1</CosmosDebugPort>
+    <Launch>VMware</Launch>
+    <Profile>VMware</Profile>
+    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
+    <PxeInterface>192.168.0.8</PxeInterface>
+    <VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
+    <VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
+    <VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
+    <VMware_Deployment>ISO</VMware_Deployment>
+    <VMware_Launch>VMware</VMware_Launch>
+    <VMware_DebugEnabled>False</VMware_DebugEnabled>
+    <VMware_DebugMode>Source</VMware_DebugMode>
+    <VMware_IgnoreDebugStubAttribute>False</VMware_IgnoreDebugStubAttribute>
+    <VMware_CosmosDebugPort>Serial: COM1</VMware_CosmosDebugPort>
+    <VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
+    <VMware_PxeInterface>192.168.0.8</VMware_PxeInterface>
+    <VMware_OutputPath>bin\Debug\net462\</VMware_OutputPath>
+    <VMware_EnableGDB>False</VMware_EnableGDB>
+    <VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
+    <Bochs_StackCorruptionDetectionEnabled>True</Bochs_StackCorruptionDetectionEnabled>
+    <Bochs_StackCorruptionDetectionLevel>MethodFooters</Bochs_StackCorruptionDetectionLevel>
+    <Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
+    <Bochs_Deployment>ISO</Bochs_Deployment>
+    <Bochs_Launch>Bochs</Bochs_Launch>
+    <Bochs_DebugEnabled>True</Bochs_DebugEnabled>
+    <Bochs_DebugMode>Source</Bochs_DebugMode>
+    <Bochs_IgnoreDebugStubAttribute>False</Bochs_IgnoreDebugStubAttribute>
+    <Bochs_CosmosDebugPort>Serial: COM1</Bochs_CosmosDebugPort>
+    <Bochs_VisualStudioDebugPort>Pipe: Cosmos\Serial</Bochs_VisualStudioDebugPort>
+    <Bochs_PxeInterface>192.168.0.8</Bochs_PxeInterface>
+    <Bochs_OutputPath>bin\Debug\net462\</Bochs_OutputPath>
+    <Bochs_EnableGDB>False</Bochs_EnableGDB>
+    <Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="*" />
+    <Compile Remove="*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Guess\GuessKernel.csproj">
+      <Name>GuessKernel</Name>
+      <Project>{e35e0dbf-555f-4d38-8f28-acdfa9dc97bd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
+</Project>
diff --git a/source/Cosmos.Build.MSBuild/IL2CPU.cs b/source/Cosmos.Build.MSBuild/IL2CPU.cs
@@ -11,6 +11,8 @@ public class IL2CPU : BaseToolTask
     {
         // protected CompilerEngine mTask = new CompilerEngine();
 
+        public bool UseGen3Kernel { get; set; }
+
         [Required]
         public string CosmosBuildDir { get; set; }
 
@@ -83,6 +85,7 @@ public override bool Execute()
                 //TODO: Add AdditionalReferences and AdditionalSearchDirs here and to log messages below.
                 Dictionary<string, string> args = new Dictionary<string, string>
                 {
+                    {"UseGen3Kernel", Convert.ToString(UseGen3Kernel)},
                     {"DebugEnabled", Convert.ToString(DebugEnabled)},
                     {"StackCorruptionDetectionEnabled", Convert.ToString(StackCorruptionDetectionEnabled)},
                     {"StackCorruptionDetectionLevel", Convert.ToString(StackCorruptionDetectionLevel)},