forked from CosmosOS/Cosmos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed delegates and moved some assemblers.
- Loading branch information
1 parent
2c27520
commit 4b67c02
Showing
33 changed files
with
403 additions
and
498 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
source/Cosmos.Core.Plugs/Assemblers/DisableInterruptsAssembler.cs
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
source/Cosmos.Core.Plugs/Assemblers/EnableInterruptsAssembler.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,161 +1,58 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Text; | ||
| using Cosmos.IL2CPU.Plugs; | ||
| using XSharp.Compiler; | ||
| using Assembler = Cosmos.Assembler.Assembler; | ||
| using CPUAll = Cosmos.Assembler; | ||
| using CPUx86 = Cosmos.Assembler.x86; | ||
|
|
||
| namespace Cosmos.Core.Plugs { | ||
| [Plug(Target = typeof(Core.CPU))] | ||
| public class CPUImpl { | ||
| [PlugMethod(Assembler = typeof(UpdateIDT))] | ||
| public static void UpdateIDT(CPU aThis, bool aEnableInterruptsImmediately) { | ||
| } | ||
|
|
||
| public class GetAmountOfRAMAsm : AssemblerMethod { | ||
| public override void AssembleNew(Cosmos.Assembler.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); | ||
| } | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(GetAmountOfRAMAsm))] | ||
| public static uint GetAmountOfRAM() { return 0; } | ||
|
|
||
| public class GetEndOfKernelAsm : AssemblerMethod { | ||
| public override void AssembleNew(CPUAll.Assembler aAssembler, object aMethodInfo) { | ||
| XS.Push("_end_code"); | ||
| } | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(GetEndOfKernelAsm))] | ||
| public static uint GetEndOfKernel() { | ||
| return 0; | ||
| } | ||
|
|
||
| public class ZeroFillAsm : AssemblerMethod { | ||
| public override void AssembleNew(CPUAll.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(CPUx86.ConditionalTestEnum.NotBelow, ".step2"); | ||
| XS.StoreByteInString(); | ||
| XS.Label(".step2"); | ||
| XS.ShiftRight(XSRegisters.ECX, 1); | ||
| XS.Jump(CPUx86.ConditionalTestEnum.NotBelow, ".step3"); | ||
| XS.StoreWordInString(); | ||
| XS.Label(".step3"); | ||
| new CPUx86.Stos { Size = 32, Prefixes = CPUx86.InstructionPrefixes.Repeat }; | ||
| } | ||
| } | ||
| [PlugMethod(Assembler = typeof(ZeroFillAsm))] | ||
| // TODO: implement this using REP STOSB and REPO STOSD | ||
| public static void ZeroFill(uint aStartAddress, uint aLength) { } | ||
|
|
||
| public class InitFloatAsm : AssemblerMethod { | ||
| public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) { | ||
| XS.FPU.FloatInit(); | ||
| } | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(InitFloatAsm))] | ||
| public static void InitFloat(CPU aThis) { } | ||
|
|
||
| public class InitSSEAsm : AssemblerMethod | ||
| using Cosmos.IL2CPU.Plugs.Assemblers; | ||
| using Cosmos.IL2CPU.Plugs.Assemblers.CPU; | ||
|
|
||
| namespace Cosmos.Core.Plugs | ||
| { | ||
| [Plug(Target = typeof(CPU))] | ||
| public class CPUImpl | ||
| { | ||
| [PlugMethod(Assembler = typeof(CPUUpdateIDTAsm))] | ||
| public static void UpdateIDT(CPU aThis, bool aEnableInterruptsImmediately) | ||
| { | ||
| public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) | ||
| { | ||
| XS.SSE.SSEInit(); | ||
| //new CPUx86.SSE.SSEInit(); | ||
| } | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(InitSSEAsm))] | ||
| public static void InitSSE(CPU aThis) { } | ||
|
|
||
| public class HaltAsm : AssemblerMethod { | ||
| public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) { | ||
| XS.Halt(); | ||
| } | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(HaltAsm))] | ||
| public static void Halt(CPU aThis) { } | ||
|
|
||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.GetEndOfStack))] | ||
| // public static uint GetEndOfStack() { | ||
| // return 0; | ||
| // } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.GetCurrentESP))] | ||
| // public static uint GetCurrentESP() { | ||
| // return 0; | ||
| // } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.DoTest))] | ||
| // public static void DoTest() { | ||
| // } | ||
|
|
||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.CPUIDSupport))] | ||
| // public static uint HasCPUIDSupport() { | ||
| // return 0; | ||
| // } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.GetCPUIDInternal))] | ||
| // public static void GetCPUId(out uint d, out uint c, out uint b, out uint a, uint v) { | ||
| // d = 0; | ||
| // c = 0; | ||
| // b = 0; | ||
| // a = 0; | ||
| // } | ||
| [PlugMethod(Assembler = typeof(CPUGetAmountOfRAMAsm))] | ||
| public static uint GetAmountOfRAM() | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.Halt))] | ||
| // public static void Halt() { } | ||
| [PlugMethod(Assembler = typeof(CPUGetEndOfKernelAsm))] | ||
| public static uint GetEndOfKernel() | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(DisableINTsAsm))] | ||
| public static void DoDisableInterrupts() | ||
| { | ||
| } | ||
| [PlugMethod(Assembler = typeof(CPUZeroFillAsm))] | ||
| // TODO: implement this using REP STOSB and REPO STOSD | ||
| public static void ZeroFill(uint aStartAddress, uint aLength) | ||
| { | ||
| } | ||
|
|
||
| [PlugMethod(Assembler = typeof(EnableINTsAsm))] | ||
| public static void DoEnableInterrupts() { | ||
| } | ||
| [PlugMethod(Assembler = typeof(CPUInitFloatAsm))] | ||
| public static void InitFloat(CPU aThis) | ||
| { | ||
| } | ||
|
|
||
| public class DisableINTsAsm : AssemblerMethod | ||
| { | ||
| public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) | ||
| { | ||
| XS.ClearInterruptFlag(); | ||
| } | ||
| } | ||
| [PlugMethod(Assembler = typeof(CPUInitSSEAsm))] | ||
| public static void InitSSE(CPU aThis) | ||
| { | ||
| } | ||
|
|
||
| public class EnableINTsAsm : AssemblerMethod | ||
| { | ||
| public override void AssembleNew(Cosmos.Assembler.Assembler aAssembler, object aMethodInfo) | ||
| { | ||
| XS.EnableInterrupts(); | ||
| } | ||
| } | ||
| [PlugMethod(Assembler = typeof(CPUHaltAsm))] | ||
| public static void Halt(CPU aThis) | ||
| { | ||
| } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.Interrupt30))] | ||
| // public static void Interrupt30(ref uint aEAX, ref uint aEBX, ref uint aECX, ref uint aEDX) { | ||
| // aEAX = 0; | ||
| // } | ||
| [PlugMethod(Assembler = typeof(CPUDisableINTsAsm))] | ||
| public static void DoDisableInterrupts() | ||
| { | ||
| } | ||
|
|
||
| // [PlugMethod(Assembler = typeof(P2.Assemblers.GetMBIAddress))] | ||
| // public static uint GetMBIAddress() { | ||
| // return 0; | ||
| // } | ||
| } | ||
| [PlugMethod(Assembler = typeof(CPUEnableINTsAsm))] | ||
| public static void DoEnableInterrupts() | ||
| { | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.