From f0e620daa70f04b712ce98a4897cdea464b2ca70 Mon Sep 17 00:00:00 2001 From: jeffhao Date: Fri, 5 Feb 2010 15:08:23 -0800 Subject: [PATCH] Cleaned up uninitialized variable use warnings in Self Verification mode. --- vm/compiler/codegen/arm/Assemble.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/vm/compiler/codegen/arm/Assemble.c b/vm/compiler/codegen/arm/Assemble.c index f854b7ad3..fd7c76b11 100644 --- a/vm/compiler/codegen/arm/Assemble.c +++ b/vm/compiler/codegen/arm/Assemble.c @@ -1928,6 +1928,10 @@ static int selfVerificationLoad(int addr, int size) break; case kSVWord: data = *((u4*) addr); + default: + LOGE("*** ERROR: BAD SIZE IN selfVerificationLoad"); + data = 0; + dvmAbort(); } //LOGD("*** HEAP LOAD: Addr: 0x%x Data: 0x%x Size: %d", addr, data, size); @@ -2003,6 +2007,9 @@ static void selfVerificationStore(int addr, int data, int size) break; case kSVWord: *((u4*) addr) = data; + default: + LOGE("*** ERROR: BAD SIZE IN selfVerificationSave"); + dvmAbort(); } } @@ -2201,8 +2208,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) if (insn & 0x400000) rt |= 0x10; rt = rt << 1; } else { - LOGD("*** ERROR: UNRECOGNIZED VECTOR MEM OP"); - assert(0); + LOGE("*** ERROR: UNRECOGNIZED VECTOR MEM OP"); dvmAbort(); } rt += 14; @@ -2228,8 +2234,8 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) offset = imm12; break; default: - LOGD("*** ERROR: UNRECOGNIZED MEM OP"); - assert(0); + LOGE("*** ERROR: UNRECOGNIZED MEM OP"); + offset = 0; dvmAbort(); } @@ -2341,8 +2347,8 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp) offset = imm; break; default: - LOGD("*** ERROR: UNRECOGNIZED MEM OP"); - assert(0); + LOGE("*** ERROR: UNRECOGNIZED MEM OP"); + offset = 0; dvmAbort(); } -- 2.11.0