From d7d995cc2dbd94e608c8e02778f4361c27b25f4b Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 4 Sep 2016 16:58:01 -0700 Subject: Remove the now-unused experimental opcodes flag/functionality --- smali/src/main/antlr/smaliParser.g | 4 ++-- smali/src/main/antlr/smaliTreeWalker.g | 4 ++-- smali/src/main/java/org/jf/smali/AssembleCommand.java | 6 ------ smali/src/main/java/org/jf/smali/Smali.java | 6 +++--- smali/src/main/java/org/jf/smali/SmaliOptions.java | 1 - smali/src/main/java/org/jf/smali/SmaliTestUtils.java | 12 ++++++------ 6 files changed, 13 insertions(+), 20 deletions(-) (limited to 'smali') diff --git a/smali/src/main/antlr/smaliParser.g b/smali/src/main/antlr/smaliParser.g index 29cd141b..2d5eccaa 100644 --- a/smali/src/main/antlr/smaliParser.g +++ b/smali/src/main/antlr/smaliParser.g @@ -263,8 +263,8 @@ import org.jf.dexlib2.Opcodes; this.allowOdex = allowOdex; } - public void setApiLevel(int apiLevel, boolean experimental) { - this.opcodes = new Opcodes(apiLevel, experimental); + public void setApiLevel(int apiLevel) { + this.opcodes = Opcodes.forApi(apiLevel); this.apiLevel = apiLevel; } diff --git a/smali/src/main/antlr/smaliTreeWalker.g b/smali/src/main/antlr/smaliTreeWalker.g index d074579b..171756ec 100644 --- a/smali/src/main/antlr/smaliTreeWalker.g +++ b/smali/src/main/antlr/smaliTreeWalker.g @@ -85,8 +85,8 @@ import java.util.*; this.dexBuilder = dexBuilder; } - public void setApiLevel(int apiLevel, boolean experimental) { - this.opcodes = new Opcodes(apiLevel, experimental); + public void setApiLevel(int apiLevel) { + this.opcodes = Opcodes.forApi(apiLevel); this.apiLevel = apiLevel; } diff --git a/smali/src/main/java/org/jf/smali/AssembleCommand.java b/smali/src/main/java/org/jf/smali/AssembleCommand.java index 96075708..efde1825 100644 --- a/smali/src/main/java/org/jf/smali/AssembleCommand.java +++ b/smali/src/main/java/org/jf/smali/AssembleCommand.java @@ -69,11 +69,6 @@ public class AssembleCommand extends Command { @ExtendedParameter(argumentNames = "file") private String output = "out.dex"; - @Parameter(names = "--experimental", - description = "Enable experimental opcodes to be assembled, even if they aren't necessarily " + - "supported in the Android runtime yet.") - private boolean experimentalOpcodes = false; - @Parameter(names = "--verbose", description = "Generate verbose error messages.") private boolean verbose = false; @@ -110,7 +105,6 @@ public class AssembleCommand extends Command { options.jobs = jobs; options.apiLevel = apiLevel; options.outputDexFile = output; - options.experimentalOpcodes = experimentalOpcodes; options.allowOdexOpcodes = allowOdexOpcodes; options.verboseErrors = verbose; diff --git a/smali/src/main/java/org/jf/smali/Smali.java b/smali/src/main/java/org/jf/smali/Smali.java index 178a3c52..c00da31f 100644 --- a/smali/src/main/java/org/jf/smali/Smali.java +++ b/smali/src/main/java/org/jf/smali/Smali.java @@ -92,7 +92,7 @@ public class Smali { boolean errors = false; final DexBuilder dexBuilder = DexBuilder.makeDexBuilder( - Opcodes.forApi(options.apiLevel, options.experimentalOpcodes)); + Opcodes.forApi(options.apiLevel)); ExecutorService executor = Executors.newFixedThreadPool(options.jobs); List> tasks = Lists.newArrayList(); @@ -177,7 +177,7 @@ public class Smali { smaliParser parser = new smaliParser(tokens); parser.setVerboseErrors(options.verboseErrors); parser.setAllowOdex(options.allowOdexOpcodes); - parser.setApiLevel(options.apiLevel, options.experimentalOpcodes); + parser.setApiLevel(options.apiLevel); smaliParser.smali_file_return result = parser.smali_file(); @@ -195,7 +195,7 @@ public class Smali { } smaliTreeWalker dexGen = new smaliTreeWalker(treeStream); - dexGen.setApiLevel(options.apiLevel, options.experimentalOpcodes); + dexGen.setApiLevel(options.apiLevel); dexGen.setVerboseErrors(options.verboseErrors); dexGen.setDexBuilder(dexBuilder); diff --git a/smali/src/main/java/org/jf/smali/SmaliOptions.java b/smali/src/main/java/org/jf/smali/SmaliOptions.java index 91fadf10..ac385fe6 100644 --- a/smali/src/main/java/org/jf/smali/SmaliOptions.java +++ b/smali/src/main/java/org/jf/smali/SmaliOptions.java @@ -39,5 +39,4 @@ public class SmaliOptions { public boolean allowOdexOpcodes = false; public boolean verboseErrors = false; public boolean printTokens = false; - public boolean experimentalOpcodes = false; } diff --git a/smali/src/main/java/org/jf/smali/SmaliTestUtils.java b/smali/src/main/java/org/jf/smali/SmaliTestUtils.java index bef07414..b76641b2 100644 --- a/smali/src/main/java/org/jf/smali/SmaliTestUtils.java +++ b/smali/src/main/java/org/jf/smali/SmaliTestUtils.java @@ -50,14 +50,14 @@ import java.io.StringReader; public class SmaliTestUtils { public static ClassDef compileSmali(String smaliText) throws RecognitionException, IOException { - return compileSmali(smaliText, 15, false); + return compileSmali(smaliText, 15); } - public static ClassDef compileSmali(String smaliText, int apiLevel, boolean experimental) + public static ClassDef compileSmali(String smaliText, int apiLevel) throws RecognitionException, IOException { CommonTokenStream tokens; LexerErrorInterface lexer; - DexBuilder dexBuilder = DexBuilder.makeDexBuilder(Opcodes.forApi(apiLevel, experimental)); + DexBuilder dexBuilder = DexBuilder.makeDexBuilder(Opcodes.forApi(apiLevel)); Reader reader = new StringReader(smaliText); @@ -67,7 +67,7 @@ public class SmaliTestUtils { smaliParser parser = new smaliParser(tokens); parser.setVerboseErrors(true); parser.setAllowOdex(false); - parser.setApiLevel(apiLevel, experimental); + parser.setApiLevel(apiLevel); smaliParser.smali_file_return result = parser.smali_file(); @@ -81,7 +81,7 @@ public class SmaliTestUtils { treeStream.setTokenStream(tokens); smaliTreeWalker dexGen = new smaliTreeWalker(treeStream); - dexGen.setApiLevel(apiLevel, experimental); + dexGen.setApiLevel(apiLevel); dexGen.setVerboseErrors(true); dexGen.setDexBuilder(dexBuilder); dexGen.smali_file(); @@ -94,7 +94,7 @@ public class SmaliTestUtils { dexBuilder.writeTo(dataStore); - DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.forApi(apiLevel, experimental), dataStore.getData()); + DexBackedDexFile dexFile = new DexBackedDexFile(Opcodes.forApi(apiLevel), dataStore.getData()); return Iterables.getFirst(dexFile.getClasses(), null); } -- cgit v1.2.3