Permalink
Browse files

Fix ALOGV bit rot.

Change-Id: Ia182af8f5ca3967a21003b3d1513145f8e6e5db0
  • Loading branch information...
1 parent 464388e commit bb046193c2da5d43a57b2fa8a17a0f634bf003ba @enh enh committed Aug 7, 2012
View
@@ -74,7 +74,7 @@ static DvmDex* allocateAuxStructures(DexFile* pDexFile)
pDvmDex->pResFields = (struct Field**)blob;
ALOGV("+++ DEX %p: allocateAux (%d+%d+%d+%d)*4 = %d bytes",
- pDvmDex, stringSizei/4, classSize/4, methodSize/4, fieldSize/4,
+ pDvmDex, stringSize/4, classSize/4, methodSize/4, fieldSize/4,
stringSize + classSize + methodSize + fieldSize);
pDvmDex->pInterfaceCache = dvmAllocAtomicCache(DEX_INTERFACE_CACHE_SIZE);
View
@@ -2306,7 +2306,7 @@ static void SetObjectArrayElement(JNIEnv* env, jobjectArray jarr, jsize index, j
if (obj != NULL && !dvmCanPutArrayElement(obj->clazz, arrayObj->clazz)) {
ALOGV("Can't put a '%s'(%p) into array type='%s'(%p)",
obj->clazz->descriptor, obj,
- arrayObj->obj.clazz->descriptor, arrayObj);
+ arrayObj->clazz->descriptor, arrayObj);
dvmThrowArrayStoreExceptionIncompatibleElement(obj->clazz, arrayObj->clazz);
return;
}
View
@@ -1067,8 +1067,9 @@ static JdwpError handleTR_Status(JdwpState* state,
if (!dvmDbgGetThreadStatus(threadId, &threadStatus, &suspendStatus))
return ERR_INVALID_THREAD;
- ALOGV(" --> %s, %s", dvmJdwpThreadStatusStr(threadStatus),
- dvmJdwpSuspendStatusStr(suspendStatus));
+ ALOGV(" --> %s, %s",
+ dvmJdwpThreadStatusStr((JdwpThreadStatus) threadStatus),
+ dvmJdwpSuspendStatusStr((JdwpSuspendStatus) suspendStatus));
expandBufAdd4BE(pReply, threadStatus);
expandBufAdd4BE(pReply, suspendStatus);
@@ -24,7 +24,7 @@ HANDLE_OPCODE(OP_APUT_OBJECT /*vAA, vBB, vCC*/)
if (!dvmCanPutArrayElement(obj->clazz, arrayObj->clazz)) {
ALOGV("Can't put a '%s'(%p) into array type='%s'(%p)",
obj->clazz->descriptor, obj,
- arrayObj->obj.clazz->descriptor, arrayObj);
+ arrayObj->clazz->descriptor, arrayObj);
dvmThrowArrayStoreExceptionIncompatibleElement(obj->clazz, arrayObj->clazz);
GOTO_exceptionThrown();
}
@@ -2050,7 +2050,7 @@ HANDLE_OPCODE(OP_APUT_OBJECT /*vAA, vBB, vCC*/)
if (!dvmCanPutArrayElement(obj->clazz, arrayObj->clazz)) {
ALOGV("Can't put a '%s'(%p) into array type='%s'(%p)",
obj->clazz->descriptor, obj,
- arrayObj->obj.clazz->descriptor, arrayObj);
+ arrayObj->clazz->descriptor, arrayObj);
dvmThrowArrayStoreExceptionIncompatibleElement(obj->clazz, arrayObj->clazz);
GOTO_exceptionThrown();
}
@@ -2061,7 +2061,7 @@ HANDLE_OPCODE(OP_APUT_OBJECT /*vAA, vBB, vCC*/)
if (!dvmCanPutArrayElement(obj->clazz, arrayObj->clazz)) {
ALOGV("Can't put a '%s'(%p) into array type='%s'(%p)",
obj->clazz->descriptor, obj,
- arrayObj->obj.clazz->descriptor, arrayObj);
+ arrayObj->clazz->descriptor, arrayObj);
dvmThrowArrayStoreExceptionIncompatibleElement(obj->clazz, arrayObj->clazz);
GOTO_exceptionThrown();
}

0 comments on commit bb04619

Please sign in to comment.