23 files changed, 44 insertions, 22 deletions
diff --git a/dx/src/com/android/dx/command/findusages/FindUsages.java b/dx/src/com/android/dx/command/findusages/FindUsages.java
index 30c6030db..1c692ae87 100644
--- a/dx/src/com/android/dx/command/findusages/FindUsages.java
+++ b/dx/src/com/android/dx/command/findusages/FindUsages.java
@@ -19,11 +19,11 @@ package com.android.dx.command.findusages;
 import com.android.dx.io.ClassData;
 import com.android.dx.io.ClassDef;
 import com.android.dx.io.CodeReader;
-import com.android.dx.io.DecodedInstruction;
 import com.android.dx.io.DexBuffer;
 import com.android.dx.io.FieldId;
 import com.android.dx.io.MethodId;
 import com.android.dx.io.OpcodeInfo;
+import com.android.dx.io.instructions.DecodedInstruction;
 import java.io.PrintStream;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/dx/src/com/android/dx/io/CodeReader.java b/dx/src/com/android/dx/io/CodeReader.java
index ca8fe6fd9..26430bdc3 100644
--- a/dx/src/com/android/dx/io/CodeReader.java
+++ b/dx/src/com/android/dx/io/CodeReader.java
@@ -17,6 +17,7 @@
 package com.android.dx.io;
 
 import com.android.dx.dex.DexException;
