bla

datascientist1976 · Nov 27, 2016 · fee2ef5 · fee2ef5
1 parent 2fffdd1
commit fee2ef5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/Demos/Guess/Guess.Cosmos b/Demos/Guess/Guess.Cosmos
@@ -15,7 +15,7 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <Profile>Bochs</Profile>
+    <Profile>VMware</Profile>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <Framework>MicrosoftNET</Framework>
@@ -26,13 +26,13 @@
     <BuildTarget>PXE</BuildTarget>
     <VMWareFlavor>Player</VMWareFlavor>
     <StartCosmosGDB>False</StartCosmosGDB>
-    <VMwareEdition>Workstation</VMwareEdition>
+    <VMwareEdition>Player</VMwareEdition>
     <VMwareDeploy>ISO</VMwareDeploy>
     <IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
     <Deployment>ISO</Deployment>
-    <Launch>Bochs</Launch>
+    <Launch>VMware</Launch>
     <DebugEnabled>True</DebugEnabled>
-    <TraceAssemblies>User</TraceAssemblies>
+    <TraceAssemblies>All</TraceAssemblies>
     <PXE_Deployment>PXE</PXE_Deployment>
     <PXE_Launch>None</PXE_Launch>
     <PXE_DebugEnabled>False</PXE_DebugEnabled>
@@ -82,7 +82,7 @@
     <ISO_EnableGDB>False</ISO_EnableGDB>
     <ISO_StartCosmosGDB>false</ISO_StartCosmosGDB>
     <Name>Guess</Name>
-    <Description>Use Bochs emulator to deploy and debug.</Description>
+    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
     <ISO_Name>User 001</ISO_Name>
     <ISO_Description>Creates a bootable ISO image which can be burned to a DVD. After running the selected project, an explorer window will open containing the ISO file. The ISO file can then be burned to a CD or DVD and used to boot a physical or virtual system.</ISO_Description>
     <USB_Name>Guess</USB_Name>
@@ -129,7 +129,7 @@
     <ISO_VisualStudioDebugPort>Pipe: Cosmos\Serial</ISO_VisualStudioDebugPort>
     <PXE_ShowLaunchConsole>False</PXE_ShowLaunchConsole>
     <PXE_VisualStudioDebugPort>Pipe: Cosmos\Serial</PXE_VisualStudioDebugPort>
-    <StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
+    <StackCorruptionDetectionEnabled>False</StackCorruptionDetectionEnabled>
     <VMware_StackCorruptionDetectionEnabled>False</VMware_StackCorruptionDetectionEnabled>
     <Bochs_Name>Guess</Bochs_Name>
     <Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
@@ -181,9 +181,10 @@
     <USB_EnableBochsDebug>False</USB_EnableBochsDebug>
     <StackCorruptionDetectionLevel>AllInstructions</StackCorruptionDetectionLevel>
     <Bochs_StackCorruptionDetectionLevel>AllInstructions</Bochs_StackCorruptionDetectionLevel>
+    <VMware_StackCorruptionDetectionLevel>AllInstructions</VMware_StackCorruptionDetectionLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <Profile>Bochs</Profile>
+    <Profile>VMware</Profile>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
     <Framework>MicrosoftNET</Framework>
@@ -194,13 +195,13 @@
     <BuildTarget>PXE</BuildTarget>
     <VMWareFlavor>Player</VMWareFlavor>
     <StartCosmosGDB>False</StartCosmosGDB>
-    <VMwareEdition>Workstation</VMwareEdition>
+    <VMwareEdition>Player</VMwareEdition>
     <VMwareDeploy>ISO</VMwareDeploy>
     <IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
     <Deployment>ISO</Deployment>
-    <Launch>Bochs</Launch>
+    <Launch>VMware</Launch>
     <DebugEnabled>True</DebugEnabled>
