diff options
author | Dan Bornstein <danfuzz@android.com> | 2010-11-19 14:15:17 -0800 |
---|---|---|
committer | Dan Bornstein <danfuzz@android.com> | 2010-11-19 14:15:17 -0800 |
commit | 82901ca4f92ec9e4c47089395a395a619086deb5 (patch) | |
tree | eb1686c0a17190be9fa3b6d1d7f24cc0584c8873 /dx/src/com/android/dx/dex | |
parent | 7c02a97a7ea688f77fa219bd122870dd30a6bbf0 (diff) | |
download | android_dalvik-82901ca4f92ec9e4c47089395a395a619086deb5.tar.gz android_dalvik-82901ca4f92ec9e4c47089395a395a619086deb5.tar.bz2 android_dalvik-82901ca4f92ec9e4c47089395a395a619086deb5.zip |
Kill off InsnFormat.nextUp().
This method used to be used during instruction selection, but hasn't
been used since the bytecode.txt file got updated to include format
chains.
Change-Id: Iee827c8b8008a88d56326aecf249299fe92101e1
Diffstat (limited to 'dx/src/com/android/dx/dex')
31 files changed, 0 insertions, 191 deletions
diff --git a/dx/src/com/android/dx/dex/code/InsnFormat.java b/dx/src/com/android/dx/dex/code/InsnFormat.java index 0db25c22a..4dfb6e2fb 100644 --- a/dx/src/com/android/dx/dex/code/InsnFormat.java +++ b/dx/src/com/android/dx/dex/code/InsnFormat.java @@ -144,17 +144,6 @@ public abstract class InsnFormat { } /** - * Returns the next instruction format to try to match an instruction - * with, presuming that this instance isn't compatible, if any. - * - * <p>Subclasses must override this method.</p> - * - * @return {@code null-ok;} the next format to try, or {@code null} if - * there are no suitable alternatives - */ - public abstract InsnFormat nextUp(); - - /** * Writes the code units for the given instruction to the given * output destination. The instruction must be of this instance's format. * diff --git a/dx/src/com/android/dx/dex/code/form/Form10t.java b/dx/src/com/android/dx/dex/code/form/Form10t.java index 82b731d6f..ced4a6400 100644 --- a/dx/src/com/android/dx/dex/code/form/Form10t.java +++ b/dx/src/com/android/dx/dex/code/form/Form10t.java @@ -78,12 +78,6 @@ public final class Form10t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form20t.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form10x.java b/dx/src/com/android/dx/dex/code/form/Form10x.java index c7a22a618..4be3aa09d 100644 --- a/dx/src/com/android/dx/dex/code/form/Form10x.java +++ b/dx/src/com/android/dx/dex/code/form/Form10x.java @@ -66,12 +66,6 @@ public final class Form10x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { write(out, opcodeUnit(insn, 0)); } diff --git a/dx/src/com/android/dx/dex/code/form/Form11n.java b/dx/src/com/android/dx/dex/code/form/Form11n.java index d63fc6fad..904aa6be8 100644 --- a/dx/src/com/android/dx/dex/code/form/Form11n.java +++ b/dx/src/com/android/dx/dex/code/form/Form11n.java @@ -87,12 +87,6 @@ public final class Form11n extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form21s.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form11x.java b/dx/src/com/android/dx/dex/code/form/Form11x.java index b4acc1a35..739e7d35e 100644 --- a/dx/src/com/android/dx/dex/code/form/Form11x.java +++ b/dx/src/com/android/dx/dex/code/form/Form11x.java @@ -69,12 +69,6 @@ public final class Form11x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); write(out, opcodeUnit(insn, regs.get(0).getReg())); diff --git a/dx/src/com/android/dx/dex/code/form/Form12x.java b/dx/src/com/android/dx/dex/code/form/Form12x.java index c7754be69..28c926cf5 100644 --- a/dx/src/com/android/dx/dex/code/form/Form12x.java +++ b/dx/src/com/android/dx/dex/code/form/Form12x.java @@ -109,12 +109,6 @@ public final class Form12x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form22x.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int sz = regs.size(); diff --git a/dx/src/com/android/dx/dex/code/form/Form20t.java b/dx/src/com/android/dx/dex/code/form/Form20t.java index 0b5a3b26b..a19ed2891 100644 --- a/dx/src/com/android/dx/dex/code/form/Form20t.java +++ b/dx/src/com/android/dx/dex/code/form/Form20t.java @@ -78,12 +78,6 @@ public final class Form20t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form30t.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form21c.java b/dx/src/com/android/dx/dex/code/form/Form21c.java index 55979cd46..5a7ee4511 100644 --- a/dx/src/com/android/dx/dex/code/form/Form21c.java +++ b/dx/src/com/android/dx/dex/code/form/Form21c.java @@ -116,12 +116,6 @@ public final class Form21c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form31c.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form21h.java b/dx/src/com/android/dx/dex/code/form/Form21h.java index e0bd7515a..03ebc2940 100644 --- a/dx/src/com/android/dx/dex/code/form/Form21h.java +++ b/dx/src/com/android/dx/dex/code/form/Form21h.java @@ -97,12 +97,6 @@ public final class Form21h extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form31i.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); CstLiteralBits cb = (CstLiteralBits) ((CstInsn) insn).getConstant(); diff --git a/dx/src/com/android/dx/dex/code/form/Form21s.java b/dx/src/com/android/dx/dex/code/form/Form21s.java index a03ee4349..b7a3f72ae 100644 --- a/dx/src/com/android/dx/dex/code/form/Form21s.java +++ b/dx/src/com/android/dx/dex/code/form/Form21s.java @@ -86,12 +86,6 @@ public final class Form21s extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form21h.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form21t.java b/dx/src/com/android/dx/dex/code/form/Form21t.java index f0ce64465..d2690975f 100644 --- a/dx/src/com/android/dx/dex/code/form/Form21t.java +++ b/dx/src/com/android/dx/dex/code/form/Form21t.java @@ -83,12 +83,6 @@ public final class Form21t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form31t.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form22b.java b/dx/src/com/android/dx/dex/code/form/Form22b.java index 2884fbb76..eb3b884c4 100644 --- a/dx/src/com/android/dx/dex/code/form/Form22b.java +++ b/dx/src/com/android/dx/dex/code/form/Form22b.java @@ -88,12 +88,6 @@ public final class Form22b extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form22s.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form22c.java b/dx/src/com/android/dx/dex/code/form/Form22c.java index 62809bcbb..f2a35557f 100644 --- a/dx/src/com/android/dx/dex/code/form/Form22c.java +++ b/dx/src/com/android/dx/dex/code/form/Form22c.java @@ -91,12 +91,6 @@ public final class Form22c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form52c.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form22s.java b/dx/src/com/android/dx/dex/code/form/Form22s.java index 15cf70dde..4b670719c 100644 --- a/dx/src/com/android/dx/dex/code/form/Form22s.java +++ b/dx/src/com/android/dx/dex/code/form/Form22s.java @@ -88,12 +88,6 @@ public final class Form22s extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form32s.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form22t.java b/dx/src/com/android/dx/dex/code/form/Form22t.java index 1577803d2..d216ccc4a 100644 --- a/dx/src/com/android/dx/dex/code/form/Form22t.java +++ b/dx/src/com/android/dx/dex/code/form/Form22t.java @@ -85,12 +85,6 @@ public final class Form22t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form22x.java b/dx/src/com/android/dx/dex/code/form/Form22x.java index b7ce4e746..daf1da2aa 100644 --- a/dx/src/com/android/dx/dex/code/form/Form22x.java +++ b/dx/src/com/android/dx/dex/code/form/Form22x.java @@ -71,12 +71,6 @@ public final class Form22x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form23x.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); write(out, diff --git a/dx/src/com/android/dx/dex/code/form/Form23x.java b/dx/src/com/android/dx/dex/code/form/Form23x.java index 64dd6b051..849e8be0d 100644 --- a/dx/src/com/android/dx/dex/code/form/Form23x.java +++ b/dx/src/com/android/dx/dex/code/form/Form23x.java @@ -73,12 +73,6 @@ public final class Form23x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form32x.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); write(out, diff --git a/dx/src/com/android/dx/dex/code/form/Form30t.java b/dx/src/com/android/dx/dex/code/form/Form30t.java index 4d11ceb5d..86a3e828a 100644 --- a/dx/src/com/android/dx/dex/code/form/Form30t.java +++ b/dx/src/com/android/dx/dex/code/form/Form30t.java @@ -74,12 +74,6 @@ public final class Form30t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form31c.java b/dx/src/com/android/dx/dex/code/form/Form31c.java index ef4f8dc03..7383651dc 100644 --- a/dx/src/com/android/dx/dex/code/form/Form31c.java +++ b/dx/src/com/android/dx/dex/code/form/Form31c.java @@ -111,12 +111,6 @@ public final class Form31c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form41c.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form31i.java b/dx/src/com/android/dx/dex/code/form/Form31i.java index 6a801cf14..7e2583ded 100644 --- a/dx/src/com/android/dx/dex/code/form/Form31i.java +++ b/dx/src/com/android/dx/dex/code/form/Form31i.java @@ -84,12 +84,6 @@ public final class Form31i extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form51l.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form31t.java b/dx/src/com/android/dx/dex/code/form/Form31t.java index 7747cafdc..c7ead273b 100644 --- a/dx/src/com/android/dx/dex/code/form/Form31t.java +++ b/dx/src/com/android/dx/dex/code/form/Form31t.java @@ -79,12 +79,6 @@ public final class Form31t extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int offset = ((TargetInsn) insn).getTargetOffset(); diff --git a/dx/src/com/android/dx/dex/code/form/Form32s.java b/dx/src/com/android/dx/dex/code/form/Form32s.java index 18e40e21a..d9118a3a3 100644 --- a/dx/src/com/android/dx/dex/code/form/Form32s.java +++ b/dx/src/com/android/dx/dex/code/form/Form32s.java @@ -92,12 +92,6 @@ public final class Form32s extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int value = diff --git a/dx/src/com/android/dx/dex/code/form/Form32x.java b/dx/src/com/android/dx/dex/code/form/Form32x.java index 0ae6f8316..87ed6badf 100644 --- a/dx/src/com/android/dx/dex/code/form/Form32x.java +++ b/dx/src/com/android/dx/dex/code/form/Form32x.java @@ -70,12 +70,6 @@ public final class Form32x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form33x.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); diff --git a/dx/src/com/android/dx/dex/code/form/Form33x.java b/dx/src/com/android/dx/dex/code/form/Form33x.java index 96c57eb92..fb143a487 100644 --- a/dx/src/com/android/dx/dex/code/form/Form33x.java +++ b/dx/src/com/android/dx/dex/code/form/Form33x.java @@ -77,12 +77,6 @@ public final class Form33x extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); write(out, diff --git a/dx/src/com/android/dx/dex/code/form/Form35c.java b/dx/src/com/android/dx/dex/code/form/Form35c.java index 31b127d56..a8b6f448a 100644 --- a/dx/src/com/android/dx/dex/code/form/Form35c.java +++ b/dx/src/com/android/dx/dex/code/form/Form35c.java @@ -95,12 +95,6 @@ public final class Form35c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form3rc.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { int cpi = ((CstInsn) insn).getIndex(); RegisterSpecList regs = explicitize(insn.getRegisters()); diff --git a/dx/src/com/android/dx/dex/code/form/Form3rc.java b/dx/src/com/android/dx/dex/code/form/Form3rc.java index dab3fba8e..fde77441a 100644 --- a/dx/src/com/android/dx/dex/code/form/Form3rc.java +++ b/dx/src/com/android/dx/dex/code/form/Form3rc.java @@ -96,12 +96,6 @@ public final class Form3rc extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return Form5rc.THE_ONE; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form41c.java b/dx/src/com/android/dx/dex/code/form/Form41c.java index aecddcd31..65b4bec06 100644 --- a/dx/src/com/android/dx/dex/code/form/Form41c.java +++ b/dx/src/com/android/dx/dex/code/form/Form41c.java @@ -114,12 +114,6 @@ public final class Form41c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form51l.java b/dx/src/com/android/dx/dex/code/form/Form51l.java index 5ed59c6fc..447351d68 100644 --- a/dx/src/com/android/dx/dex/code/form/Form51l.java +++ b/dx/src/com/android/dx/dex/code/form/Form51l.java @@ -81,12 +81,6 @@ public final class Form51l extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); long value = diff --git a/dx/src/com/android/dx/dex/code/form/Form52c.java b/dx/src/com/android/dx/dex/code/form/Form52c.java index 9e03c569a..7ebeb8589 100644 --- a/dx/src/com/android/dx/dex/code/form/Form52c.java +++ b/dx/src/com/android/dx/dex/code/form/Form52c.java @@ -90,12 +90,6 @@ public final class Form52c extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/Form5rc.java b/dx/src/com/android/dx/dex/code/form/Form5rc.java index de2becb29..b05acd67b 100644 --- a/dx/src/com/android/dx/dex/code/form/Form5rc.java +++ b/dx/src/com/android/dx/dex/code/form/Form5rc.java @@ -95,12 +95,6 @@ public final class Form5rc extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - return null; - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { RegisterSpecList regs = insn.getRegisters(); int cpi = ((CstInsn) insn).getIndex(); diff --git a/dx/src/com/android/dx/dex/code/form/SpecialFormat.java b/dx/src/com/android/dx/dex/code/form/SpecialFormat.java index 8a2e5edf6..2d04964f5 100644 --- a/dx/src/com/android/dx/dex/code/form/SpecialFormat.java +++ b/dx/src/com/android/dx/dex/code/form/SpecialFormat.java @@ -67,12 +67,6 @@ public final class SpecialFormat extends InsnFormat { /** {@inheritDoc} */ @Override - public InsnFormat nextUp() { - throw new RuntimeException("unsupported"); - } - - /** {@inheritDoc} */ - @Override public void writeTo(AnnotatedOutput out, DalvInsn insn) { throw new RuntimeException("unsupported"); } |