From f5765d37c86742f610191ce963e749c7d0f88341 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Mon, 17 Feb 2014 00:08:50 -0600 Subject: [PATCH] Give comment-generating functions more precise naming --- .../Adaptors/Format/ArrayDataMethodItem.java | 7 +++--- .../Format/InstructionMethodItem.java | 25 ++++++++++--------- .../Format/PackedSwitchMethodItem.java | 2 +- .../Format/SparseSwitchMethodItem.java | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java index 0ea28eab..9c7b658c 100644 --- a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java +++ b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java @@ -66,10 +66,11 @@ public class ArrayDataMethodItem extends InstructionMethodItem { LongRenderer.writeSignedIntOrLongTo(writer, number.longValue()); writer.write(suffix); if (elementWidth == 8) { - writeDouble(writer, number.longValue()); + writeCommentIfLikelyDouble(writer, number.longValue()); } else if (elementWidth == 4) { - writeResourceId(writer, number.intValue()); - writeFloat(writer, number.intValue()); + int value = number.intValue(); + boolean isResourceId = writeCommentIfResourceId(writer, value); + if (!isResourceId) writeCommentIfLikelyFloat(writer, value); } writer.write("\n"); } diff --git a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java index 745b9c21..7975c894 100644 --- a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java +++ b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java @@ -232,10 +232,10 @@ public class InstructionMethodItem extends MethodItem { writer.write(", "); writeLiteral(writer); if (instruction.getOpcode().setsWideRegister()) { - writeDouble(writer); + writeCommentIfLikelyDouble(writer); } else { - writeResourceId(writer); - writeFloat(writer); + boolean isResourceId = writeCommentIfResourceId(writer); + if (!isResourceId) writeCommentIfLikelyFloat(writer); } return true; case Format21t: @@ -441,11 +441,11 @@ public class InstructionMethodItem extends MethodItem { LongRenderer.writeSignedIntOrLongTo(writer, ((WideLiteralInstruction)instruction).getWideLiteral()); } - protected void writeFloat(IndentingWriter writer) throws IOException { - writeFloat(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); + protected void writeCommentIfLikelyFloat(IndentingWriter writer) throws IOException { + writeCommentIfLikelyFloat(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); } - protected void writeFloat(IndentingWriter writer, int val) throws IOException { + protected void writeCommentIfLikelyFloat(IndentingWriter writer, int val) throws IOException { if (NumberUtils.isLikelyFloat(val)) { writer.write(" # "); float fval = Float.intBitsToFloat(val); @@ -468,11 +468,11 @@ public class InstructionMethodItem extends MethodItem { } } - protected void writeDouble(IndentingWriter writer) throws IOException { - writeDouble(writer, ((WideLiteralInstruction)instruction).getWideLiteral()); + protected void writeCommentIfLikelyDouble(IndentingWriter writer) throws IOException { + writeCommentIfLikelyDouble(writer, ((WideLiteralInstruction)instruction).getWideLiteral()); } - protected void writeDouble(IndentingWriter writer, long val) throws IOException { + protected void writeCommentIfLikelyDouble(IndentingWriter writer, long val) throws IOException { if (NumberUtils.isLikelyDouble(val)) { writer.write(" # "); double dval = Double.longBitsToDouble(val); @@ -493,17 +493,18 @@ public class InstructionMethodItem extends MethodItem { } } - protected void writeResourceId(IndentingWriter writer) throws IOException { - writeResourceId(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); + protected boolean writeCommentIfResourceId(IndentingWriter writer) throws IOException { + return writeCommentIfResourceId(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); } - protected void writeResourceId(IndentingWriter writer, int val) throws IOException { + protected boolean writeCommentIfResourceId(IndentingWriter writer, int val) throws IOException { Map resourceIds = methodDef.classDef.options.resourceIds; String resource = resourceIds.get(Integer.valueOf(val)); if (resource != null) { writer.write(" # "); writer.write(resource); } + return (resource != null); } protected void writeFieldOffset(IndentingWriter writer) throws IOException { diff --git a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java index 5d7dea7e..f0dd656b 100644 --- a/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java +++ b/brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java @@ -85,7 +85,7 @@ public class PackedSwitchMethodItem extends InstructionMethodItem "); target.writeTargetTo(writer); - writeResourceId(writer, target.getKey()); + writeCommentIfResourceId(writer, target.getKey()); writer.write('\n'); } writer.deindent(4);