This commit is contained in:
kudzu_cp 2009-07-26 19:14:12 +00:00
parent 5aaa481881
commit ec708c62fd
6 changed files with 7 additions and 7 deletions

View file

@ -4,6 +4,6 @@ using System.Linq;
using System.Text; using System.Text;
namespace Cosmos.IL2CPU.X86 { namespace Cosmos.IL2CPU.X86 {
class Assembler { public abstract class Assembler : Cosmos.IL2CPU.Assembler {
} }
} }

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
namespace Cosmos.IL2CPU.X86 { namespace Cosmos.IL2CPU.X86 {
public class AssemblerBin : Cosmos.IL2CPU.Assembler { public class AssemblerBin : Assembler {
protected override void InitILOps() { protected override void InitILOps() {
InitILOps(typeof(ILOp)); InitILOps(typeof(ILOp));

View file

@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
namespace Cosmos.IL2CPU.X86 { namespace Cosmos.IL2CPU.X86 {
public class AssemblerNasm : Cosmos.IL2CPU.Assembler { public class AssemblerNasm : Assembler {
protected override void InitILOps() { protected override void InitILOps() {
InitILOps(typeof(ILOp)); InitILOps(typeof(ILOp));

View file

@ -34,9 +34,7 @@ namespace Cosmos.IL2CPU.X86.IL
//new CPUx86.Jump(TargetLabel); //new CPUx86.Jump(TargetLabel);
//new CPU.Label(LabelFalse); //new CPU.Label(LabelFalse);
//new CPUx86.Add(CPUx86.Registers_Old.ESP, "4"); //new CPUx86.Add(CPUx86.Registers_Old.ESP, "4");
} } else {
else
{
new CPU.Pop { DestinationReg = CPU.Registers.EAX }; new CPU.Pop { DestinationReg = CPU.Registers.EAX };
new CPU.Pop { DestinationReg = CPU.Registers.EBX }; new CPU.Pop { DestinationReg = CPU.Registers.EBX };
new CPU.Pop { DestinationReg = CPU.Registers.ECX }; new CPU.Pop { DestinationReg = CPU.Registers.ECX };

View file

@ -6,9 +6,11 @@ using CPU = Indy.IL2CPU.Assembler.X86;
namespace Cosmos.IL2CPU.X86 { namespace Cosmos.IL2CPU.X86 {
public abstract class ILOp : Cosmos.IL2CPU.ILOp { public abstract class ILOp : Cosmos.IL2CPU.ILOp {
protected new readonly Assembler Assembler;
protected ILOp(Cosmos.IL2CPU.Assembler aAsmblr) protected ILOp(Cosmos.IL2CPU.Assembler aAsmblr)
: base(aAsmblr) { : base(aAsmblr) {
Assembler = (Assembler)aAsmblr;
OldAsmblr = ((CPU.Assembler)Indy.IL2CPU.Assembler.Assembler.CurrentInstance.Peek()); OldAsmblr = ((CPU.Assembler)Indy.IL2CPU.Assembler.Assembler.CurrentInstance.Peek());
} }

View file

@ -5,7 +5,7 @@ using System.Text;
namespace Cosmos.IL2CPU { namespace Cosmos.IL2CPU {
public abstract class ILOp { public abstract class ILOp {
public readonly Assembler Assembler; protected readonly Assembler Assembler;
protected ILOp(Assembler aAsmblr) { protected ILOp(Assembler aAsmblr) {
Assembler = aAsmblr; Assembler = aAsmblr;
} }