From 285dfd013a14d058cf6c1937933e5bc1f0fcc823 Mon Sep 17 00:00:00 2001
From: "JesusFreke@JesusFreke.com"
 <JesusFreke@JesusFreke.com@55b6fa8a-2a1e-11de-a435-ffa8d773f76a>
Date: Tue, 8 Sep 2009 08:27:52 +0000
Subject: [PATCH] Fix the registers in the dummy method calls used to replace
 null pointer method invokes/field accesses

git-svn-id: https://smali.googlecode.com/svn/trunk@438 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
---
 .../Adaptors/Format/Instruction22csnMethodItem.java         | 2 +-
 .../Adaptors/Format/Instruction35msnMethodItem.java         | 2 +-
 .../src/main/resources/templates/templates/baksmali.stg     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22csnMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22csnMethodItem.java
index a58e7b76..e5bacc74 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22csnMethodItem.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22csnMethodItem.java
@@ -40,6 +40,6 @@ public class Instruction22csnMethodItem extends InstructionFormatMethodItem<Inst
     }
 
     protected void setAttributes(StringTemplate template) {
-        template.setAttribute("Register", instruction.RegisterNum);
+        template.setAttribute("Register", formatRegister(instruction.RegisterNum));
     }
 }
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35msnMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35msnMethodItem.java
index 01c9d17a..747ddf83 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35msnMethodItem.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35msnMethodItem.java
@@ -40,6 +40,6 @@ public class Instruction35msnMethodItem extends InstructionFormatMethodItem<Inst
     }
 
     protected void setAttributes(StringTemplate template) {
-        template.setAttribute("Register", instruction.RegisterNum);
+        template.setAttribute("Register", formatRegister(instruction.RegisterNum));
     }
 }
diff --git a/baksmali/src/main/resources/templates/templates/baksmali.stg b/baksmali/src/main/resources/templates/templates/baksmali.stg
index 69125c26..2b57f379 100644
--- a/baksmali/src/main/resources/templates/templates/baksmali.stg
+++ b/baksmali/src/main/resources/templates/templates/baksmali.stg
@@ -200,8 +200,8 @@ Format22csf(Opcode, RegisterA, RegisterB, Reference) ::=
 
 Format22csn(Opcode, Register) ::=
 <<
-#Couldn't determine field access while deodexing, replaced with generic method call
-invoke-virtual <Register>, Ljava/lang/Object;->hashCode()I
+#Couldn't determine the field while deodexing, replaced with generic method call
+invoke-virtual-range {<Register> .. <Register>}, Ljava/lang/Object;->hashCode()I
 >>
 
 Format22s(Opcode, RegisterA, RegisterB, Literal) ::=
@@ -277,7 +277,7 @@ Format35msf(Opcode, Registers, Reference) ::=
 Format35msn(Opcode, Register) ::=
 <<
 #Couldn't determine method while deodexing, replaced with generic method call
-invoke-virtual <Register>, Ljava/lang/Object;->hashCode()I
+invoke-virtual-range {<Register> .. <Register>}, Ljava/lang/Object;->hashCode()I
 >>
 
 Format3rc(Opcode, StartRegister, LastRegister, Reference) ::=