Update field offsets in InterpState per Jit-to-Interp cleanup

[android-x86/dalvik.git] / vm / AllocTracker.c

diff --git a/vm/AllocTracker.c b/vm/AllocTracker.c
index 168713c..8e2c325 100644 (file)
--- a/vm/AllocTracker.c
+++ b/vm/AllocTracker.c
@@ -155,7 +155,7 @@ static void getStackFrames(Thread* self, AllocRecord* pRec)
         const StackSaveArea* saveArea = SAVEAREA_FROM_FP(fp);
         const Method* method = saveArea->method;
 
-        if (!dvmIsBreakFrame(fp)) {
+        if (!dvmIsBreakFrame((u4*) fp)) {
             pRec->stackElem[stackDepth].method = method;
             if (dvmIsNativeMethod(method)) {
                 pRec->stackElem[stackDepth].pc = 0;
@@ -461,7 +461,7 @@ static size_t computeStringTableSize(PointerSet* strings)
  *
  * Returns the string's length, in characters.
  */
-int convertUtf8ToUtf16BEUA(u1* utf16Str, const char* utf8Str)
+static int convertUtf8ToUtf16BEUA(u1* utf16Str, const char* utf8Str)
 {
     u1* origUtf16Str = utf16Str;