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/alloc/Copying.cpp

diff --git a/vm/alloc/Copying.cpp b/vm/alloc/Copying.cpp
index fca8ae7..f36fc89 100644
--- a/vm/alloc/Copying.cpp
+++ b/vm/alloc/Copying.cpp
@@ -1526,7 +1526,7 @@
     bool first = true;
 #endif
 
-    framePtr = (const u4 *)thread->curFrame;
+    framePtr = (const u4 *)thread->interpSave.curFrame;
     while (framePtr != NULL) {
         const StackSaveArea *saveArea;
         const Method *method;
@@ -1752,7 +1752,7 @@
     Object *obj;
 
     saveArea = NULL;
-    framePtr = (const u4 *)thread->curFrame;
+    framePtr = (const u4 *)thread->interpSave.curFrame;
     for (; framePtr != NULL; framePtr = saveArea->prevFrame) {
         saveArea = SAVEAREA_FROM_FP(framePtr);
         method = (Method *)saveArea->method;

vm/alloc/Visit.cpp

diff --git a/vm/alloc/Visit.cpp b/vm/alloc/Visit.cpp
index b329595..7f949f6 100644
--- a/vm/alloc/Visit.cpp
+++ b/vm/alloc/Visit.cpp
@@ -87,7 +87,7 @@
     assert(thread != NULL);
     u4 threadId = thread->threadId;
     const StackSaveArea *saveArea;
-    for (u4 *fp = (u4 *)thread->curFrame;
+    for (u4 *fp = (u4 *)thread->interpSave.curFrame;
          fp != NULL;
          fp = (u4 *)saveArea->prevFrame) {
         Method *method;