fix waittillmatch opcode size

This commit is contained in:
xensik 2022-03-19 01:53:09 +01:00
parent f3bc6eed46
commit 689d17cd6f
9 changed files with 15 additions and 15 deletions

View File

@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:
case opcode::OP_SetLevelFieldVariableField: case opcode::OP_SetLevelFieldVariableField:
@ -133,7 +134,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:
case opcode::OP_SetLevelFieldVariableField: case opcode::OP_SetLevelFieldVariableField:
@ -133,7 +134,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -96,6 +96,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_ScriptMethodChildThreadCallPointer:
case opcode::OP_CallBuiltinPointer: case opcode::OP_CallBuiltinPointer:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_waittillmatch:
case opcode::OP_SafeCreateVariableFieldCached: case opcode::OP_SafeCreateVariableFieldCached:
case opcode::OP_SafeSetVariableFieldCached: case opcode::OP_SafeSetVariableFieldCached:
case opcode::OP_SafeSetWaittillVariableFieldCached: case opcode::OP_SafeSetWaittillVariableFieldCached:
@ -118,7 +119,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_endswitch: case opcode::OP_endswitch:
case opcode::OP_JumpOnFalse: case opcode::OP_JumpOnFalse:
case opcode::OP_JumpOnTrue: case opcode::OP_JumpOnTrue:
case opcode::OP_waittillmatch:
case opcode::OP_EvalLevelFieldVariable: case opcode::OP_EvalLevelFieldVariable:
case opcode::OP_EvalAnimFieldVariable: case opcode::OP_EvalAnimFieldVariable:
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:

View File

@ -100,12 +100,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:
case opcode::OP_SetLevelFieldVariableField: case opcode::OP_SetLevelFieldVariableField:
@ -132,7 +133,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -100,12 +100,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_CallBuiltin0: case opcode::OP_CallBuiltin0:
case opcode::OP_CallBuiltin1: case opcode::OP_CallBuiltin1:
@ -120,7 +121,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -98,6 +98,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
return 1; return 1;
case opcode::OP_SetLocalVariableFieldCached: case opcode::OP_SetLocalVariableFieldCached:
case opcode::OP_RemoveLocalVariables: case opcode::OP_RemoveLocalVariables:
case opcode::OP_waittillmatch:
case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_ScriptMethodChildThreadCallPointer:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_SafeSetWaittillVariableFieldCached: case opcode::OP_SafeSetWaittillVariableFieldCached:
@ -127,7 +128,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_SafeCreateVariableFieldCached_Precompiled: case opcode::OP_SafeCreateVariableFieldCached_Precompiled:
case opcode::OP_FormalParams_Precompiled:*/ case opcode::OP_FormalParams_Precompiled:*/
return 2; return 2;
case opcode::OP_waittillmatch:
case opcode::OP_JumpOnTrue: case opcode::OP_JumpOnTrue:
case opcode::OP_JumpOnFalseExpr: case opcode::OP_JumpOnFalseExpr:
case opcode::OP_jumpback: case opcode::OP_jumpback:

View File

@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:
case opcode::OP_SetLevelFieldVariableField: case opcode::OP_SetLevelFieldVariableField:
@ -133,7 +134,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -102,12 +102,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_ScriptThreadCallPointer: case opcode::OP_ScriptThreadCallPointer:
case opcode::OP_CreateLocalVariable: case opcode::OP_CreateLocalVariable:
case opcode::OP_EvalLocalVariableObjectCached: case opcode::OP_EvalLocalVariableObjectCached:
case opcode::OP_GetAnimTree:
case opcode::OP_GetNegByte: case opcode::OP_GetNegByte:
case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_CallBuiltinMethodPointer:
case opcode::OP_EvalLocalArrayCached: case opcode::OP_EvalLocalArrayCached:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_ScriptChildThreadCallPointer: case opcode::OP_ScriptChildThreadCallPointer:
case opcode::OP_GetAnimTree: case opcode::OP_waittillmatch:
return 2; return 2;
case opcode::OP_EvalSelfFieldVariable: case opcode::OP_EvalSelfFieldVariable:
case opcode::OP_SetLevelFieldVariableField: case opcode::OP_SetLevelFieldVariableField:
@ -134,7 +135,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_GetBuiltinFunction: case opcode::OP_GetBuiltinFunction:
case opcode::OP_jumpback: case opcode::OP_jumpback:
case opcode::OP_GetBuiltinMethod: case opcode::OP_GetBuiltinMethod:
case opcode::OP_waittillmatch:
case opcode::OP_GetNegUnsignedShort: case opcode::OP_GetNegUnsignedShort:
case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod0:
case opcode::OP_CallBuiltinMethod1: case opcode::OP_CallBuiltinMethod1:

View File

@ -98,6 +98,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
return 1; return 1;
case opcode::OP_SetLocalVariableFieldCached: case opcode::OP_SetLocalVariableFieldCached:
case opcode::OP_RemoveLocalVariables: case opcode::OP_RemoveLocalVariables:
case opcode::OP_waittillmatch:
case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_ScriptMethodChildThreadCallPointer:
case opcode::OP_GetByte: case opcode::OP_GetByte:
case opcode::OP_SafeSetWaittillVariableFieldCached: case opcode::OP_SafeSetWaittillVariableFieldCached:
@ -127,7 +128,6 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t
case opcode::OP_SafeCreateVariableFieldCached_Precompiled: case opcode::OP_SafeCreateVariableFieldCached_Precompiled:
case opcode::OP_FormalParams_Precompiled:*/ case opcode::OP_FormalParams_Precompiled:*/
return 2; return 2;
case opcode::OP_waittillmatch:
case opcode::OP_JumpOnTrue: case opcode::OP_JumpOnTrue:
case opcode::OP_JumpOnFalseExpr: case opcode::OP_JumpOnFalseExpr:
case opcode::OP_jumpback: case opcode::OP_jumpback: