summaryrefslogtreecommitdiffstats
path: root/vm/compiler/codegen
diff options
context:
space:
mode:
authorJeff Hao <jeffhao@google.com>2010-02-05 15:41:57 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-05 15:41:57 -0800
commit90d5f6b0abffdd1f151014558d664872ace36976 (patch)
treee2087dff4866028374201634cdc3e838dd9a3d21 /vm/compiler/codegen
parent5eda24f40300e65f505977e457551faec225d3be (diff)
parente86676443a4cf6924c56ef069349f203e4056ca9 (diff)
downloadandroid_dalvik-90d5f6b0abffdd1f151014558d664872ace36976.tar.gz
android_dalvik-90d5f6b0abffdd1f151014558d664872ace36976.tar.bz2
android_dalvik-90d5f6b0abffdd1f151014558d664872ace36976.zip
Merge "Cleaned up uninitialized variable use warnings in Self Verification mode."
Diffstat (limited to 'vm/compiler/codegen')
-rw-r--r--vm/compiler/codegen/arm/Assemble.c18
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();
}