diff options
| author | Dan Bornstein <danfuzz@android.com> | 2011-03-07 14:54:14 -0800 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2011-03-07 14:54:14 -0800 |
| commit | 47f58250c5177adba475b0b11a36151ac0ce9ab9 (patch) | |
| tree | bdb2602c8b2ab000436e257c36d0c7f191302cae /vm/mterp/out/InterpAsm-armv5te.S | |
| parent | 3111b0c80ca3f90e966371cbab606ac38ed17cad (diff) | |
| download | android_dalvik-47f58250c5177adba475b0b11a36151ac0ce9ab9.tar.gz android_dalvik-47f58250c5177adba475b0b11a36151ac0ce9ab9.tar.bz2 android_dalvik-47f58250c5177adba475b0b11a36151ac0ce9ab9.zip | |
Consistency in exception throws.
Make the messages that consist of a series of values consistently use
semicolons between the values, and make the call order for exception
throws that take both "info about a thing" as well as "info about a
use of that thing" take the "info about a thing" argument first.
Practical upshot: Adding a second semicolon in the message for
StringIndexOutOfBoundsException being thrown for a region, and
switching the order of arguments of
dvmThrowArrayIndexOutOfBoundsException().
Bug: 3500987
Change-Id: I97eb0046ab8997a68e2d6dfde5dbf3d02290c1f7
Diffstat (limited to 'vm/mterp/out/InterpAsm-armv5te.S')
| -rw-r--r-- | vm/mterp/out/InterpAsm-armv5te.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S index 627f1a47b..a1977ee95 100644 --- a/vm/mterp/out/InterpAsm-armv5te.S +++ b/vm/mterp/out/InterpAsm-armv5te.S @@ -21774,14 +21774,13 @@ common_resumeAfterGlueCall: /* * Invalid array index. Note that our calling convention is strange; we use r1 * and r3 because those just happen to be the registers all our callers are - * using. We shuffle them here before calling the C function. + * using. We move r3 before calling the C function, but r1 happens to match. * r1: index * r3: size */ common_errArrayIndex: EXPORT_PC() - mov r0, r1 - mov r1, r3 + mov r0, r3 bl dvmThrowArrayIndexOutOfBoundsException b common_exceptionThrown |