From 09448540a61d1e735f527d55a2a0bc7b2e1aa01e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 22 Feb 2015 14:58:43 +0000 Subject: [PATCH] Print opcode name in initialiser error message --- .../spongepowered/asm/mixin/transformer/MixinTransformer.java | 3 ++- src/main/java/org/spongepowered/asm/util/ASMHelper.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index 36764275..320e7a4f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -756,7 +756,8 @@ public class MixinTransformer extends TreeTransformer { if (opcode == ivalidOp) { // At the moment I don't handle any transient locals because I haven't seen any in the wild, but let's avoid writing // code which will likely break things and fix it if a real test case ever appears - throw new InvalidMixinException("Cannot handle opcode 0x" + Integer.toHexString(opcode) + " in class initialiser"); + throw new InvalidMixinException("Cannot handle " + ASMHelper.getOpcodeName(opcode) +" opcode (0x" + + Integer.toHexString(opcode).toUpperCase() + ") in class initialiser"); } } diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index b3f719df..1a432c3d 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -406,7 +406,7 @@ public class ASMHelper { * @return Approximate opcode name (approximate because some constants in * the {@link Opcodes} class have the same value as opcodes */ - private static String getOpcodeName(int opcode) { + public static String getOpcodeName(int opcode) { if (opcode > 0) { boolean found = false;