diff --git a/Build.sln b/Build.sln index e98c1446c8..8d459808dc 100644 --- a/Build.sln +++ b/Build.sln @@ -52,8 +52,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.USB", "source EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cosmos.Deploy.Pixie", "source\Cosmos.Deploy.Pixie\Cosmos.Deploy.Pixie.csproj", "{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XSharp.Nasm", "..\XSharp\source\XSharp.Nasm\XSharp.Nasm.csproj", "{841A734E-9606-4AAB-9C4A-74E7E303FF5D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Compiler", "..\XSharp\source\XSharp.Compiler\XSharp.Compiler.csproj", "{69E08155-F075-4728-8387-1549CFD4FA97}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{F3025446-D2C7-4FEA-AB03-C707F7B48B43}" @@ -86,7 +84,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.System2_Plugs", "sou EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel.Plugs.Asm", "source\Cosmos.Debug.Kernel.Plugs.Asm\Cosmos.Debug.Kernel.Plugs.Asm.csproj", "{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj", "{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}" EndProject @@ -148,10 +146,6 @@ Global {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.ActiveCfg = Release|Any CPU {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.Build.0 = Release|Any CPU - {841A734E-9606-4AAB-9C4A-74E7E303FF5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {841A734E-9606-4AAB-9C4A-74E7E303FF5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {841A734E-9606-4AAB-9C4A-74E7E303FF5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {841A734E-9606-4AAB-9C4A-74E7E303FF5D}.Release|Any CPU.Build.0 = Release|Any CPU {69E08155-F075-4728-8387-1549CFD4FA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69E08155-F075-4728-8387-1549CFD4FA97}.Debug|Any CPU.Build.0 = Debug|Any CPU {69E08155-F075-4728-8387-1549CFD4FA97}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -267,7 +261,6 @@ Global {FB71E8EF-E229-4D81-984A-B9170D752BF9} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {3D84CF8B-C6DF-4D78-8DE1-708582B43711} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} {D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865} = {FD42844B-2767-4DF4-B0AF-EA5F7CB11528} - {841A734E-9606-4AAB-9C4A-74E7E303FF5D} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {69E08155-F075-4728-8387-1549CFD4FA97} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90} {F3025446-D2C7-4FEA-AB03-C707F7B48B43} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} {3C45A898-4AA9-476F-8302-63391D6ED044} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6} diff --git a/IDE.sln b/IDE.sln index 7872bb898c..2e0c6863ca 100644 --- a/IDE.sln +++ b/IDE.sln @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deploy", "Deploy", "{BDFC9B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{F7C6CA93-1D02-443C-9C8B-A1988DE0306B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{F74A4B2B-02DA-455A-89FB-803A442B5B2C}" EndProject diff --git a/IL2CPU.sln b/IL2CPU.sln index 03f6311091..9ce671c50b 100644 --- a/IL2CPU.sln +++ b/IL2CPU.sln @@ -6,17 +6,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assembler", "Assembler", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{C286932C-3F6D-47F0-BEEF-26843D1BB11B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{4F903492-CCA6-4FD9-A1B6-5E4CC0CE7767}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU", "..\IL2CPU\source\Cosmos.IL2CPU\Cosmos.IL2CPU.csproj", "{4F903492-CCA6-4FD9-A1B6-5E4CC0CE7767}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj", "{34AEEB7C-FD5D-4B15-A830-B429681844BD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.IL2CPU.API", "..\IL2CPU\source\Cosmos.IL2CPU.API\Cosmos.IL2CPU.API.csproj", "{34AEEB7C-FD5D-4B15-A830-B429681844BD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XSharp", "XSharp", "{E9CD521E-C386-466D-B5F7-A5EB19A61625}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{72EB557A-8A2D-4B0F-823E-C70A791831B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IL2CPU", "..\IL2CPU\source\IL2CPU\IL2CPU.csproj", "{295AA95F-BEC6-4F9E-A2E1-8205FD06E951}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Compiler", "..\XSharp\source\XSharp.Compiler\XSharp.Compiler.csproj", "{6EE75318-F00B-4295-A132-484CDB812801}" EndProject diff --git a/Kernel.sln b/Kernel.sln index 467404b0e5..a4219211e6 100644 --- a/Kernel.sln +++ b/Kernel.sln @@ -62,7 +62,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "40 System", "40 System", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50 Application", "50 Application", "{2A22DC4C-E237-4D4B-A592-47D477F9ED5B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "..\XSharp\source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "..\XSharp\source\XSharp.Assembler\XSharp.Assembler.csproj", "{F0860B7D-3FF7-4E2A-AC10-18E87ADD62A3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Common", "..\XSharp\source\XSharp.Common\XSharp.Common.csproj", "{F785B091-7E4D-4D2E-A310-B18690623F74}" EndProject diff --git a/Test.sln b/Test.sln index ccb47b29d3..c397e13642 100644 --- a/Test.sln +++ b/Test.sln @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel G2", "Kernel G2", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1A46752C-98F3-4DE3-B1FB-EDCE22E8AF73}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Assembler", "source\Cosmos.Assembler\Cosmos.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XSharp.Assembler", "source\XSharp.Assembler\XSharp.Assembler.csproj", "{0CDB3F6E-7971-426B-81F8-38B966A54C2B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Build.Common", "source\Cosmos.Build.Common\Cosmos.Build.Common.csproj", "{F74A4B2B-02DA-455A-89FB-803A442B5B2C}" EndProject diff --git a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj index 9fdd386f8e..33e151f34a 100644 --- a/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj +++ b/Tests/Cosmos.TestRunner.Core/Cosmos.TestRunner.Core.csproj @@ -34,7 +34,7 @@ - + diff --git a/Users/Gero Landmann/Cosmos.Assembler.X86.Gero/Cosmos.Assembler.X86.Gero.csproj b/Users/Gero Landmann/Cosmos.Assembler.X86.Gero/Cosmos.Assembler.X86.Gero.csproj index 3ee1eb20ae..7d47fb965d 100644 --- a/Users/Gero Landmann/Cosmos.Assembler.X86.Gero/Cosmos.Assembler.X86.Gero.csproj +++ b/Users/Gero Landmann/Cosmos.Assembler.X86.Gero/Cosmos.Assembler.X86.Gero.csproj @@ -8,8 +8,8 @@ {6658FCE0-7032-4B7B-BD95-F2765C393442} Library Properties - Cosmos.Assembler.X86.Gero - Cosmos.Assembler.X86.Gero + XSharp.Assembler.X86.Gero + XSharp.Assembler.X86.Gero v4.6.2 512 SAK diff --git a/source/Archive/Cosmos.Assembler.Nasm/Cosmos.Assembler.Nasm.csproj b/source/Archive/Cosmos.Assembler.Nasm/Cosmos.Assembler.Nasm.csproj index c7bb5749c4..3d3b02ecc4 100644 --- a/source/Archive/Cosmos.Assembler.Nasm/Cosmos.Assembler.Nasm.csproj +++ b/source/Archive/Cosmos.Assembler.Nasm/Cosmos.Assembler.Nasm.csproj @@ -8,8 +8,8 @@ {D5321EC7-9F27-4713-A7EC-9BED3ACA8D9F} Library Properties - Cosmos.Assembler.Nasm - Cosmos.Assembler.Nasm + XSharp.Assembler.Nasm + XSharp.Assembler.Nasm v4.6.2 512 SAK diff --git a/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj b/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj index a2a5e98cfb..9aecba0a34 100644 --- a/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj +++ b/source/Archive/Cosmos.Kernel.Plugs/Cosmos.Kernel.Plugs.csproj @@ -71,9 +71,9 @@ - + {1116130E-28E0-428A-A597-F4B3B676C0CA} - Cosmos.Assembler + XSharp.Assembler {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E} diff --git a/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj b/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj index d3840b3891..e2d3012166 100644 --- a/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj +++ b/source/Archive/Cosmos.Sys.Plugs/Cosmos.Sys.Plugs.csproj @@ -67,9 +67,9 @@ - + {1116130E-28E0-428A-A597-F4B3B676C0CA} - Cosmos.Assembler + XSharp.Assembler {C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E} diff --git a/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs b/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs index f8392b5aa2..600d8de8e9 100644 --- a/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs +++ b/source/Cosmos.Core_Asm/Array/ArrayGetLengthAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class ArrayGetLengthAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { // $this ebp+8 XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 8); diff --git a/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs b/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs index db452eb0a7..ccdc0126a7 100644 --- a/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs +++ b/source/Cosmos.Core_Asm/Array/ArrayInternalCopyAsm.cs @@ -1,7 +1,7 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU.API; using XSharp.Common; -using CPUx86 = Cosmos.Assembler.x86; +using CPUx86 = XSharp.Assembler.x86; namespace Cosmos.Core_Asm { @@ -22,7 +22,7 @@ public class ArrayInternalCopyAsm : AssemblerMethod * bool reliable); ebp + 8 */ - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Comment("Source"); XS.Comment("Element size"); diff --git a/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs b/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs index 3d1738e48c..852d4ca20f 100644 --- a/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs +++ b/source/Cosmos.Core_Asm/Buffer/BufferBlockCopyAsm.cs @@ -1,7 +1,7 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU.API; using XSharp.Common; -using CPUx86 = Cosmos.Assembler.x86; +using CPUx86 = XSharp.Assembler.x86; namespace Cosmos.Core_Asm { @@ -20,7 +20,7 @@ public class BufferBlockCopyAsm : AssemblerMethod * int dstOffset, [ebp + 12] * int count); [ebp + 8] */ - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Comment("Source array"); XS.Set(XSRegisters.ESI, XSRegisters.EBP, sourceDisplacement: SourceArrayDisplacement); diff --git a/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs index 533e2b179f..6cccb7c9a4 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUDisableINTsAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUDisableINTsAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.ClearInterruptFlag(); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs index 72780955f5..04b8216552 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUEnableINTsAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUEnableINTsAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.EnableInterrupts(); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs index d19ceb8e0c..5cf0e7f994 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUGetAmountOfRAMAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUGetAmountOfRAMAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EAX, "MultiBootInfo_Memory_High", sourceIsIndirect: true); XS.Xor(XSRegisters.EDX, XSRegisters.EDX); diff --git a/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs index 2b7fa55e99..bb776b55bb 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUGetEndOfKernelAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUGetEndOfKernelAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Push("_end_code"); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs index 6cce614074..97b10c0818 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUHaltAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUHaltAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Halt(); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs index 3c7e4f004d..bf934c8272 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUInitFloatAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUInitFloatAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.FPU.FloatInit(); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs index 4da1fc7c5d..bee787a784 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUInitSSEAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.Core_Asm { public class CPUInitSSEAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.SSE.SSEInit(); } diff --git a/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs index 174434df25..32a64e2108 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUUpdateIDTAsm.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using Cosmos.Assembler; -using Cosmos.Assembler.x86; +using XSharp.Assembler; +using XSharp.Assembler.x86; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; using static XSharp.Common.XSRegisters; @@ -36,7 +36,7 @@ private static MethodBase GetInterruptHandler(byte aInterrupt) , "HandleInterrupt_" + aInterrupt.ToString("X2"), false); } - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + 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 diff --git a/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs b/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs index e2b019ea2a..efcd08ba5a 100644 --- a/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs +++ b/source/Cosmos.Core_Asm/CPU/CPUZeroFillAsm.cs @@ -1,11 +1,12 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; +using x86 = XSharp.Assembler.x86; namespace Cosmos.Core_Asm { public class CPUZeroFillAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.ClearDirectionFlag(); XS.Set(XSRegisters.EDI, XSRegisters.EBP, sourceDisplacement: 0xC); //address @@ -13,14 +14,14 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI // set EAX to value of fill (zero) XS.Xor(XSRegisters.EAX, XSRegisters.EAX); XS.ShiftRight(XSRegisters.ECX, 1); - XS.Jump(Assembler.x86.ConditionalTestEnum.NotBelow, ".step2"); + XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step2"); XS.StoreByteInString(); XS.Label(".step2"); XS.ShiftRight(XSRegisters.ECX, 1); - XS.Jump(Assembler.x86.ConditionalTestEnum.NotBelow, ".step3"); + XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step3"); XS.StoreWordInString(); XS.Label(".step3"); - new Assembler.x86.Stos { Size = 32, Prefixes = Assembler.x86.InstructionPrefixes.Repeat }; + new x86.Stos { Size = 32, Prefixes = x86.InstructionPrefixes.Repeat }; } } } diff --git a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj index a17c741e9c..8f0dd7da7b 100644 --- a/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj +++ b/source/Cosmos.Core_Asm/Cosmos.Core_Asm.csproj @@ -16,7 +16,7 @@ - + diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs index a327aab2c4..37c590e656 100644 --- a/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs +++ b/source/Cosmos.Core_Asm/Delegate/DelegateCtorAsm.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using Cosmos.IL2CPU.X86.IL; using XSharp.Common; @@ -8,7 +8,7 @@ namespace Cosmos.Core_Asm { public class DelegateCtorAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { // method signature: $this, object @object, IntPtr method var xAssembler = aAssembler; diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs index 7bc87f4591..c989762e3c 100644 --- a/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs +++ b/source/Cosmos.Core_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using XSharp.Common; @@ -7,7 +7,7 @@ namespace Cosmos.Core_Asm { public class DelegateGetMulticastInvokeAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { var xAssembler = aAssembler; var xMethodInfo = (MethodInfo)aMethodInfo; diff --git a/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs b/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs index 6b3b64c072..bc18763a2c 100644 --- a/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs +++ b/source/Cosmos.Core_Asm/Delegate/DelegateInvokeAsm.cs @@ -1,16 +1,17 @@ using System; using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using Cosmos.IL2CPU.X86.IL; using XSharp.Common; +using x86 = XSharp.Assembler.x86; // ReSharper disable once CheckNamespace namespace Cosmos.Core_Asm { public class DelegateInvokeAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { var xAssembler = aAssembler; var xMethodInfo = (_MethodInfo) aMethodInfo; @@ -56,7 +57,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Label(".BEGIN_OF_LOOP"); { XS.Compare(XSRegisters.EDX, XSRegisters.EBX); - XS.Jump(Assembler.x86.ConditionalTestEnum.GreaterThanOrEqualTo, ".END_OF_INVOKE"); + XS.Jump(x86.ConditionalTestEnum.GreaterThanOrEqualTo, ".END_OF_INVOKE"); XS.PushAllRegisters(); @@ -65,7 +66,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI 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(Assembler.x86.ConditionalTestEnum.Zero, ".NO_THIS"); + XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_THIS"); XS.Label(".HAS_THIS"); XS.Push(XSRegisters.EDI); XS.Push(0); @@ -75,7 +76,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Comment("Check if delegate has args"); XS.Compare(XSRegisters.ECX, 0); - XS.Jump(Assembler.x86.ConditionalTestEnum.Zero, ".NO_ARGS"); + XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_ARGS"); XS.Label(".HAS_ARGS"); XS.Sub(XSRegisters.ESP, XSRegisters.ECX); XS.Push(XSRegisters.EDI); @@ -83,7 +84,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Add(XSRegisters.EDI, 4); XS.Set(XSRegisters.ESI, XSRegisters.EBP); XS.Add(XSRegisters.ESI, 8); - new Assembler.x86.Movs { Size = 8, Prefixes = Assembler.x86.InstructionPrefixes.Repeat }; + new x86.Movs { Size = 8, Prefixes = x86.InstructionPrefixes.Repeat }; XS.Pop(XSRegisters.EDI); XS.Label(".NO_ARGS"); XS.Call(XSRegisters.EDI); @@ -97,7 +98,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI 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(Assembler.x86.ConditionalTestEnum.Equal, ".NO_RETURN"); + XS.Jump(x86.ConditionalTestEnum.Equal, ".NO_RETURN"); XS.Label(".HAS_RETURN"); XS.Exchange(XSRegisters.EBP, XSRegisters.EDX, destinationDisplacement: 8); diff --git a/source/Cosmos.Core_Asm/IOPortImpl.cs b/source/Cosmos.Core_Asm/IOPortImpl.cs index f164b973ce..d8de8b5ece 100644 --- a/source/Cosmos.Core_Asm/IOPortImpl.cs +++ b/source/Cosmos.Core_Asm/IOPortImpl.cs @@ -1,5 +1,5 @@ using System; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.Core; using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; @@ -15,7 +15,7 @@ public class IOPortImpl private class Write8Assembler : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 @@ -37,7 +37,7 @@ public static void Write8(UInt16 aPort, byte aData) private class Write16Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C); XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08); @@ -56,7 +56,7 @@ public static void Write16(UInt16 aPort, UInt16 aData) private class Write32Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C); XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08); @@ -75,7 +75,7 @@ public static void Write32(UInt16 aPort, UInt32 aData) private class Read8Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + 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? @@ -98,7 +98,7 @@ public static byte Read8(UInt16 aPort) private class Read16Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08); XS.Set(XSRegisters.EAX, 0); @@ -119,7 +119,7 @@ public static UInt16 Read16(UInt16 aPort) private class Read32Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08); XS.ReadFromPortDX(XSRegisters.EAX); diff --git a/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs b/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs index cbbd397554..d2afd44599 100644 --- a/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs +++ b/source/Cosmos.Core_Asm/MemoryOperations/MemoryOperationsFillFastAsm.cs @@ -1,5 +1,5 @@ -using Cosmos.Assembler; -using Cosmos.Assembler.x86; +using XSharp.Assembler; +using XSharp.Assembler.x86; using XSharp.Common; using static XSharp.Common.XSRegisters; @@ -18,7 +18,7 @@ public class MemoryOperationsFill16BlocksAsm : AssemblerMethod * int value, [ebp + 12] * int BlocksNum) [ebp + 16] */ - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { /* First we copy dest, value and DestSize from EBP (stack) to 3 different registers */ XS.Comment("Destination (int pointer)"); diff --git a/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs b/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs index 47414c5b04..ec3130e686 100644 --- a/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs +++ b/source/Cosmos.Core_Asm/ProcessorInformationImpl.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.Core; using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; diff --git a/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs b/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs index 08000049e6..09bfc54899 100644 --- a/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs +++ b/source/Cosmos.Core_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs @@ -2,7 +2,7 @@ using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; -using CPUx86 = Cosmos.Assembler.x86; +using CPUx86 = XSharp.Assembler.x86; namespace Cosmos.Core_Asm { diff --git a/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj b/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj index bc4f11569e..3f351b844d 100644 --- a/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj +++ b/source/Cosmos.Debug.Kernel.Plugs.Asm/Cosmos.Debug.Kernel.Plugs.Asm.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs b/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs index e20caae548..74342caa5d 100644 --- a/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs +++ b/source/Cosmos.Debug.Kernel.Plugs.Asm/DebuggerAsm.cs @@ -1,4 +1,4 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; @@ -78,7 +78,7 @@ public static void DoRealHalt() // Maybe could merge this into the same unit as the plug public class DebugTraceOff : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("pushad"); @@ -90,7 +90,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugTraceOn : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("pushad"); @@ -111,7 +111,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a /// public class DebugSendChannelCommand : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("mov AL, [EBP + 20]"); @@ -134,7 +134,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a /// public class DebugSendChannelCommandNoData : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("mov AL, [EBP + 12]"); @@ -148,7 +148,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugBreak : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("mov dword [DebugStub_DebugBreakOnNextTrace], 1"); @@ -165,7 +165,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a /// public class DebugDoSend : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); XS.Label(".BeforeArgumentsPrepare"); @@ -182,7 +182,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugDoSendNumber : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("push dword [EBP + 8]"); @@ -194,7 +194,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugDoSendLongNumber : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("push dword [EBP + 12]"); @@ -207,7 +207,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugDoSendComplexNumber : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("push dword [EBP + 8]"); @@ -219,7 +219,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugDoSendComplexLongNumber : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("push dword [EBP + 12]"); @@ -232,7 +232,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugSendMessageBox : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("pushad"); @@ -244,7 +244,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DebugSendPtr : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(XSharp.Assembler.Assembler aAssembler, object aMethodInfo) { new LiteralAssemblerCode("%ifdef DEBUGSTUB"); new LiteralAssemblerCode("pushad"); @@ -256,7 +256,7 @@ public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object a public class DoBochsBreak : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Exchange(XSRegisters.BX, XSRegisters.BX); } @@ -264,7 +264,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI public class DoRealHalt : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.DisableInterrupts(); // bochs magic break 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 index eab1e766df..45654d9b32 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayGetLengthAsm.cs @@ -1,11 +1,11 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class ArrayGetLengthAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { // $this ebp+8 XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 8); 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 index 70d734fe5c..746955be53 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Array/ArrayInternalCopyAsm.cs @@ -1,7 +1,7 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU.API; using XSharp.Common; -using CPUx86 = Cosmos.Assembler.x86; +using CPUx86 = XSharp.Assembler.x86; namespace Cosmos.CPU_Asm { @@ -22,7 +22,7 @@ public class ArrayInternalCopyAsm : AssemblerMethod * bool reliable); ebp + 8 */ - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Comment("Source"); XS.Comment("Element size"); 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 index 82e1713f5f..45a3b9a097 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUDisableINTsAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUDisableINTsAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 index 3324e8b8cd..03a9c0e523 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUEnableINTsAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUEnableINTsAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 index e68b16a533..a8c519e42c 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetAmountOfRAMAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUGetAmountOfRAMAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EAX, "MultiBootInfo_Memory_High", sourceIsIndirect: true); XS.Xor(XSRegisters.EDX, XSRegisters.EDX); 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 index c3377f6da0..b1ad2f095c 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUGetEndOfKernelAsm.cs @@ -1,9 +1,9 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUGetEndOfKernelAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) { + 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 index 446c586d4f..62c48c87ff 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUHaltAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUHaltAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 index 81fd767c0e..7e419968a0 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitFloatAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUInitFloatAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 index 4413ed9c99..b846b17963 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUInitSSEAsm.cs @@ -1,10 +1,10 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; namespace Cosmos.CPU_Asm { public class CPUInitSSEAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 index 30886952d9..cf85e8f4d2 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUUpdateIDTAsm.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using Cosmos.Assembler; -using Cosmos.Assembler.x86; +using XSharp.Assembler; +using XSharp.Assembler.x86; using Cosmos.CPU.x86; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; @@ -36,7 +36,7 @@ private static MethodBase GetInterruptHandler(byte aInterrupt) , "HandleInterrupt_" + aInterrupt.ToString("X2"), false); } - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + 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 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 index 76b65c4089..636dd56d20 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/CPU/CPUZeroFillAsm.cs @@ -1,11 +1,12 @@ -using Cosmos.Assembler; +using XSharp.Assembler; using XSharp.Common; +using x86 = XSharp.Assembler.x86; namespace Cosmos.CPU_Asm { public class CPUZeroFillAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.ClearDirectionFlag(); XS.Set(XSRegisters.EDI, XSRegisters.EBP, sourceDisplacement: 0xC); //address @@ -13,14 +14,14 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI // set EAX to value of fill (zero) XS.Xor(XSRegisters.EAX, XSRegisters.EAX); XS.ShiftRight(XSRegisters.ECX, 1); - XS.Jump(Assembler.x86.ConditionalTestEnum.NotBelow, ".step2"); + XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step2"); XS.StoreByteInString(); XS.Label(".step2"); XS.ShiftRight(XSRegisters.ECX, 1); - XS.Jump(Assembler.x86.ConditionalTestEnum.NotBelow, ".step3"); + XS.Jump(x86.ConditionalTestEnum.NotBelow, ".step3"); XS.StoreWordInString(); XS.Label(".step3"); - new Assembler.x86.Stos { Size = 32, Prefixes = Assembler.x86.InstructionPrefixes.Repeat }; + new x86.Stos { Size = 32, Prefixes = x86.InstructionPrefixes.Repeat }; } } } 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 index a04c5fb1eb..bba2153395 100644 --- 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 @@ -18,7 +18,7 @@ - + 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 index faed78645d..f4947573e2 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateCtorAsm.cs @@ -1,12 +1,12 @@ using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using Cosmos.IL2CPU.X86.IL; using XSharp.Common; namespace Cosmos.CPU_Asm { public class DelegateCtorAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) { + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { // method signature: $this, object @object, IntPtr method var xAssembler = aAssembler; var xMethodInfo = (_MethodInfo)aMethodInfo; 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 index 0e9715ace3..a7ff2ef502 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateGetMulticastInvokeAsm.cs @@ -1,11 +1,11 @@ using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using XSharp.Common; namespace Cosmos.CPU_Asm { public class DelegateGetMulticastInvokeAsm : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) { + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { var xAssembler = aAssembler; var xMethodInfo = (MethodInfo)aMethodInfo; var xDelegate = typeof(global::System.Delegate); 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 index bc09008553..3d5ca4b830 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/Delegate/DelegateInvokeAsm.cs @@ -1,14 +1,15 @@ using System; using System.Reflection; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.IL2CPU; using Cosmos.IL2CPU.X86.IL; using XSharp.Common; +using x86 = XSharp.Assembler.x86; // ReSharper disable once CheckNamespace namespace Cosmos.CPU_Asm { public class DelegateInvokeAsm : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) { + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { var xAssembler = aAssembler; var xMethodInfo = (_MethodInfo)aMethodInfo; var xMethodBaseAsInfo = xMethodInfo.MethodBase as global::System.Reflection.MethodInfo; @@ -52,7 +53,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Label(".BEGIN_OF_LOOP"); { XS.Compare(XSRegisters.EDX, XSRegisters.EBX); - XS.Jump(Assembler.x86.ConditionalTestEnum.GreaterThanOrEqualTo, ".END_OF_INVOKE"); + XS.Jump(x86.ConditionalTestEnum.GreaterThanOrEqualTo, ".END_OF_INVOKE"); XS.PushAllRegisters(); @@ -61,7 +62,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI 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(Assembler.x86.ConditionalTestEnum.Zero, ".NO_THIS"); + XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_THIS"); XS.Label(".HAS_THIS"); XS.Push(XSRegisters.EDI); XS.Push(0); @@ -71,7 +72,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Comment("Check if delegate has args"); XS.Compare(XSRegisters.ECX, 0); - XS.Jump(Assembler.x86.ConditionalTestEnum.Zero, ".NO_ARGS"); + XS.Jump(x86.ConditionalTestEnum.Zero, ".NO_ARGS"); XS.Label(".HAS_ARGS"); XS.Sub(XSRegisters.ESP, XSRegisters.ECX); XS.Push(XSRegisters.EDI); @@ -79,7 +80,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI XS.Add(XSRegisters.EDI, 4); XS.Set(XSRegisters.ESI, XSRegisters.EBP); XS.Add(XSRegisters.ESI, 8); - new Assembler.x86.Movs { Size = 8, Prefixes = Assembler.x86.InstructionPrefixes.Repeat }; + new x86.Movs { Size = 8, Prefixes = x86.InstructionPrefixes.Repeat }; XS.Pop(XSRegisters.EDI); XS.Label(".NO_ARGS"); XS.Call(XSRegisters.EDI); @@ -93,7 +94,7 @@ public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodI 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(Assembler.x86.ConditionalTestEnum.Equal, ".NO_RETURN"); + XS.Jump(x86.ConditionalTestEnum.Equal, ".NO_RETURN"); XS.Label(".HAS_RETURN"); XS.Exchange(XSRegisters.EBP, XSRegisters.EDX, destinationDisplacement: 8); diff --git a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs index b47a0e8b17..4d401e572e 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/IOPortImpl.cs @@ -1,5 +1,5 @@ using System; -using Cosmos.Assembler; +using XSharp.Assembler; using Cosmos.CPU.x86; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; @@ -14,7 +14,7 @@ public class IOPortImpl private class Write8Assembler : AssemblerMethod { - public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) + 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 @@ -36,7 +36,7 @@ public static void Write8(UInt16 aPort, byte aData) private class Write16Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C); XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08); @@ -55,7 +55,7 @@ public static void Write16(UInt16 aPort, UInt16 aData) private class Write32Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x0C); XS.Set(XSRegisters.EAX, XSRegisters.EBP, sourceDisplacement: 0x08); @@ -74,7 +74,7 @@ public static void Write32(UInt16 aPort, UInt32 aData) private class Read8Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + 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? @@ -97,7 +97,7 @@ public static byte Read8(UInt16 aPort) private class Read16Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08); XS.Set(XSRegisters.EAX, 0); @@ -118,7 +118,7 @@ public static UInt16 Read16(UInt16 aPort) private class Read32Assembler : AssemblerMethod { - public override void AssembleNew(Assembler.Assembler aAssembler, object aMethodInfo) + public override void AssembleNew(Assembler aAssembler, object aMethodInfo) { XS.Set(XSRegisters.EDX, XSRegisters.EBP, sourceDisplacement: 0x08); XS.ReadFromPortDX(XSRegisters.EAX); 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 index 4865602c79..4a21be4122 100644 --- a/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs +++ b/source/Kernel-X86/10-CPU/Cosmos.CPU_Asm/RuntimeHelpers/RuntimeHelpersImpl.cs @@ -2,7 +2,7 @@ using Cosmos.IL2CPU.API; using Cosmos.IL2CPU.API.Attribs; using XSharp.Common; -using CPUx86 = Cosmos.Assembler.x86; +using CPUx86 = XSharp.Assembler.x86; namespace Cosmos.CPU_Asm {