From 689d17cd6f763b949328c63ac2aa001fb0431160 Mon Sep 17 00:00:00 2001 From: xensik Date: Sat, 19 Mar 2022 01:53:09 +0100 Subject: [PATCH] fix waittillmatch opcode size --- src/h1/xsk/h1.cpp | 4 ++-- src/h2/xsk/h2.cpp | 4 ++-- src/iw5/xsk/iw5.cpp | 2 +- src/iw6/xsk/iw6.cpp | 4 ++-- src/iw7/xsk/iw7.cpp | 4 ++-- src/iw8/xsk/iw8.cpp | 2 +- src/s1/xsk/s1.cpp | 4 ++-- src/s2/xsk/s2.cpp | 4 ++-- src/s4/xsk/s4.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/h1/xsk/h1.cpp b/src/h1/xsk/h1.cpp index f5fc7dc6..f0049676 100644 --- a/src/h1/xsk/h1.cpp +++ b/src/h1/xsk/h1.cpp @@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_EvalSelfFieldVariable: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/h2/xsk/h2.cpp b/src/h2/xsk/h2.cpp index d594737c..8aa94120 100644 --- a/src/h2/xsk/h2.cpp +++ b/src/h2/xsk/h2.cpp @@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_EvalSelfFieldVariable: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/iw5/xsk/iw5.cpp b/src/iw5/xsk/iw5.cpp index 9f07cbf4..57d29606 100644 --- a/src/iw5/xsk/iw5.cpp +++ b/src/iw5/xsk/iw5.cpp @@ -96,6 +96,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_CallBuiltinPointer: case opcode::OP_CallBuiltinMethodPointer: + case opcode::OP_waittillmatch: case opcode::OP_SafeCreateVariableFieldCached: case opcode::OP_SafeSetVariableFieldCached: 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_JumpOnFalse: case opcode::OP_JumpOnTrue: - case opcode::OP_waittillmatch: case opcode::OP_EvalLevelFieldVariable: case opcode::OP_EvalAnimFieldVariable: case opcode::OP_EvalSelfFieldVariable: diff --git a/src/iw6/xsk/iw6.cpp b/src/iw6/xsk/iw6.cpp index 7a71dbf6..ff6386be 100644 --- a/src/iw6/xsk/iw6.cpp +++ b/src/iw6/xsk/iw6.cpp @@ -100,12 +100,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_EvalSelfFieldVariable: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/iw7/xsk/iw7.cpp b/src/iw7/xsk/iw7.cpp index 632e4b5b..0dc72d8c 100644 --- a/src/iw7/xsk/iw7.cpp +++ b/src/iw7/xsk/iw7.cpp @@ -100,12 +100,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_CallBuiltin0: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/iw8/xsk/iw8.cpp b/src/iw8/xsk/iw8.cpp index 0a45c279..c33cee72 100644 --- a/src/iw8/xsk/iw8.cpp +++ b/src/iw8/xsk/iw8.cpp @@ -98,6 +98,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t return 1; case opcode::OP_SetLocalVariableFieldCached: case opcode::OP_RemoveLocalVariables: + case opcode::OP_waittillmatch: case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_GetByte: 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_FormalParams_Precompiled:*/ return 2; - case opcode::OP_waittillmatch: case opcode::OP_JumpOnTrue: case opcode::OP_JumpOnFalseExpr: case opcode::OP_jumpback: diff --git a/src/s1/xsk/s1.cpp b/src/s1/xsk/s1.cpp index 8508651d..5c91be59 100644 --- a/src/s1/xsk/s1.cpp +++ b/src/s1/xsk/s1.cpp @@ -101,12 +101,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_EvalSelfFieldVariable: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/s2/xsk/s2.cpp b/src/s2/xsk/s2.cpp index fb3e6714..f59a8deb 100644 --- a/src/s2/xsk/s2.cpp +++ b/src/s2/xsk/s2.cpp @@ -102,12 +102,13 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t case opcode::OP_ScriptThreadCallPointer: case opcode::OP_CreateLocalVariable: case opcode::OP_EvalLocalVariableObjectCached: + case opcode::OP_GetAnimTree: case opcode::OP_GetNegByte: case opcode::OP_CallBuiltinMethodPointer: case opcode::OP_EvalLocalArrayCached: case opcode::OP_GetByte: case opcode::OP_ScriptChildThreadCallPointer: - case opcode::OP_GetAnimTree: + case opcode::OP_waittillmatch: return 2; case opcode::OP_EvalSelfFieldVariable: 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_jumpback: case opcode::OP_GetBuiltinMethod: - case opcode::OP_waittillmatch: case opcode::OP_GetNegUnsignedShort: case opcode::OP_CallBuiltinMethod0: case opcode::OP_CallBuiltinMethod1: diff --git a/src/s4/xsk/s4.cpp b/src/s4/xsk/s4.cpp index ef7af0fc..270ee73f 100644 --- a/src/s4/xsk/s4.cpp +++ b/src/s4/xsk/s4.cpp @@ -98,6 +98,7 @@ auto opcode_size(std::uint8_t id) -> std::uint32_t return 1; case opcode::OP_SetLocalVariableFieldCached: case opcode::OP_RemoveLocalVariables: + case opcode::OP_waittillmatch: case opcode::OP_ScriptMethodChildThreadCallPointer: case opcode::OP_GetByte: 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_FormalParams_Precompiled:*/ return 2; - case opcode::OP_waittillmatch: case opcode::OP_JumpOnTrue: case opcode::OP_JumpOnFalseExpr: case opcode::OP_jumpback: