commit 30bc0d46ae730d78c42c39cfa56a59ba3025380b
author buzbee <buzbee@google.com> Fri Apr 22 10:27:14 2011 -0700
committer buzbee <buzbee@google.com> Fri Apr 22 14:18:00 2011 -0700
tree 497bb35e8045c9c0d92c90f7dadb594e0879c0e6
parent fad819858f84f27b4461b70a82ae11d9088bbdcb

Consolidate curFrame fields in thread storage

We ended up with two locations in the Thread structure for saved
Dalvik frame pointer.  This change consolidates them.

Change-Id: I78f288e4e57e232f29663be930101e775bfe370f

vm/mterp/portable/stubdefs.cpp

diff --git a/vm/mterp/portable/stubdefs.cpp b/vm/mterp/portable/stubdefs.cpp
index de9a8e7..57ff35c 100644
--- a/vm/mterp/portable/stubdefs.cpp
+++ b/vm/mterp/portable/stubdefs.cpp
@@ -21,7 +21,8 @@
  */
 #define PC_FP_TO_SELF()                                                    \
     self->interpSave.pc = pc;                                              \
-    self->interpSave.fp = fp;
+    self->interpSave.curFrame = fp;
+#define PC_TO_SELF() self->interpSave.pc = pc;
 
 /*
  * Instruction framing.  For a switch-oriented implementation this is