diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/EncodedLiteralInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/EncodedLiteralInstruction.java
new file mode 100644
index 00000000..a772dfea
--- /dev/null
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/EncodedLiteralInstruction.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.dexlib.Code;
+
+public interface EncodedLiteralInstruction extends LiteralInstruction {
+    long getDecodedLiteral();
+}
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java
index 6208a0c0..c063b9aa 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java
@@ -28,15 +28,15 @@
 
 package org.jf.dexlib.Code.Format;
 
+import org.jf.dexlib.Code.EncodedLiteralInstruction;
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.NumberUtils;
 
-public class Instruction21h extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
+public class Instruction21h extends Instruction implements SingleRegisterInstruction, EncodedLiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();
     private byte regA;
     private short litB;
@@ -77,6 +77,15 @@ public class Instruction21h extends Instruction implements SingleRegisterInstruc
         return litB;
     }
 
+    public long getDecodedLiteral() {
+        if (opcode == Opcode.CONST_HIGH16) {
+            return litB << 16;
+        } else {
+            assert opcode == Opcode.CONST_WIDE_HIGH16;
+            return ((long)litB) << 48;
+        }
+    }
+
     private static class Factory implements Instruction.InstructionFactory {
         public Instruction makeInstruction(DexFile dexFile, Opcode opcode, byte[] buffer, int bufferIndex) {
             return new Instruction21h(opcode, buffer, bufferIndex);
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/LiteralInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/LiteralInstruction.java
index 1a92a76b..17bfc630 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/LiteralInstruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/LiteralInstruction.java
@@ -29,5 +29,5 @@
 package org.jf.dexlib.Code;
 
 public interface LiteralInstruction {
-    long getLiteral(); 
+    long getLiteral();
 }