summaryrefslogtreecommitdiffstats
path: root/vm/Init.c
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2011-03-03 13:10:04 -0800
committerDan Bornstein <danfuzz@android.com>2011-03-03 13:10:04 -0800
commit85ba81d1da57c9f19c54bee3d7907b70045dad46 (patch)
tree3e67a568f6a4923058494cdc3599e1d5fef47c98 /vm/Init.c
parentcfb32121210a260fab1c010e134738d1e32c567e (diff)
downloadandroid_dalvik-85ba81d1da57c9f19c54bee3d7907b70045dad46.tar.gz
android_dalvik-85ba81d1da57c9f19c54bee3d7907b70045dad46.tar.bz2
android_dalvik-85ba81d1da57c9f19c54bee3d7907b70045dad46.zip
Set up a few more exceptions.
I'm starting to scrape the bottom of the barrel. Bug: 3500987 Change-Id: If9c0f922506a94e78c504ea8c58176effe5fe00c
Diffstat (limited to 'vm/Init.c')
-rw-r--r--vm/Init.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/vm/Init.c b/vm/Init.c
index 0780211cf..e4d05ee24 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -1200,6 +1200,8 @@ int dvmFindRequiredClassesAndMembers(void) {
/* Exception classes and related support classes */
+ ok &= initRef(&gDvm.exAbstractMethodError,
+ "Ljava/lang/AbstractMethodError;");
ok &= initRef(&gDvm.exArithmeticException,
"Ljava/lang/ArithmeticException;");
ok &= initRef(&gDvm.exArrayIndexOutOfBoundsException,
@@ -1208,6 +1210,8 @@ int dvmFindRequiredClassesAndMembers(void) {
"Ljava/lang/ArrayStoreException;");
ok &= initRef(&gDvm.exClassCastException,
"Ljava/lang/ClassCastException;");
+ ok &= initRef(&gDvm.exClassCircularityError,
+ "Ljava/lang/ClassCircularityError;");
ok &= initRef(&gDvm.exClassNotFoundException,
"Ljava/lang/ClassNotFoundException;");
ok &= initRef(&gDvm.exClassFormatError, "Ljava/lang/ClassFormatError;");
@@ -1251,6 +1255,8 @@ int dvmFindRequiredClassesAndMembers(void) {
"Ljava/lang/NoSuchMethodError;");
ok &= initRef(&gDvm.exNullPointerException,
"Ljava/lang/NullPointerException;");
+ ok &= initRef(&gDvm.exOutOfMemoryError,
+ "Ljava/lang/OutOfMemoryError;");
ok &= initRef(&gDvm.exRuntimeException, "Ljava/lang/RuntimeException;");
ok &= initRef(&gDvm.exStackOverflowError,
"Ljava/lang/StackOverflowError;");
@@ -1259,10 +1265,14 @@ int dvmFindRequiredClassesAndMembers(void) {
ok &= initRef(&gDvm.exStringIndexOutOfBoundsException,
"Ljava/lang/StringIndexOutOfBoundsException;");
ok &= initRef(&gDvm.exThrowable, "Ljava/lang/Throwable;");
+ ok &= initRef(&gDvm.exTypeNotPresentException,
+ "Ljava/lang/TypeNotPresentException;");
ok &= initRef(&gDvm.exUnsatisfiedLinkError,
"Ljava/lang/UnsatisfiedLinkError;");
ok &= initRef(&gDvm.exUnsupportedOperationException,
"Ljava/lang/UnsupportedOperationException;");
+ ok &= initRef(&gDvm.exVerifyError,
+ "Ljava/lang/VerifyError;");
ok &= initRef(&gDvm.exVirtualMachineError,
"Ljava/lang/VirtualMachineError;");