Wack0/IFPSTools.NET
1
Fork 0
mirror of https://github.com/Wack0/IFPSTools.NET.git synced 2025-06-18 10:45:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

libifps: fix loading and saving op2 for InlineCmpValueType (is instruction)

Browse Source 
libifps: document is instruction better
libifps: document InlineCmpValueType better
This commit is contained in:
zc 2023-03-31 12:52:45 +01:00
parent 6feeac38f7
commit 8aea82c678
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IFPSLib/Emit/Instruction.cs
View File

@ -29,6 +29,8 @@ namespace IFPSLib.Emit
private List<Operand> m_Operands = new List<Operand>();
private static readonly Operand s_opU32 = Operand.Create<uint>(0);
/// <summary>
/// Gets or sets the operand at the specified index.
/// </summary>
@ -380,6 +382,13 @@ namespace IFPSLib.Emit
return FixBranchOffset(br, br.Read<uint>());
}
private static Operand ReadTypeForCmpValueType(BinaryReader br, Script script, ScriptFunction function)
{
var operand = Operand.LoadValue(br, script, function);
if (operand.Type == BytecodeOperandType.Immediate) return Operand.Create(script.Types[(int)operand.ImmediateAs<uint>()]);
return operand;
}
internal static Instruction Load(BinaryReader br, Script script, ScriptFunction function)
{
var ret = new Instruction();
@ -449,7 +458,7 @@ namespace IFPSLib.Emit
ret.m_Operands = new List<Operand>(3) {
Operand.LoadValue(br, script, function),
Operand.LoadValue(br, script, function),
Operand.Create(script.Types[(int)br.Read<uint>()])
ReadTypeForCmpValueType(br, script, function)
};
break;
case OperandType.InlineEH:
@ -565,7 +574,7 @@ namespace IFPSLib.Emit
ret += m_Operands[0].Size + m_Operands[1].Size + m_Operands[2].Size;
break;
case OperandType.InlineCmpValueType:
ret += m_Operands[0].Size + m_Operands[1].Size + sizeof(int);
ret += m_Operands[0].Size + m_Operands[1].Size + (m_Operands[2].Type != BytecodeOperandType.Immediate ? m_Operands[2] : s_opU32).Size;
break;
case OperandType.InlineEH:
ret += sizeof(uint) * 4;
@ -664,7 +673,14 @@ namespace IFPSLib.Emit
case OperandType.InlineCmpValueType:
m_Operands[0].Save(bw, ctx);
m_Operands[1].Save(bw, ctx);
bw.Write<int>(ctx.GetTypeIndex(m_Operands[2].ImmediateAs<IType>()));
if (m_Operands[2].Type == BytecodeOperandType.Immediate)
{
Operand.Create((uint)ctx.GetTypeIndex(m_Operands[2].ImmediateAs<IType>())).Save(bw, ctx);
}
else
{
m_Operands[2].Save(bw, ctx);
}
break;
case OperandType.InlineEH:
bw.Write<uint>(GetEHOffset(m_Operands[0], table));

1
IFPSLib/Emit/OpCodes.cs
View File

@ -186,6 +186,7 @@ namespace IFPSLib.Emit
/// <summary>
/// Operand 1 must be a <see cref="Types.ClassType"/>, operand 2 is a <see cref="Types.TypeType"/> that must be a <see cref="Types.ClassType"/>
/// Checks if operand 1 is of the <see cref="Types.ClassType"/> referenced by operand 2.
/// Operand 2 can also be a variable of type <see cref="UInt32"/> containing the index of the type to compare against.
/// </summary>
public static readonly OpCode Is = new OpCode("is", Code.Is, OperandType.InlineCmpValueType, FlowControl.Next, OpCodeType.Macro);

2
IFPSLib/Emit/OperandType.cs
View File

@ -39,7 +39,7 @@ namespace IFPSLib.Emit
/// </summary>
InlineCmpValue,
/// <summary>
/// Two <see cref="InlineValue"/>s followed by <see cref="InlineType"/>
/// Three <see cref="InlineValue"/>s where the last is a <see cref="UInt32"/> type index
/// </summary>
InlineCmpValueType,
/// <summary>