diff --git a/ChocolArm64/Translation/IILEmit.cs b/ChocolArm64/Translation/IILEmit.cs index 3c3925ee0a..320520eba7 100644 --- a/ChocolArm64/Translation/IILEmit.cs +++ b/ChocolArm64/Translation/IILEmit.cs @@ -2,6 +2,6 @@ namespace ChocolArm64.Translation { interface IILEmit { - void Emit(ILEmitter context); + void Emit(ILMethodBuilder context); } } \ No newline at end of file diff --git a/ChocolArm64/Translation/ILBarrier.cs b/ChocolArm64/Translation/ILBarrier.cs index f931e9922d..37f7558a75 100644 --- a/ChocolArm64/Translation/ILBarrier.cs +++ b/ChocolArm64/Translation/ILBarrier.cs @@ -2,6 +2,6 @@ namespace ChocolArm64.Translation { struct ILBarrier : IILEmit { - public void Emit(ILEmitter context) { } + public void Emit(ILMethodBuilder context) { } } } \ No newline at end of file diff --git a/ChocolArm64/Translation/ILBlock.cs b/ChocolArm64/Translation/ILBlock.cs index bd5d5656d7..136579012b 100644 --- a/ChocolArm64/Translation/ILBlock.cs +++ b/ChocolArm64/Translation/ILBlock.cs @@ -37,7 +37,7 @@ namespace ChocolArm64.Translation IntAwOutputs = IntOutputs; VecAwOutputs = VecOutputs; } - else if (emitter is ILOpCodeLoad ld && ILEmitter.IsRegIndex(ld.Index)) + else if (emitter is ILOpCodeLoad ld && ILMethodBuilder.IsRegIndex(ld.Index)) { switch (ld.IoType) { @@ -46,7 +46,7 @@ namespace ChocolArm64.Translation case IoType.Vector: VecInputs |= (1L << ld.Index) & ~VecAwOutputs; break; } } - else if (emitter is ILOpCodeStore st && ILEmitter.IsRegIndex(st.Index)) + else if (emitter is ILOpCodeStore st && ILMethodBuilder.IsRegIndex(st.Index)) { switch (st.IoType) { @@ -63,7 +63,7 @@ namespace ChocolArm64.Translation _emitters.Add(emitter); } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { foreach (IILEmit ilEmitter in _emitters) { diff --git a/ChocolArm64/Translation/ILLabel.cs b/ChocolArm64/Translation/ILLabel.cs index 4f96edccf1..f423a4256c 100644 --- a/ChocolArm64/Translation/ILLabel.cs +++ b/ChocolArm64/Translation/ILLabel.cs @@ -8,12 +8,12 @@ namespace ChocolArm64.Translation private Label _lbl; - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { context.Generator.MarkLabel(GetLabel(context)); } - public Label GetLabel(ILEmitter context) + public Label GetLabel(ILMethodBuilder context) { if (!_hasLabel) { diff --git a/ChocolArm64/Translation/ILEmitter.cs b/ChocolArm64/Translation/ILMethodBuilder.cs similarity index 97% rename from ChocolArm64/Translation/ILEmitter.cs rename to ChocolArm64/Translation/ILMethodBuilder.cs index da961842fc..70d9a2db65 100644 --- a/ChocolArm64/Translation/ILEmitter.cs +++ b/ChocolArm64/Translation/ILMethodBuilder.cs @@ -6,7 +6,7 @@ using System.Runtime.Intrinsics; namespace ChocolArm64.Translation { - class ILEmitter + class ILMethodBuilder { public LocalAlloc LocalAlloc { get; private set; } @@ -20,7 +20,7 @@ namespace ChocolArm64.Translation private int _localsCount; - public ILEmitter(ILBlock[] ilBlocks, string subName) + public ILMethodBuilder(ILBlock[] ilBlocks, string subName) { _ilBlocks = ilBlocks; _subName = subName; diff --git a/ChocolArm64/Translation/ILOpCode.cs b/ChocolArm64/Translation/ILOpCode.cs index eb91639e63..4021603c01 100644 --- a/ChocolArm64/Translation/ILOpCode.cs +++ b/ChocolArm64/Translation/ILOpCode.cs @@ -11,7 +11,7 @@ namespace ChocolArm64.Translation _ilOp = ilOp; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { context.Generator.Emit(_ilOp); } diff --git a/ChocolArm64/Translation/ILOpCodeBranch.cs b/ChocolArm64/Translation/ILOpCodeBranch.cs index b0ba23313f..22b80b5d52 100644 --- a/ChocolArm64/Translation/ILOpCodeBranch.cs +++ b/ChocolArm64/Translation/ILOpCodeBranch.cs @@ -13,7 +13,7 @@ namespace ChocolArm64.Translation _label = label; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { context.Generator.Emit(_ilOp, _label.GetLabel(context)); } diff --git a/ChocolArm64/Translation/ILOpCodeCall.cs b/ChocolArm64/Translation/ILOpCodeCall.cs index 0b591d46ce..8486a791b1 100644 --- a/ChocolArm64/Translation/ILOpCodeCall.cs +++ b/ChocolArm64/Translation/ILOpCodeCall.cs @@ -12,7 +12,7 @@ namespace ChocolArm64.Translation _mthdInfo = mthdInfo; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { context.Generator.Emit(OpCodes.Call, _mthdInfo); } diff --git a/ChocolArm64/Translation/ILOpCodeConst.cs b/ChocolArm64/Translation/ILOpCodeConst.cs index 5497eba16f..2aaf8676ee 100644 --- a/ChocolArm64/Translation/ILOpCodeConst.cs +++ b/ChocolArm64/Translation/ILOpCodeConst.cs @@ -51,7 +51,7 @@ namespace ChocolArm64.Translation _value = new ImmVal { R8 = value }; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { switch (_type) { diff --git a/ChocolArm64/Translation/ILOpCodeLoad.cs b/ChocolArm64/Translation/ILOpCodeLoad.cs index 8d74090a2f..c31e06bbd9 100644 --- a/ChocolArm64/Translation/ILOpCodeLoad.cs +++ b/ChocolArm64/Translation/ILOpCodeLoad.cs @@ -18,7 +18,7 @@ namespace ChocolArm64.Translation RegisterSize = registerSize; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { switch (IoType) { @@ -30,7 +30,7 @@ namespace ChocolArm64.Translation } } - private void EmitLdloc(ILEmitter context, int index, RegisterType registerType) + private void EmitLdloc(ILMethodBuilder context, int index, RegisterType registerType) { Register reg = new Register(index, registerType); diff --git a/ChocolArm64/Translation/ILOpCodeLoadState.cs b/ChocolArm64/Translation/ILOpCodeLoadState.cs index f813bb14e6..ddab611019 100644 --- a/ChocolArm64/Translation/ILOpCodeLoadState.cs +++ b/ChocolArm64/Translation/ILOpCodeLoadState.cs @@ -12,7 +12,7 @@ namespace ChocolArm64.Translation _block = block; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { long intInputs = context.LocalAlloc.GetIntInputs(_block); long vecInputs = context.LocalAlloc.GetVecInputs(_block); @@ -21,7 +21,7 @@ namespace ChocolArm64.Translation LoadLocals(context, vecInputs, RegisterType.Vector); } - private void LoadLocals(ILEmitter context, long inputs, RegisterType baseType) + private void LoadLocals(ILMethodBuilder context, long inputs, RegisterType baseType) { for (int bit = 0; bit < 64; bit++) { @@ -29,7 +29,7 @@ namespace ChocolArm64.Translation if ((inputs & mask) != 0) { - Register reg = ILEmitter.GetRegFromBit(bit, baseType); + Register reg = ILMethodBuilder.GetRegFromBit(bit, baseType); context.Generator.EmitLdarg(TranslatedSub.StateArgIdx); context.Generator.Emit(OpCodes.Ldfld, reg.GetField()); diff --git a/ChocolArm64/Translation/ILOpCodeLog.cs b/ChocolArm64/Translation/ILOpCodeLog.cs index 2c77021b10..ebb042b596 100644 --- a/ChocolArm64/Translation/ILOpCodeLog.cs +++ b/ChocolArm64/Translation/ILOpCodeLog.cs @@ -9,7 +9,7 @@ namespace ChocolArm64.Translation _text = text; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { context.Generator.EmitWriteLine(_text); } diff --git a/ChocolArm64/Translation/ILOpCodeStore.cs b/ChocolArm64/Translation/ILOpCodeStore.cs index eff8868b68..17a6259c6f 100644 --- a/ChocolArm64/Translation/ILOpCodeStore.cs +++ b/ChocolArm64/Translation/ILOpCodeStore.cs @@ -18,7 +18,7 @@ namespace ChocolArm64.Translation RegisterSize = registerSize; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { switch (IoType) { @@ -30,7 +30,7 @@ namespace ChocolArm64.Translation } } - private void EmitStloc(ILEmitter context, int index, RegisterType registerType) + private void EmitStloc(ILMethodBuilder context, int index, RegisterType registerType) { Register reg = new Register(index, registerType); diff --git a/ChocolArm64/Translation/ILOpCodeStoreState.cs b/ChocolArm64/Translation/ILOpCodeStoreState.cs index 74bd994169..458e9eda43 100644 --- a/ChocolArm64/Translation/ILOpCodeStoreState.cs +++ b/ChocolArm64/Translation/ILOpCodeStoreState.cs @@ -12,7 +12,7 @@ namespace ChocolArm64.Translation _block = block; } - public void Emit(ILEmitter context) + public void Emit(ILMethodBuilder context) { long intOutputs = context.LocalAlloc.GetIntOutputs(_block); long vecOutputs = context.LocalAlloc.GetVecOutputs(_block); @@ -21,7 +21,7 @@ namespace ChocolArm64.Translation StoreLocals(context, vecOutputs, RegisterType.Vector); } - private void StoreLocals(ILEmitter context, long outputs, RegisterType baseType) + private void StoreLocals(ILMethodBuilder context, long outputs, RegisterType baseType) { for (int bit = 0; bit < 64; bit++) { @@ -29,7 +29,7 @@ namespace ChocolArm64.Translation if ((outputs & mask) != 0) { - Register reg = ILEmitter.GetRegFromBit(bit, baseType); + Register reg = ILMethodBuilder.GetRegFromBit(bit, baseType); context.Generator.EmitLdarg(TranslatedSub.StateArgIdx); context.Generator.EmitLdloc(context.GetLocalIndex(reg)); diff --git a/ChocolArm64/Translator.cs b/ChocolArm64/Translator.cs index 133c45b482..40f453745a 100644 --- a/ChocolArm64/Translator.cs +++ b/ChocolArm64/Translator.cs @@ -93,7 +93,7 @@ namespace ChocolArm64 string subName = GetSubroutineName(position); - ILEmitter ilMthdBuilder = new ILEmitter(context.GetILBlocks(), subName); + ILMethodBuilder ilMthdBuilder = new ILMethodBuilder(context.GetILBlocks(), subName); TranslatedSub subroutine = ilMthdBuilder.GetSubroutine(); @@ -138,7 +138,7 @@ namespace ChocolArm64 ILBlock[] ilBlocks = context.GetILBlocks(); - ILEmitter ilMthdBuilder = new ILEmitter(ilBlocks, subName); + ILMethodBuilder ilMthdBuilder = new ILMethodBuilder(ilBlocks, subName); TranslatedSub subroutine = ilMthdBuilder.GetSubroutine();