[+] Brtrue and Brfalse both support 64-bit operands.

This commit is contained in:
LostTheBlack_cp 2008-04-17 23:57:56 +00:00
parent c5c5fd4ad9
commit 233e4fc76f
2 changed files with 36 additions and 11 deletions

View file

@ -1,20 +1,21 @@
using System;
using System.IO;
using CPU = Indy.IL2CPU.Assembler;
using CPUx86 = Indy.IL2CPU.Assembler.X86;
namespace Indy.IL2CPU.IL.X86 {
[OpCode(OpCodeEnum.Brfalse)]
public class Brfalse: Op {
public readonly string TargetLabel;
public readonly string CurInstructionLabel;
public Brfalse(ILReader aReader, MethodInformation aMethodInfo)
: base(aReader, aMethodInfo) {
TargetLabel = GetInstructionLabel(aReader.OperandValueBranchPosition);
CurInstructionLabel = GetInstructionLabel(aReader);
}
public override void DoAssemble() {
new CPUx86.Popd(CPUx86.Registers.EAX);
var xStackContent = Assembler.StackContents.Pop();
if (xStackContent.IsFloat) {
throw new Exception("Floats not yet supported!");
@ -22,11 +23,27 @@ namespace Indy.IL2CPU.IL.X86 {
if (xStackContent.Size > 8) {
throw new Exception("StackSize>8 not supported");
}
if (xStackContent.Size > 4) {
new CPUx86.Add("esp", "4");
string BaseLabel = CurInstructionLabel + "__";
string LabelTrue = BaseLabel + "True";
string LabelFalse = BaseLabel + "False";
if (xStackContent.Size > 4)
{
new CPUx86.Popd("eax");
new CPUx86.Popd("ebx");
new CPUx86.Xor("eax", "eax");
new CPUx86.JumpIfNotZero(LabelFalse);
new CPUx86.Xor("ebx", "ebx");
new CPUx86.JumpIfNotZero(LabelFalse);
new CPUx86.JumpAlways(TargetLabel);
new CPU.Label(LabelFalse);
} else
{
new CPUx86.Popd(CPUx86.Registers.EAX);
new CPUx86.Compare(CPUx86.Registers.EAX, "0");
new CPUx86.JumpIfEquals(TargetLabel);
}
new CPUx86.Compare(CPUx86.Registers.EAX, "0");
new CPUx86.JumpIfEquals(TargetLabel);
}
}
}

View file

@ -14,16 +14,24 @@ namespace Indy.IL2CPU.IL.X86 {
}
public override void DoAssemble() {
new CPUx86.Popd(CPUx86.Registers.EAX);
int xSize = Assembler.StackContents.Pop().Size;
if (xSize > 8) {
throw new Exception("StackSize>8 not supported");
}
if (xSize > 4) {
new CPUx86.Add("esp", "4");
if (xSize > 4)
{
new CPUx86.Popd("eax");
new CPUx86.Popd("ebx");
new CPUx86.Xor("eax", "eax");
new CPUx86.JumpIfNotZero(TargetLabel);
new CPUx86.Xor("ebx", "ebx");
new CPUx86.JumpIfNotZero(TargetLabel);
} else
{
new CPUx86.Popd(CPUx86.Registers.EAX);
new CPUx86.Compare(CPUx86.Registers.EAX, "0");
new CPUx86.JumpIfNotEquals(TargetLabel);
}
new CPUx86.Compare(CPUx86.Registers.EAX, "0");
new CPUx86.JumpIfNotEquals(TargetLabel);
}
}
}