am bef0d290: Merge "Disable 64-bit registers alignment of Dx"
* commit 'bef0d290eb9e7ead4ec6e1f6c19b5988435d5c2b':
Disable 64-bit registers alignment of Dx
diff --git a/tools/dasm/src/dasm/DAsm.java b/tools/dasm/src/dasm/DAsm.java
index 72436ac..aa55a23 100644
--- a/tools/dasm/src/dasm/DAsm.java
+++ b/tools/dasm/src/dasm/DAsm.java
@@ -55,6 +55,7 @@
import com.android.dx.rop.type.StdTypeList;
import com.android.dx.rop.type.Type;
import com.android.dx.rop.type.TypeList;
+import com.android.dx.rop.type.Prototype;
import com.android.dx.util.IntList;
import java.io.FileWriter;
@@ -84,7 +85,6 @@
// options for dex output
DexOptions dexOptions = new DexOptions();
-
// file being processed
DexFile dexFile;
int line_num;
@@ -1522,8 +1522,12 @@
* Creates processor of instruction list.
*/
private void createOutputFinisher() {
- if (output_finisher == null)
- output_finisher = new OutputFinisher(dexOptions, 5, regs_count);
+ if (output_finisher == null) {
+ dexOptions.ALIGN_64BIT_REGS_IN_OUTPUT_FINISHER = false;
+ int paramSize = Prototype.intern(method_nat.getDescriptor()
+ .getString()).getParameterTypes().getWordCount();
+ output_finisher = new OutputFinisher(dexOptions, 5, regs_count, paramSize);
+ }
}
/**