diff options
| author | jeffhao <jeffhao@google.com> | 2010-02-05 15:08:23 -0800 |
|---|---|---|
| committer | jeffhao <jeffhao@google.com> | 2010-02-05 15:38:35 -0800 |
| commit | e86676443a4cf6924c56ef069349f203e4056ca9 (patch) | |
| tree | 299085149be38825004af51b3301ace361071623 /vm/compiler/codegen/arm | |
| parent | 9e45c0b968d63ea38353c99252d233879c2efdaf (diff) | |
| download | android_dalvik-e86676443a4cf6924c56ef069349f203e4056ca9.tar.gz android_dalvik-e86676443a4cf6924c56ef069349f203e4056ca9.tar.bz2 android_dalvik-e86676443a4cf6924c56ef069349f203e4056ca9.zip | |
Cleaned up uninitialized variable use warnings in Self Verification mode.
Diffstat (limited to 'vm/compiler/codegen/arm')
| -rw-r--r-- | vm/compiler/codegen/arm/Assemble.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/vm/compiler/codegen/arm/Assemble.c b/vm/compiler/codegen/arm/Assemble.c index 5cb8ff697..826a3d24d 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(); } |