WIPP - BareMetal & Debugger (#1080)

* - WIP * - WIP * - WIP * - WIP * - WIP * - WIP * - WIP
mosa · Jul 11, 2023 · c7242d0 · c7242d0
1 parent affa1c3
commit c7242d0
Show file tree

Hide file tree

Showing 51 changed files with 589 additions and 416 deletions.
diff --git a/Source/Docs/command-line-arguments.rst b/Source/Docs/command-line-arguments.rst
@@ -105,7 +105,7 @@ Below are the command line arguments available:
     -memory,Emulator.Memory
     -gdb,Emulator.GDB,true
 	-term,Emulator.MaxRuntime,{value}
-	-debug,Launcher.Serial.Console,true
+	-debug,Launcher.Serial.Connection,true
 
     Launcher - Emulator - Qemu & VMWare:
     -vmware-svga,Emulator.SVGA,vmware

diff --git a/Source/Docs/settings-options.rst b/Source/Docs/settings-options.rst
@@ -124,7 +124,7 @@ Launcher Settings
     Launcher.Exit,"If true, exit immediately after launch"
     Launcher.PlugKorlib,"If true, automatically include the plugs for CoreLib"
     Launcher.GDB,"If true, launch the GNU GDB application after VM launch"
-	Launcher.Serial.Console,"If true, outout the serial to console"
+	Launcher.Serial.Connection,"If true, outout the serial to console"
 	Launcher.Serial.File,Filename to emit serial output (future)
     Launcher.Debugger,"If true, launch the MOSA debugger application after VM launch"
     Launcher.Test,"If true, monitors VM serial for success or failure messages"

diff --git a/Source/Mosa.Demo.CoolWorld.x86/HAL/Hardware.cs b/Source/Mosa.Demo.CoolWorld.x86/HAL/Hardware.cs
@@ -17,6 +17,8 @@ public sealed class Hardware : BaseHardwareAbstraction
 	/// </summary>
 	public override uint PageSize => PageFrameAllocator.PageSize;
 
+	public override PlatformArchitecture PlatformArchitecture => PlatformArchitecture.X86;
+
 	/// <summary>
 	/// Gets a block of memory from the kernel
 	/// </summary>
@@ -33,6 +35,7 @@ public override ConstrainedPointer GetPhysicalMemory(Pointer address, uint size)
 
 		return new ConstrainedPointer(address, size);
 	}
+
 	/// Disables all interrupts.
 	/// </summary>
 	public override void DisableInterrupts()

diff --git a/Source/Mosa.Demo.SVGAWorld.x86/HAL/Hardware.cs b/Source/Mosa.Demo.SVGAWorld.x86/HAL/Hardware.cs
@@ -18,6 +18,8 @@ public sealed class Hardware : BaseHardwareAbstraction
 	/// </summary>
 	public override uint PageSize => PageFrameAllocator.PageSize;
 
+	public override PlatformArchitecture PlatformArchitecture => PlatformArchitecture.X86;
+
 	/// <summary>
 	/// Gets a block of memory from the kernel
 	/// </summary>

diff --git a/Source/Mosa.DeviceDriver/Setup.cs b/Source/Mosa.DeviceDriver/Setup.cs
@@ -14,7 +14,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "StandardKeyboard",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				AutoLoad = true,
 				BasePort = 0x60,
 				PortRange = 1,
@@ -27,7 +27,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "StandardMouse",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				AutoLoad = true,
 				BasePort = 0x60,
 				PortRange = 1,
@@ -40,7 +40,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "PCIController",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				AutoLoad = true,
 				BasePort = 0x0CF8,
 				PortRange = 8,
@@ -50,7 +50,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "PCIGenericHostBridge",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				ClassCode = 0x06,
 				SubClassCode = 0x00,
@@ -61,7 +61,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "IDEController",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				AutoLoad = true,
 				BasePort = 0x1F0,
 				PortRange = 8,
@@ -73,7 +73,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "IDEController (Secondary)",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				AutoLoad = true,
 				BasePort = 0x170,
 				PortRange = 8,
@@ -86,7 +86,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel4SeriesChipsetDRAMController",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x2E10,
@@ -97,7 +97,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel4SeriesChipsetIntegratedGraphicsController",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x2E10,
@@ -108,7 +108,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel4SeriesChipsetIntegratedGraphicsController2E13",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x2E10,
@@ -119,7 +119,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel4SeriesChipsetPCIExpressRootPort",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x2E10,
@@ -130,7 +130,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel4SeriesChipsetPCIExpressRootPort",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x2E10,
@@ -141,7 +141,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "Intel440FX",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x1237,
@@ -154,7 +154,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "IntelPIIX3",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x7000,
@@ -165,7 +165,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "IntelPIIX4",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x7113,
@@ -176,7 +176,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "IntelGPIOController",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x0934,
@@ -191,7 +191,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "IntelHSUART",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x0936,
@@ -206,7 +206,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "PCIIDEInterface",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x8086,
 				DeviceID = 0x7010,