-    <TraceAssemblies>User</TraceAssemblies>
+    <TraceAssemblies>All</TraceAssemblies>
     <PXE_Deployment>PXE</PXE_Deployment>
     <PXE_Launch>None</PXE_Launch>
     <PXE_DebugEnabled>False</PXE_DebugEnabled>
@@ -250,7 +251,7 @@
     <ISO_EnableGDB>False</ISO_EnableGDB>
     <ISO_StartCosmosGDB>false</ISO_StartCosmosGDB>
     <Name>Guess</Name>
-    <Description>Use Bochs emulator to deploy and debug.</Description>
+    <Description>Use VMware Player or Workstation to deploy and debug.</Description>
     <ISO_Name>User 001</ISO_Name>
     <ISO_Description>Creates a bootable ISO image which can be burned to a DVD. After running the selected project, an explorer window will open containing the ISO file. The ISO file can then be burned to a CD or DVD and used to boot a physical or virtual system.</ISO_Description>
     <USB_Name>Guess</USB_Name>
@@ -303,7 +304,7 @@
     <VMware_ShowLaunchConsole>False</VMware_ShowLaunchConsole>
     <ISO_ShowLaunchConsole>False</ISO_ShowLaunchConsole>
     <PXE_ShowLaunchConsole>False</PXE_ShowLaunchConsole>
-    <StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
+    <StackCorruptionDetectionEnabled>False</StackCorruptionDetectionEnabled>
     <VMware_StackCorruptionDetectionEnabled>False</VMware_StackCorruptionDetectionEnabled>
     <Bochs_Name>Guess</Bochs_Name>
     <Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
@@ -355,6 +356,7 @@
     <USB_EnableBochsDebug>False</USB_EnableBochsDebug>
     <StackCorruptionDetectionLevel>AllInstructions</StackCorruptionDetectionLevel>
     <Bochs_StackCorruptionDetectionLevel>AllInstructions</Bochs_StackCorruptionDetectionLevel>
+    <VMware_StackCorruptionDetectionLevel>AllInstructions</VMware_StackCorruptionDetectionLevel>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="Cosmos.bxrc">

diff --git a/Demos/Guess/GuessOS.cs b/Demos/Guess/GuessOS.cs
@@ -10,15 +10,15 @@ namespace GuessKernel
     public class GuessOS : Sys.Kernel
     {
         protected int mCount = 0;
-
+
         protected int mMagicNo = 22;
 
         public GuessOS()
         {
             // Didnt check if tickcount is working yet.. can change this later
             //var xRandom = new Random(234243534);
             //mMagicNo = xRandom.Next(1, 100);
-        }
+        }
 
         protected override void BeforeRun()
         {

diff --git a/Demos/zMachine/Frotz.Net/source/zConsole/Program.cs b/Demos/zMachine/Frotz.Net/source/zConsole/Program.cs
@@ -24,7 +24,7 @@ static void Main(string[] args)
             Frotz.os_.debug_mode = false;
             //if (File.Exists("debug.log"))
             //    File.Delete("debug.log");
-            string fName = "";
+            string fName = args[0];
             //while(!File.Exists(fName))
             //{
             //    Console.WriteLine("Please type a path to a storyfile:");

diff --git a/Docs/Kernel/Levels.md b/Docs/Kernel/Levels.md
@@ -119,6 +119,9 @@ Things that Core implements and exposes to HAL:
 
 Core also manages consumers of its services to avoid conflicts and security to prevent a specific driver from accessing "everything".
 
+Notes:
+https://github.com/joeduffy/slice.net
+
 ### 1 HAL (Hardware Abstraction Layer)
 
 Summary: Hardware control
@@ -191,7 +194,7 @@ references.
 ## Graphics
 
 0 IO/Memory access (Cosmos)
-1 DirectX / Graphics Memory
+1 DirectX / VESA / Graphics Memory
 2 WinForms, WPF, Other UI, Canvas, JPG/PNG/GIF
 3 Application