diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:16:58 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-08 11:26:30 +0000 |
| commit | c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef (patch) | |
| tree | 76e90a6ae1910835a56e4dad3f60f42392645703 /vm/interp/Stack.cpp | |
| parent | e8e1ddccd616e8226b7cc1e4e9fdb327429249e8 (diff) | |
| download | android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.tar.gz android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.tar.bz2 android_dalvik-c1a4ab9c313d8a3d12007f2dbef7b5a6fa4ac2ef.zip | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Also fix an occurrence of LOGW missed in an earlier change.
Bug: 5449033
Change-Id: I2e3b23839e6dcd09015d6402280e9300c75e3406
Diffstat (limited to 'vm/interp/Stack.cpp')
| -rw-r--r-- | vm/interp/Stack.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vm/interp/Stack.cpp b/vm/interp/Stack.cpp index aa164393b..a1f8d7130 100644 --- a/vm/interp/Stack.cpp +++ b/vm/interp/Stack.cpp @@ -335,7 +335,7 @@ static bool dvmPopFrame(Thread* self) saveBlock = SAVEAREA_FROM_FP(saveBlock->prevFrame); } if (saveBlock->method != NULL) { - LOGE("PopFrame missed the break"); + ALOGE("PopFrame missed the break"); assert(false); dvmAbort(); // stack trashed -- nowhere to go in this thread } @@ -504,7 +504,7 @@ void dvmCallMethodV(Thread* self, const Method* method, Object* obj, #ifndef NDEBUG if (verifyCount != method->insSize) { - LOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, + ALOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, method->insSize, clazz->descriptor, method->name); assert(false); goto bail; @@ -599,7 +599,7 @@ void dvmCallMethodA(Thread* self, const Method* method, Object* obj, *ins++ = args->z; /* 8 bits, zero or non-zero */ break; default: - LOGE("Invalid char %c in short signature of %s.%s", + ALOGE("Invalid char %c in short signature of %s.%s", *(desc-1), clazz->descriptor, method->name); assert(false); goto bail; @@ -611,7 +611,7 @@ void dvmCallMethodA(Thread* self, const Method* method, Object* obj, #ifndef NDEBUG if (verifyCount != method->insSize) { - LOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, + ALOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, method->insSize, clazz->descriptor, method->name); assert(false); goto bail; @@ -717,7 +717,7 @@ Object* dvmInvokeMethod(Object* obj, const Method* method, #ifndef NDEBUG if (verifyCount != method->insSize) { - LOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, + ALOGE("Got vfycount=%d insSize=%d for %s.%s", verifyCount, method->insSize, clazz->descriptor, method->name); assert(false); goto bail; @@ -1007,7 +1007,7 @@ void dvmHandleStackOverflow(Thread* self, const Method* method) /* * Already did, nothing to do but bail. */ - LOGE("DalvikVM: double-overflow of stack in threadid=%d; aborting", + ALOGE("DalvikVM: double-overflow of stack in threadid=%d; aborting", self->threadId); dvmDumpThread(self, false); dvmAbort(); @@ -1060,7 +1060,7 @@ void dvmCleanupStackOverflow(Thread* self, const Object* exception) newStackEnd = (self->interpStackStart - self->interpStackSize) + STACK_OVERFLOW_RESERVE; if ((u1*)self->interpSave.curFrame <= newStackEnd) { - LOGE("Can't shrink stack: curFrame is in reserved area (%p %p)", + ALOGE("Can't shrink stack: curFrame is in reserved area (%p %p)", self->interpStackEnd, self->interpSave.curFrame); dvmDumpThread(self, false); dvmAbort(); |