@@ -220,7 +220,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "VirtIOGPU",
-				Platforms = PlatformArchitecture.X86AndX64 | PlatformArchitecture.ARMv8A32,
+				Platform = PlatformArchitecture.X86AndX64 | PlatformArchitecture.ARMv8A32,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x1AF4,
 				DeviceID = 0x1050,
@@ -231,7 +231,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new PCIDeviceDriverRegistryEntry
 			{
 				Name = "VMwareSVGA2",
-				Platforms = PlatformArchitecture.X86AndX64,
+				Platform = PlatformArchitecture.X86AndX64,
 				BusType = DeviceBusType.PCI,
 				VendorID = 0x15AD,
 				DeviceID = 0x0405,
@@ -242,7 +242,7 @@ public static List<DeviceDriverRegistryEntry> GetDeviceDriverRegistryEntries()
 			new ISADeviceDriverRegistryEntry
 			{
 				Name = "ACPI",
-				Platforms = PlatformArchitecture.X86,
+				Platform = PlatformArchitecture.X86,
 				AutoLoad = true,
 				Factory = () => new ISA.ACPI()
 			},

diff --git a/Source/Mosa.DeviceDriver/X86System.cs b/Source/Mosa.DeviceDriver/X86System.cs
@@ -24,6 +24,7 @@ public override void Probe()
 	public override void Start()
 	{
 		Debug.WriteLine("X86System:Start()");
+
 		CreateISABusDevices();
 
 		Device.Status = DeviceStatus.Online;

diff --git a/Source/Mosa.DeviceSystem/BaseHardwareAbstraction.cs b/Source/Mosa.DeviceSystem/BaseHardwareAbstraction.cs
@@ -14,7 +14,7 @@ public abstract class BaseHardwareAbstraction
 	/// </summary>
 	public abstract uint PageSize { get; }
 
-	/// <summary>
+	public abstract PlatformArchitecture PlatformArchitecture { get; }
 
 	/// <summary>
 	/// Gets a block of memory from the kernel
@@ -76,8 +76,6 @@ public abstract class BaseHardwareAbstraction
 	/// </summary>
 	public abstract void Yield();
 
-	#region IO Port Operations
-
 	public abstract byte In8(ushort address);
 
 	public abstract ushort In16(ushort address);
@@ -89,6 +87,4 @@ public abstract class BaseHardwareAbstraction
 	public abstract void Out16(ushort address, ushort data);
 
 	public abstract void Out32(ushort address, uint data);
-
-	#endregion IO Port Operations
 }
diff --git a/Source/Mosa.DeviceSystem/DeviceDriverRegistryEntry.cs b/Source/Mosa.DeviceSystem/DeviceDriverRegistryEntry.cs
@@ -6,7 +6,7 @@ namespace Mosa.DeviceSystem;
 
 public abstract class DeviceDriverRegistryEntry
 {
-	public virtual PlatformArchitecture Platforms { get; set; }
+	public virtual PlatformArchitecture Platform { get; set; }
 
 	public virtual DeviceBusType BusType { get; set; }
 

diff --git a/Source/Mosa.DeviceSystem/FrameBuffer32.cs b/Source/Mosa.DeviceSystem/FrameBuffer32.cs
@@ -14,7 +14,7 @@ public sealed class FrameBuffer32
 	private const uint BytesPerPixel = 4;
 
 	/// <summary>The memory</summary>
-	public ConstrainedPointer Buffer { get; }
+	private ConstrainedPointer Buffer { get; }
 
 	/// <summary>Gets the width in pixels</summary>
 	/// <value>The width.</value>
@@ -118,8 +118,8 @@ public void DrawBuffer(FrameBuffer32 buffer, uint x, uint y, uint transparentCol
 		if (x >= Width || y >= Height)
 			return;
 
-		for (uint h = 0; h < he; h++)
-			for (uint w = 0; w < wi; w++)
+		for (var h = 0u; h < he; h++)
+			for (var w = 0u; w < wi; w++)
 			{
 				var color = buffer.GetPixel(w, h);
 
@@ -145,8 +145,8 @@ public void DrawBuffer(FrameBuffer32 buffer, uint x, uint y, bool alpha)
 			if (x >= Width || y >= Height)
 				return;
 
-			for (uint h = 0; h < he; h++)
-				for (uint w = 0; w < wi; w++)
+			for (var h = 0u; h < he; h++)
+				for (var w = 0u; w < wi; w++)
 				{
 					var xx = x + w;
 					var yy = y + h;
@@ -270,13 +270,13 @@ public void DrawLine(uint color, uint x1, uint y1, uint x2, uint y2)
 
 	private void DrawHorizontalLine(uint color, uint dx, uint x, uint y)
 	{
-		for (uint i = 0; i < dx; i++)
+		for (var i = 0u; i < dx; i++)
 			SetPixel(x + i, y, color);
 	}
 
 	private void DrawVerticalLine(uint color, uint dy, uint x, uint y)
 	{
-		for (uint i = 0; i < dy; i++)
+		for (var i = 0u; i < dy; i++)
 			SetPixel(color, x, y + i);
 	}