diff --git a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine.Kernel/Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine.Kernel/Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot.Cosmos index 45809673d..f1682c2a9 100644 --- a/Tests/Cosmos.Compiler.Tests.SimpleWriteLine.Kernel/Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot.Cosmos +++ b/Tests/Cosmos.Compiler.Tests.SimpleWriteLine.Kernel/Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot.Cosmos @@ -17,8 +17,8 @@ True Source User - False - false + True + False Player bin\Debug\ Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot @@ -39,15 +39,25 @@ Player bin\Debug\ All - False - false + True + False - - - - - + + Cosmos.Core.Plugs + {d9a87aad-fcc9-4517-b31d-e904dad00784} + True + + + Cosmos.Debug.Kernel.Plugs + {b97a2956-c363-47f2-a6aa-b4fccff4d315} + True + + + Cosmos.System.Plugs + {7c64b97f-516d-4a6d-b9e1-3fe48f561409} + True + Cosmos.Compiler.Tests.SimpleWriteLine.Kernel {57045fe8-b0fe-4fc1-810f-7c3914aef1de} diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj index de49b7c53..c2f5ff727 100644 --- a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj +++ b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj @@ -121,10 +121,6 @@ {6128DEEB-D30F-4859-B60F-C36D5452F3E9} IL2CPU - - {f8889473-5866-4913-86ac-8072a1a2558c} - BoxingTests - {bdc011be-6041-4a58-a6e7-0f592e78cb27} Cosmos.Compiler.Tests.Interfaces.Kernel diff --git a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj index b1d63f43c..d8dcf998d 100644 --- a/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj +++ b/Tests/Cosmos.TestRunner/Cosmos.TestRunner.csproj @@ -53,10 +53,6 @@ {3DEF0461-08AB-471A-8F03-A9C556652A0F} Cosmos.System - - {f8889473-5866-4913-86ac-8072a1a2558c} - BoxingTests - {BDC011BE-6041-4A58-A6E7-0F592E78CB27} Cosmos.Compiler.Tests.Interfaces.Kernel diff --git a/Tests/Cosmos.TestRunner/Program.cs b/Tests/Cosmos.TestRunner/Program.cs index a48958e8f..bed8e655f 100644 --- a/Tests/Cosmos.TestRunner/Program.cs +++ b/Tests/Cosmos.TestRunner/Program.cs @@ -21,9 +21,8 @@ namespace Cosmos.TestRunner.Console var xOutputXml = new OutputHandlerXml(); xEngine.OutputHandler = new MultiplexingOutputHandler( xOutputXml, - new OutputHandlerConsole()); + new OutputHandlerFullConsole()); - xEngine.RunTargets.Add(RunTargetEnum.Bochs); xEngine.Execute(); global::System.Console.WriteLine("Do you want to save test run details?"); diff --git a/source/Cosmos.Debug.Kernel.Plugs/.editorconfig b/source/Cosmos.Debug.Kernel.Plugs/.editorconfig new file mode 100644 index 000000000..d79adc04a --- /dev/null +++ b/source/Cosmos.Debug.Kernel.Plugs/.editorconfig @@ -0,0 +1,2 @@ +[*.cs] +indent_size = 2 diff --git a/source/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj b/source/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj index 0cc73ddda..f48a70231 100644 --- a/source/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj +++ b/source/Cosmos.Debug.Kernel.Plugs/Cosmos.Debug.Kernel.Plugs.csproj @@ -96,6 +96,7 @@ + diff --git a/source/Cosmos.Debug.Kernel/Debugger.cs b/source/Cosmos.Debug.Kernel/Debugger.cs index d241a011d..6ffbb984d 100644 --- a/source/Cosmos.Debug.Kernel/Debugger.cs +++ b/source/Cosmos.Debug.Kernel/Debugger.cs @@ -14,9 +14,10 @@ namespace Cosmos.Debug.Kernel { { } // Plugged - public unsafe void Send(int aLength, char* aText) + private static unsafe void Send(int aLength, char* aText) { } // Plugged + //public void TraceOff() { } // Plugged //public void TraceOn() { } // Plugged public void SendPtr(object aObject) diff --git a/source/Cosmos.IL2CPU/.editorconfig b/source/Cosmos.IL2CPU/.editorconfig index 934d17cd0..73b325490 100644 --- a/source/Cosmos.IL2CPU/.editorconfig +++ b/source/Cosmos.IL2CPU/.editorconfig @@ -13,7 +13,7 @@ indent_size = 2 indent_size = 2 [IL/*.cs] -indent_size = 4 +indent_size = 2 [AppAssembler.cs] indent_size = 4 diff --git a/source/Cosmos.IL2CPU/IL/Ldstr.cs b/source/Cosmos.IL2CPU/IL/Ldstr.cs index 9f0d503fe..018dcf931 100644 --- a/source/Cosmos.IL2CPU/IL/Ldstr.cs +++ b/source/Cosmos.IL2CPU/IL/Ldstr.cs @@ -22,7 +22,9 @@ namespace Cosmos.IL2CPU.X86.IL new Comment( Assembler, "String Value: " + xOpString.Value.Replace( "\r", "\\r" ).Replace( "\n", "\\n" ) ); new Mov { DestinationReg = RegistersEnum.EAX, SourceRef = Cosmos.Assembler.ElementReference.New(xDataName) }; new Push { DestinationReg = RegistersEnum.EAX }; - // DEBUG VERIFICATION: leave it here for now. we have issues with fields ordering. if that changes, we need to change the code below! + // DEBUG VERIFICATION: leave it here for now. we have issues with fields ordering. + // if that changes, we need to change the code below! + // We also need to change the debugstub to fix this then. #region Debug verification var xFields = GetFieldsInfo(typeof(string), false).Where(i => !i.IsStatic).ToArray();