dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
kudzu_cp 2011-07-17 16:09:21 +00:00
parent a7e3f9549f
commit 801a8a69a3
4 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.cs
View file

@ -316,7 +316,7 @@ namespace Cosmos.Compiler.DebugStub {
EAX = (uint)xCount; EAX = (uint)xCount;
Call<DebugStub.WriteAXToComPort>(); Call<DebugStub.WriteAXToComPort>();
ESI = Memory["DebugStub_OldEBP", 32]; ESI = Memory[OldEBP.Name, 32];
ESI.Add(8); // Dont transmit EIP or old EBP ESI.Add(8); // Dont transmit EIP or old EBP
for (int i = 1; i <= xCount; i++) { for (int i = 1; i <= xCount; i++) {
Call("WriteByteToComPort"); Call("WriteByteToComPort");
@ -331,7 +331,7 @@ namespace Cosmos.Compiler.DebugStub {
// Send size of bytes // Send size of bytes
ESI = Memory["DebugESP", 32]; ESI = Memory["DebugESP", 32];
EAX = Memory["DebugStub_OldEBP", 32]; EAX = Memory[OldEBP.Name, 32];
EAX.Sub(ESI); EAX.Sub(ESI);
Call<DebugStub.WriteAXToComPort>(); Call<DebugStub.WriteAXToComPort>();
@ -340,7 +340,7 @@ namespace Cosmos.Compiler.DebugStub {
// Need to reload ESI, WriteAXToCompPort modifies it // Need to reload ESI, WriteAXToCompPort modifies it
ESI = Memory["DebugESP", 32]; ESI = Memory["DebugESP", 32];
Label = "DebugStub_SendStack_SendByte"; Label = "DebugStub_SendStack_SendByte";
ESI.Compare(Memory["DebugStub_OldEBP", 32]); ESI.Compare(Memory[OldEBP.Name, 32]);
JumpIf(Flags.Equal, "DebugStub_SendStack_Exit"); JumpIf(Flags.Equal, "DebugStub_SendStack_Exit");
Call("WriteByteToComPort"); Call("WriteByteToComPort");
Jump("DebugStub_SendStack_SendByte"); Jump("DebugStub_SendStack_SendByte");
@ -492,7 +492,7 @@ namespace Cosmos.Compiler.DebugStub {
Memory["DebugBreakOnNextTrace", 32].Compare(StepTrigger.Over); Memory["DebugBreakOnNextTrace", 32].Compare(StepTrigger.Over);
JumpIf(Flags.NotEqual, "DebugStub_ExecutingStepOverAfter"); JumpIf(Flags.NotEqual, "DebugStub_ExecutingStepOverAfter");
Label = "Debug__StepOver__"; Label = "Debug__StepOver__";
EAX = Memory["DebugStub_OldEBP", 32]; EAX = Memory[OldEBP.Name, 32];
EAX.Compare(Memory["DebugBreakEBP", 32]); EAX.Compare(Memory["DebugBreakEBP", 32]);
// If EBP and start EBP arent equal, dont break // If EBP and start EBP arent equal, dont break
// Dont use Equal because we aslo need to stop above if the user starts // Dont use Equal because we aslo need to stop above if the user starts
@ -505,7 +505,7 @@ namespace Cosmos.Compiler.DebugStub {
Memory["DebugBreakOnNextTrace", 32].Compare(StepTrigger.Out); Memory["DebugBreakOnNextTrace", 32].Compare(StepTrigger.Out);
JumpIf(Flags.NotEqual, "DebugStub_ExecutingStepOutAfter"); JumpIf(Flags.NotEqual, "DebugStub_ExecutingStepOutAfter");
EAX = Memory["DebugStub_OldEBP", 32]; // TODO: X# Allow memory object instead of string, maybe the Datamember object itself. ie EAX = DebugEBP, and below inside Compare EAX = Memory[OldEBP.Name, 32]; // TODO: X# Allow memory object instead of string, maybe the Datamember object itself. ie EAX = DebugEBP, and below inside Compare
EAX.Compare(Memory["DebugBreakEBP", 32]); // TODO: X# JumpIf(EAX == Memory[...... or better yet if(EAX==Memory..., new Delegate { Jump.... Jump should be handled specially so we dont jump around jumps... TODO: Also allow Compare(EAX, 0), in fact force this new syntax EAX.Compare(Memory["DebugBreakEBP", 32]); // TODO: X# JumpIf(EAX == Memory[...... or better yet if(EAX==Memory..., new Delegate { Jump.... Jump should be handled specially so we dont jump around jumps... TODO: Also allow Compare(EAX, 0), in fact force this new syntax
JumpIf(Flags.Equal, "DebugStub_Executing_Normal"); JumpIf(Flags.Equal, "DebugStub_Executing_Normal");
CallIf(Flags.LessThanOrEqualTo, "DebugStub_Break"); CallIf(Flags.LessThanOrEqualTo, "DebugStub_Break");
@ -584,7 +584,7 @@ namespace Cosmos.Compiler.DebugStub {
JumpIf(Flags.NotEqual, "DebugStub_Break_StepOver_After"); JumpIf(Flags.NotEqual, "DebugStub_Break_StepOver_After");
Memory["DebugBreakOnNextTrace", 32] = StepTrigger.Over; Memory["DebugBreakOnNextTrace", 32] = StepTrigger.Over;
// TODO: Change this so ,32 is not necessary, can be implied by 32 bit register - ie Memory["DebugBreakEBP", 32] = EBP; // TODO: Change this so ,32 is not necessary, can be implied by 32 bit register - ie Memory["DebugBreakEBP", 32] = EBP;
EAX = Memory["DebugStub_OldEBP", 32]; EAX = Memory[OldEBP.Name, 32];
Memory["DebugBreakEBP", 32] = EAX; Memory["DebugBreakEBP", 32] = EAX;
Jump("DebugStub_Break_Exit"); Jump("DebugStub_Break_Exit");
Label = "DebugStub_Break_StepOver_After"; Label = "DebugStub_Break_StepOver_After";
@ -592,7 +592,7 @@ namespace Cosmos.Compiler.DebugStub {
AL.Compare(DsCommand.StepOut); AL.Compare(DsCommand.StepOut);
JumpIf(Flags.NotEqual, "DebugStub_Break_StepOut_After"); JumpIf(Flags.NotEqual, "DebugStub_Break_StepOut_After");
Memory["DebugBreakOnNextTrace", 32] = StepTrigger.Out; Memory["DebugBreakOnNextTrace", 32] = StepTrigger.Out;
EAX = Memory["DebugStub_OldEBP", 32]; EAX = Memory[OldEBP.Name, 32];
Memory["DebugBreakEBP", 32] = EAX; Memory["DebugBreakEBP", 32] = EAX;
Jump("DebugStub_Break_Exit"); Jump("DebugStub_Break_Exit");
Label = "DebugStub_Break_StepOut_After"; Label = "DebugStub_Break_StepOut_After";
@ -605,11 +605,10 @@ namespace Cosmos.Compiler.DebugStub {
} }
} }
// 0 = Not in, 1 = already running
static public DataMember32 IsRunning;
// Calling code's EBP value // Calling code's EBP value
protected DataMember32 OldEBP; static public DataMember32 OldEBP;
[XSharp]
public void Test() {
}
public class TracerEntry : CodeBlock { public class TracerEntry : CodeBlock {
public override void Assemble() { public override void Assemble() {
@ -618,8 +617,7 @@ namespace Cosmos.Compiler.DebugStub {
// EBP is restored by PopAll, but SendFrame uses it. Could // EBP is restored by PopAll, but SendFrame uses it. Could
// get it from the PushAll data, but this is easier. // get it from the PushAll data, but this is easier.
//Memory[OldEBP.Name, 32] = EBP; Memory[OldEBP.Name, 32] = EBP;
Memory["DebugStub_OldEBP", 32] = EBP;
// Could also get ESP from PushAll but this is easier // Could also get ESP from PushAll but this is easier
// Another reason to do it here is that soem day we may need to use // Another reason to do it here is that soem day we may need to use
@ -652,7 +650,7 @@ namespace Cosmos.Compiler.DebugStub {
Jump("DebugStub_Return"); Jump("DebugStub_Return");
Label = "DebugStub_Running"; Label = "DebugStub_Running";
Memory["DebugRunning", 32].Compare(0); Memory[IsRunning.Name, 32].Compare(0);
JumpIf(Flags.Equal, "DebugStub_Start"); JumpIf(Flags.Equal, "DebugStub_Start");
// If we made it this far we exit because DebugStub is already running. // If we made it this far we exit because DebugStub is already running.
// We need to see if IRQs were originally enabled or disabled and // We need to see if IRQs were originally enabled or disabled and
@ -661,7 +659,7 @@ namespace Cosmos.Compiler.DebugStub {
// All clear, mark that we are entering the debug stub // All clear, mark that we are entering the debug stub
Label = "DebugStub_Start"; Label = "DebugStub_Start";
Memory["DebugRunning", 32] = 1; Memory[IsRunning.Name, 32] = 1;
// DS is now marked not to re-enter, so re-enable interrupts if // DS is now marked not to re-enter, so re-enable interrupts if
// they were enabled on entry // they were enabled on entry
@ -700,7 +698,7 @@ namespace Cosmos.Compiler.DebugStub {
// So just to be safe, we disable interrupts while we do this. // So just to be safe, we disable interrupts while we do this.
DisableInterrupts(); DisableInterrupts();
// Complete, mark that DebugStub is complete // Complete, mark that DebugStub is complete
Memory["DebugRunning", 32] = 0; Memory[IsRunning.Name, 32] = 0;
Label = "DebugStub_CheckIntAndReturn"; Label = "DebugStub_CheckIntAndReturn";
// Re-enable interrupts if needed. This happens on normal exit, or call from above // Re-enable interrupts if needed. This happens on normal exit, or call from above

4
source2/Compiler/Cosmos.Compiler.DebugStub/DebugStubOld.cs
View file

@ -25,8 +25,6 @@ namespace Cosmos.Compiler.DebugStub {
// enum Status // enum Status
new DataMember("DebugStatus", 0), new DataMember("DebugStatus", 0),
// 0 = Not in, 1 = already running
new DataMember("DebugRunning", 0),
// Nesting control for non steppable routines // Nesting control for non steppable routines
new DataMember("DebugSuspendLevel", 0), new DataMember("DebugSuspendLevel", 0),
// Nesting control for non steppable routines // Nesting control for non steppable routines
@ -123,7 +121,7 @@ namespace Cosmos.Compiler.DebugStub {
// now ECX contains size of data (count) // now ECX contains size of data (count)
// EAX contains relative to EBP // EAX contains relative to EBP
Label = "DebugStub_SendMethodContext2"; Label = "DebugStub_SendMethodContext2";
ESI = Memory["DebugStub_OldEBP", 32]; ESI = Memory[DebugStub.OldEBP.Name, 32];
ESI.Add(EAX); ESI.Add(EAX);
Label = "DebugStub_SendMethodContext_SendByte"; Label = "DebugStub_SendMethodContext_SendByte";

6
source2/Compiler/Cosmos.Compiler.XSharp/CodeGroup.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using Cosmos.Compiler.Assembler; using Cosmos.Compiler.Assembler;
using Cosmos.Compiler.Assembler.X86;
namespace Cosmos.Compiler.XSharp { namespace Cosmos.Compiler.XSharp {
public class CodeGroup { public class CodeGroup {
@ -13,7 +14,7 @@ namespace Cosmos.Compiler.XSharp {
var xAsm = Assembler.Assembler.CurrentInstance; var xAsm = Assembler.Assembler.CurrentInstance;
// Generate DataMembers // Generate DataMembers
foreach (var xMember in xThisType.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)) { foreach (var xMember in xThisType.GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)) {
if (xMember.FieldType.IsSubclassOf(typeof(DataMember))) { if (xMember.FieldType.IsSubclassOf(typeof(DataMember))) {
var xCtor = xMember.FieldType.GetConstructor(new Type[] { typeof(string) }); var xCtor = xMember.FieldType.GetConstructor(new Type[] { typeof(string) });
var xInstance = (DataMember)(xCtor.Invoke(new Object[] { xThisType.Name + "_" + xMember.Name })); var xInstance = (DataMember)(xCtor.Invoke(new Object[] { xThisType.Name + "_" + xMember.Name }));
@ -22,7 +23,7 @@ namespace Cosmos.Compiler.XSharp {
} }
} }
// Genereate code // Genereate code - Old style
foreach (var xType in xThisType.GetNestedTypes()) { foreach (var xType in xThisType.GetNestedTypes()) {
if (xType.IsSubclassOf(typeof(CodeBlock))) { if (xType.IsSubclassOf(typeof(CodeBlock))) {
var xCtor = xType.GetConstructor(new Type[0]); var xCtor = xType.GetConstructor(new Type[0]);
@ -39,4 +40,5 @@ namespace Cosmos.Compiler.XSharp {
} }
} }
} }

2
source2/Compiler/Cosmos.Compiler.XSharp/XSharpAttribute.cs
View file

@ -7,7 +7,7 @@ namespace Cosmos.Compiler.XSharp {
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
public class XSharpAttribute : Attribute { public class XSharpAttribute : Attribute {
public bool InteruptHandler { get; set; } public bool IsInteruptHandler { get; set; }
} }
} }