From 7265b3098778346edc7cfcc2ea797a09e5b3a563 Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Wed, 17 Sep 2008 03:56:52 +0000
Subject: [PATCH] Optimized asm in DebubStub a bit
---
.../Indy.IL2CPU.Assembler.X86.csproj | 1 +
.../SpecialDebug/DebugStub.cs | 42 ++++++++++---------
.../Indy.IL2CPU.Assembler.X86/X/Register.cs | 4 ++
.../X/RegisterESI.cs | 35 ++++++++++++++++
source/Indy.IL2CPU.Assembler.X86/X/Y86.cs | 4 +-
5 files changed, 65 insertions(+), 21 deletions(-)
create mode 100644 source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs
diff --git a/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj b/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
index 9be04238a..1d1f64a21 100644
--- a/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
+++ b/source/Indy.IL2CPU.Assembler.X86/Indy.IL2CPU.Assembler.X86.csproj
@@ -336,6 +336,7 @@
+
diff --git a/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs b/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs
index 3e36ba66f..6f662f8d6 100644
--- a/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs
+++ b/source/Indy.IL2CPU.Assembler.X86/SpecialDebug/DebugStub.cs
@@ -91,19 +91,15 @@ namespace Indy.IL2CPU.Assembler.X86 {
//TODO: Add extension methods so we can do int.Push, byte.Push, etc
AL = (int)MsgType.TracePoint;
EAX.Push();
+ ESI = ESP;
Call("WriteByteToComPort");
+ EAX.Pop();
+
// Send EIP
- AL = Memory[EBP];
- EAX.Push();
+ ESI = EBP;
Call("WriteByteToComPort");
- AL = Memory[EBP + 1];
- EAX.Push();
Call("WriteByteToComPort");
- AL = Memory[EBP + 2];
- EAX.Push();
Call("WriteByteToComPort");
- AL = Memory[EBP + 3];
- EAX.Push();
Call("WriteByteToComPort");
Label = "DebugStub_SendTrace_Exit";
Return();
@@ -116,26 +112,26 @@ namespace Indy.IL2CPU.Assembler.X86 {
// Write the type
AL = (int)MsgType.Text;
EAX.Push();
+ ESI = ESP;
Call("WriteByteToComPort");
+ EAX.Pop();
+ //TODO: Limited to 255 bytes, need to send 2 bytes
// Write Length
- EAX = Memory[EBP + 12];
- ECX = EAX; // Store in counter for later
- EAX.Push();
+ ESI = EBP;
+ new Add("ESI", 12);
+ ECX = Memory[ESI];
Call("WriteByteToComPort");
// Address of string
- new X86.Move("ESI", "[EBP + 8]");
+ ESI = Memory[EBP + 8];
Label = "DebugStub_SendTextWriteChar";
ECX.Compare(0);
JumpIf(Flags.Equal, "DebugStub_SendTextExit");
- new X86.Move("AL", "[ESI]");
- EAX.Push();
Call("WriteByteToComPort");
new X86.Dec("ECX");
// We are storing as 16 bits, but for now I will transmit 8 bits
- // So we inc twice to skip the 0
- new X86.Inc("ESI");
+ // So we inc again to skip the 0
new X86.Inc("ESI");
Jump("DebugStub_SendTextWriteChar");
@@ -146,7 +142,7 @@ namespace Indy.IL2CPU.Assembler.X86 {
// Input: ESI
// Output: None
// Modifies: EAX, EDX
-
+ //
// Sends byte at [ESI] to com port and does esi + 1
protected void WriteByteToComPort() {
// This sucks to use the stack, but x86 can only read and write ports from AL and
@@ -161,14 +157,22 @@ namespace Indy.IL2CPU.Assembler.X86 {
// Sucks again to use DX just for this, but x86 only supports
// 8 bit address for literals on ports
DX = mComStatusAddr;
+
+ // Wait for serial port to be ready
Label = "WriteByteToComPort_Wait";
AL = Port[DX];
AL.Test(0x20);
JumpIf(Flags.Zero, "WriteByteToComPort_Wait");
+
+ // Set address of port
DX = mComAddr;
- AL = Memory[ESP + 4];
+ // Get byte to send
+ AL = Memory[ESI];
+ // Send the byte
Port[DX] = AL;
- Return(4);
+
+ new Inc("ESI");
+ Return();
}
protected void DebugSuspend() {
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Register.cs b/source/Indy.IL2CPU.Assembler.X86/X/Register.cs
index 9709f711f..908de179a 100644
--- a/source/Indy.IL2CPU.Assembler.X86/X/Register.cs
+++ b/source/Indy.IL2CPU.Assembler.X86/X/Register.cs
@@ -11,6 +11,10 @@ namespace Indy.IL2CPU.Assembler.X86.X {
new Push(ToString());
}
+ public void Pop() {
+ new Pop(ToString());
+ }
+
protected void Move(string aValue) {
new X86.Move(ToString(), aValue);
}
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs b/source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs
new file mode 100644
index 000000000..60cbb1d29
--- /dev/null
+++ b/source/Indy.IL2CPU.Assembler.X86/X/RegisterESI.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Indy.IL2CPU.Assembler.X86.X {
+ public class RegisterESI : Register32 {
+ public const string Name = "ESI";
+ public static readonly RegisterESI Instance = new RegisterESI();
+
+ public override string ToString() {
+ return Name;
+ }
+
+ public static implicit operator RegisterESI(MemoryAction aAction) {
+ Instance.Move(aAction.ToString());
+ return Instance;
+ }
+
+ public static implicit operator RegisterESI(UInt32 aValue) {
+ Instance.Move(aValue.ToString());
+ return Instance;
+ }
+
+ public static implicit operator RegisterESI(RegisterESP aValue) {
+ Instance.Move(aValue.ToString());
+ return Instance;
+ }
+
+ public static implicit operator RegisterESI(RegisterEBP aValue) {
+ Instance.Move(aValue.ToString());
+ return Instance;
+ }
+ }
+}
diff --git a/source/Indy.IL2CPU.Assembler.X86/X/Y86.cs b/source/Indy.IL2CPU.Assembler.X86/X/Y86.cs
index b2d9cc319..79b1af3dc 100644
--- a/source/Indy.IL2CPU.Assembler.X86/X/Y86.cs
+++ b/source/Indy.IL2CPU.Assembler.X86/X/Y86.cs
@@ -19,9 +19,9 @@ namespace Indy.IL2CPU.Assembler.X86.X {
public RegisterEDX EDX = RegisterEDX.Instance;
public RegisterDX DX = RegisterDX.Instance;
- public RegisterESP ESP = RegisterESP.Instance;
-
public RegisterEBP EBP = RegisterEBP.Instance;
+ public RegisterESP ESP = RegisterESP.Instance;
+ public RegisterESI ESI = RegisterESI.Instance;
public readonly Ports Port = new Ports();
public readonly Memory Memory = new Memory();