diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index 495f02829..66e3063c3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -156,58 +156,58 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.other.SetPropertyIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.SetSlotIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.SetSuperIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ThrowIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.AbsJumpIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.AddDIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.AddPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.AllocIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.BkptIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.BkptLineIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CallInterfaceIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CallSuperIdIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CodeGenOpIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CoerceBIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CoerceDIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CoerceIIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CoerceOIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.CoerceUIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ConcatIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ConvertF4Ins; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ConvertFIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ConvertMIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ConvertMPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DecLocalPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DecodeIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DecrementPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DelDescendantsIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DeletePropertyLateIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DividePIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DoubleToAtomIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.FindPropGlobalIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.GetOuterScopeIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.IncLocalPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.IncrementPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.InvalidIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.Lf32x4Ins; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.MarkIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.ModuloPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.MultiplyPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.NegatePIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PrologueIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PushConstantIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PushDNanIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PushDecimalIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PushFloat4Ins; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.PushFloatIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.SendEnterIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.SetPropertyLateIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.Sf32x4Ins; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.SubtractPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.SweepIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.TimestampIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.UnPlusIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.VerifyOpIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.VerifyPassIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.WbIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.AbsJumpIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.AddDIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.AddPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.AllocIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.BkptIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.BkptLineIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.CallInterfaceIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.CallSuperIdIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.CodeGenOpIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated.CoerceBIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated.CoerceDIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated.CoerceIIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceOIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated.CoerceUIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.ConcatIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.ConvertF4Ins; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.ConvertFIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.ConvertMIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.ConvertMPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.DecLocalPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.DecodeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.DecrementPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.DelDescendantsIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.DeletePropertyLateIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.DividePIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.DoubleToAtomIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.FindPropGlobalIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetOuterScopeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.IncLocalPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.IncrementPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.InvalidIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.Lf32x4Ins; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.MarkIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.ModuloPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.MultiplyPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.NegatePIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.PrologueIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.PushConstantIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.PushDNanIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.PushDecimalIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.PushFloat4Ins; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.PushFloatIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.SendEnterIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.SetPropertyLateIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.Sf32x4Ins; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.SubtractPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.SweepIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.TimestampIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport.UnPlusIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.VerifyOpIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.VerifyPassIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown.WbIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.DupIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PopIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PopScopeIns; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index 177af8aef..376ae42fa 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -40,8 +40,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.SetLocalTypeIn import com.jpexs.decompiler.flash.abc.avm2.instructions.other.HasNext2Ins; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.LabelIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.NopIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.DecLocalPIns; -import com.jpexs.decompiler.flash.abc.avm2.instructions.other2.IncLocalPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.DecLocalPIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport.IncLocalPIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PopIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushByteIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushScopeIns; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instructions.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instructions.java index 712a3c90d..23e5ca570 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instructions.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instructions.java @@ -261,11 +261,17 @@ public class AVM2Instructions { public static final int ConvertO = 0x77; public static final int CheckFilter = 0x78; - + public static final int ConvertM = 0x79; + + public static final int ConvertF = 0x79; public static final int ConvertMP = 0x7A; - + + public static final int UnPlus = 0x7A; + + public static final int ConvertF4 = 0x7B; + public static final int Coerce = 0x80; public static final int CoerceB = 0x81; @@ -424,14 +430,10 @@ public class AVM2Instructions { public static final int Prologue = 0xF9; - public static final int SendEnter = 0xFA; - - public static final int UnPlus = 0xFA; + public static final int SendEnter = 0xFA; public static final int DoubleToAtom = 0xFB; - - public static final int ConvertF4 = 0x7B; - + public static final int Sweep = 0xFC; public static final int CodeGenOp = 0xFD; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptIns.java index 38bd62f08..9443f32aa 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptLineIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptLineIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptLineIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptLineIns.java index 47740ac92..97dd4e437 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/BkptLineIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/BkptLineIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetOuterScopeIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetOuterScopeIns.java similarity index 88% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetOuterScopeIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetOuterScopeIns.java index 6c6cf397f..a26d9d3bd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetOuterScopeIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetOuterScopeIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -33,11 +33,11 @@ public class GetOuterScopeIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 0; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/TimestampIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/TimestampIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/TimestampIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/TimestampIns.java index 252e3494c..ff43fde02 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/TimestampIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/TimestampIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/AddPIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/AddPIns.java index 56780be0f..a23ca96b0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/AddPIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMIns.java index a9b73e03c..718a0c6a3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMPIns.java similarity index 92% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMPIns.java index 2fd85b83c..b8d1dd6a2 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertMPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ConvertMPIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class ConvertMPIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecLocalPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecLocalPIns.java similarity index 84% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecLocalPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecLocalPIns.java index 700d325ea..8f9a78279 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecLocalPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecLocalPIns.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; +import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -43,4 +44,14 @@ public class DecLocalPIns extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } + + @Override + public int getStackPushCount(AVM2Instruction ins, ABC abc) { + return 0; + } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecrementPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecrementPIns.java similarity index 84% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecrementPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecrementPIns.java index 200f7cd37..1a69fdecf 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecrementPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DecrementPIns.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; +import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -43,4 +44,14 @@ public class DecrementPIns extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 1; + } + + @Override + public int getStackPushCount(AVM2Instruction ins, ABC abc) { + return 1; + } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DividePIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DividePIns.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DividePIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DividePIns.java index bcb9f0ddd..1d73da9c4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DividePIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/DividePIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class DividePIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - return 2; // ? + return 2; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncLocalPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncLocalPIns.java similarity index 84% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncLocalPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncLocalPIns.java index 6851a88f8..6a921e507 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncLocalPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncLocalPIns.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; +import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -43,4 +44,14 @@ public class IncLocalPIns extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } + + @Override + public int getStackPushCount(AVM2Instruction ins, ABC abc) { + return 0; + } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncrementPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncrementPIns.java similarity index 84% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncrementPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncrementPIns.java index 179b8d0d8..d3b001383 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/IncrementPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/IncrementPIns.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; +import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -43,4 +44,14 @@ public class IncrementPIns extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 1; + } + + @Override + public int getStackPushCount(AVM2Instruction ins, ABC abc) { + return 1; + } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ModuloPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ModuloPIns.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ModuloPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ModuloPIns.java index 1153f7f52..3ddb17d0b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ModuloPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/ModuloPIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class ModuloPIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - return 2; // ? + return 2; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MultiplyPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/MultiplyPIns.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MultiplyPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/MultiplyPIns.java index 9f91c15a5..a33b21ac5 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MultiplyPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/MultiplyPIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class MultiplyPIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - return 2; // ? + return 2; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/NegatePIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/NegatePIns.java similarity index 92% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/NegatePIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/NegatePIns.java index dba5fba36..0c929fdb4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/NegatePIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/NegatePIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class NegatePIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDNanIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDNanIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDNanIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDNanIns.java index 988f51e7e..81edb4e7e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDNanIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDNanIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -44,8 +44,13 @@ public class PushDNanIns extends InstructionDefinition { super.verify(lda, constants, ins); } + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } + @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDecimalIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDecimalIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDecimalIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDecimalIns.java index b77258f16..6d9e8531a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushDecimalIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/PushDecimalIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -45,8 +45,13 @@ public class PushDecimalIns extends InstructionDefinition { super.verify(lda, constants, ins); } + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } + @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SubtractPIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/SubtractPIns.java similarity index 92% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SubtractPIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/SubtractPIns.java index efd54d6c5..0f32ecadf 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SubtractPIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/decimalsupport/SubtractPIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.decimalsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -47,11 +47,11 @@ public class SubtractPIns extends InstructionDefinition { @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 2; } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - throw new UnsupportedOperationException(); + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceBIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceBIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceBIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceBIns.java index d3aa8ecd7..793b94c95 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceBIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceBIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceDIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceDIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceDIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceDIns.java index 62b5182e1..3bd5cf934 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceDIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceDIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceIIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceIIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceIIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceIIns.java index 2a93bf09c..77d90f281 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceIIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceIIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceUIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceUIns.java similarity index 89% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceUIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceUIns.java index b3416147c..31f6d5780 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceUIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/deprecated/CoerceUIns.java @@ -14,12 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.deprecated; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2InstructionFlag; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceOrConvertTypeIns; import com.jpexs.decompiler.flash.ecma.EcmaScript; @@ -34,7 +35,7 @@ import com.jpexs.decompiler.graph.TypeItem; public class CoerceUIns extends InstructionDefinition implements CoerceOrConvertTypeIns { public CoerceUIns() { - super(0x88, "coerce_u", new int[]{}, true); // stack: -1+1 + super(0x88, "coerce_u", new int[]{}, true, AVM2InstructionFlag.DEPRECATED); // stack: -1+1 } @Override diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertF4Ins.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertF4Ins.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertF4Ins.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertF4Ins.java index a5059b83d..6745a2540 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertF4Ins.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertF4Ins.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertFIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertFIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertFIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertFIns.java index 2916a1acc..82bc0b6e8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConvertFIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/ConvertFIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Lf32x4Ins.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Lf32x4Ins.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Lf32x4Ins.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Lf32x4Ins.java index 7eab6d217..69bf4187a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Lf32x4Ins.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Lf32x4Ins.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.AVM2LocalData; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloat4Ins.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloat4Ins.java similarity index 83% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloat4Ins.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloat4Ins.java index 96d0fb256..561fbbe12 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloat4Ins.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloat4Ins.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; +import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -43,4 +44,16 @@ public class PushFloat4Ins extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } + + @Override + public int getStackPushCount(AVM2Instruction ins, ABC abc) { + return 1; + } + + } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloatIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloatIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloatIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloatIns.java index f134a22d7..459efc5bc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushFloatIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/PushFloatIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -44,9 +44,14 @@ public class PushFloatIns extends InstructionDefinition { super.verify(lda, constants, ins); } + + @Override + public int getStackPopCount(AVM2Instruction ins, ABC abc) { + return 0; + } @Override public int getStackPushCount(AVM2Instruction ins, ABC abc) { - return 1; // ? + return 1; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Sf32x4Ins.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Sf32x4Ins.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Sf32x4Ins.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Sf32x4Ins.java index 5da558100..ddf3734dc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/Sf32x4Ins.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/Sf32x4Ins.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/UnPlusIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/UnPlusIns.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/UnPlusIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/UnPlusIns.java index 3b0c2a256..7fbc1b6b3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/UnPlusIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/floatsupport/UnPlusIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.floatsupport; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AbsJumpIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AbsJumpIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AbsJumpIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AbsJumpIns.java index 70ff9413f..d178b1c83 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AbsJumpIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AbsJumpIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class AbsJumpIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddDIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AddDIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddDIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AddDIns.java index 27f1e005f..7377c347a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AddDIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AddDIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class AddDIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AllocIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AllocIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AllocIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AllocIns.java index 686aefea6..e31c05250 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/AllocIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/AllocIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class AllocIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallInterfaceIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallInterfaceIns.java similarity index 89% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallInterfaceIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallInterfaceIns.java index fb11ec9ec..e9ae99ea7 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallInterfaceIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallInterfaceIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class CallInterfaceIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallSuperIdIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallSuperIdIns.java similarity index 89% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallSuperIdIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallSuperIdIns.java index f4a04a10f..074738fea 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CallSuperIdIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CallSuperIdIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -27,6 +27,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class CallSuperIdIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CodeGenOpIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CodeGenOpIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CodeGenOpIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CodeGenOpIns.java index 810c4fbac..96bbe9faa 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CodeGenOpIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/CodeGenOpIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class CodeGenOpIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConcatIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/ConcatIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConcatIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/ConcatIns.java index a1696e4bb..c5d805ca0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/ConcatIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/ConcatIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class ConcatIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecodeIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DecodeIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecodeIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DecodeIns.java index 857818fe8..b61081402 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DecodeIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DecodeIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class DecodeIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DelDescendantsIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DelDescendantsIns.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DelDescendantsIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DelDescendantsIns.java index bc1302a42..56379b3f0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DelDescendantsIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DelDescendantsIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -29,6 +29,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: ?? */ public class DelDescendantsIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DeletePropertyLateIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DeletePropertyLateIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DeletePropertyLateIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DeletePropertyLateIns.java index 280811aae..a302b7e0a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DeletePropertyLateIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DeletePropertyLateIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: ?? */ public class DeletePropertyLateIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DoubleToAtomIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DoubleToAtomIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DoubleToAtomIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DoubleToAtomIns.java index 8c405378b..dcb451d19 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/DoubleToAtomIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/DoubleToAtomIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class DoubleToAtomIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalIns.java similarity index 91% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalIns.java index 0fe511d75..0af02659d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -29,6 +29,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/magicalhobo/SWFWire/blob/master/SWFWireDecompiler/src/com/swfwire/decompiler/abc/ABCInstructions.as */ public class FindPropGlobalIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalStrictIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalStrictIns.java similarity index 67% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalStrictIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalStrictIns.java index 0aa7cdfe4..62dda0004 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/FindPropGlobalStrictIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/FindPropGlobalStrictIns.java @@ -14,10 +14,14 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.exceptions.AVM2VerifyErrorException; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2InstructionFlag; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; @@ -25,6 +29,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/magicalhobo/SWFWire/blob/master/SWFWireDecompiler/src/com/swfwire/decompiler/abc/ABCInstructions.as */ public class FindPropGlobalStrictIns extends InstructionDefinition { @@ -32,6 +38,15 @@ public class FindPropGlobalStrictIns extends InstructionDefinition { super(0x5B, "findpropglobalstrict", new int[]{AVM2Code.DAT_MULTINAME_INDEX}, true, AVM2InstructionFlag.NO_FLASH_PLAYER, AVM2InstructionFlag.UNKNOWN_STACK); } + @Override + public void verify(LocalDataArea lda, AVM2ConstantPool constants, AVM2Instruction ins) throws AVM2VerifyErrorException { + if (lda.getRuntime() == AVM2Runtime.ADOBE_FLASH) { + illegalOpCode(lda, ins); + } + + super.verify(lda, constants, ins); + } + @Override public int getStackPopCount(AVM2Instruction ins, ABC abc) { throw new UnsupportedOperationException(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetPropertyLateIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/GetPropertyLateIns.java similarity index 86% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetPropertyLateIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/GetPropertyLateIns.java index 74ae0c487..ae6b5ef75 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/GetPropertyLateIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/GetPropertyLateIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; @@ -24,6 +24,9 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/magicalhobo/SWFWire/blob/master/SWFWireDecompiler/src/com/swfwire/decompiler/abc/ABCInstructions.as + * collides with getouterscope */ public class GetPropertyLateIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/InvalidIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/InvalidIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/InvalidIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/InvalidIns.java index 01ed91199..8da047517 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/InvalidIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/InvalidIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.AVM2Runtime; @@ -27,6 +27,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: ?? */ public class InvalidIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MarkIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/MarkIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MarkIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/MarkIns.java index 96d95a4e4..8683a197e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/MarkIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/MarkIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class MarkIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PrologueIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PrologueIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PrologueIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PrologueIns.java index e5898923f..d614afbea 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PrologueIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PrologueIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class PrologueIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushConstantIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PushConstantIns.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushConstantIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PushConstantIns.java index b2bee5915..ebb85c285 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/PushConstantIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/PushConstantIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; @@ -25,6 +25,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: ?? */ public class PushConstantIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SendEnterIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SendEnterIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SendEnterIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SendEnterIns.java index 4dd67c2e9..3dc3a0629 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SendEnterIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SendEnterIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class SendEnterIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SetPropertyLateIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SetPropertyLateIns.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SetPropertyLateIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SetPropertyLateIns.java index 5e27ccdfa..1f17b18e8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SetPropertyLateIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SetPropertyLateIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: ?? */ public class SetPropertyLateIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SweepIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SweepIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SweepIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SweepIns.java index 3f382dd2b..248bc1924 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/SweepIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/SweepIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class SweepIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyOpIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyOpIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyOpIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyOpIns.java index 264998ddb..8006e93e1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyOpIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyOpIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class VerifyOpIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyPassIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyPassIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyPassIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyPassIns.java index f4808a9b8..89d699b1a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/VerifyPassIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/VerifyPassIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class VerifyPassIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/WbIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/WbIns.java similarity index 90% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/WbIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/WbIns.java index 9164c61be..8cc6d8f17 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/WbIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/unknown/WbIns.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other.unknown; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; @@ -28,6 +28,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; /** * * @author JPEXS + * + * source: https://github.com/apache/flex-sdk/blob/414b9a3e55effd243a697e614b702d1fa0b53efe/modules/asc/src/java/macromedia/abc/Opcodes.java */ public class WbIns extends InstructionDefinition { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceOIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOIns.java similarity index 93% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceOIns.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOIns.java index 36afcb446..41fdeccb9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other2/CoerceOIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOIns.java @@ -14,14 +14,13 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.avm2.instructions.other2; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceOrConvertTypeIns; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.graph.DottedChain;