>(INT3sSet.Count) : mDebugInfoDb.GetAllINT3AddressesForMethod(currMethod, true);
connection.Close();
//If we just do a stright assigment then we get a collection modified exception in foreach loop below
@@ -1237,7 +1237,7 @@ public void SendAssembly(bool noDisplay = false)
// - We use the method header label as a start point and find all asm labels till the method footer label
// - We then find all the asm for these labels and display it.
var connection = mDebugInfoDb.GetNewConnection();
- Label[] xLabels = mDebugInfoDb.GetMethodLabels(connection, xAddress);
+ Label[] xLabels = mDebugInfoDb.GetMethodLabels(xAddress);
connection.Close();
AD7Util.Log("SendAssembly - MethodLabels retrieved");
// get the label of our current position, or the closest one before
diff --git a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7StackFrame.cs b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7StackFrame.cs
index 639c94a1b2..c80ee29dac 100644
--- a/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7StackFrame.cs
+++ b/source/Cosmos.VS.DebugEngine/AD7.Impl/AD7StackFrame.cs
@@ -43,9 +43,7 @@ public AD7StackFrame(AD7Engine aEngine, AD7Thread aThread, AD7Process aProcess)
if (mHasSource = xProcess.mCurrentAddress.HasValue)
{
var xAddress = xProcess.mCurrentAddress.Value;
- var connection = xProcess.mDebugInfoDb.GetNewConnection();
- var label = xProcess.mDebugInfoDb.GetMethod(connection, xAddress);
- connection.Close();
+ var label = xProcess.mDebugInfoDb.GetMethod(xAddress);
var xSourceInfos = xProcess.mDebugInfoDb.GetSourceInfos(xAddress);
if (!xSourceInfos.ContainsKey(xAddress))
{
diff --git a/source/Cosmos.VS.ProjectSystem/.editorconfig b/source/Cosmos.VS.ProjectSystem/.editorconfig
deleted file mode 100644
index 930c4915ae..0000000000
--- a/source/Cosmos.VS.ProjectSystem/.editorconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[*]
-indent_size = 4
diff --git a/source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml b/source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml
index a2199e8984..d3e0e69dbe 100644
--- a/source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml
+++ b/source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/CosmosPropertyPage.xaml
@@ -85,8 +85,8 @@
diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CSharp/Cosmos/Cosmos Kernel/CSharpProject.csproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CSharp/Cosmos/Cosmos Kernel/CSharpProject.csproj
index 242f868162..5548636e91 100644
--- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CSharp/Cosmos/Cosmos Kernel/CSharpProject.csproj
+++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/CSharp/Cosmos/Cosmos Kernel/CSharpProject.csproj
@@ -23,6 +23,7 @@
+
diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/FSharp/Cosmos/Cosmos Kernel/FSharpProject.fsproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/FSharp/Cosmos/Cosmos Kernel/FSharpProject.fsproj
index f954b441be..d05b9c8f74 100644
--- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/FSharp/Cosmos/Cosmos Kernel/FSharpProject.fsproj
+++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/FSharp/Cosmos/Cosmos Kernel/FSharpProject.fsproj
@@ -27,6 +27,7 @@
+
diff --git a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/VisualBasic/Cosmos/Cosmos Kernel/VisualBasicProject.vbproj b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/VisualBasic/Cosmos/Cosmos Kernel/VisualBasicProject.vbproj
index 242f868162..5548636e91 100644
--- a/source/Cosmos.VS.ProjectSystem/ProjectTemplates/VisualBasic/Cosmos/Cosmos Kernel/VisualBasicProject.vbproj
+++ b/source/Cosmos.VS.ProjectSystem/ProjectTemplates/VisualBasic/Cosmos/Cosmos Kernel/VisualBasicProject.vbproj
@@ -23,6 +23,7 @@
+
diff --git a/source/Cosmos.VS.ReadMe.html b/source/Cosmos.VS.ReadMe.html
deleted file mode 100644
index 2b9cbec2ca..0000000000
--- a/source/Cosmos.VS.ReadMe.html
+++ /dev/null
@@ -1,147 +0,0 @@
-
- Projects that provide Visual Studio IDE support.
-
- Debugging
-
- Debugging VS packages can be a royal PITA. The hive can be used but install.bat
- often requires it to be reset each time.
-
- Hive:
-
- Cosmos.VS.ProjectSystem is setup for debugging via a second (non hive) instance but
- the path is set for the default directory on x64.
-
- Hive:
- C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe
-
- D:\source\Cosmos\source\Cosmos.sln /ranu /rootsuffix Exp
-
- Non hive:
- C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe
- D:\source\Cosmos\source\Cosmos.sln
-
- Resources
-
- VSIX
-
-
- MEF
-
-
- Projects
-
- Note that some VS parts, the custom VS debugger for example is in \Debug.
-
- Cosmos.VS.ProjectSystem
-
- MPF project.
- Does not appear to be a VS Package. So what is it? This was our first package
- from very old VS, might be old crapp COM model?
-
- Provides:
-
- - Support for the .Cosmos project type
- - Project configuration dialogs
- - X# custom tool generator - Move to XSharp.VS probably
-
-
- Cosmos.VS.Windows
-
- Provides UI for Cosmos debug windows in VS.
- Contains windows, toolbars and menu options.
-
- Separate from other pacakges
- because:
-
- - Threading and hosting issues
- - It is a different project
- type.
- - Allows external testing by Cosmos.VS.Windows.Test
-
-
- Cosmos.VS.Windows.Test
-
- Testing project for Cosmos.VS.Windows. Not used by VS itself.
-
- Cosmos.VS.Wizards
-
- Not VSIX, not MEF, not MPF. Why is this a separate assembly?
-
- Provides:
-
- - Support for creating new Cosmos projects from within Visual Studio.
-
-
- Cosmos.VS.XSharp
-
- MPF project and VS Package.
-
- XSharp Language Service
-
- Provides:
-
- - Syntax coloring for X#.
-
- - Code completion / intellisense (future)
-
-
-
- X# custom tool generator is in Cosmos.VS.ProjectSystem.
-
- Comos.Launch.VMware
-
- VS debugger requires a process that starts paused, and is then later started. To
- do this and to unify the process that is used, we use a proxy process which then
- controls the actual execution environment (VMWare, QEMU, etc).
-
- Comos.Debug.VSDebugEngine
-
- This provides a custom debug engine to Visual Studio to handle tracing,
- breakpoints, stepping, watches, etc.
-
- - AD7.Impl \ AD7Process.cs
- - Launches DebugHost, which then launches
- VMWare etc
- - Contains pipes for communicating to VMWare's serial port to DebugStub
-
-
- - BreakpointManager.cs
- - contains notes on breakpoints
-
-
-
-
-
- References
-
- - http://archive.msdn.microsoft.com/debugenginesample/Release/ProjectReleases.aspx?ReleaseId=4149
-
-
-
-
-
diff --git a/source/Cosmos.VS.Windows/.editorconfig b/source/Cosmos.VS.Windows/.editorconfig
deleted file mode 100644
index 5c974e5e79..0000000000
--- a/source/Cosmos.VS.Windows/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[*.cs]
-indent_size=4
-indent_style=space
diff --git a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.html b/source/Cosmos.VS.Windows/Cosmos.VS.Windows.html
deleted file mode 100644
index df01c04b82..0000000000
--- a/source/Cosmos.VS.Windows/Cosmos.VS.Windows.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
- http://dotneteers.net/blogs/divedeeper/archive/2010/05/23/vs-2010-package-development-chapter-2-commands-menus-and-toolbars.aspx
-
-
-
\ No newline at end of file
diff --git a/source/Kernel-TapRoot/Demo/Boot.cs b/source/Kernel-TapRoot/Demo/Boot.cs
deleted file mode 100644
index 383da1c7f6..0000000000
--- a/source/Kernel-TapRoot/Demo/Boot.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
- // Beware Demo Kernels are not recompiled when its dependencies changes!
- // To force recompilation right click on on the Cosmos icon of the demo solution and do "Build".
-namespace TRKernel {
- public class Boot {
- }
-}
diff --git a/source/Kernel-TapRoot/Demo/TRKernel.csproj b/source/Kernel-TapRoot/Demo/TRKernel.csproj
deleted file mode 100644
index e481687b25..0000000000
--- a/source/Kernel-TapRoot/Demo/TRKernel.csproj
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- net6.0
- true
-
-
-
- X86-TapRoot
- elf
- False
- Source
- User
- False
- False
- ISO
- Pipe: Cosmos\Serial
- True
- MethodFooters
- False
- Serial: COM1
- VMware
- VMware
- Use VMware Player or Workstation to deploy and debug.
- 192.168.0.8
- True
- MethodFooters
- Use VMware Player or Workstation to deploy and debug.
- ISO
- VMware
- False
- Source
- False
- Serial: COM1
- Pipe: Cosmos\Serial
- 192.168.0.8
- bin\Debug\net462\
- False
- False
- True
- MethodFooters
- Use Bochs emulator to deploy and debug.
- ISO
- Bochs
- True
- Source
- False
- Serial: COM1
- Pipe: Cosmos\Serial
- 192.168.0.8
- bin\Debug\net462\
- False
- False
- BootGen3
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/BaseIOGroups.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/BaseIOGroups.cs
deleted file mode 100644
index e285b181e4..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/BaseIOGroups.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using global::System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Cosmos.CPU.x86 {
- public class BaseIOGroups {
- // These are common/fixed pieces of hardware. PCI, USB etc should be self discovering
- // and not hardcoded like this.
- // Further more some kind of security needs to be applied to these, but even now
- // at least we have isolation between the consumers that use these.
-
- //public readonly IOGroup.Keyboard Keyboard = new IOGroup.Keyboard();
- //public static readonly IOGroup.Mouse Mouse = new IOGroup.Mouse();
- //public static readonly IOGroup.PCSpeaker PCSpeaker = new IOGroup.PCSpeaker();
- //public readonly IOGroup.PIT PIT = new IOGroup.PIT();
- //public readonly IOGroup.TextScreen TextScreen = new IOGroup.TextScreen();
- //public readonly IOGroup.ATA ATA1 = new IOGroup.ATA(false);
- //public readonly IOGroup.ATA ATA2 = new IOGroup.ATA(true);
- //public readonly IOGroup.RTC RTC = new IOGroup.RTC();
- //public readonly IOGroup.VBE VBE = new IOGroup.VBE();
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Boot.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Boot.cs
deleted file mode 100644
index bc01e295ae..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Boot.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU.x86 {
- static public class Boot {
-
- // OLD CODE pasted.. .still cleaning/porting
-
-
- // See note in Global - these are a "hack" for now so
- // we dont force static init of Global, and it "pulls" these later till
- // we eventually eliminate them
- static public PIC PIC;
- // Has to be static for now, ZeroFill gets called before the Init.
- static public readonly Processor Processor = new Processor();
-
- // Bootstrap is a class designed only to get the essentials done.
- // ie the stuff needed to "pre boot". Do only the very minimal here.
- // IDT, PIC, and Float
- // Note: This is changing a bit GDT (already) and IDT are moving to a real preboot area.
-
- [BootEntry(10)]
- static private void Init() {
- PIC = new PIC();
- Processor.UpdateIDT(true);
-
- /* TODO check using CPUID that SSE2 is supported */
- Processor.InitSSE();
-
- /*
- * We liked to use SSE for all floating point operation and end to mix SSE / x87 in Cosmos code
- * but sadly in x86 this resulte impossible as Intel not implemented some needed instruction (for example conversion
- * for long to double) so - in some rare cases - x87 continue to be used. I hope passing to the x32 or x64 IA will solve
- * definively this problem.
- */
- Processor.InitFloat();
-
- // Managed_Memory_System.ManagedMemory.Initialize();
- // Managed_Memory_System.ManagedMemory.SetUpMemoryArea();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj
deleted file mode 100644
index 817080a1ff..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.CPU.x86.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- net6.0
- true
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.cfg b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.cfg
deleted file mode 100644
index 9c7a967f2e..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: CPU
\ No newline at end of file
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GcHook.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GcHook.cs
deleted file mode 100644
index 1a1f68aec5..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GcHook.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Diagnostics;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU.x86 {
- [DebuggerStepThrough]
- public static class GCImplementation {
- private static void AcquireLock() {
- }
-
- private static void ReleaseLock() {
- }
-
- [PlugMethod(PlugRequired = true)]
- public static uint AllocNewObject(uint aSize) {
- return 0;
- }
-
- ///
- /// This function gets the pointer to the memory location of where it's stored.
- ///
- ///
- public static unsafe void IncRefCount(uint aObject) {
- }
-
- ///
- /// This function gets the pointer to the memory location of where it's stored.
- ///
- ///
- public static unsafe void DecRefCount(uint aObject) {
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Global.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Global.cs
deleted file mode 100644
index 188a429155..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Global.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Cosmos.Debug.Kernel;
-
-namespace Cosmos.CPU.x86 {
- public static class Global {
- public static readonly Debugger mDebugger = new Debugger("Processor", "Global");
-
- public static BaseIOGroups BaseIOGroups = new BaseIOGroups();
-
- // These are used by Bootstrap.. but also called to signal end of interrupt etc...
- // Need to chagne this.. I dont like how this is.. maybe isolate or split into to classes... one for boostrap one for
- // later user
- static public PIC PIC {
- get {
- return Boot.PIC;
- }
- }
-
- static public Processor Processor {
- get {
- return Boot.Processor;
- }
- }
-
- static public void Init() {
- // See note in Bootstrap about these
-
- // DONT transform the properties in fields, as then they remain null somehow.
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GlobalSystemInfo.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GlobalSystemInfo.cs
deleted file mode 100644
index 5bd0ef01f8..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/GlobalSystemInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Cosmos.CPU.x86 {
- internal static unsafe class GlobalSystemInfo {
- //private static volatile GlobalInformationTable* mGlobalInformationTable;
- //public static GlobalInformationTable* GlobalInformationTable {
- // get {
- // EnsureInitialized();
- // return mGlobalInformationTable;
- // }
- //}
-
- internal static unsafe void EnsureInitialized() {
- //if (mGlobalInformationTable == null) {
- //var xEndOfKernel = Processor.GetEndOfKernel();
- //xEndOfKernel = xEndOfKernel + (1024 * 1024); // for now, skip 1 MB
- //Processor.ZeroFill(xEndOfKernel, (uint)(sizeof(GlobalInformationTable) + TotalDataLookupTableSize) * 4);
- //mGlobalInformationTable = (GlobalInformationTable*)xEndOfKernel;
- //uint xFirstDataLookupLocation = (uint)(xEndOfKernel + sizeof(GlobalInformationTable));
- //mGlobalInformationTable->FirstDataLookupTable = (DataLookupTable*)xFirstDataLookupLocation;
- //}
- }
-
- //public static uint TotalDataLookupTableSize {
- // get {
- //return (uint)(sizeof(DataLookupTable) + (DataLookupTable.EntriesPerTable * sizeof(DataLookupEntry)));
- //}
- //}
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.cs
deleted file mode 100644
index 336826f2b5..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-using System.Runtime.InteropServices;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU.x86 {
-
- [ForceInclude]
- public class INTs {
- #region Enums
- // TODO: Protect IRQs like memory and ports are
- // TODO: Make IRQs so they are not hookable, and instead release high priority threads like FreeBSD (When we get threading)
- public enum EFlagsEnum : uint {
- Carry = 1,
- Parity = 1 << 2,
- AuxilliaryCarry = 1 << 4,
- Zero = 1 << 6,
- Sign = 1 << 7,
- Trap = 1 << 8,
- InterruptEnable = 1 << 9,
- Direction = 1 << 10,
- Overflow = 1 << 11,
- NestedTag = 1 << 14,
- Resume = 1 << 16,
- Virtual8086Mode = 1 << 17,
- AlignmentCheck = 1 << 18,
- VirtualInterrupt = 1 << 19,
- VirtualInterruptPending = 1 << 20,
- ID = 1 << 21
- }
-
- [StructLayout(LayoutKind.Explicit, Size = 0x68)]
- public struct TSS {
- [FieldOffset(0)]
- public ushort Link;
- [FieldOffset(4)]
- public uint ESP0;
- [FieldOffset(8)]
- public ushort SS0;
- [FieldOffset(12)]
- public uint ESP1;
- [FieldOffset(16)]
- public ushort SS1;
- [FieldOffset(20)]
- public uint ESP2;
- [FieldOffset(24)]
- public ushort SS2;
- [FieldOffset(28)]
- public uint CR3;
- [FieldOffset(32)]
- public uint EIP;
- [FieldOffset(36)]
- public EFlagsEnum EFlags;
- [FieldOffset(40)]
- public uint EAX;
- [FieldOffset(44)]
- public uint ECX;
- [FieldOffset(48)]
- public uint EDX;
- [FieldOffset(52)]
- public uint EBX;
- [FieldOffset(56)]
- public uint ESP;
- [FieldOffset(60)]
- public uint EBP;
- [FieldOffset(64)]
- public uint ESI;
- [FieldOffset(68)]
- public uint EDI;
- [FieldOffset(72)]
- public ushort ES;
- [FieldOffset(76)]
- public ushort CS;
- [FieldOffset(80)]
- public ushort SS;
- [FieldOffset(84)]
- public ushort DS;
- [FieldOffset(88)]
- public ushort FS;
- [FieldOffset(92)]
- public ushort GS;
- [FieldOffset(96)]
- public ushort LDTR;
- [FieldOffset(102)]
- public ushort IOPBOffset;
- }
-
- [StructLayout(LayoutKind.Explicit, Size = 512)]
- public struct MMXContext {
- }
-
- [StructLayout(LayoutKind.Explicit, Size = 80)]
- public struct IRQContext {
- [FieldOffset(0)]
- public unsafe MMXContext* MMXContext;
-
- [FieldOffset(4)]
- public uint EDI;
-
- [FieldOffset(8)]
- public uint ESI;
-
- [FieldOffset(12)]
- public uint EBP;
-
- [FieldOffset(16)]
- public uint ESP;
-
- [FieldOffset(20)]
- public uint EBX;
-
- [FieldOffset(24)]
- public uint EDX;
-
- [FieldOffset(28)]
- public uint ECX;
-
- [FieldOffset(32)]
- public uint EAX;
-
- [FieldOffset(36)]
- public uint Interrupt;
-
- [FieldOffset(40)]
- public uint Param;
-
- [FieldOffset(44)]
- public uint EIP;
-
- [FieldOffset(48)]
- public uint CS;
-
- [FieldOffset(52)]
- public EFlagsEnum EFlags;
-
- [FieldOffset(56)]
- public uint UserESP;
- }
- #endregion
-
- [AsmMarker(AsmMarker.Type.Int_LastKnownAddress)]
- private static uint mLastKnownAddress = 0;
-
- private static IRQDelegate[] mIRQ_Handlers = new IRQDelegate[256];
-
- // We used to use:
- //Interrupts.IRQ01 += HandleKeyboardInterrupt;
- // But at one point we had issues with multi cast delegates, so we changed to this single cast option.
- // [1:48:37 PM] Matthijs ter Woord: the issues were: "they didn't work, would crash kernel". not sure if we still have them..
- public static void SetIntHandler(byte aIntNo, IRQDelegate aHandler) {
- mIRQ_Handlers[aIntNo] = aHandler;
- }
- public static void SetIrqHandler(byte aIrqNo, IRQDelegate aHandler) {
- SetIntHandler((byte)(0x20 + aIrqNo), aHandler);
- }
-
- private static void IRQ(uint irq, ref IRQContext aContext) {
- var xCallback = mIRQ_Handlers[irq];
- if (xCallback != null) {
- xCallback(ref aContext);
- }
- }
-
- public static void HandleInterrupt_Default(ref IRQContext aContext) {
- if (aContext.Interrupt >= 0x20 && aContext.Interrupt <= 0x2F) {
- if (aContext.Interrupt >= 0x28) {
- Global.PIC.EoiSlave();
- } else {
- Global.PIC.EoiMaster();
- }
- }
- }
-
- public delegate void IRQDelegate(ref IRQContext aContext);
- public delegate void ExceptionInterruptDelegate(ref IRQContext aContext, ref bool aHandled);
-
- #region Default Interrupt Handlers
-
- //IRQ 0 - System timer. Reserved for the system. Cannot be changed by a user.
- public static void HandleInterrupt_20(ref IRQContext aContext) {
- IRQ(0x20, ref aContext);
- Global.PIC.EoiMaster();
- }
-
- //public static IRQDelegate IRQ01;
- //IRQ 1 - Keyboard. Reserved for the system. Cannot be altered even if no keyboard is present or needed.
- public static void HandleInterrupt_21(ref IRQContext aContext) {
-
- IRQ(0x21, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_22(ref IRQContext aContext) {
-
- IRQ(0x22, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_23(ref IRQContext aContext) {
-
- IRQ(0x23, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_24(ref IRQContext aContext) {
-
- IRQ(0x24, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_25(ref IRQContext aContext) {
- IRQ(0x25, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_26(ref IRQContext aContext) {
-
- IRQ(0x26, ref aContext);
- Global.PIC.EoiMaster();
- }
- public static void HandleInterrupt_27(ref IRQContext aContext) {
-
- IRQ(0x27, ref aContext);
- Global.PIC.EoiMaster();
- }
-
- public static void HandleInterrupt_28(ref IRQContext aContext) {
-
- IRQ(0x28, ref aContext);
- Global.PIC.EoiSlave();
- }
- //IRQ 09 - (Added for AMD PCNet network card)
- //public static IRQDelegate IRQ09;
-
- public static void HandleInterrupt_29(ref IRQContext aContext) {
- IRQ(0x29, ref aContext);
- Global.PIC.EoiSlave();
- }
-
- //IRQ 10 - (Added for VIA Rhine network card)
- //public static IRQDelegate IRQ10;
-
- public static void HandleInterrupt_2A(ref IRQContext aContext) {
- IRQ(0x2A, ref aContext);
- Global.PIC.EoiSlave();
- }
-
- //IRQ 11 - (Added for RTL8139 network card)
- //public static IRQDelegate IRQ11;
-
- public static void HandleInterrupt_2B(ref IRQContext aContext) {
- IRQ(0x2B, ref aContext);
- Global.PIC.EoiSlave();
- }
-
- public static void HandleInterrupt_2C(ref IRQContext aContext) {
- IRQ(0x2C, ref aContext);
- Global.PIC.EoiSlave();
- }
-
-
- public static void HandleInterrupt_2D(ref IRQContext aContext) {
- IRQ(0x2D, ref aContext);
- Global.PIC.EoiSlave();
- }
- //IRQ 14 - Primary IDE. If no Primary IDE this can be changed
- public static void HandleInterrupt_2E(ref IRQContext aContext) {
- IRQ(0x2E, ref aContext);
- Global.PIC.EoiSlave();
- }
- //IRQ 15 - Secondary IDE
- public static void HandleInterrupt_2F(ref IRQContext aContext) {
- IRQ(0x2F, ref aContext);
- Global.PIC.EoiSlave();
- }
-
- public static event IRQDelegate Interrupt30;
- // Interrupt 0x30, enter VMM
- public static void HandleInterrupt_30(ref IRQContext aContext) {
- if (Interrupt30 != null) {
- Interrupt30(ref aContext);
- }
- }
-
- public static void HandleInterrupt_35(ref IRQContext aContext) {
- aContext.EAX *= 2;
- aContext.EBX *= 2;
- aContext.ECX *= 2;
- aContext.EDX *= 2;
- }
-
- public static void HandleInterrupt_40(ref IRQContext aContext) {
- IRQ(0x40, ref aContext);
- }
- public static void HandleInterrupt_41(ref IRQContext aContext) {
- IRQ(0x41, ref aContext);
- }
- public static void HandleInterrupt_42(ref IRQContext aContext) {
- IRQ(0x42, ref aContext);
- }
- public static void HandleInterrupt_43(ref IRQContext aContext) {
- IRQ(0x43, ref aContext);
- }
- public static void HandleInterrupt_44(ref IRQContext aContext) {
- IRQ(0x44, ref aContext);
- }
- public static void HandleInterrupt_45(ref IRQContext aContext) {
- IRQ(0x45, ref aContext);
- }
- public static void HandleInterrupt_46(ref IRQContext aContext) {
- IRQ(0x46, ref aContext);
- }
- public static void HandleInterrupt_47(ref IRQContext aContext) {
- IRQ(0x47, ref aContext);
- }
- public static void HandleInterrupt_48(ref IRQContext aContext) {
- IRQ(0x48, ref aContext);
- }
- public static void HandleInterrupt_49(ref IRQContext aContext) {
- IRQ(0x49, ref aContext);
- }
-
- #endregion
-
- #region Processor Exceptions
-
- public static IRQDelegate GeneralProtectionFault;
-
- public static void HandleInterrupt_00(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Divide by zero", "EDivideByZero", ref aContext, aContext.EIP);
- }
-
- public static void HandleInterrupt_01(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Debug Exception", "Debug Exception", ref aContext);
- }
-
- public static void HandleInterrupt_02(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Non Maskable Interrupt Exception", "Non Maskable Interrupt Exception", ref aContext);
- }
-
- public static void HandleInterrupt_03(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Breakpoint Exception", "Breakpoint Exception", ref aContext);
- }
-
- public static void HandleInterrupt_04(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Into Detected Overflow Exception", "Into Detected Overflow Exception", ref aContext);
- }
-
- public static void HandleInterrupt_05(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Out of Bounds Exception", "Out of Bounds Exception", ref aContext);
- }
-
- public static void HandleInterrupt_06(ref IRQContext aContext) {
- // although mLastKnownAddress is a static, we need to get it here, any subsequent calls will change the value!!!
- var xLastKnownAddress = mLastKnownAddress;
- HandleException(aContext.EIP, "Invalid Opcode", "EInvalidOpcode", ref aContext, xLastKnownAddress);
- }
-
- public static void HandleInterrupt_07(ref IRQContext aContext) {
- HandleException(aContext.EIP, "No Coprocessor Exception", "No Coprocessor Exception", ref aContext);
- }
-
- public static void HandleInterrupt_08(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Double Fault Exception", "Double Fault Exception", ref aContext);
- }
-
- public static void HandleInterrupt_09(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Coprocessor Segment Overrun Exception", "Coprocessor Segment Overrun Exception", ref aContext);
- }
-
- public static void HandleInterrupt_0A(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Bad TSS Exception", "Bad TSS Exception", ref aContext);
- }
-
- public static void HandleInterrupt_0B(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Segment Not Present", "Segment Not Present", ref aContext);
- }
-
- public static void HandleInterrupt_0C(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Stack Fault Exception", "Stack Fault Exception", ref aContext);
- }
- public static void HandleInterrupt_0D(ref IRQContext aContext) {
- if (GeneralProtectionFault != null) {
- GeneralProtectionFault(ref aContext);
- } else {
- HandleException(aContext.EIP, "General Protection Fault", "GPF", ref aContext);
- }
- }
-
- public static void HandleInterrupt_0E(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Page Fault Exception", "Page Fault Exception", ref aContext);
- }
-
- public static void HandleInterrupt_0F(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Unknown Interrupt Exception", "Unknown Interrupt Exception", ref aContext);
- }
-
- public static void HandleInterrupt_10(ref IRQContext aContext) {
- HandleException(aContext.EIP, "x87 Floating Point Exception", "Coprocessor Fault Exception", ref aContext);
- }
-
- public static void HandleInterrupt_11(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Alignment Exception", "Alignment Exception", ref aContext);
- }
-
- public static void HandleInterrupt_12(ref IRQContext aContext) {
- HandleException(aContext.EIP, "Machine Check Exception", "Machine Check Exception", ref aContext);
- }
- public static void HandleInterrupt_13(ref IRQContext aContext) {
- HandleException(aContext.EIP, "SIMD Floating Point Exception", "SIMD Floating Point Exception", ref aContext);
- }
-
-
- #endregion
-
- private static void HandleException(uint aEIP, string aDescription, string aName, ref IRQContext ctx, uint lastKnownAddressValue = 0) {
- // At this point we are in a very unstable state.
- // Try not to use any Cosmos routines, just
- // report a crash dump.
- const string xHex = "0123456789ABCDEF";
- uint xPtr = ctx.EIP;
-
- // we're printing exception info to the screen now:
- // 0/0: x
- // 1/0: exception number in hex
- unsafe
- {
- byte* xAddress = (byte*)0xB8000;
- PutErrorChar(0, 00, ' ');
- PutErrorChar(0, 01, '*');
- PutErrorChar(0, 02, '*');
- PutErrorChar(0, 03, '*');
- PutErrorChar(0, 04, ' ');
- PutErrorChar(0, 05, 'C');
- PutErrorChar(0, 06, 'P');
- PutErrorChar(0, 07, 'U');
- PutErrorChar(0, 08, ' ');
- PutErrorChar(0, 09, 'E');
- PutErrorChar(0, 10, 'x');
- PutErrorChar(0, 11, 'c');
- PutErrorChar(0, 12, 'e');
- PutErrorChar(0, 13, 'p');
- PutErrorChar(0, 14, 't');
- PutErrorChar(0, 15, 'i');
- PutErrorChar(0, 16, 'o');
- PutErrorChar(0, 17, 'n');
- PutErrorChar(0, 18, ' ');
- PutErrorChar(0, 19, 'x');
- PutErrorChar(0, 20, xHex[(int)((ctx.Interrupt >> 4) & 0xF)]);
- PutErrorChar(0, 21, xHex[(int)(ctx.Interrupt & 0xF)]);
- PutErrorChar(0, 22, ' ');
- PutErrorChar(0, 23, '*');
- PutErrorChar(0, 24, '*');
- PutErrorChar(0, 25, '*');
- PutErrorChar(0, 26, ' ');
-
- if (lastKnownAddressValue != 0) {
- PutErrorString(1, 0, "Last known address: 0x");
-
- PutErrorChar(1, 22, xHex[(int)((lastKnownAddressValue >> 28) & 0xF)]);
- PutErrorChar(1, 23, xHex[(int)((lastKnownAddressValue >> 24) & 0xF)]);
- PutErrorChar(1, 24, xHex[(int)((lastKnownAddressValue >> 20) & 0xF)]);
- PutErrorChar(1, 25, xHex[(int)((lastKnownAddressValue >> 16) & 0xF)]);
- PutErrorChar(1, 26, xHex[(int)((lastKnownAddressValue >> 12) & 0xF)]);
- PutErrorChar(1, 27, xHex[(int)((lastKnownAddressValue >> 8) & 0xF)]);
- PutErrorChar(1, 28, xHex[(int)((lastKnownAddressValue >> 4) & 0xF)]);
- PutErrorChar(1, 29, xHex[(int)(lastKnownAddressValue & 0xF)]);
- }
-
- }
-
- // lock up
- while (true) {
- }
- }
-
- private static void PutErrorChar(int line, int col, char c) {
- unsafe
- {
- byte* xAddress = (byte*)0xB8000;
-
- xAddress += (line * 80 + col) * 2;
-
- xAddress[0] = (byte)c;
- xAddress[1] = 0x0C;
- }
- }
-
- private static void PutErrorString(int line, int startCol, string error) {
- for (int i = 0; i < error.Length; i++) {
- PutErrorChar(line, startCol + i, error[i]);
- }
- }
-
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.html b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.html
deleted file mode 100644
index 49c5db9f22..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/INTs.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
- - IRQs can interrupt each other. But of same level?
- - IRQs can stack up - if same IRQ they can get "lost" (Link).
- If of different level, will queue up.. lower priority queues up, higher
- intterupts unless masked.
-
-
- IRQs are handled by priority and are queued.
- Questions
-
- Higher priority IRQs can happen while lower ones are in progress
-
- Can a signle IRQ happen while one is already in progress? ie Int 2 happen while
- Int 2 is already in progress? If so does it call again, queue it? or lose it?
-
- MtW: This depends on us: we can do this, but can have issues with debugger etc.
- Right now, we dont allow it.
-
-
-
- One thing to keep in mind: the Hardware IRQ's are mapped to interrupts 0x20-0x2F
-
- Links
-
-
- http://en.wikipedia.org/wiki/Interrupt
-
- http://en.wikipedia.org/wiki/Interrupt_request
-
- http://en.wikipedia.org/wiki/IF_%28x86_flag%29\
- http://wiki.osdev.org/IRQ
-
- http://www.xml.com/ldd/chapter/book/ch09.html
-
-
- Interrupt Descriptor Table -
-
- http://en.wikipedia.org/wiki/Interrupt_descriptor_table
- Interrupt Threads -
- http://en.wikipedia.org/wiki/Interrupt_handler
- Efficiency
- http://lwn.net/Articles/395783/
-
- Master PIC
-
-
- Slave PIC
-
-
-
-
-
-
\ No newline at end of file
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/IOGroup.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/IOGroup.cs
deleted file mode 100644
index a072e87c2d..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/IOGroup.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Cosmos.CPU.x86.IOGroup {
- public abstract class IOGroup {
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/PIC.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/PIC.cs
deleted file mode 100644
index 4156132f2b..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOGroup/PIC.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Cosmos.CPU.x86.IOGroup {
- public class PIC : IOGroup {
- public readonly IOPort Cmd = new IOPort(0x20);
- public readonly IOPort Data = new IOPort(0x21);
-
- internal PIC(bool aSlave) {
- byte aBase = (byte)(aSlave ? 0xA0 : 0x20);
- Cmd = new IOPort(aBase);
- Data = new IOPort((byte)(aBase + 1));
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOPort.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOPort.cs
deleted file mode 100644
index 90704433e9..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/IOPort.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-using System;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU.x86 {
- public abstract class IOPortBase {
- //TODO Make it that IO port classes are exclusive to each port. For example
- // only one IOPort class can be created per port number. This will prevent
- // two instances of an IOPort from using the same port.
- // A locking mechanism is not necessary as the creator can control access
- // to the instance.
- // We are not threaded yet anyways, but when we are will assume the caller
- // or owner handles any concurrency issues so as to minimize overhead in this
- // class. Or maybe some base support can be added to this class, but its functionality
- // is optional and only used by classes that need concurrency control like ATA.
-
- public readonly UInt16 Port;
-
- // all ctors are internal - Only Core ring can create it.. but hardware ring can use it.
- protected IOPortBase(UInt16 aPort) {
- Port = aPort;
- }
-
- protected IOPortBase(UInt16 aBase, UInt16 aOffset) {
- // C# math promotes things to integers, so we have this constructor
- // to relieve the use from having to do so many casts
- Port = (UInt16)(aBase + aOffset);
- }
-
- //TODO: Reads and writes can use this to get port instead of argument
- [PlugMethod(PlugRequired = true)]
- static protected void Write8(UInt16 aPort, byte aData) {
- } // Plugged
-
- [PlugMethod(PlugRequired = true)]
- static protected void Write16(UInt16 aPort, UInt16 aData) {
- } // Plugged
-
- [PlugMethod(PlugRequired = true)]
- static protected void Write32(UInt16 aPort, UInt32 aData) {
- } // Plugged
-
- [PlugMethod(PlugRequired = true)]
- static protected byte Read8(UInt16 aPort) {
- return 0;
- } // Plugged
-
- [PlugMethod(PlugRequired = true)]
- static protected UInt16 Read16(UInt16 aPort) {
- return 0;
- } // Plugged
-
- [PlugMethod(PlugRequired = true)]
- static protected UInt32 Read32(UInt16 aPort) {
- return 0;
- } // Plugged
-
- //TODO: Plug these Reads with asm to read directly to RAM
- // REP INSW
- public void Read8(byte[] aData) {
- UInt16 xValue;
- for (int i = 0; i < aData.Length / 2; i++) {
- xValue = Read16(Port);
- aData[i * 2] = (byte)xValue;
- aData[i * 2 + 1] = (byte)(xValue >> 8);
- }
- }
-
- public void Read16(UInt16[] aData) {
- for (int i = 0; i < aData.Length; i++) {
- aData[i] = Read16(Port);
- }
- }
-
- public void Read32(UInt32[] aData) {
- for (int i = 0; i < aData.Length; i++) {
- aData[i] = Read32(Port);
- }
- }
- }
-
- public class IOPort : IOPortBase {
- public IOPort(UInt16 aPort) : base(aPort) {
- }
-
- public IOPort(UInt16 aBase, UInt16 aOffset) : base(aBase, aOffset) {
- }
-
- static public void Wait() {
- // Write to an unused port. This assures whatever we were waiting on for a previous
- // IO read/write has completed.
- // Port 0x80 is unused after BIOS POST.
- // 0x22 is just a random byte.
- // Since IO is slow - its just a dummy sleep to wait long enough for the previous operation
- // to have effect on the target.
- Write8(0x80, 0x22);
- }
-
- public byte Byte {
- get {
- return Read8(Port);
- }
- set {
- Write8(Port, value);
- }
- }
-
- public UInt16 Word {
- get {
- return Read16(Port);
- }
- set {
- Write16(Port, value);
- }
- }
-
- public UInt32 DWord {
- get {
- return Read32(Port);
- }
- set {
- Write32(Port, value);
- }
- }
- }
-
- // I split these instead of adding CanRead/CanWrite because this enforces
- // at build time, and its also faster at runtime. Finally it allows future optimizations better
- // than checking at runtime.
- public class IOPortRead : IOPortBase {
- public IOPortRead(UInt16 aPort) : base(aPort) {
- }
-
- public IOPortRead(UInt16 aBase, UInt16 aOffset) : base(aBase, aOffset) {
- }
-
- public byte Byte {
- get {
- return Read8(Port);
- }
- }
-
- public UInt16 Word {
- get {
- return Read16(Port);
- }
- }
-
- public UInt32 DWord {
- get {
- return Read32(Port);
- }
- }
- }
-
- public class IOPortWrite : IOPortBase {
- public IOPortWrite(UInt16 aPort) : base(aPort) {
- }
-
- public IOPortWrite(UInt16 aBase, UInt16 aOffset) : base(aBase, aOffset) {
- }
-
- public byte Byte {
- set {
- Write8(Port, value);
- }
- }
-
- public UInt16 Word {
- set {
- Write16(Port, value);
- }
- }
-
- public UInt32 DWord {
- set {
- Write32(Port, value);
- }
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory.cs
deleted file mode 100644
index 5908c286a5..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace Cosmos.CPU.x86 {
- public class Memory2 {
- int mPtr;
- public Memory2(int aPtr) {
- mPtr = aPtr;
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupEntry.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupEntry.cs
deleted file mode 100644
index 3c1e83f5f0..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupEntry.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Cosmos.CPU.x86.Memory.Old {
- [StructLayout(LayoutKind.Explicit)]
- public unsafe struct DataLookupEntry {
- [FieldOffset(0)]
- public void* DataBlock;
- [FieldOffset(4)]
- public uint Size;
- // Refcount will be UInt32.MaxValue (0xFFFFFFFF) in case the block has been freed, but the memory hasn't been compacted yet
- [FieldOffset(8)]
- public uint Refcount;
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupTable.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupTable.cs
deleted file mode 100644
index 824fd6d6b1..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/DataLookupTable.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Cosmos.CPU.x86.Memory.Old {
- // The DataLookupTable (DLT) basically is a double linked list.
- [StructLayout(LayoutKind.Explicit)]
- public unsafe struct DataLookupTable {
- public const int EntriesPerTable = 170;
-
- [FieldOffset(0)]
- public DataLookupTable* Previous;
- [FieldOffset(4)]
- public DataLookupTable* Next;
-
- [FieldOffset(8)]
- public DataLookupEntry FirstEntry;
-
- public unsafe DataLookupEntry* GetEntry(uint index) {
- fixed (DataLookupEntry* xFirstEntryPtr = &FirstEntry) {
- if (index == 0) {
- return xFirstEntryPtr;
- } else {
- return &xFirstEntryPtr[index];
- }
- }
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalInformationTable.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalInformationTable.cs
deleted file mode 100644
index bf79ec5b68..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalInformationTable.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Cosmos.CPU.x86.Memory.Old {
- [StructLayout(LayoutKind.Explicit)]
- public unsafe struct GlobalInformationTable {
- [FieldOffset(0)]
- public DataLookupTable* FirstDataLookupTable;
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalSystemInfo.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalSystemInfo.cs
deleted file mode 100644
index fb1e95ca7e..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/GlobalSystemInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using Cosmos.CPU.x86;
-using Cosmos.Debug.Kernel;
-
-namespace Cosmos.CPU.x86.Memory.Old {
- public static unsafe class GlobalSystemInfo {
- private static volatile GlobalInformationTable* mGlobalInformationTable;
- public static GlobalInformationTable* GlobalInformationTable {
- get {
- EnsureInitialized();
- return mGlobalInformationTable;
- }
- }
-
- public static unsafe void EnsureInitialized() {
- if (mGlobalInformationTable == null) {
- // todo: should we align this structure somehow?
-
- var xEndOfKernel = Processor.GetEndOfKernel();
- xEndOfKernel = xEndOfKernel + 1024 * 1024; // for now, skip 1 MB
- Processor.ZeroFill(xEndOfKernel, (uint)(sizeof(GlobalInformationTable) + TotalDataLookupTableSize) * 4);
- mGlobalInformationTable = (GlobalInformationTable*)xEndOfKernel;
- uint xFirstDataLookupLocation = (uint)(xEndOfKernel + sizeof(GlobalInformationTable));
- //Debugger.DoSend("Setting FirstDataLookupTable to ");
- //Debugger.DoSendNumber(xFirstDataLookupLocation);
- mGlobalInformationTable->FirstDataLookupTable = (DataLookupTable*)xFirstDataLookupLocation;
- //Debugger.DoSend("FirstDataLookupTable was set to ");
- //Debugger.DoSendNumber((uint)mGlobalInformationTable->FirstDataLookupTable);
- }
- }
-
- public static uint TotalDataLookupTableSize {
- get {
- return (uint)(sizeof(DataLookupTable) + DataLookupTable.EntriesPerTable * sizeof(DataLookupEntry));
- }
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/Old_Heap.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/Old_Heap.cs
deleted file mode 100644
index 72ca188057..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Memory/Old/Old_Heap.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Cosmos.Debug.Kernel;
-
-namespace Cosmos.CPU.x86.Memory.Old
-{
- // This class must be static, as for creating objects, we need the heap
- // this heap implementation it the very most basic one: no reentrancy, etc.
- // Interrupts are disabled when trying to allocate a new block of memory.
- public static unsafe class Heap
- {
- private static Debugger mDebugger = new Debugger("Core", "Memory");
-
- private static uint mEndOfRam;
-
- private static uint mLastTableIndex = 0u;
-
- private static uint mLastEntryIndex = 0u;
-
- private static void DoInitialize(uint aEndOfRam)
- {
- mLastTableIndex = 0u;
- mLastEntryIndex = 0u;
- mEndOfRam = aEndOfRam;
- //
- }
-
- private static bool mInitialized = false;
- internal static void EnsureIsInitialized()
- {
- if (!mInitialized)
- {
- mInitialized = true;
- DoInitialize((Processor.GetAmountOfRAM() - 1) * 1024 * 1024);
- //DoInitialize(4 * 1024 * 1024, 16 * 1024 * 1024);
- }
- }
-
- private static void ClearMemory(void* aStartAddress, uint aLength)
- {
- //TODO: Move to memory. Internal access only...
- Processor.ZeroFill((uint)aStartAddress, aLength);
- }
-
- public static uint MemAlloc(uint aLength)
- {
- if (aLength == 0)
- {
- mDebugger.Send(" Request to retrieve block with size = 0 was halted!");
- while (true)
- {
- }
- }
- var xInterruptsWereEnabled = Processor.DisableInterrupts();
- try
- {
- EnsureIsInitialized();
-
- var xCurrentTableIdx = mLastTableIndex;
- DataLookupTable* xCurrentTable = GlobalSystemInfo.GlobalInformationTable->FirstDataLookupTable;
- DataLookupTable* xPreviousTable = null;
- uint xResult;
- #region Loop through existing tables and see if we find a free spot
- while (xCurrentTable != null)
- {
- //mDebugger.Trace($"At address {(uint)xCurrentTable}");
- if (ScanDataLookupTable(xCurrentTableIdx, xCurrentTable, aLength, out xResult))
- {
- if (xResult < Processor.GetEndOfKernel())
- {
- mDebugger.Send("Wrong handle returned!");
- while (true)
- {
- }
- }
- return xResult;
- }
- xCurrentTableIdx++;
- xPreviousTable = xCurrentTable;
- xCurrentTable = xCurrentTable->Next;
- mLastTableIndex = xCurrentTableIdx;
- mLastEntryIndex = 0;
- }
- #endregion Loop through existing tables and see if we find a free spot
-
- // no tables found, lets create a new one, and use that
- if (xPreviousTable == null)
- {
- // this check should theoretically be unnecessary, but lets keep it, to do some double-checking.
- mDebugger.Send("No PreviousTable found!");
- while (true)
- {
- }
- }
- var xLastItem = xPreviousTable->GetEntry(DataLookupTable.EntriesPerTable - 1);
- var xNextTablePointer = (DataLookupTable*)((uint)xLastItem->DataBlock + xLastItem->Size);
- // the memory hasn't been cleared yet, so lets do that now.
- ClearMemory(xNextTablePointer, GlobalSystemInfo.TotalDataLookupTableSize);
- xPreviousTable->Next = xNextTablePointer;
- xNextTablePointer->Previous = xPreviousTable;
-
- if (!ScanDataLookupTable(xCurrentTableIdx, xNextTablePointer, aLength, out xResult))
- {
- // Something seriously weird happened: we could create a new DataLookupTable (with new entries)
- // but couldn't allocate a new handle from it.
- mDebugger.Send(" Something seriously weird happened: we could create a new DataLookupTable (with new entries), but couldn't allocate a new handle from it.");
- while (true)
- {
- }
- }
- mLastTableIndex = xCurrentTableIdx;
- mLastEntryIndex = 0;
- return xResult;
- }
- finally
- {
- if (xInterruptsWereEnabled)
- {
- Processor.EnableInterrupts();
- }
- else
- {
- //mDebugger.Trace(" Not enabling interrupts, because they weren't enabled yet!");
- }
- }
- }
-
- private static bool ScanDataLookupTable(uint aTableIdx, DataLookupTable* aTable, uint aSize, out uint aHandle)
- {
- DataLookupEntry* xPreviousEntry = null;
- for (uint i = mLastEntryIndex; i < DataLookupTable.EntriesPerTable; i++)
- {
- var xCurrentEntry = aTable->GetEntry(i);
-
- //mDebugger.Trace($"Item.Size", xCurrentEntry->Size);
- //mDebugger.Trace($"Item.Refcount", xCurrentEntry->Refcount);
- if (xCurrentEntry->Size == 0)
- {
- #region Found an uninitialized entry
- // found an entry now. Let's set it
- if (aTable->Next != null)
- {
- // once a handle is used, the size should be set. But at this point, it somehow got unset again.
- // This should never occur.
- mDebugger.Send("Found an entry which has no size, but there is a followup DataLookupTable");
- while (true)
- {
- }
- }
-
- void* xDataBlock;
- //mDebugger.Trace("Now calculate datablock pointer");
- // now we found ourself a free handle
- if (i == 0)
- {
- //mDebugger.Trace("Using table end");
- // we don't have a previous handle yet, so we take the FirstByteAfterTable field of the DataLookupTable
- // note: we're explicitly initializing all blocks, as memory hasn't been cleared yet.
- var xTableAddr = (uint)aTable;
- //mDebugger.Trace($"aTableAddr", xTableAddr);
- var xTotalTableSize = GlobalSystemInfo.TotalDataLookupTableSize;
- //mDebugger.Trace($"TotalTableSize", xTotalTableSize);
- xDataBlock = (void*)((uint)aTable + GlobalSystemInfo.TotalDataLookupTableSize);
- }
- else
- {
- //mDebugger.Trace("Using previous entry");
- // We're not the very first handle being assigned, so calculate the start address using the previous block
- xDataBlock = (void*)((uint)xPreviousEntry->DataBlock + xPreviousEntry->Size);
- }
-
- // make sure the memory is empty
- ClearMemory(xDataBlock, aSize);
- //mDebugger.Trace("Cleared memory");
- xCurrentEntry->Size = aSize;
- xCurrentEntry->DataBlock = xDataBlock;
- xCurrentEntry->Refcount = 1;
-
- aHandle = (uint)xCurrentEntry->DataBlock;
- //mDebugger.Trace($"Returning handle ", aHandle);
- mLastEntryIndex = i;
- #endregion Found an uninitialized entry
- return true;
- }
-
- // Refcount == UInt32.MaxValue, it means that the block has been reclaimed, and can be reused now.
- if (xCurrentEntry->Refcount == UInt32.MaxValue)
- {
- // we can reuse this entry if its Size >= aLength
- if (xCurrentEntry->Size >= aSize)
- {
- // we can reuse this entry
- xCurrentEntry->Refcount = 1;
- aHandle = (uint)xCurrentEntry->DataBlock;
- mLastEntryIndex = i;
- return true;
- }
- }
- xPreviousEntry = xCurrentEntry;
- }
- aHandle = 0;
- return false;
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.cs
deleted file mode 100644
index 5ab467fd3f..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-namespace Cosmos.CPU.x86 {
- // PIC is not in hardware becuase its a special core piece like Processor that is not interacted with by anything except Core.
- //
- // Remaps the IRQ's to INT20-INT2F
- public class PIC {
- // This is here and not in BaseGroups for 2 reasons.
- // 1) Its needed before the other Basegroups are created.
- // 2) Its only used by this class, and it also exists in Core.
- protected IOGroup.PIC Master = new IOGroup.PIC(false);
- protected IOGroup.PIC Slave = new IOGroup.PIC(true);
-
- protected enum Cmd {
- Init = 0x10,
- EOI = 0x20
- }
-
- public void EoiMaster() {
- Master.Cmd.Byte = (byte)Cmd.EOI;
- }
-
- public void EoiSlave() {
- Master.Cmd.Byte = (byte)Cmd.EOI;
- Slave.Cmd.Byte = (byte)Cmd.EOI;
- }
-
- public PIC() {
- // MTW: to disable PIT, send 0x01 to Master mask
- // Right now we mask all IRQs. We enable them as we add
- // support for them. The 0x08 on master MUST remain. IRQ7
- // has a problem of "spurious requests" and is therefore unreliable.
- // It used for LPT2 (and sometimes old 8 bit sound blasters). We likely
- // won't need either of those for a very long time, so we just mask it
- // completely. For more info:
- // http://en.wikipedia.org/wiki/Intel_8259#Spurious_Interrupts
-
- //Init(Master, 0x20, 4, 0xFD | 0x08);
- //Init(Slave, 0x28, 2, 0xFF);
- //for now enable keyboard, mouse(ps2)
- Remap(0x20, 0xF9 | 0x08, 0x28, 0xEF);
-
- }
-
- private void Remap(byte masterStart, byte masterMask, byte slaveStart, byte slaveMask) {
- #region consts
-
- // source: osdev.org
-
-#pragma warning disable
- const byte ICW1_ICW4 = 0x01; // ICW4 (not) needed
- const byte ICW1_SINGLE = 0x02; // Single (cascade) mode
- const byte ICW1_INTERVAL4 = 0x04; // Call address interval 4 (8)
- const byte ICW1_LEVEL = 0x08; // Level triggered (edge) mode
- const byte ICW1_INIT = 0x10;
-
- const byte ICW4_8086 = 0x01; // 8086/88 mode
- const byte ICW4_AUTO = 0x02; // auto (normal) EOI
- const byte ICW4_BUF_SLAVE = 0x08; // buffered mode/slave
- const byte ICW4_BUF_MASTER = 0x0C; // buffered mode/master
- const byte ICW4_SFNM = 0x10; // special fully nested (not)
-#pragma warning restore
-
- #endregion
-
- var xOldMasterMask = Master.Data.Byte;
- var xOldSlaveMask = Slave.Data.Byte;
- Master.Cmd.Byte = ICW1_INIT + ICW1_ICW4;
- IOPort.Wait();
- Slave.Cmd.Byte = ICW1_INIT + ICW1_ICW4;
- IOPort.Wait();
- Master.Data.Byte = masterStart;
- IOPort.Wait();
- Slave.Data.Byte = slaveStart;
- IOPort.Wait();
-
- // magic:
- Master.Data.Byte = 4;
- IOPort.Wait();
- Slave.Data.Byte = 2;
- IOPort.Wait();
-
- // set modes:
- Master.Data.Byte = ICW4_8086;
- IOPort.Wait();
- Slave.Data.Byte = ICW4_8086;
- IOPort.Wait();
-
- // set masks:
- Master.Data.Byte = masterMask;
- IOPort.Wait();
- Slave.Data.Byte = slaveMask;
- IOPort.Wait();
- }
-
- protected void Init(IOGroup.PIC aPIC, byte aBase, byte aIDunno, byte aMask) {
- // We need to remap the PIC interrupt lines to the Processor. The BIOS sets
- // them in a way compatible for 16 bit mode, but in a way that causes problems
- // for 32 bit mode.
- // The only way to remap them however is to completely reinitialize the PICs.
-
- byte xOldMask = aPIC.Data.Byte;
-
- //#define ICW1_ICW4 0x01 /* ICW4 (not) needed */
- //#define ICW1_SINGLE 0x02 /* Single (cascade) mode */
- //#define ICW1_INTERVAL4 0x04 /* Call address interval 4 (8) */
- //#define ICW1_LEVEL 0x08 /* Level triggered (edge) mode */
- Master.Cmd.Byte = (byte)Cmd.Init | 0x01;
- IOPort.Wait();
-
- // ICW2
- Master.Data.Byte = aBase;
- IOPort.Wait();
-
- // ICW3
- // Somehow tells them about master/slave relationship
- Master.Data.Byte = aIDunno;
- IOPort.Wait();
-
- //#define ICW4_AUTO 0x02 /C:\Data\Cosmos\source2\Kernel\System\Hardware\Core\Cosmos.Core\Processor.cs* Auto (normal) EOI */
- //#define ICW4_BUF_SLAVE 0x08 /* Buffered mode/slave */
- //#define ICW4_BUF_MASTER 0x0C /* Buffered mode/master */
- //#define ICW4_SFNM 0x10 /* Special fully nested (not) */
- //0x01 8086/88 (MCS-80/85) mode
- Master.Data.Byte = 0x01;
- IOPort.Wait();
-
- // Set mask
- Master.Data.Byte = aMask;
- IOPort.Wait();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.html b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.html
deleted file mode 100644
index 55687a707b..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/PIC.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
- http://wiki.osdev.org/PIC
-
- http://wiki.osdev.org/I_Cant_Get_Interrupts_Working
-
-
- APIC
- http://wiki.osdev.org/APIC
-
- http://www.intel.com/design/chipsets/datashts/290566.htm
-
- http://en.wikipedia.org/wiki/Intel_APIC_Architecture
-
-
-
-
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Processor.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Processor.cs
deleted file mode 100644
index 52043edd0e..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/Processor.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU.x86 {
- // Non hardware class, only used by core and hardware drivers for ports etc.
- public class Processor {
- // Amount of RAM in MB's.
- // needs to be static, as Heap needs it before we can instantiate objects
- [PlugMethod(PlugRequired = true)]
- public static uint GetAmountOfRAM() {
- throw new NotImplementedException();
- }
-
- // needs to be static, as Heap needs it before we can instantiate objects
- [PlugMethod(PlugRequired = true)]
- public static uint GetEndOfKernel() {
- throw new NotImplementedException();
- }
-
- [PlugMethod(PlugRequired = true)]
- public void UpdateIDT(bool aEnableInterruptsImmediately) {
- throw new NotImplementedException();
- }
-
- [PlugMethod(PlugRequired = true)]
- public void InitFloat() {
- throw new NotImplementedException();
- }
-
- [PlugMethod(PlugRequired = true)]
- public void InitSSE() {
- throw new NotImplementedException();
- }
-
- [PlugMethod(PlugRequired = true)]
- public static void ZeroFill(uint aStartAddress, uint aLength) {
- throw new NotImplementedException();
- }
-
- [PlugMethod(PlugRequired = true)]
- public void Halt() {
- throw new NotImplementedException();
- }
-
- public void Reboot() {
- // Disable all interrupts
- DisableInterrupts();
-
- var myPort = new IOPort(0x64);
- while ((myPort.Byte & 0x02) != 0) {
- }
- myPort.Byte = 0xFE;
- Halt(); // If it didn't work, Halt the Processor
- }
-
- private static void DoEnableInterrupts() {
- throw new NotImplementedException();
- }
-
- private static void DoDisableInterrupts() {
- throw new NotImplementedException();
- }
-
- [AsmMarker(AsmMarker.Type.Processor_IntsEnabled)]
- public static bool mInterruptsEnabled;
-
- public static void EnableInterrupts() {
- mInterruptsEnabled = true;
- DoEnableInterrupts();
- }
-
- ///
- /// Returns if the interrupts were actually enabled
- ///
- ///
- public static bool DisableInterrupts() {
- DoDisableInterrupts();
- var xResult = mInterruptsEnabled;
- mInterruptsEnabled = false;
- return xResult;
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/TempDebug.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/TempDebug.cs
deleted file mode 100644
index 38a4404a34..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU.x86/TempDebug.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-namespace Cosmos.CPU.x86 {
- static public class TempDebug {
- unsafe static byte* mPtr = (byte*)(0xB8000 - 1);
- static public void ShowText(char aChar) {
- unsafe {
- mPtr++;
- *mPtr = (byte)aChar;
-
- mPtr++;
- *mPtr = 0x0A;
- }
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs
deleted file mode 100644
index 0f563b7d15..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm
-{
- public class ArrayGetLengthAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- // $this ebp+8
- XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 8);
- XS.Set(XSRegisters.EAX, XSRegisters.EAX, sourceDisplacement: 8, sourceIsIndirect: true); // element count
- XS.Push(XSRegisters.EAX);
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs
deleted file mode 100644
index 03a8e9fafe..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using IL2CPU.API;
-using XSharp;
-using XSharp.Assembler;
-using XSharp.Assembler.x86;
-using static XSharp.XSRegisters;
-
-namespace Cosmos.CPU_Asm
-{
- public class ArrayInternalCopyAsm : AssemblerMethod
- {
- private const int SourceArrayDisplacement = 36;
- private const int SourceIndexDisplacement = 28;
- private const int DestinationArrayDisplacement = 24;
- private const int DestinationIndexDisplacement = 16;
- private const int LengthDisplacement = 12;
-
- /* void Copy(
- * Array sourceArray, ebp + 36
- * int sourceIndex, ebp + 28
- * Array destinationArray, ebp + 24
- * int destinationIndex, ebp + 16
- * int length, ebp + 12
- * bool reliable); ebp + 8
- */
-
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- var xArrayCopyReverseLabel = "ArrayCopy_Reverse";
- var xArrayCopyReverseLoopLabel = "ArrayCopy_Reverse_Loop";
- var xArrayCopyEndLabel = "ArrayCopy_End";
-
- XS.Comment("Source");
- XS.Comment("Element size");
- XS.Set(EAX, EBP, sourceDisplacement: SourceArrayDisplacement);
- XS.Add(EAX, ObjectUtils.FieldDataOffset);
- XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
- XS.Comment("Source ptr");
- XS.Set(EBX, EBP, sourceDisplacement: SourceIndexDisplacement);
- XS.Multiply(EBX);
- XS.Add(EAX, ObjectUtils.FieldDataOffset + 4); // first element
- XS.Set(ESI, EBP, sourceDisplacement: SourceArrayDisplacement);
- XS.Add(ESI, EAX); // source ptr
-
- XS.Comment("Destination");
- XS.Comment("Element size");
- XS.Set(EAX, EBP, sourceDisplacement: DestinationArrayDisplacement);
- XS.Add(EAX, ObjectUtils.FieldDataOffset);
- XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
- XS.Comment("Destination ptr");
- XS.Set(ECX, EBP, sourceDisplacement: DestinationIndexDisplacement);
- XS.Multiply(ECX);
- XS.Add(EAX, ObjectUtils.FieldDataOffset + 4); // first element
- XS.Set(EDI, EBP, sourceDisplacement: DestinationArrayDisplacement);
- XS.Add(EDI, EAX); // destination ptr
-
- XS.Compare(EDI, ESI);
- XS.Jump(ConditionalTestEnum.Equal, xArrayCopyEndLabel);
-
- XS.Comment("Copy byte count");
- XS.Comment("Element size");
- XS.Set(EAX, EBP, sourceDisplacement: DestinationArrayDisplacement);
- XS.Add(EAX, ObjectUtils.FieldDataOffset);
- XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
- XS.Comment("Count");
- XS.Set(EDX, EBP, sourceDisplacement: LengthDisplacement);
-
- // if length is 0, jump to end
- XS.Compare(EDX, 0);
- XS.Jump(ConditionalTestEnum.Equal, xArrayCopyEndLabel);
-
- XS.Multiply(EDX);
- XS.Set(ECX, EAX);
-
- XS.Compare(EDI, ESI);
- XS.Jump(ConditionalTestEnum.GreaterThan, xArrayCopyReverseLabel);
-
- new Movs { Size = 8, Prefixes = InstructionPrefixes.Repeat };
-
- XS.Jump(xArrayCopyEndLabel);
-
- XS.Label(xArrayCopyReverseLabel);
-
- XS.Add(ESI, ECX);
- XS.Add(EDI, ECX);
-
- XS.Label(xArrayCopyReverseLoopLabel);
-
- XS.Decrement(ESI);
- XS.Decrement(EDI);
- XS.Decrement(ECX);
-
- XS.Set(AL, ESI, sourceIsIndirect: true);
- XS.Set(EDI, AL, destinationIsIndirect: true);
-
- XS.Compare(ECX, 0);
- XS.Jump(ConditionalTestEnum.NotEqual, xArrayCopyReverseLoopLabel);
-
- XS.Label(xArrayCopyEndLabel);
- }
- }
-}
-
-// Old implementation
-// (it's a good memcpy implementation, as it doesn't check for array overlapping, so it can't be used for Array.Copy)
-
-//using Cosmos.Assembler;
-//using Cosmos.Assembler.x86;
-//using IL2CPU.API;
-//using XSharp.Common;
-//using static XSharp.Common.XSRegisters;
-
-//namespace Cosmos.Core_Asm
-//{
-// public class ArrayInternalCopyAsm : AssemblerMethod
-// {
-// private const int SourceArrayDisplacement = 36;
-// private const int SourceIndexDisplacement = 28;
-// private const int DestinationArrayDisplacement = 24;
-// private const int DestinationIndexDisplacement = 16;
-// private const int LengthDisplacement = 12;
-
-// /* void Copy(
-// * Array sourceArray, ebp + 36
-// * int sourceIndex, ebp + 28
-// * Array destinationArray, ebp + 24
-// * int destinationIndex, ebp + 16
-// * int length, ebp + 12
-// * bool reliable); ebp + 8
-// */
-
-// public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo)
-// {
-// XS.Comment("Source");
-// XS.Comment("Element size");
-// XS.Set(EAX, EBP, sourceDisplacement: SourceArrayDisplacement);
-// XS.Add(EAX, ObjectUtils.FieldDataOffset);
-// XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
-// XS.Comment("Source ptr");
-// XS.Set(EBX, EBP, sourceDisplacement: SourceIndexDisplacement);
-// XS.Multiply(EBX);
-// XS.Add(EAX, ObjectUtils.FieldDataOffset + 4); // first element
-// XS.Set(ESI, EBP, sourceDisplacement: SourceArrayDisplacement);
-// XS.Add(ESI, EAX); // source ptr
-
-// XS.Comment("Destination");
-// XS.Comment("Element size");
-// XS.Set(EAX, EBP, sourceDisplacement: DestinationArrayDisplacement);
-// XS.Add(EAX, ObjectUtils.FieldDataOffset);
-// XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
-// XS.Comment("Destination ptr");
-// XS.Set(ECX, EBP, sourceDisplacement: DestinationIndexDisplacement);
-// XS.Multiply(ECX);
-// XS.Add(EAX, ObjectUtils.FieldDataOffset + 4); // first element
-// XS.Set(EDI, EBP, sourceDisplacement: DestinationArrayDisplacement);
-// XS.Add(EDI, EAX); // destination ptr
-
-// XS.Comment("Copy byte count");
-// XS.Comment("Element size");
-// XS.Set(EAX, EBP, sourceDisplacement: DestinationArrayDisplacement);
-// XS.Add(EAX, ObjectUtils.FieldDataOffset);
-// XS.Set(EAX, EAX, sourceIsIndirect: true); // element size
-// XS.Comment("Count");
-// XS.Set(EDX, EBP, sourceDisplacement: LengthDisplacement);
-// XS.Multiply(EDX);
-// XS.Set(ECX, EAX);
-// new Movs { Size = 8, Prefixes = InstructionPrefixes.Repeat };
-// }
-// }
-//}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/ArrayImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/ArrayImpl.cs
deleted file mode 100644
index c7b9d6218c..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/ArrayImpl.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Asm
-{
- [Plug(Target = typeof(Array))]
- public class ArrayImpl
- {
- [PlugMethod(Assembler = typeof(ArrayGetLengthAsm))]
- public static int get_Length(Array aThis)
- {
- throw new NotImplementedException();
- }
-
- [PlugMethod(Assembler = typeof(ArrayInternalCopyAsm))]
- public static void Copy(Array sourceArray, int sourceIndex, Array destinationArray, int destinationIndex, int length, bool reliable)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs
deleted file mode 100644
index 29b0096372..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUDisableINTsAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.ClearInterruptFlag();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs
deleted file mode 100644
index c3c0c1c8a8..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUEnableINTsAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.EnableInterrupts();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs
deleted file mode 100644
index 76e8e62900..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUGetAmountOfRAMAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EAX, "MultiBootInfo_Memory_High", sourceIsIndirect: true);
- XS.Xor(XSRegisters.EDX, XSRegisters.EDX);
- XS.Set(XSRegisters.ECX, 1024);
- XS.Divide(XSRegisters.ECX);
- XS.Add(XSRegisters.EAX, 1);
- XS.Push(XSRegisters.EAX);
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs
deleted file mode 100644
index 5bf667cd27..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUGetEndOfKernelAsm : AssemblerMethod {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo) {
- XS.Push("_end_code");
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs
deleted file mode 100644
index 8efdbf7735..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUHaltAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Halt();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs
deleted file mode 100644
index 21c40131e0..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUInitFloatAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.FPU.FloatInit();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs
deleted file mode 100644
index 0a2acf12af..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class CPUInitSSEAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.SSE.SSEInit();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs
deleted file mode 100644
index d95949a38f..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Reflection;
-
-using Cosmos.CPU.x86;
-
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-
-using XSharp;
-using XSharp.Assembler;
-using XSharp.Assembler.x86;
-using static XSharp.XSRegisters;
-
-namespace Cosmos.CPU_Asm
-{
- //TODO: This asm refs Hardware.. should not.. its a higher ring
- public class CPUUpdateIDTAsm : AssemblerMethod
- {
- private static MethodBase GetMethodDef(Assembly aAssembly, string aType, string aMethodName, bool aErrorWhenNotFound)
- {
- Type xType = aAssembly.GetType(aType, false);
- if (xType != null)
- {
- MethodBase xMethod = xType.GetMethod(aMethodName);
- if (xMethod != null)
- {
- return xMethod;
- }
- }
- if (aErrorWhenNotFound)
- {
- throw new Exception("Method '" + aType + "::" + aMethodName + "' not found!");
- }
- return null;
- }
-
- private static MethodBase GetInterruptHandler(byte aInterrupt)
- {
- return GetMethodDef(typeof(INTs).Assembly, typeof(INTs).FullName
- , "HandleInterrupt_" + aInterrupt.ToString("X2"), false);
- }
-
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- // IDT is already initialized but just for base hooks, and asm only.
- // ie Int 1, 3 and GPF
- // This routine updates the IDT now that we have C# running to allow C# hooks to handle
- // the other INTs
-
- // We are updating the IDT, disable interrupts
- XS.ClearInterruptFlag();
-
- for (int i = 0; i < 256; i++)
- {
- // These are already mapped, don't remap them.
- // Maybe in the future we can look at ones that are present
- // and skip them, but some we may want to overwrite anyways.
- if (i == 1 || i == 3)
- {
- continue;
- }
-
- XS.Set(EAX, "__ISR_Handler_" + i.ToString("X2"));
- XS.Set("_NATIVE_IDT_Contents", AL, destinationDisplacement: i * 8 + 0);
- XS.Set("_NATIVE_IDT_Contents", AH, destinationDisplacement: i * 8 + 1);
- XS.Set("_NATIVE_IDT_Contents", 0x8, destinationDisplacement: i * 8 + 2, size: RegisterSize.Byte8);
- XS.Set("_NATIVE_IDT_Contents", 0x8E, destinationDisplacement: i * 8 + 5, size: RegisterSize.Byte8);
- XS.ShiftRight(EAX, 16);
- XS.Set("_NATIVE_IDT_Contents", AL, destinationDisplacement: i * 8 + 6);
- XS.Set("_NATIVE_IDT_Contents", AH, destinationDisplacement: i * 8 + 7);
- }
-
- XS.Jump("__AFTER__ALL__ISR__HANDLER__STUBS__");
- var xInterruptsWithParam = new[] { 8, 10, 11, 12, 13, 14 };
- for (int j = 0; j < 256; j++)
- {
- XS.Label("__ISR_Handler_" + j.ToString("X2"));
- XS.Call("__INTERRUPT_OCCURRED__");
-
- if (Array.IndexOf(xInterruptsWithParam, j) == -1)
- {
- XS.Push(0);
- }
- XS.Push((uint)j);
- XS.PushAllRegisters();
-
- XS.Sub(ESP, 4);
- XS.Set(EAX, ESP); // preserve old stack address for passing to interrupt handler
-
- // store floating point data
- XS.And(ESP, 0xfffffff0); // fxsave needs to be 16-byte alligned
- XS.Sub(ESP, 512); // fxsave needs 512 bytes
- XS.SSE.FXSave(ESP, isIndirect: true); // save the registers
- XS.Set(EAX, ESP, destinationIsIndirect: true);
-
- XS.Push(EAX); //
- XS.Push(EAX); // pass old stack address (pointer to InterruptContext struct) to the interrupt handler
-
- XS.JumpToSegment(8, "__ISR_Handler_" + j.ToString("X2") + "_SetCS");
- XS.Label("__ISR_Handler_" + j.ToString("X2") + "_SetCS");
- MethodBase xHandler = GetInterruptHandler((byte)j);
- if (xHandler == null)
- {
- xHandler = GetMethodDef(typeof(INTs).Assembly, typeof(INTs).FullName, "HandleInterrupt_Default", true);
- }
- XS.Call(LabelName.Get(xHandler));
- XS.Pop(EAX);
- XS.SSE.FXRestore(ESP, isIndirect: true);
-
- XS.Set(ESP, EAX); // this restores the stack for the FX stuff, except the pointer to the FX data
- XS.Add(ESP, 4); // "pop" the pointer
-
- XS.PopAllRegisters();
-
- XS.Add(ESP, 8);
- XS.Label("__ISR_Handler_" + j.ToString("X2") + "_END");
- XS.InterruptReturn();
- }
- XS.Label("__INTERRUPT_OCCURRED__");
- XS.Return();
- XS.Label("__AFTER__ALL__ISR__HANDLER__STUBS__");
- XS.Noop();
- XS.Set(EAX, EBP, sourceDisplacement: 8);
- XS.Compare(EAX, 0);
- XS.Jump(ConditionalTestEnum.Zero, ".__AFTER_ENABLE_INTERRUPTS");
-
- // reload interrupt list
- XS.Set(EAX, "_NATIVE_IDT_Pointer");
- XS.Set(AsmMarker.Labels[AsmMarker.Type.Processor_IntsEnabled], 1, destinationIsIndirect: true, size: RegisterSize.Byte8);
- XS.LoadIdt(EAX, isIndirect: true);
- // Reenable interrupts
- XS.EnableInterrupts();
-
- XS.Label(".__AFTER_ENABLE_INTERRUPTS");
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs
deleted file mode 100644
index 7030bb3fd0..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using XSharp.Assembler;
-using XSharp;
-using x86 = XSharp.Assembler.x86;
-
-namespace Cosmos.CPU_Asm
-{
- public class CPUZeroFillAsm : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.ClearDirectionFlag();
- XS.Set(XSRegisters.EDI, XSRegisters.EBP, sourceDisplacement: 0xC); //address
- XS.Set(XSRegisters.ECX, XSRegisters.EBP, sourceDisplacement: 0x8); //length
- // set EAX to value of fill (zero)
- XS.Xor(XSRegisters.EAX, XSRegisters.EAX);
- XS.ShiftRight(XSRegisters.ECX, 1);
- XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step2");
- XS.StoreByteInString();
- XS.Label(".step2");
- XS.ShiftRight(XSRegisters.ECX, 1);
- XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step3");
- XS.StoreWordInString();
- XS.Label(".step3");
- new x86.Stos { Size = 32, Prefixes = x86.InstructionPrefixes.Repeat };
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPUImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPUImpl.cs
deleted file mode 100644
index ccc05cb4ae..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPUImpl.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using IL2CPU.API.Attribs;
-using Cosmos.CPU.x86;
-
-namespace Cosmos.CPU_Asm {
- [Plug(Target = typeof(Processor))]
- public class CPUImpl {
- [PlugMethod(Assembler = typeof(CPUUpdateIDTAsm))]
- public static void UpdateIDT(Processor aThis, bool aEnableInterruptsImmediately) {
- }
-
- [PlugMethod(Assembler = typeof(CPUGetAmountOfRAMAsm))]
- public static uint GetAmountOfRAM() {
- return 0;
- }
-
- [PlugMethod(Assembler = typeof(CPUGetEndOfKernelAsm))]
- public static uint GetEndOfKernel() {
- return 0;
- }
-
- [PlugMethod(Assembler = typeof(CPUZeroFillAsm))]
- // TODO: implement this using REP STOSB and REPO STOSD
- public static void ZeroFill(uint aStartAddress, uint aLength) {
- }
-
- [PlugMethod(Assembler = typeof(CPUInitFloatAsm))]
- public static void InitFloat(Processor aThis) {
- }
-
- [PlugMethod(Assembler = typeof(CPUInitSSEAsm))]
- public static void InitSSE(Processor aThis) {
- }
-
- [PlugMethod(Assembler = typeof(CPUHaltAsm))]
- public static void Halt(Processor aThis) {
- }
-
- [PlugMethod(Assembler = typeof(CPUDisableINTsAsm))]
- public static void DoDisableInterrupts() {
- }
-
- [PlugMethod(Assembler = typeof(CPUEnableINTsAsm))]
- public static void DoEnableInterrupts() {
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj
deleted file mode 100644
index fd7a67d10f..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.CPU_Asm.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- net6.0
- true
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.cfg b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.cfg
deleted file mode 100644
index dcb76c5045..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: Debug
\ No newline at end of file
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs
deleted file mode 100644
index bf48eb6f61..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Reflection;
-using XSharp.Assembler;
-using Cosmos.IL2CPU;
-using Cosmos.IL2CPU.X86.IL;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class DelegateCtorAsm : AssemblerMethod {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo) {
- // method signature: $this, object @object, IntPtr method
- var xAssembler = aAssembler;
- var xMethodInfo = (Il2cpuMethodInfo)aMethodInfo;
- XS.Comment("Save target ($this) to field");
- XS.Comment("-- ldarg 0");
- Ldarg.DoExecute(xAssembler, xMethodInfo, 0);
- XS.Comment("-- ldarg 1");
- Ldarg.DoExecute(xAssembler, xMethodInfo, 1);
- XS.Comment("-- stfld _target");
- Stfld.DoExecute(xAssembler, xMethodInfo, "System.Object System.Delegate._target", xMethodInfo.MethodBase.DeclaringType, true, false);
- XS.Comment("Save method pointer to field");
- XS.Comment("-- ldarg 0");
- Ldarg.DoExecute(xAssembler, xMethodInfo, 0);
- XS.Comment("-- ldarg 2");
- Ldarg.DoExecute(xAssembler, xMethodInfo, 2);
- XS.Comment("-- stfld _methodPtr");
- Stfld.DoExecute(xAssembler, xMethodInfo, "System.IntPtr System.Delegate._methodPtr", xMethodInfo.MethodBase.DeclaringType, true, false);
- XS.Comment("Saving ArgSize to field");
- uint xSize = 0;
- foreach (var xArg in xMethodInfo.MethodBase.DeclaringType.GetMethod("Invoke").GetParameters()) {
- xSize += ILOp.Align(ILOp.SizeOfType(xArg.ParameterType), 4);
- }
-
- XS.Comment("-- ldarg 0");
- Ldarg.DoExecute(xAssembler, xMethodInfo, 0);
- XS.Comment("-- push argsize");
- XS.Push(xSize);
- XS.Comment("-- stfld ArgSize");
- Stfld.DoExecute(xAssembler, xMethodInfo, "$$ArgSize$$", xMethodInfo.MethodBase.DeclaringType, true, false);
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs
deleted file mode 100644
index 0b5d852800..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Reflection;
-using XSharp.Assembler;
-using Cosmos.IL2CPU;
-using XSharp;
-
-namespace Cosmos.CPU_Asm {
- public class DelegateGetMulticastInvokeAsm : AssemblerMethod {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo) {
- var xAssembler = aAssembler;
- var xMethodInfo = (MethodInfo)aMethodInfo;
- var xDelegate = typeof(global::System.Delegate);
- var xMethod = xDelegate.GetMethod("GetInvokeMethod", BindingFlags.NonPublic | BindingFlags.Instance);
- XS.Push(ILOp.GetLabel(xMethod));
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs
deleted file mode 100644
index b7f00f21ba..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-
-using IL2CPU.API;
-using Cosmos.IL2CPU;
-using Cosmos.IL2CPU.X86.IL;
-
-using XSharp;
-using XSharp.Assembler;
-using x86 = XSharp.Assembler.x86;
-
-// ReSharper disable once CheckNamespace
-namespace Cosmos.CPU_Asm {
- public class DelegateInvokeAsm : AssemblerMethod {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo) {
- var xAssembler = aAssembler;
- var xMethodInfo = (Il2cpuMethodInfo)aMethodInfo;
- var xMethodBaseAsInfo = xMethodInfo.MethodBase as global::System.Reflection.MethodInfo;
- if (xMethodBaseAsInfo.ReturnType != typeof(void)) {
- throw new Exception("Events with return type not yet supported!");
- }
-
- /*
- * EAX contains the GetInvocationList() array at the index at which it was last used
- * EDX contains the index at which the EAX is
- * EBX contains the number of items in the array
- * ECX contains the argument size
- */
-
- XS.ClearInterruptFlag();
-
- XS.Comment("Get Invoke list count");
- var xGetInvocationListMethod = typeof(MulticastDelegate).GetMethod("GetInvocationList");
- Ldarg.DoExecute(aAssembler, xMethodInfo, 0);
- XS.Call(LabelName.Get(xGetInvocationListMethod));
- XS.Add(XSRegisters.ESP, 4);
- XS.Pop(XSRegisters.EAX);
- XS.Add(XSRegisters.EAX, 8);
- XS.Set(XSRegisters.EBX, XSRegisters.EAX, sourceIsIndirect: true);
-
- XS.Comment("Get invoke method");
- XS.Add(XSRegisters.EAX, 8);
- XS.Set(XSRegisters.EDI, XSRegisters.EAX, sourceIsIndirect: true, sourceDisplacement: 4);
-
- XS.Comment("Get ArgSize");
- int xArgSizeOffset = Ldfld.GetFieldOffset(typeof(global::System.Delegate), "$$ArgSize$$");
- Ldarg.DoExecute(aAssembler, xMethodInfo, 0);
- XS.Add(XSRegisters.ESP, 4);
- XS.Pop(XSRegisters.ECX);
- XS.Add(XSRegisters.ECX, (uint)xArgSizeOffset);
- XS.Set(XSRegisters.ECX, XSRegisters.ECX, sourceIsIndirect: true);
-
- XS.Comment("Set current invoke list index");
- XS.Set(XSRegisters.EDX, 0);
-
- XS.Label(".BEGIN_OF_LOOP");
- {
- XS.Compare(XSRegisters.EDX, XSRegisters.EBX);
- XS.Jump(x86.ConditionalTestEnum.GreaterThanOrEqualTo, ".END_OF_INVOKE");
-
- XS.PushAllRegisters();
-
- XS.Comment("Check if delegate has $this");
- XS.Set(XSRegisters.EDI, XSRegisters.EBP, sourceDisplacement: Ldarg.GetArgumentDisplacement(xMethodInfo, 0));
- XS.Add(XSRegisters.EDI, 4);
- XS.Set(XSRegisters.EDI, XSRegisters.EDI, sourceDisplacement: Ldfld.GetFieldOffset(xMethodInfo.MethodBase.DeclaringType, "System.Object System.Delegate._target"));
- XS.Compare(XSRegisters.EDI, 0);
- XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_THIS");
- XS.Label(".HAS_THIS");
- XS.Push(XSRegisters.EDI);
- XS.Push(0);
- XS.Label(".NO_THIS");
- XS.Set(XSRegisters.EDI, XSRegisters.EAX, sourceIsIndirect: true, sourceDisplacement: 4);
- XS.Set(XSRegisters.EDI, XSRegisters.EDI, sourceDisplacement: Ldfld.GetFieldOffset(xMethodInfo.MethodBase.DeclaringType, "System.IntPtr System.Delegate._methodPtr"));
-
- XS.Comment("Check if delegate has args");
- XS.Compare(XSRegisters.ECX, 0);
- XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_ARGS");
- XS.Label(".HAS_ARGS");
- XS.Sub(XSRegisters.ESP, XSRegisters.ECX);
- XS.Push(XSRegisters.EDI);
- XS.Set(XSRegisters.EDI, XSRegisters.ESP);
- XS.Add(XSRegisters.EDI, 4);
- XS.Set(XSRegisters.ESI, XSRegisters.EBP);
- XS.Add(XSRegisters.ESI, 8);
- new x86.Movs { Size = 8, Prefixes = x86.InstructionPrefixes.Repeat };
- XS.Pop(XSRegisters.EDI);
- XS.Label(".NO_ARGS");
- XS.Call(XSRegisters.EDI);
-
- XS.PopAllRegisters();
- XS.Increment(XSRegisters.EDX);
- XS.Jump(".BEGIN_OF_LOOP");
- }
-
- XS.Label(".END_OF_INVOKE");
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: Ldarg.GetArgumentDisplacement(xMethodInfo, 0));
- XS.Set(XSRegisters.EDX, XSRegisters.EDX, sourceDisplacement: Ldfld.GetFieldOffset(xMethodInfo.MethodBase.DeclaringType, "$$ReturnsValue$$"));
- XS.Compare(XSRegisters.EDX, 0);
- XS.Jump(x86.ConditionalTestEnum.Equal, ".NO_RETURN");
-
- XS.Label(".HAS_RETURN");
- XS.Exchange(XSRegisters.EBP, XSRegisters.EDX, destinationDisplacement: 8);
- XS.Exchange(XSRegisters.EBP, XSRegisters.EDX, destinationDisplacement: 4);
- XS.Exchange(XSRegisters.EBP, XSRegisters.EDX, destinationIsIndirect: true);
- XS.Push(XSRegisters.EDX);
- XS.Set(XSRegisters.ESP, XSRegisters.EDI, destinationDisplacement: 12);
-
- XS.Label(".NO_RETURN");
- XS.EnableInterrupts();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/DelegateImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/DelegateImpl.cs
deleted file mode 100644
index 68abceb282..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/DelegateImpl.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Asm {
- [Plug(Target = typeof(Delegate), Inheritable = true)]
- public static class DelegateImpl {
- [PlugMethod(Assembler = typeof(DelegateCtorAsm), IsWildcard = true, WildcardMatchParameters = true)]
- public static void Ctor(Delegate aThis, object aTarget, IntPtr aMethod) {
- throw new NotImplementedException();
- }
-
- [PlugMethod(IsWildcard = true, Assembler = typeof(DelegateInvokeAsm))]
- public static void Invoke() {
- throw new NotImplementedException();
- }
-
- [PlugMethod(Assembler = typeof(DelegateGetMulticastInvokeAsm))]
- public static IntPtr GetMulticastInvoke(Delegate aThis) {
- throw new NotImplementedException();
- }
-
- public static bool Equals(Delegate aThis, object aThat) {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs
deleted file mode 100644
index dea5745396..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using XSharp.Assembler;
-using Cosmos.CPU.x86;
-using IL2CPU.API.Attribs;
-using XSharp;
-
-namespace Cosmos.CPU_Asm
-{
- [Plug(Target = typeof(IOPortBase))]
- public class IOPortImpl
- {
-
- #region Write8
-
- private class Write8Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- //TODO: This is a lot of work to write to a single port.
- // We need to have some kind of inline ASM option that can
- // emit a single out instruction
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C);
- XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08);
- XS.WriteToPortDX(XSRegisters.AL);
- }
- }
-
- [PlugMethod(Assembler = typeof(Write8Assembler))]
- public static void Write8(UInt16 aPort, byte aData)
- {
- }
-
- #endregion
-
- #region Write16
-
- private class Write16Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C);
- XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08);
- XS.WriteToPortDX(XSRegisters.AX);
- }
- }
-
- [PlugMethod(Assembler = typeof(Write16Assembler))]
- public static void Write16(UInt16 aPort, UInt16 aData)
- {
- }
-
- #endregion
-
- #region Write32
-
- private class Write32Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C);
- XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08);
- XS.WriteToPortDX(XSRegisters.EAX);
- }
- }
-
- [PlugMethod(Assembler = typeof(Write32Assembler))]
- public static void Write32(UInt16 aPort, UInt32 aData)
- {
- }
-
- #endregion
-
- #region Read8
-
- private class Read8Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08);
- //TODO: Do we need to clear rest of EAX first?
- // MTW: technically not, as in other places, it _should_ be working with AL too..
- XS.Set(XSRegisters.EAX, 0);
- XS.ReadFromPortDX(XSRegisters.AL);
- XS.Push(XSRegisters.EAX);
- }
- }
-
- [PlugMethod(Assembler = typeof(Read8Assembler))]
- public static byte Read8(UInt16 aPort)
- {
- return 0;
- }
-
- #endregion
-
- #region Read16
-
- private class Read16Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08);
- XS.Set(XSRegisters.EAX, 0);
- XS.ReadFromPortDX(XSRegisters.AX);
- XS.Push(XSRegisters.EAX);
- }
- }
-
- [PlugMethod(Assembler = typeof(Read16Assembler))]
- public static UInt16 Read16(UInt16 aPort)
- {
- return 0;
- }
-
- #endregion
-
- #region Read32
-
- private class Read32Assembler : AssemblerMethod
- {
- public override void AssembleNew(Assembler aAssembler, object aMethodInfo)
- {
- XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08);
- XS.ReadFromPortDX(XSRegisters.EAX);
- XS.Push(XSRegisters.EAX);
- }
- }
-
- [PlugMethod(Assembler = typeof(Read32Assembler))]
- public static UInt32 Read32(UInt16 aPort)
- {
- return 0;
- }
-
- #endregion
-
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Properties/AssemblyInfo.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Properties/AssemblyInfo.cs
deleted file mode 100644
index 96abbd8baa..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using IL2CPU.API;
-
-//[assembly: Ring(Ring.Core)]
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs
deleted file mode 100644
index 8715c2cc2a..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-
-using XSharp;
-using CPUx86 = XSharp.Assembler.x86;
-
-namespace Cosmos.CPU_Asm
-{
- [Plug(typeof(RuntimeHelpers))]
- public static class RuntimeHelpersImpl
- {
- [Inline(TargetPlatform = TargetPlatform.x86)]
- [PlugMethod]
- public static void InitializeArray(Array array, RuntimeFieldHandle fldHandle)
- {
- // Arguments:
- // Array aArray, RuntimeFieldHandle aFieldHandle
- XS.Set(XSRegisters.EDI, XSRegisters.EBP, sourceDisplacement: 20); // array
- XS.Set(XSRegisters.ESI, XSRegisters.EBP, sourceDisplacement: 12); // aFieldHandle
- XS.Add(XSRegisters.EDI, 8);
- XS.Push(XSRegisters.EDI, isIndirect: true); // element size
- XS.Add(XSRegisters.EDI, 4);
- XS.Set(XSRegisters.EAX, XSRegisters.EDI, sourceIsIndirect: true);
- XS.Multiply(XSRegisters.ESP, isIndirect: true, size: XSRegisters.RegisterSize.Int32);
- XS.Pop(XSRegisters.ECX);
- XS.Set(XSRegisters.ECX, XSRegisters.EAX);
- XS.Set(XSRegisters.EAX, 0);
- XS.Add(XSRegisters.EDI, 4);
-
- XS.Label(".StartLoop");
- XS.Set(XSRegisters.DL, XSRegisters.ESI, sourceIsIndirect: true);
- XS.Set(XSRegisters.EDI, XSRegisters.DL, destinationIsIndirect: true);
- XS.Add(XSRegisters.EAX, 1);
- XS.Add(XSRegisters.ESI, 1);
- XS.Add(XSRegisters.EDI, 1);
- XS.Compare(XSRegisters.EAX, XSRegisters.ECX);
- XS.Jump(CPUx86.ConditionalTestEnum.Equal, ".EndLoop");
- XS.Jump(".StartLoop");
-
- XS.Label(".EndLoop");
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj
deleted file mode 100644
index 5d7f0fc810..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.CPU_Plugs.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- net6.0
- true
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.cfg b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.cfg
deleted file mode 100644
index dcb76c5045..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: Debug
\ No newline at end of file
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/GCImplementationImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/GCImplementationImpl.cs
deleted file mode 100644
index dcceb488f6..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/GCImplementationImpl.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Cosmos.CPU.x86;
-using Cosmos.CPU.x86.Memory.Old;
-
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Plugs {
- [Plug(typeof(GCImplementation))]
- public static class GCImplementationImpl {
- public static uint AllocNewObject(uint aSize) {
- GlobalSystemInfo.EnsureInitialized();
- return Heap.MemAlloc(aSize);
- }
-
- public static void IncRefCount(uint aObject) {
- // Do nothing right now
- }
-
- public static void DecRefCount(uint aObject) {
- // Do nothing right now
- }
-
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Properties/AssemblyInfo.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Properties/AssemblyInfo.cs
deleted file mode 100644
index aafeb100b1..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1 +0,0 @@
-using IL2CPU.API;
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/ArrayImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/ArrayImpl.cs
deleted file mode 100644
index 3e53b4da81..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/ArrayImpl.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Plugs.System
-{
- [Plug(Target = typeof(Array))]
- public class ArrayImpl
- {
- [PlugMethod(Signature = "System_Void__System_Array_Clear_System_Array__System_Int32__System_Int32_")]
- public static unsafe void Clear([ObjectPointerAccess] uint* aArray, uint aIndex, uint aLength)
- {
- aArray = (uint*) aArray[0];
- aArray += 3;
- uint xElementSize = *aArray;
- aArray += 1;
- byte* xBytes = (byte*) aArray;
- for (uint i = aIndex * xElementSize; i < (aIndex + aLength) * xElementSize; i++)
- {
- xBytes[i] = 0;
- }
- }
-
- public static int GetUpperBound(Array aThis, int aDimension)
- {
- return GetLength(aThis, aDimension) - 1;
- }
-
- public static int GetLength(Array aThis, int aDimension)
- {
- if (aDimension != 0)
- {
- throw new NotSupportedException("Multidimensional array's are not yet supported!");
- }
- return aThis.Length;
- }
-
- [PlugMethod(Signature = "System_Boolean__System_Array_TrySZBinarySearch_System_Array__System_Int32__System_Int32__System_Object___System_Int32_")]
- public static unsafe bool TrySZBinarySearch(uint* aArray, uint sourceIndex, uint count, uint value, out uint retVal)
- {
- aArray = (uint*) aArray[0];
- return TrySZIndexOf(aArray, sourceIndex, count, value, out retVal);
- }
-
- [PlugMethod(Signature = "System_Boolean__System_Array_TrySZLastIndexOf_System_Array__System_Int32__System_Int32__System_Object___System_Int32_")]
- public static unsafe bool TrySZLastIndexOf(uint* aArray, uint sourceIndex, uint count, uint value, out uint retVal)
- {
- aArray = (uint*) aArray[0];
- aArray += 4;
- for (uint i = sourceIndex + count; i > sourceIndex; i--)
- {
- if (aArray[i - 1] == value)
- {
- retVal = i - 1;
- return true;
- }
- }
- retVal = 0;
- return false;
- }
-
- //[PlugMethod(Signature = "System_Boolean__System_Array_TrySZIndexOf_System_Array__System_Int32__System_Int32__System_Object__System_Int32__")]
- private static unsafe bool TrySZIndexOf(uint* aArray, uint sourceIndex, uint count, uint value, out uint retVal)
- {
- aArray = (uint*) aArray[0];
- aArray += 4;
- for (uint i = sourceIndex; i < sourceIndex + count; i++)
- {
- if (aArray[i] == value)
- {
- retVal = i;
- return true;
- }
- }
- retVal = 0;
- return false;
- }
-
- public static unsafe int get_Rank([ObjectPointerAccess]int* aThis)
- {
- return 1;
- }
-
- public static unsafe int GetLowerBound([ObjectPointerAccess]int* aThis, int aDimension)
- {
- aThis = (int*) aThis[0];
- if (aDimension != 0)
- {
- //throw new NotSupportedException("Multidimensional arrays not supported yet!");
- }
- return 0;
- }
-
- [PlugMethod(Signature = "System_Object__System_Array_GetValue_System_Int32_")]
- public static unsafe uint GetValue(uint* aThis, int aIndex)
- {
- aThis = (uint*) aThis[0];
- aThis += 3;
- uint xElementSize = *aThis;
- aThis += 1;
- aThis = (uint*) ((byte*) aThis + aIndex * xElementSize);
- switch (xElementSize)
- {
- case 1:
- return *(byte*) aThis;
- case 2:
- return *(ushort*) aThis;
- case 3:
- return *aThis & 0x0FFFFFFF;
- case 4:
- return *aThis;
- }
- throw new NotSupportedException("GetValue not supported in this situation!");
- }
-
- public static unsafe object GetValue(Array aThis, params int[] aIndices)
- {
- throw new NotImplementedException("Multidimensional arrays not supported yet!");
- }
-
- [PlugMethod(Signature = "System_Void__System_Array_SetValue_System_Object__System_Int32_")]
- public static unsafe void SetValue(uint* aThis, uint aValue, int aIndex)
- {
- aThis = (uint*) aThis[0];
- aThis += 3;
- uint xElementSize = *aThis;
- aThis += 1;
- aThis = (uint*) ((byte*) aThis + aIndex * xElementSize);
- switch (xElementSize)
- {
- case 1:
- *(byte*) aThis = (byte) aValue;
- return;
- case 2:
- *(ushort*) aThis = (ushort) aValue;
- return;
- case 3:
- *(uint*) aThis = (uint) aValue;
- return;
- case 4:
- *(uint*) aThis = (uint) aValue;
- return;
- }
- throw new NotSupportedException("SetValue not supported in this situation!");
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/CharUnicodeInfoImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/CharUnicodeInfoImpl.cs
deleted file mode 100644
index f1471d13f5..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/CharUnicodeInfoImpl.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Globalization;
-
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Plugs.System {
- [Plug(typeof(CharUnicodeInfo))]
- public static class CharUnicodeInfoImpl {
- public static void Cctor() {
-
- }
-
- public static bool InitTable() {
- return false;
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/DelegateImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/DelegateImpl.cs
deleted file mode 100644
index df31a812fa..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/DelegateImpl.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.CPU_Plugs.System {
- [Plug(Target = typeof(Delegate), Inheritable = true)]
- [PlugField(FieldType = typeof(int), FieldId = "$$ArgSize$$")]
- [PlugField(FieldType = typeof(int), FieldId = "$$ReturnsValue$$")]
- public static class DelegateImpl {
- public static bool Equals(Delegate aThis, object aThat) {
- // todo: implement proper Delegate.Equals(object)
- return false;
- }
-
- public static unsafe bool InternalEqualTypes([ObjectPointerAccess] uint** a, [ObjectPointerAccess] uint** b) {
- var xTypeA = a[0][0];
- var xTypeB = b[0][0];
-
- return xTypeA == xTypeB;
- }
-
- [PlugMethod(Signature = "System_MulticastDelegate__System_Delegate_InternalAllocLike_System_Delegate_")]
- public static unsafe uint InternalAllocLike(uint* aDelegate) {
- uint xNeededSize = 1024; // 24 is needed fields for Multicast Delegate
- xNeededSize += 12;
- uint xResultAddr = GCImplementationImpl.AllocNewObject(xNeededSize);
- byte* xResult = (byte*)xResultAddr;
- byte* xDelegateAsByte = (byte*)aDelegate;
- for (int i = 0; i < 1024; i++) {
- xResult[i] = xDelegateAsByte[i];
- }
- return xResultAddr;
- }
- }
-}
diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/StringImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/StringImpl.cs
deleted file mode 100644
index 76089f6580..0000000000
--- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Plugs/System/StringImpl.cs
+++ /dev/null
@@ -1,740 +0,0 @@
-//#define COSMOSDEBUG
-using System;
-using System.Globalization;
-using IL2CPU.API;
-using IL2CPU.API.Attribs;
-using Debugger = Cosmos.Debug.Kernel.Debugger;
-
-namespace Cosmos.CPU_Plugs.System {
- [Plug(Target = typeof(string))]
- public static class StringImpl {
- internal static Debugger mDebugger = new Debugger("CPU", "String Plugs");
-
- public static unsafe void Ctor(
- string aThis,
- char* aChars,
- [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- mDebugger.SendInternal("String.Ctor(string, char*)");
-
- aStringEmpty = "";
- while (*aChars != '\0') {
- aChars++;
- aStringLength++;
- }
- for (int i = 0; i < aStringLength; i++) {
- aFirstChar[i] = aChars[i];
- }
- }
-
- public static unsafe void Ctor(
- string aThis,
- char* aChars,
- int start,
- int length,
- [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- aStringEmpty = "";
- aStringLength = length;
- for (int i = 0; i < length; i++) {
- aFirstChar[i] = aChars[start + i];
- }
- }
-
- public static unsafe void Ctor(
- string aThis,
- char[] aChars,
- [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- aStringEmpty = "";
- aStringLength = aChars.Length;
- for (int i = 0; i < aChars.Length; i++) {
- aFirstChar[i] = aChars[i];
- }
- }
-
- public static unsafe void Ctor(
- string aThis,
- char[] aChars,
- int start,
- int length,
- [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- aStringEmpty = "";
- aStringLength = length;
- for (int i = 0; i < length; i++) {
- aFirstChar[i] = aChars[start + i];
- }
- }
-
-
- public static unsafe void Ctor(
- string aThis,
- char aChar,
- int aLength,
- [FieldAccess(Name = "System.String System.String.Empty")] ref string aStringEmpty,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aStringLength,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- aStringEmpty = "";
- aStringLength = aLength;
- for (int i = 0; i < aLength; i++) {
- aFirstChar[i] = aChar;
- }
- }
-
-
- public static unsafe int get_Length(
- [ObjectPointerAccess] uint* aThis,
- [FieldAccess(Name = "System.Int32 System.String.m_stringLength")] ref int aLength) {
- return aLength;
- }
-
- public static unsafe char get_Chars(
- [ObjectPointerAccess] uint* aThis,
- int aIndex,
- [FieldAccess(Name = "System.Char System.String.m_firstChar")] char* aFirstChar) {
- return *(aFirstChar + aIndex);
- }
-
- public static bool IsAscii(string aThis) {
- for (int i = 0; i < aThis.Length; i++) {
- if (aThis[i] >= 0x80) {
- return false;
- }
- }
- return true;
- }
-
- public static string Format(string aFormat, object aArg0) {
- if (aArg0 == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(null, aFormat, aArg0);
- }
-
- public static string Format(string aFormat, object aArg0, object aArg1) {
- if (aFormat == null) {
- throw new ArgumentNullException(nameof(aFormat));
- }
- if (aArg0 == null) {
- throw new ArgumentNullException(nameof(aArg0));
- }
- if (aArg1 == null) {
- throw new ArgumentNullException(nameof(aArg1));
- }
-
- return FormatHelper(null, aFormat, aArg0, aArg1);
- }
-
- public static string Format(string aFormat, object aArg0, object aArg1, object aArg2) {
- if (aArg0 == null || aArg1 == null || aArg2 == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(null, aFormat, aArg0, aArg1, aArg2);
- }
-
- public static string Format(string aFormat, params object[] aArgs) {
- if (aArgs == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(null, aFormat, aArgs);
- }
-
- public static string Format(IFormatProvider aProvider, string aFormat, object aArg0) {
- if (aArg0 == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(aProvider, aFormat, aArg0);
- }
-
- public static string Format(IFormatProvider aProvider, string aFormat, object aArg0, object aArg1) {
- if (aArg0 == null | aArg1 == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(aProvider, aFormat, aArg0, aArg1);
- }
-
- public static string Format(IFormatProvider aProvider, string aFormat, object aArg0, object aArg1, object aArg2) {
- if (aArg0 == null | aArg1 == null || aArg2 == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(aProvider, aFormat, aArg0, aArg1, aArg2);
- }
-
- public static string Format(IFormatProvider aProvider, string aFormat, params object[] aArgs) {
- if (aArgs == null) {
- throw new ArgumentNullException(aFormat == null ? "aFormat" : "aArgs");
- }
-
- return FormatHelper(aProvider, aFormat, aArgs);
- }
-
- public static int GetStringToNumber(string aString) {
- bool xIsNegative = false;
- int xNumber = 0;
- if (!string.IsNullOrWhiteSpace(aString)) {
- char[] xCharArray = aString.ToCharArray();
- for (int i = 0; i < xCharArray.Length; i++) {
- if (char.IsDigit(xCharArray[i])) {
- int xValue = xCharArray[i] - '0';
- int xMax = xCharArray.Length - 1;
- for (int j = 0; j < xMax - i; i++) {
- xValue *= 10;
- }
-
- xNumber += xValue;
- } else if (xCharArray[i] == '-') {
- xIsNegative = true;
- } else if (xCharArray[i] == '.') {
- break;
- } else {
- throw new FormatException("The string parameter is not a number and is invalid.");
- }
- }
- }
-
- if (xIsNegative) {
- xNumber *= -1;
- }
-
- return xNumber;
- }
-
- internal static string FormatHelper(IFormatProvider aFormatProvider, string aFormat, params object[] aArgs) {
- char[] xCharArray = aFormat.ToCharArray();
- string xFormattedString = string.Empty, xStaticString;
- bool xFoundPlaceholder = false, xParamNumberDone = true;
- int xStartParamNumber = -1, xEndParamNumber = -1, xLastPlaceHolder = 0;
-
- for (int i = 0; i < xCharArray.Length; i++) {
- if (xFoundPlaceholder) {
- if (xCharArray[i] == '{') {
- throw new FormatException("The format string provided is invalid.");
- }
- if (xCharArray[i] == '}') {
- mDebugger.SendInternal("Found closing placeholder.");
- if (xEndParamNumber < 0) {
- xEndParamNumber = i;
- }
- string xParamNumber = aFormat.Substring(xStartParamNumber, xEndParamNumber - xStartParamNumber);
- mDebugger.SendInternal("Calling StringHelper.GetStringToNumber");
- mDebugger.SendInternal(xParamNumber);
- int xParamIndex = GetStringToNumber(xParamNumber);
- mDebugger.SendInternal("Converted paramindex to a number.");
- if (xParamIndex < aArgs.Length && aArgs[xParamIndex] != null) {
- string xParamValue = aArgs[xParamIndex].ToString();
- xFormattedString = string.Concat(xFormattedString, xParamValue);
- mDebugger.SendInternal("xParamValue =");
- mDebugger.SendInternal(xParamValue);
- mDebugger.SendInternal("xFormattedString =");
- mDebugger.SendInternal(xFormattedString);
-
- }
- xFoundPlaceholder = false;
- xParamNumberDone = true;
- xStartParamNumber = -1;
- xEndParamNumber = -1;
- xLastPlaceHolder = i + 1;
- } else if (xCharArray[i] == ':') {
- xParamNumberDone = true;
- xEndParamNumber = i;
- // TODO: Need to handle different formats. (X, N, etc)
- } else if (char.IsDigit(xCharArray[i]) && !xParamNumberDone) {
- mDebugger.SendInternal("Getting param number.");
- if (xStartParamNumber < 0) {
- xStartParamNumber = i;
- }
- }
- } else if (xCharArray[i] == '{') {
- mDebugger.SendInternal("Found opening placeholder");
- xStaticString = aFormat.Substring(xLastPlaceHolder, i - xLastPlaceHolder);
- xFormattedString = string.Concat(xFormattedString, xStaticString);
- xFoundPlaceholder = true;
- xParamNumberDone = false;
- }
- }
-
- xStaticString = aFormat.Substring(xLastPlaceHolder, aFormat.Length - xLastPlaceHolder);
- xFormattedString = string.Concat(xFormattedString, xStaticString);
-
- return xFormattedString;
- }
-
- public static bool StartsWith(string aThis, string aSubstring, StringComparison aComparison) {
- Char[] di = aThis.ToCharArray();
- Char[] ci = aSubstring.ToCharArray();
- if (aSubstring.Length > aThis.Length) {
- return false;
- }
- for (int i = 0; i < ci.Length; i++) {
- if (di[i] != ci[i]) {
- return false;
-
- }
- }
- return true;
- }
-
- public static string PadHelper(string aThis, int totalWidth, char paddingChar, bool isRightPadded) {
- var cs = new char[totalWidth];
-
- int pos = aThis.Length;
-
- if (isRightPadded) {
- for (int i = 0; i < aThis.Length; i++) {
- cs[i] = aThis[i];
- }
-
- for (int i = aThis.Length; i < totalWidth; i++) {
- cs[i] = paddingChar;
- }
- } else {
- int offset = totalWidth - aThis.Length;
- for (int i = 0; i < aThis.Length; i++) {
- cs[i + offset] = aThis[i];
- }
-
- for (int i = 0; i < offset; i++) {
- cs[i] = paddingChar;
- }
- }
-
- return new string(cs);
- }
-
- public static string Replace(string aThis, char oldValue, char newValue) {
- var cs = new char[aThis.Length];
-
- for (int i = 0; i < aThis.Length; i++) {
- if (aThis[i] != oldValue) {
- cs[i] = aThis[i];
- } else {
- cs[i] = newValue;
- }
- }
-
- return new string(cs);
- }
-
- // HACK: We need to redo this once char support is complete (only returns 0, -1).
- public static int CompareTo(string aThis, string other) {
- if (aThis.Length != other.Length) {
- return -1;
- }
- for (int i = 0; i < aThis.Length; i++) {
- if (aThis[i] != other[i]) {
- return -1;
- }
- }
- return 0;
- }
-
- public static int IndexOf(string aThis, char value, int startIndex, int count) {
- int xEndIndex = aThis.Length;
- if (startIndex + count < xEndIndex) {
- xEndIndex = startIndex + count;
- }
- for (int i = startIndex; i < xEndIndex; i++) {
- if (aThis[i] == value) {
- return i;
- }
- }
-
- return -1;
- }
-
- // HACK: TODO - improve efficiency of this.
- //How do we access the raw memory to copy it into a char array?
- public static char[] ToCharArray(string aThis) {
- var result = new char[aThis.Length];
-
- for (int i = 0; i < aThis.Length; i++) {
- result[i] = aThis[i];
- }
-
- return result;
- }
-
- [PlugMethod(Enabled = false)]
- public static uint GetStorage(string aString) {
- return 0;
- }
-
- //[PlugMethod(Enabled = false)]
- //public static char[] GetStorageArray(string aString) {
- // return null;
- //}
-
- private static int[] BuildBadCharTable(char[] needle) {
- var badShift = new int[256];
- for (int i = 0; i < 256; i++) {
- badShift[i] = needle.Length;
- }
- int last = needle.Length - 1;
- for (int i = 0; i < last; i++) {
- badShift[needle[i]] = last - i;
- }
- return badShift;
- }
-
- private static int boyerMooreHorsepool(string pattern, string text) {
- var needle = pattern.ToCharArray();
- var haystack = text.ToCharArray();
-
- if (needle.Length > haystack.Length) {
- return -1;
- }
- var badShift = BuildBadCharTable(needle);
- int offset = 0;
- int scan = 0;
- int last = needle.Length - 1;
- int maxoffset = haystack.Length - needle.Length;
- while (offset <= maxoffset) {
- for (scan = last; needle[scan] == haystack[scan + offset]; scan--) {
- if (scan == 0) {
- //Match found
- return offset;
- }
- }
- offset += badShift[haystack[offset + last]];
- }
- return -1;
- }
-
- public static int IndexOf(string aThis, string aSubstring, int aIdx, int aLength, StringComparison aComparison) {
- return boyerMooreHorsepool(aSubstring, aThis.Substring(aIdx, aLength));
- }
-
- //private static void WriteNumber(uint aValue,
- // byte aBitCount)
- //{
- // uint xValue = aValue;
- // byte xCurrentBits = aBitCount;
- // Console.Write("0x");
- // while (xCurrentBits >= 4)
- // {
- // xCurrentBits -= 4;
- // byte xCurrentDigit = (byte)((xValue >> xCurrentBits) & 0xF);
- // string xDigitString = null;
- // switch (xCurrentDigit)
- // {
- // case 0:
- // xDigitString = "0";
- // goto default;
- // case 1:
- // xDigitString = "1";
- // goto default;
- // case 2:
- // xDigitString = "2";
- // goto default;
- // case 3:
- // xDigitString = "3";
- // goto default;
- // case 4:
- // xDigitString = "4";
- // goto default;
- // case 5:
- // xDigitString = "5";
- // goto default;
- // case 6:
- // xDigitString = "6";
- // goto default;
- // case 7:
- // xDigitString = "7";
- // goto default;
- // case 8:
- // xDigitString = "8";
- // goto default;
- // case 9:
- // xDigitString = "9";
- // goto default;
- // case 10:
- // xDigitString = "A";
- // goto default;
- // case 11:
- // xDigitString = "B";
- // goto default;
- // case 12:
- // xDigitString = "C";
- // goto default;
- // case 13:
- // xDigitString = "D";
- // goto default;
- // case 14:
- // xDigitString = "E";
- // goto default;
- // case 15:
- // xDigitString = "F";
- // goto default;
- // default:
- // Console.Write(xDigitString);
- // break;
- // }
- // }
- //}
-
- public static bool Contains(string aThis, string value) {
- Char[] di = aThis.ToCharArray();
- Char[] ci = value.ToCharArray();
- if (value.Length == aThis.Length) {
- if (value == aThis) {
- return true;
- } else {
- return false;
- }
- } else if (!(value.Length > aThis.Length) && value.Length != aThis.Length) {
- for (int i = 0; i < aThis.Length; i++) {
- if (di[i] == ci[0]) {
- for (int j = 1; j < value.Length; j++) {
- if (di[i + j] != ci[j]) {
- return false;
- }
- }
- return true;
- }
- }
- }
- return false;
- }
-
- public static bool EndsWith(string aThis, string aSubStr, bool aIgnoreCase, CultureInfo aCulture) {
- return EndsWith(aThis, aSubStr, StringComparison.CurrentCulture);
- }
-
- public static bool EndsWith(string aThis, string aSubStr, StringComparison aComparison) {
- Char[] di = aThis.ToCharArray();
- Char[] ci = aSubStr.ToCharArray();
- if (aThis.Length == aSubStr.Length) {
- if (aThis == aSubStr) {
- return true;
- }
- return false;
- } else if (aThis.Length < aSubStr.Length) {
- return false;
- } else {
- for (int i = 0; i < ci.Length; i++) {
- if (di[aThis.Length - aSubStr.Length + i] != ci[i]) {
- return false;
- }
- }
- return true;
- }
- }
-
- // System.Int32 System.String.IndexOf(System.String, System.Int32, System.Int32, System.StringComparison)
-
- public static bool Equals(string aThis, string aThat, StringComparison aComparison) {
-#warning TODO: implement
- if (aComparison == StringComparison.OrdinalIgnoreCase) {
- string xLowerThis = aThis.ToLower();
- string xLowerThat = aThat.ToLower();
- return EqualsHelper(xLowerThis, xLowerThat);
- }
- return EqualsHelper(aThis, aThat);
- }
-
- public static bool EqualsHelper(string aStrA, string aStrB) {
- return aStrA.CompareTo(aStrB) == 0;
- }
-
- private static bool CharArrayContainsChar(char[] aArray, char aChar) {
- for (int i = 0; i < aArray.Length; i++) {
- if (aArray[i] == aChar) {
- return true;
- }
- }
- return false;
- }
-
- public static int IndexOf(string aThis, string aValue) {
- return aThis.IndexOf(aValue, 0, aThis.Length, StringComparison.CurrentCulture);
- }
-
- public static int IndexOfAny(string aThis, char[] aSeparators, int aStartIndex, int aLength) {
- if (aSeparators == null) {
- throw new ArgumentNullException("aSeparators");
- }
-
- int xResult = -1;
- for (int i = 0; i < aSeparators.Length; i++) {
- int xValue = IndexOf(aThis, aSeparators[i], aStartIndex, aLength);
- if (xValue < xResult || xResult == -1) {
- xResult = xValue;
- }
- }
- return xResult;
- }
-
- public static string Insert(string aThis, int aStartPos, string aValue) {
- return aThis.Substring(0, aStartPos) + aValue + aThis.Substring(aStartPos);
- }
-
- public static int LastIndexOf(string aThis, char aChar, int aStartIndex, int aCount) {
- return LastIndexOfAny(aThis, new[] { aChar }, aStartIndex, aCount);
- }
-
- public static int LastIndexOfAny(string aThis, char[] aChars, int aStartIndex, int aCount) {
- for (int i = 0; i < aCount; i++) {
- if (CharArrayContainsChar(aChars, aThis[aStartIndex - i])) {
- return aStartIndex - i;
- }
- }
- return -1;
- }
-
- public static int nativeCompareOrdinalEx(string aStrA, int aIndexA, string aStrB, int aIndexB, int aCount) {
- //mDebugger.SendInternal($"nativeCompareOrdinalEx : aStrA|aIndexA = {aStrA}|{aIndexA}, aStrB|aIndexB = {aStrB}|{aIndexB}, aCount = {aCount}");
- if (aCount < 0) {
- throw new ArgumentOutOfRangeException("aCount");
- }
-
- if (aIndexA < 0 || aIndexA > aStrA.Length) {
- throw new ArgumentOutOfRangeException("aIndexA");
- }
-
- if (aIndexB < 0 || aIndexB > aStrB.Length) {
- throw new ArgumentOutOfRangeException("aIndexB");
- }
-
- if (aStrA == null) {
- mDebugger.SendInternal("nativeCompareOrdinalEx : aStrA is null");
- if (aStrB == null) {
- mDebugger.SendInternal($"nativeCompareOrdinalEx : aStrB is null");
- mDebugger.SendInternal($"nativeCompareOrdinalEx : returning 0");
- return 0;
- }
- mDebugger.SendInternal($"nativeCompareOrdinalEx : aStrB is not null");
- mDebugger.SendInternal($"nativeCompareOrdinalEx : returning -1");
- return -1;
- }
- if (aStrB == null) {
- mDebugger.SendInternal("nativeCompareOrdinalEx : aStrA is not null");
- mDebugger.SendInternal($"nativeCompareOrdinalEx : aStrB is null");
- mDebugger.SendInternal($"nativeCompareOrdinalEx : returning 1");
- return 1;
- }
- int xLengthA = Math.Min(aStrA.Length, aCount - aIndexA);
- int xLengthB = Math.Min(aStrB.Length, aCount - aIndexB);
- //mDebugger.SendInternal($"nativeCompareOrdinalEx : xLengthA = {xLengthA}");
- //mDebugger.SendInternal($"nativeCompareOrdinalEx : xLengthB = {xLengthB}");
-
- if (xLengthA == xLengthB && aIndexA == aIndexB && ReferenceEquals(aStrA, aStrB)) {
- mDebugger.SendInternal("nativeCompareOrdinalEx : xLengthA == xLengthB && aIndexA == aIndexB && aStrA is the same object asaStrB, returning 0");
- return 0;
- }
-
- int xResult = 0;
- if (xLengthA != xLengthB) {
- xResult = xLengthA - xLengthB;
- mDebugger.SendInternal("nativeCompareOrdinalEx : xLengthA != xLengthB, returning " + xResult);
- }
-
- for (int i = 0; i < xLengthA; i++) {
- if (aStrA != aStrB) {
- xResult = (byte)aStrA[i] - (byte)aStrB[i];
- mDebugger.SendInternal("nativeCompareOrdinalEx : aStrA[i] != aStrB[i], returning " + xResult);
- return xResult;
- }
- }
- return xResult;
- }
-
- public static bool StartsWith(string aThis, string aSubStr, bool aIgnoreCase, CultureInfo aCulture) {
- Char[] di = aThis.ToCharArray();
- Char[] ci = aSubStr.ToCharArray();
- if (aSubStr.Length > aThis.Length) {
- return false;
- }
- for (int i = 0; i < ci.Length; i++) {
- if (di[i] != ci[i]) {
- return false;
-
- }
- }
- return true;
- }
-
- //public static string Remove(string aThis, int aStart, int aCount)
- //{
- // return aThis.Substring(0, aStart) + aThis.Substring(aStart + aCount, aThis.Length - (aStart + aCount));
- //}
-
- public static string Replace(string aThis, string oldValue, string newValue) {
- while (aThis.IndexOf(oldValue) != -1) {
- int xIndex = aThis.IndexOf(oldValue);
- aThis = aThis.Remove(xIndex, oldValue.Length);
- aThis = aThis.Insert(xIndex, newValue);
- }
- return aThis;
- }
-
- public static string ToLower(string aThis, CultureInfo aCulture) {
- return ChangeCasing(aThis, 65, 90, 32);
- }
-
- public static string ToUpper(string aThis, CultureInfo aCulture) {
- return ChangeCasing(aThis, 97, 122, -32);
- }
-
- public static string ToUpper(string aThis) {
- return ChangeCasing(aThis, 97, 122, -32);
- }
-
- private static string ChangeCasing(string aValue, int lowerAscii, int upperAscii, int offset) {
- var xChars = new char[aValue.Length];
-
- for (int i = 0; i < aValue.Length; i++) {
- int xAsciiCode = aValue[i];
- if (xAsciiCode <= upperAscii && xAsciiCode >= lowerAscii) {
- xChars[i] = (char)(xAsciiCode + offset);
- } else {
- xChars[i] = aValue[i];
- }
- }
-
- return new string(xChars);
- }
-
- public static string FastAllocateString(int aLength) {
- return new string(new char[aLength]);
- }
-
- [PlugMethod(IsOptional = true)]
- public static string TrimStart(string aThis, string aSubStr) {
- char[] ci = aThis.ToCharArray();
- char[] di = aSubStr.ToCharArray();
-
- if (aThis.StartsWith(aSubStr)) {
- if (aThis != aSubStr) {
- char[] oi = new char[ci.Length - di.Length];
- for (int i = 0; i < ci.Length - di.Length; i++) {
- oi[i] = ci[i + di.Length];
- }
- return oi.ToString();
- }
-
- return string.Empty;
- }
-
- throw new ArgumentNullException();
- }
-
- public static int CompareOrdinalHelper(string strA, int indexA, int countA, string strB, int indexB, int countB) {
- throw new NotImplementedException();
- }
-
- public static int GetHashCode(string aThis) {
- throw new NotImplementedException("String.GetHashCode()");
- }
- }
-}
diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Boot.cs b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Boot.cs
deleted file mode 100644
index 5e2a5e1f19..0000000000
--- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Boot.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Cosmos.HAL;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.Platform.PC {
- static public class Boot {
- [BootEntry(20)]
- static private void Init() {
- HAL.Globals.DeviceMgr = new DeviceMgr();
- }
- }
-}
diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj
deleted file mode 100644
index 9d6790b8b2..0000000000
--- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.Platform.PC.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- net6.0
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.cfg b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.cfg
deleted file mode 100644
index 99e1a80153..0000000000
--- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: Platform
\ No newline at end of file
diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/DeviceMgr.cs b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/DeviceMgr.cs
deleted file mode 100644
index 352d6ac567..0000000000
--- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/DeviceMgr.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.Platform.PC {
- public class DeviceMgr : HAL.DeviceMgr {
- public DeviceMgr() {
- var xProcessor = new Devices.Processor();
- Add(xProcessor);
- }
- }
-}
diff --git a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Devices/Processor.cs b/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Devices/Processor.cs
deleted file mode 100644
index 3616041784..0000000000
--- a/source/Kernel-X86/20-Platform/Cosmos.Platform.PC/Devices/Processor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.Platform.PC.Devices {
- public class Processor : HAL.Devices.Processor {
- public override ulong SetOption(uint aID, ulong aValue = 0) {
- CPU.x86.TempDebug.ShowText('D');
- if (aID == 1) {
- CPU.x86.TempDebug.ShowText('E');
- }
- return 0;
- }
- }
-}
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Boot.cs b/source/Kernel-X86/30-HAL/Cosmos.HAL/Boot.cs
deleted file mode 100644
index b81e32554d..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Boot.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.HAL {
- static public class Boot {
- [BootEntry(30)]
- static private void Init() {
- }
- }
-}
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj
deleted file mode 100644
index d44d3abb77..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.HAL.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- net6.0
- true
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.cfg b/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.cfg
deleted file mode 100644
index 8a2a207373..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: HAL
\ No newline at end of file
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/DeviceMgr.cs b/source/Kernel-X86/30-HAL/Cosmos.HAL/DeviceMgr.cs
deleted file mode 100644
index c6fa430ab8..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/DeviceMgr.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Cosmos.HAL.Devices;
-
-namespace Cosmos.HAL {
- public abstract class DeviceMgr {
- protected readonly List mAll = new List();
- protected readonly IList mAllRO;
- public IList All {
- get { return mAllRO; }
- }
-
- public DeviceMgr() {
- mAllRO = mAll.AsReadOnly();
- }
-
- protected Processor mProcessor;
- public Processor Processor {
- get { return mProcessor; }
- }
-
- public void Add(Devices.Device aDevice) {
- mAll.Add(aDevice);
-
- if (aDevice is Processor) {
- mProcessor = (Processor)aDevice;
- }
- }
- }
-}
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Device.cs b/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Device.cs
deleted file mode 100644
index 72ca448938..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Device.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.HAL.Devices {
- public abstract class Device {
- }
-}
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Processor.cs b/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Processor.cs
deleted file mode 100644
index 6e9483dfd6..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Devices/Processor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.HAL.Devices {
- public abstract class Processor : Device {
- // Generic method that is specific to each CPU ring.
- // Designed to allow limited extra API communication to CPU from HAL.
- // Optionally implemented.
- public virtual UInt64 SetOption(UInt32 aID, UInt64 aValue = 0) {
- return 0;
- }
- }
-}
diff --git a/source/Kernel-X86/30-HAL/Cosmos.HAL/Globals.cs b/source/Kernel-X86/30-HAL/Cosmos.HAL/Globals.cs
deleted file mode 100644
index ac97ca51dd..0000000000
--- a/source/Kernel-X86/30-HAL/Cosmos.HAL/Globals.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Cosmos.HAL {
- static public class Globals {
- static public DeviceMgr DeviceMgr;
- }
-}
diff --git a/source/Kernel-X86/40-System/Cosmos.System/Boot.cs b/source/Kernel-X86/40-System/Cosmos.System/Boot.cs
deleted file mode 100644
index 2e495f0d39..0000000000
--- a/source/Kernel-X86/40-System/Cosmos.System/Boot.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Text;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.System {
- static public class Boot {
- [BootEntry(40)]
- static private void Init() {
- }
-
- static public void TempDebugTest() {
- HAL.Globals.DeviceMgr.Processor.SetOption(1);
- }
- }
-}
diff --git a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj
deleted file mode 100644
index 838a384f0d..0000000000
--- a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.System.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- net6.0
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.cfg b/source/Kernel-X86/40-System/Cosmos.System/Cosmos.cfg
deleted file mode 100644
index 9c3e57fa51..0000000000
--- a/source/Kernel-X86/40-System/Cosmos.System/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: System
\ No newline at end of file
diff --git a/source/Kernel-X86/50-Application/Boot.cs b/source/Kernel-X86/50-Application/Boot.cs
deleted file mode 100644
index a65ea0838d..0000000000
--- a/source/Kernel-X86/50-Application/Boot.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using IL2CPU.API.Attribs;
-using Cosmos.System;
-
-namespace KernelGen3 {
- static public class Boot {
- [BootEntry]
- static private void Init() {
- Cosmos.System.Boot.TempDebugTest();
-
- while (true) {
- }
- }
- }
-}
diff --git a/source/Kernel-X86/50-Application/Cosmos.cfg b/source/Kernel-X86/50-Application/Cosmos.cfg
deleted file mode 100644
index 5ffa0e0d4a..0000000000
--- a/source/Kernel-X86/50-Application/Cosmos.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-Ring: Application
-DebugRing: Allowed
\ No newline at end of file
diff --git a/source/Kernel-X86/50-Application/GuessKernelGen3.csproj b/source/Kernel-X86/50-Application/GuessKernelGen3.csproj
deleted file mode 100644
index 0140ddc5df..0000000000
--- a/source/Kernel-X86/50-Application/GuessKernelGen3.csproj
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- net6.0
- true
-
-
-
- X86
- elf
- False
- Source
- User
- False
- False
- ISO
- Pipe: Cosmos\Serial
- True
- MethodFooters
- False
- Serial: COM1
- VMware
- VMware
- Use VMware Player or Workstation to deploy and debug.
- 192.168.0.8
- True
- MethodFooters
- Use VMware Player or Workstation to deploy and debug.
- ISO
- VMware
- False
- Source
- False
- Serial: COM1
- Pipe: Cosmos\Serial
- 192.168.0.8
- bin\Debug\net462\
- False
- False
- True
- MethodFooters
- Use Bochs emulator to deploy and debug.
- ISO
- Bochs
- True
- Source
- False
- Serial: COM1
- Pipe: Cosmos\Serial
- 192.168.0.8
- bin\Debug\net462\
- False
- False
- BootGen3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj
deleted file mode 100644
index 7920fe9ff0..0000000000
--- a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.Plugs.TapRoot.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- net6.0
- true
- Cosmos.Plugs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.cfg b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.cfg
deleted file mode 100644
index 96cade3754..0000000000
--- a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/Cosmos.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ring: Plug
\ No newline at end of file
diff --git a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Console.cs b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Console.cs
deleted file mode 100644
index f491acc321..0000000000
--- a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Console.cs
+++ /dev/null
@@ -1,812 +0,0 @@
-using System;
-using System.Text;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.Plugs.TapRoot.System {
- [Plug(Target = typeof(global::System.Console))]
- public static class Console {
- //private static ConsoleColor mForeground = ConsoleColor.White;
- //private static ConsoleColor mBackground = ConsoleColor.Black;
-
- //private static Cosmos.System.Console GetConsole()
- //{
- // return mFallbackConsole;
- //}
-
- //public static ConsoleColor get_BackgroundColor()
- //{
- // return mBackground;
- //}
-
- //public static void set_BackgroundColor(ConsoleColor value)
- //{
- // mBackground = value;
- // //Cosmos.HAL.Global.TextScreen.SetColors(mForeground, mBackground);
- // if (GetConsole() != null) GetConsole().Background = value;
- //}
-
- //public static int get_BufferHeight()
- //{
- // WriteLine("Not implemented: get_BufferHeight");
- // return -1;
- //}
-
- //public static void set_BufferHeight(int aHeight)
- //{
- // WriteLine("Not implemented: set_BufferHeight");
- //}
-
- //public static int get_BufferWidth()
- //{
- // WriteLine("Not implemented: get_BufferWidth");
- // return -1;
- //}
-
- //public static void set_BufferWidth(int aWidth)
- //{
- // WriteLine("Not implemented: set_BufferWidth");
- //}
-
- //public static bool get_CapsLock()
- //{
- // return Global.CapsLock;
- //}
-
- //public static int get_CursorLeft()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return 0;
- // }
- // return GetConsole().X;
- //}
-
- //public static void set_CursorLeft(int x)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
-
- // if (x < get_WindowWidth())
- // {
- // xConsole.X = x;
- // }
- // else
- // {
- // WriteLine("x must be lower than the console width!");
- // }
- //}
-
- //public static int get_CursorSize()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return 0;
- // }
- // return xConsole.CursorSize;
- //}
-
- //public static void set_CursorSize(int aSize)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // xConsole.CursorSize = aSize;
- //}
-
- //public static int get_CursorTop()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return 0;
- // }
- // return GetConsole().Y;
- //}
-
- //public static void set_CursorTop(int y)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
-
- // if (y < get_WindowHeight())
- // {
- // xConsole.Y = y;
- // }
- // else
- // {
- // WriteLine("y must be lower than the console height!");
- // }
- //}
-
- //public static bool get_CursorVisible()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // return false;
- // }
- // return GetConsole().CursorVisible;
- //}
-
- //public static void set_CursorVisible(bool value)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // xConsole.CursorVisible = value;
- //}
-
-
- ////public static TextWriter get_Error() {
- //// WriteLine("Not implemented: get_Error");
- //// return null;
- ////}
-
- //public static ConsoleColor get_ForegroundColor()
- //{
- // return mForeground;
- //}
-
- //public static void set_ForegroundColor(ConsoleColor value)
- //{
- // mForeground = value;
- // //Cosmos.HAL.Global.TextScreen.SetColors(mForeground, mBackground);
- // if (GetConsole() != null) GetConsole().Foreground = value;
- //}
-
- ////public static TextReader get_In()
- ////{
- //// WriteLine("Not implemented: get_In");
- //// return null;
- ////}
-
- //public static Encoding get_InputEncoding()
- //{
- // WriteLine("Not implemented: get_InputEncoding");
- // return null;
- //}
-
- //public static void set_InputEncoding(Encoding value)
- //{
- // WriteLine("Not implemented: set_InputEncoding");
- //}
-
- //public static bool get_KeyAvailable()
- //{
- // WriteLine("Not implemented: get_KeyAvailable");
- // return false;
- //}
-
- //public static int get_LargestWindowHeight()
- //{
- // WriteLine("Not implemented: get_LargestWindowHeight");
- // return -1;
- //}
-
- //public static int get_LargestWindowWidth()
- //{
- // WriteLine("Not implemented: get_LargestWindowWidth");
- // return -1;
- //}
-
- //public static bool get_NumberLock()
- //{
- // return Global.NumLock;
- //}
-
- ////public static TextWriter get_Out() {
- //// WriteLine("Not implemented: get_Out");
- //// return null;
- ////}
-
- //public static Encoding get_OutputEncoding()
- //{
- // WriteLine("Not implemented: get_OutputEncoding");
- // return null;
- //}
-
- //public static void set_OutputEncoding(Encoding value)
- //{
- // WriteLine("Not implemented: set_OutputEncoding");
- //}
-
- //public static string get_Title()
- //{
- // WriteLine("Not implemented: get_Title");
- // return string.Empty;
- //}
-
- //public static void set_Title(string value)
- //{
- // WriteLine("Not implemented: set_Title");
- //}
-
- //public static bool get_TreatControlCAsInput()
- //{
- // WriteLine("Not implemented: get_TreatControlCAsInput");
- // return false;
- //}
-
- //public static void set_TreatControlCAsInput(bool value)
- //{
- // WriteLine("Not implemented: set_TreatControlCAsInput");
- //}
-
- //public static int get_WindowHeight()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return 25;
- // }
- // return GetConsole().Rows;
- //}
-
- //public static void set_WindowHeight(int value)
- //{
- // WriteLine("Not implemented: set_WindowHeight");
- //}
-
- //public static int get_WindowLeft()
- //{
- // WriteLine("Not implemented: get_WindowLeft");
- // return -1;
- //}
-
- //public static void set_WindowLeft(int value)
- //{
- // WriteLine("Not implemented: set_WindowLeft");
- //}
-
- //public static int get_WindowTop()
- //{
- // WriteLine("Not implemented: get_WindowTop");
- // return -1;
- //}
-
- //public static void set_WindowTop(int value)
- //{
- // WriteLine("Not implemented: set_WindowTop");
- //}
-
- //public static int get_WindowWidth()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return 85;
- // }
- // return GetConsole().Cols;
- //}
-
- //public static void set_WindowWidth(int value)
- //{
- // WriteLine("Not implemented: set_WindowWidth");
- //}
-
- //// Beep() is pure CIL
-
- //public static void Beep(int aFrequency, int aDuration)
- //{
- // if (aFrequency < 37 || aFrequency > 32767)
- // {
- // throw new ArgumentOutOfRangeException("Frequency must be between 37 and 32767Hz");
- // }
-
- // if (aDuration <= 0)
- // {
- // throw new ArgumentOutOfRangeException("Duration must be more than 0");
- // }
-
- // WriteLine("Not implemented: Beep");
-
- // //var xPIT = Hardware.Global.PIT;
- // //xPIT.EnableSound();
- // //xPIT.T2Frequency = (uint)aFrequency;
- // //xPIT.Wait((uint)aDuration);
- // //xPIT.DisableSound();
- //}
-
- ////TODO: Console uses TextWriter - intercept and plug it instead
- //public static void Clear()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // GetConsole().Clear();
- //}
-
- //// MoveBufferArea(int, int, int, int, int, int) is pure CIL
-
- //public static void MoveBufferArea(int sourceLeft, int sourceTop, int sourceWidth, int sourceHeight,
- // int targetLeft, int targetTop, Char sourceChar, ConsoleColor sourceForeColor, ConsoleColor sourceBackColor)
- //{
- // WriteLine("Not implemented: MoveBufferArea");
- //}
-
- ////public static Stream OpenStandardError() {
- //// WriteLine("Not implemented: OpenStandardError");
- ////}
-
- ////public static Stream OpenStandardError(int bufferSize) {
- //// WriteLine("Not implemented: OpenStandardError");
- ////}
-
- ////public static Stream OpenStandardInput(int bufferSize) {
- //// WriteLine("Not implemented: OpenStandardInput");
- ////}
-
- ////public static Stream OpenStandardInput() {
- //// WriteLine("Not implemented: OpenStandardInput");
- ////}
-
- ////public static Stream OpenStandardOutput(int bufferSize) {
- //// WriteLine("Not implemented: OpenStandardOutput");
- ////}
-
- ////public static Stream OpenStandardOutput() {
- //// WriteLine("Not implemented: OpenStandardOutput");
- ////}
-
- //public static int Read()
- //{
- // // TODO special cases, if needed, that returns -1
- // KeyEvent xResult;
-
- // if (KeyboardManager.TryReadKey(out xResult))
- // {
- // return xResult.KeyChar;
- // }
- // else
- // {
- // return -1;
- // }
- //}
-
- //public static String ReadLine()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return null;
- // }
- // List chars = new List(32);
- // KeyEvent current;
- // int currentCount = 0;
-
- // while ((current = KeyboardManager.ReadKey()).Key != ConsoleKeyEx.Enter)
- // {
- // if (current.Key == ConsoleKeyEx.NumEnter) break;
- // //Check for "special" keys
- // if (current.Key == ConsoleKeyEx.Backspace) // Backspace
- // {
- // if (currentCount > 0)
- // {
- // int curCharTemp = GetConsole().X;
- // chars.RemoveAt(currentCount - 1);
- // GetConsole().X = GetConsole().X - 1;
-
- // //Move characters to the left
- // for (int x = currentCount - 1; x < chars.Count; x++)
- // {
- // Write(chars[x]);
- // }
-
- // Write(' ');
-
- // GetConsole().X = curCharTemp - 1;
-
- // currentCount--;
- // }
- // continue;
- // }
- // else if (current.Key == ConsoleKeyEx.LeftArrow)
- // {
- // if (currentCount > 0)
- // {
- // GetConsole().X = GetConsole().X - 1;
- // currentCount--;
- // }
- // continue;
- // }
- // else if (current.Key == ConsoleKeyEx.RightArrow)
- // {
- // if (currentCount < chars.Count)
- // {
- // GetConsole().X = GetConsole().X + 1;
- // currentCount++;
- // }
- // continue;
- // }
-
- // if (current.KeyChar == '\0') continue;
-
- // //Write the character to the screen
- // if (currentCount == chars.Count)
- // {
- // chars.Add(current.KeyChar);
- // Write(current.KeyChar);
- // currentCount++;
- // }
- // else
- // {
- // //Insert the new character in the correct location
- // //For some reason, List.Insert() doesn't work properly
- // //so the character has to be inserted manually
- // List temp = new List();
-
- // for (int x = 0; x < chars.Count; x++)
- // {
- // if (x == currentCount)
- // {
- // temp.Add(current.KeyChar);
- // }
-
- // temp.Add(chars[x]);
- // }
-
- // chars = temp;
-
- // //Shift the characters to the right
- // for (int x = currentCount; x < chars.Count; x++)
- // {
- // Write(chars[x]);
- // }
-
- // GetConsole().X -= (chars.Count - currentCount) - 1;
- // currentCount++;
- // }
- // }
- // WriteLine();
-
- // char[] final = chars.ToArray();
- // return new string(final);
- //}
-
- //public static void ResetColor()
- //{
- // set_BackgroundColor(ConsoleColor.Black);
- // set_ForegroundColor(ConsoleColor.White);
- //}
-
- //public static void SetBufferSize(int width, int height)
- //{
- // WriteLine("Not implemented: SetBufferSize");
- //}
-
- //public static void SetCursorPosition(int left, int top)
- //{
- // set_CursorLeft(left);
- // set_CursorTop(top);
- //}
-
- ////public static void SetError(TextWriter newError) {
- //// WriteLine("Not implemented: SetError");
- ////}
-
- ////public static void SetIn(TextReader newIn) {
- //// WriteLine("Not implemented: SetIn");
- ////}
-
- ////public static void SetOut(TextWriter newOut) {
- //// WriteLine("Not implemented: SetOut");
- ////}
-
- //public static void SetWindowPosition(int left, int top)
- //{
- // WriteLine("Not implemented: SetWindowPosition");
- //}
-
- //public static void SetWindowSize(int width, int height)
- //{
- // WriteLine("Not implemented: SetWindowSize");
- //}
-
- //#region Write
-
- //public static void Write(bool aBool)
- //{
- // Write(aBool.ToString());
- //}
-
- //public static void Write(char aChar)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // GetConsole().WriteChar(aChar);
- //}
-
- //public static void Write(char[] aBuffer)
- //{
- // Write(aBuffer, 0, aBuffer.Length);
- //}
-
- ////public static void Write(decimal aBuffer) {
- //// Write("No Decimal.ToString()");
- ////}
-
- //public static void Write(double aDouble)
- //{
- // Write(aDouble.ToString());
- //}
-
- //public static void Write(float aFloat)
- //{
- // Write(aFloat.ToString());
- //}
-
- //public static void Write(int aInt)
- //{
- // Write(aInt.ToString());
- //}
-
- //public static void Write(long aLong)
- //{
- // Write(aLong.ToString());
- //}
-
- //public static void Write(object value)
- //{
- // if (value != null)
- // {
- // Write(value.ToString());
- // }
- //}
-
- //public static void Write(string aText)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // GetConsole().Write(aText);
- //}
-
- //public static void Write(uint aInt)
- //{
- // Write(aInt.ToString());
- //}
-
- //public static void Write(ulong aLong)
- //{
- // Write(aLong.ToString());
- //}
-
- //public static void Write(string format, object arg0)
- //{
- // WriteLine("Not implemented: Write");
- //}
-
- //public static void Write(string format, params object[] arg)
- //{
- // WriteLine("Not implemented: Write");
- //}
-
- //public static void Write(char[] aBuffer, int aIndex, int aCount)
- //{
- // if (aBuffer == null)
- // {
- // throw new ArgumentNullException("aBuffer");
- // }
- // if (aIndex < 0)
- // {
- // throw new ArgumentOutOfRangeException("aIndex");
- // }
- // if (aCount < 0)
- // {
- // throw new ArgumentOutOfRangeException("aCount");
- // }
- // if ((aBuffer.Length - aIndex) < aCount)
- // {
- // throw new ArgumentException();
- // }
- // for (int i = 0; i < aCount; i++)
- // {
- // Write(aBuffer[aIndex + i]);
- // }
- //}
-
- //public static void Write(string format, object arg0, object arg1)
- //{
- // WriteLine("Not implemented: Write");
- //}
-
- //public static void Write(string format, object arg0, object arg1, object arg2)
- //{
- // WriteLine("Not implemented: Write");
- //}
-
- //public static void Write(string format, object arg0, object arg1, object arg2, object arg3)
- //{
- // WriteLine("Not implemented: Write");
- //}
-
- ////You'd expect this to be on System.Console wouldn't you? Well, it ain't so we just rely on Write(object value)
- ////public static void Write(byte aByte) {
- //// Write(aByte.ToString());
- ////}
-
- //#endregion
-
- //public static void WriteLine()
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(bool aBool)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(aBool.ToString());
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(char aChar)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(aChar);
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(char[] aBuffer)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(aBuffer, 0, aBuffer.Length);
- // GetConsole().NewLine();
- //}
-
- ////public static void WriteLine(decimal aDecimal) {
- //// Write(aDecimal);
- //// Global.Console.NewLine();
- ////}
-
- //public static void WriteLine(double aDouble)
- //{
- // Write(aDouble.ToString());
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(float aFloat)
- //{
- // Write(aFloat.ToString());
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(int aInt)
- //{
- // Write(aInt.ToString());
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(long aLong)
- //{
- // Write(aLong.ToString());
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(object value)
- //{
- // if (value != null)
- // {
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(value.ToString());
- // xConsole.NewLine();
- // }
- //}
-
- public static void WriteLine(string aText) {
- }
-
- //public static void WriteLine(uint aInt)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(aInt.ToString());
- // xConsole.NewLine();
- //}
-
- //public static void WriteLine(ulong aLong)
- //{
- // var xConsole = GetConsole();
- // if (xConsole == null)
- // {
- // // for now:
- // return;
- // }
- // Write(aLong.ToString());
- // xConsole.NewLine();
- //}
-
- //public static void WriteLine(string format, object arg0)
- //{
- // WriteLine("Not implemented: WriteLine");
- //}
-
- //public static void WriteLine(string format, params object[] arg)
- //{
- // WriteLine("Not implemented: WriteLine");
- //}
-
- //public static void WriteLine(char[] aBuffer, int aIndex, int aCount)
- //{
- // Write(aBuffer, aIndex, aCount);
- // GetConsole().NewLine();
- //}
-
- //public static void WriteLine(string format, object arg0, object arg1)
- //{
- // WriteLine("Not implemented: WriteLine");
- //}
-
- //public static void WriteLine(string format, object arg0, object arg1, object arg2)
- //{
- // WriteLine("Not implemented: WriteLine");
- //}
-
- //public static void WriteLine(string format, object arg0, object arg1, object arg2, object arg3)
- //{
- // WriteLine("Not implemented: WriteLine");
- //}
-
- }
-}
diff --git a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Environment.cs b/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Environment.cs
deleted file mode 100644
index d0d709fe60..0000000000
--- a/source/Kernel-X86/91-Plugs/Cosmos.Plugs.TapRoot/System/Environment.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using IL2CPU.API.Attribs;
-
-namespace Cosmos.Plugs.TapRoot.System {
- [Plug(Target = typeof(global::System.Environment))]
- public static class Environment {
- // [PlugMethod(Signature = "System_Environment_OSName__System_Environment_get_OSInfo__")]
- // public static int get_OSName() { return 0x82; }
-
- public static string GetResourceFromDefault(string aResource) {
- return "";
- }
-
- public static string GetResourceString(string aResource) {
- return "";
- }
- }
-}
diff --git a/source/TheRingMaster/Program.cs b/source/TheRingMaster/Program.cs
deleted file mode 100644
index 5e8cb4e30d..0000000000
--- a/source/TheRingMaster/Program.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Loader;
-
-using IL2CPU.API.Attribs;
-
-namespace TheRingMaster
-{
- public class Program
- {
- enum Ring
- {
- External = 0,
- CPU = 10,
- Platform = 20,
- HAL = 30,
- System = 40,
- Application = 50,
- Plug = 91,
- CpuPlug = 92,
- Debug
- }
-
- static Dictionary RingCache = new Dictionary();
- static string KernelDir;
-
- public static void Main(string[] args)
- {
- if (args.Length != 1)
- {
- Console.WriteLine("Usage: theringmaster ");
- return;
- }
-
- var xKernelAssemblyPath = args[0];
-
- if (!File.Exists(xKernelAssemblyPath))
- {
- throw new FileNotFoundException("Kernel Assembly not found! Path: '" + xKernelAssemblyPath + "'");
- }
-
- KernelDir = Path.GetDirectoryName(xKernelAssemblyPath);
- AssemblyLoadContext.Default.Resolving += Default_Resolving;
-
- var xKernelAssembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(xKernelAssemblyPath);
- CheckRings(xKernelAssembly, Ring.Application);
-
- void CheckRings(Assembly aAssembly, Ring aRing, string aSourceAssemblyName = null)
- {
- bool xDebugAllowed = false;
-
- if (!RingCache.TryGetValue(aAssembly, out var xRing))
- {
- var xManifestName = aAssembly.GetManifestResourceNames()
- .Where(n => n == aAssembly.GetName().Name + ".Cosmos.cfg")
- .SingleOrDefault();
-
- if (xManifestName != null)
- {
- Dictionary xCfg;
-
- using (var xManifestStream = aAssembly.GetManifestResourceStream(xManifestName))
- {
- xCfg = ParseCfg(xManifestStream);
- }
-
- if (xCfg == null)
- {
- throw new Exception("Invalid Cosmos configuration! Resource name: " + xManifestName);
- }
-
- xCfg.TryGetValue("Ring", out var xRingName);
-
- if (!Enum.TryParse(xRingName, true, out xRing))
- {
- throw new Exception("Unknown ring! Ring: " + xRingName);
- }
-
- xCfg.TryGetValue("DebugRing", out var xDebugRing);
- xDebugAllowed = xDebugRing.ToLower() == "allowed";
- }
- }
-
- RingCache.Add(aAssembly, xRing);
-
- // Check Rings
-
- bool xValid = false;
-
- // Same rings
- // OR
- // External ring, can be referenced by any ring
- // OR
- // One of the assemblies is Debug
- // OR
- // Debug ring allowed
- if (aRing == xRing || xRing == Ring.External || aRing == Ring.Debug || xRing == Ring.Debug || xDebugAllowed)
- {
- xValid = true;
- }
-
- if (!xValid)
- {
- switch (aRing)
- {
- case Ring.Application when xRing == Ring.System:
- case Ring.System when xRing == Ring.HAL:
- case Ring.Platform when xRing == Ring.CPU:
- case Ring.Platform when xRing == Ring.HAL:
- return;
- }
- }
-
- if (!xValid)
- {
- var xExceptionMessage = "Invalid rings! Source assembly: " + (aSourceAssemblyName ?? "(no assembly)") +
- ", Ring: " + aRing + "; Referenced assembly: " + aAssembly.GetName().Name +
- ", Ring: " + xRing;
-
- throw new Exception(xExceptionMessage);
- }
-
- if (xRing != Ring.CPU && xRing != Ring.CpuPlug)
- {
- foreach (var xModule in aAssembly.Modules)
- {
- // TODO: Check unsafe code
- }
- }
-
- foreach (var xType in aAssembly.GetTypes())
- {
- if (xRing != Ring.Plug)
- {
- if (xType.GetCustomAttribute() != null)
- {
- throw new Exception("Plugs are only allowed in the Plugs ring! Assembly: " + aAssembly.GetName().Name);
- }
- }
- }
-
- foreach (var xReference in aAssembly.GetReferencedAssemblies())
- {
- try
- {
- CheckRings(AssemblyLoadContext.Default.LoadFromAssemblyName(xReference), xRing, aAssembly.GetName().Name);
- }
- catch (FileNotFoundException)
- {
- }
- }
- }
- }
-
- private static Assembly Default_Resolving(AssemblyLoadContext aContext, AssemblyName aAssemblyName)
- {
- Assembly xAssembly = null;
-
- if (ResolveAssemblyForDir(KernelDir, out xAssembly))
- {
- return xAssembly;
- }
-
- //if (ResolveAssemblyForDir(CosmosPaths.Kernel, out xAssembly))
- //{
- // return xAssembly;
- //}
-
- return xAssembly;
-
- bool ResolveAssemblyForDir(string aDir, out Assembly aAssembly)
- {
- aAssembly = null;
-
- var xFiles = Directory.GetFiles(aDir, aAssemblyName.Name + ".*", SearchOption.TopDirectoryOnly);
-
- if (xFiles.Any(f => Path.GetExtension(f) == ".dll"))
- {
- aAssembly = aContext.LoadFromAssemblyPath(xFiles.Where(f => Path.GetExtension(f) == ".dll").Single());
- }
-
- if (xFiles.Any(f => Path.GetExtension(f) == ".exe"))
- {
- aAssembly = aContext.LoadFromAssemblyPath(xFiles.Where(f => Path.GetExtension(f) == ".exe").Single());
- }
-
- return aAssembly != null;
- }
- }
-
- static Dictionary ParseCfg(Stream aStream)
- {
- var xCfg = new Dictionary();
-
- using (var xReader = new StreamReader(aStream))
- {
- while (xReader.Peek() >= 0)
- {
- var xLine = xReader.ReadLine();
-
- if (!xLine.Contains(':') || xLine.Count(c => c == ':') > 1)
- {
- return null;
- }
-
- var xProperty = xLine.Split(':');
- xCfg.Add(xProperty[0].Trim(), xProperty[1].Trim());
- }
- }
-
- return xCfg;
- }
- }
-}
diff --git a/source/TheRingMaster/TheRingMaster.csproj b/source/TheRingMaster/TheRingMaster.csproj
deleted file mode 100644
index d4703a60d8..0000000000
--- a/source/TheRingMaster/TheRingMaster.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- net6.0
- Exe
- Debug;Release;TEST
-
-
-
-
-
-
-
-
diff --git a/source/templates/csharp/CSharpProject.csproj b/source/templates/csharp/CSharpProject.csproj
index 0fc253a378..86947e3838 100644
--- a/source/templates/csharp/CSharpProject.csproj
+++ b/source/templates/csharp/CSharpProject.csproj
@@ -22,6 +22,7 @@
+
-Cosmos is an operating system "construction kit" made for Visual Studio 2022. Build your own OS using managed languages such as C#, VB.NET, and more!
+