+import com.android.dx.io.instructions.DecodedInstruction;
 
 /**
  * Walks through a block of code and calls visitor call backs.
diff --git a/dx/src/com/android/dx/io/OpcodeInfo.java b/dx/src/com/android/dx/io/OpcodeInfo.java
index e75791ff1..c8fcf25d5 100644
--- a/dx/src/com/android/dx/io/OpcodeInfo.java
+++ b/dx/src/com/android/dx/io/OpcodeInfo.java
@@ -16,6 +16,7 @@
 
 package com.android.dx.io;
 
+import com.android.dx.io.instructions.InstructionCodec;
 import com.android.dx.util.Hex;
 
 /**
diff --git a/dx/src/com/android/dx/io/AddressMap.java b/dx/src/com/android/dx/io/instructions/AddressMap.java
index a35b55055..a8dbe0bab 100644
--- a/dx/src/com/android/dx/io/AddressMap.java
+++ b/dx/src/com/android/dx/io/instructions/AddressMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import java.io.EOFException;
 import java.util.HashMap;
diff --git a/dx/src/com/android/dx/io/BaseCodeCursor.java b/dx/src/com/android/dx/io/instructions/BaseCodeCursor.java
index 32772f83f..6915fa881 100644
--- a/dx/src/com/android/dx/io/BaseCodeCursor.java
+++ b/dx/src/com/android/dx/io/instructions/BaseCodeCursor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import java.io.EOFException;
 
diff --git a/dx/src/com/android/dx/io/CodeCursor.java b/dx/src/com/android/dx/io/instructions/CodeCursor.java
index dd38ae68d..68eb9c927 100644
--- a/dx/src/com/android/dx/io/CodeCursor.java
+++ b/dx/src/com/android/dx/io/instructions/CodeCursor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * Cursor over code units, for reading or writing out Dalvik bytecode.
diff --git a/dx/src/com/android/dx/io/CodeInput.java b/dx/src/com/android/dx/io/instructions/CodeInput.java
index 04629bfb0..41a5ef7f8 100644
--- a/dx/src/com/android/dx/io/CodeInput.java
+++ b/dx/src/com/android/dx/io/instructions/CodeInput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import java.io.EOFException;
 
diff --git a/dx/src/com/android/dx/io/CodeOutput.java b/dx/src/com/android/dx/io/instructions/CodeOutput.java
index d5622c613..7d0077e04 100644
--- a/dx/src/com/android/dx/io/CodeOutput.java
+++ b/dx/src/com/android/dx/io/instructions/CodeOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * Output stream of code units, for writing out Dalvik bytecode.
diff --git a/dx/src/com/android/dx/io/DecodedInstruction.java b/dx/src/com/android/dx/io/instructions/DecodedInstruction.java
index 14ae76832..f9bdcf813 100644
--- a/dx/src/com/android/dx/io/DecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/DecodedInstruction.java
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import com.android.dx.dex.DexException;
+import com.android.dx.io.IndexType;
+import com.android.dx.io.OpcodeInfo;
+import com.android.dx.io.Opcodes;
 import com.android.dx.util.Hex;
 
 import java.io.EOFException;
diff --git a/dx/src/com/android/dx/io/FillArrayDataPayloadDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
index f007326df..64fc55bd7 100644
--- a/dx/src/com/android/dx/io/FillArrayDataPayloadDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/FillArrayDataPayloadDecodedInstruction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * A decoded Dalvik instruction which contains the payload for
diff --git a/dx/src/com/android/dx/io/FiveRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
index 71df05fd4..6e14d34a0 100644
--- a/dx/src/com/android/dx/io/FiveRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/FiveRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has five register arguments.
diff --git a/dx/src/com/android/dx/io/FourRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
index 35f6c83ce..29836d054 100644
--- a/dx/src/com/android/dx/io/FourRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/FourRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has five register arguments.
diff --git a/dx/src/com/android/dx/io/InstructionCodec.java b/dx/src/com/android/dx/io/instructions/InstructionCodec.java
index 5edf2e524..2523f8692 100644
--- a/dx/src/com/android/dx/io/InstructionCodec.java
+++ b/dx/src/com/android/dx/io/instructions/InstructionCodec.java
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import com.android.dx.dex.DexException;
+import com.android.dx.io.IndexType;
+import com.android.dx.io.OpcodeInfo;
+import com.android.dx.io.Opcodes;
 import com.android.dx.util.Hex;
 
 import java.io.EOFException;
diff --git a/dx/src/com/android/dx/io/OneRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
index 375f81da5..fd38e3baa 100644
--- a/dx/src/com/android/dx/io/OneRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/OneRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has one register argument.
diff --git a/dx/src/com/android/dx/io/PackedSwitchPayloadDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
index 5362d7a15..c31d3198f 100644
--- a/dx/src/com/android/dx/io/PackedSwitchPayloadDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/PackedSwitchPayloadDecodedInstruction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * A decoded Dalvik instruction which contains the payload for
diff --git a/dx/src/com/android/dx/io/RegisterRangeDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
index 10769f01d..f294f6345 100644
--- a/dx/src/com/android/dx/io/RegisterRangeDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/RegisterRangeDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has register range arguments (an
diff --git a/dx/src/com/android/dx/io/ShortArrayCodeInput.java b/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java
index 114b865d1..bb5a4a041 100644
--- a/dx/src/com/android/dx/io/ShortArrayCodeInput.java
+++ b/dx/src/com/android/dx/io/instructions/ShortArrayCodeInput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 import java.io.EOFException;
 
diff --git a/dx/src/com/android/dx/io/ShortArrayCodeOutput.java b/dx/src/com/android/dx/io/instructions/ShortArrayCodeOutput.java
index d3a3710a7..efa7ddd59 100644
--- a/dx/src/com/android/dx/io/ShortArrayCodeOutput.java
+++ b/dx/src/com/android/dx/io/instructions/ShortArrayCodeOutput.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * Implementation of {@code CodeOutput} that writes to a {@code short[]}.
diff --git a/dx/src/com/android/dx/io/SparseSwitchPayloadDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
index 1bc9f404b..bfc47c9d5 100644
--- a/dx/src/com/android/dx/io/SparseSwitchPayloadDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/SparseSwitchPayloadDecodedInstruction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
 
 /**
  * A decoded Dalvik instruction which contains the payload for
diff --git a/dx/src/com/android/dx/io/ThreeRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
index d041807e5..a463677c3 100644
--- a/dx/src/com/android/dx/io/ThreeRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/ThreeRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has three register arguments.
diff --git a/dx/src/com/android/dx/io/TwoRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
index b299a54f1..acb77baea 100644
--- a/dx/src/com/android/dx/io/TwoRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/TwoRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has two register arguments.
diff --git a/dx/src/com/android/dx/io/ZeroRegisterDecodedInstruction.java b/dx/src/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
index 522b95c42..172caa4aa 100644
--- a/dx/src/com/android/dx/io/ZeroRegisterDecodedInstruction.java
+++ b/dx/src/com/android/dx/io/instructions/ZeroRegisterDecodedInstruction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.dx.io;
+package com.android.dx.io.instructions;
+
+import com.android.dx.io.IndexType;
 
 /**
  * A decoded Dalvik instruction which has no register arguments.
diff --git a/dx/src/com/android/dx/merge/InstructionTransformer.java b/dx/src/com/android/dx/merge/InstructionTransformer.java
index d3499d8e3..48d664254 100644
--- a/dx/src/com/android/dx/merge/InstructionTransformer.java
+++ b/dx/src/com/android/dx/merge/InstructionTransformer.java
@@ -18,9 +18,9 @@ package com.android.dx.merge;
 
 import com.android.dx.dex.DexException;
 import com.android.dx.io.CodeReader;
-import com.android.dx.io.DecodedInstruction;
 import com.android.dx.io.OpcodeInfo;
-import com.android.dx.io.ShortArrayCodeOutput;
+import com.android.dx.io.instructions.DecodedInstruction;
+import com.android.dx.io.instructions.ShortArrayCodeOutput;
 
 final class InstructionTransformer {
     private final IndexMap indexMap;