commit b408de744566a5c5a80be1ba7f5c88407e816945
author Elliott Hughes <enh@google.com> Tue Oct 04 14:35:05 2011 -0700
committer Elliott Hughes <enh@google.com> Tue Oct 04 14:51:27 2011 -0700
tree fa282edb7134f16de6e3ff81181e6d9724039ab3
parent 4377a7e93b47386de1e0c2e472a6e3e99d235331

Implement the "unreasonable array allocation" OutOfMemoryError.

This doesn't fix test 061 because we still need AllocWithGrowth, but at least
it gets us far enough to need that.

Change-Id: Ia7b4a1f91a31e25d439f36b17280ce21c9ed8933

src/runtime_support_asm.S

diff --git a/src/runtime_support_asm.S b/src/runtime_support_asm.S
index 25a6872..eb12854 100644
--- a/src/runtime_support_asm.S
+++ b/src/runtime_support_asm.S
@@ -276,17 +276,17 @@
     mov    r1, sp                  @ pass SP
     b      artDeliverPendingExceptionFromCode  @ artDeliverPendingExceptionFromCode(Thread*, SP)
 
-    .global art_array_alloc_from_code
-    .extern artArrayAllocFromCode
+    .global art_alloc_array_from_code
+    .extern artAllocArrayFromCode
     /*
      * Called by managed code to allocate an array
      */
-art_array_alloc_from_code:
+art_alloc_array_from_code:
     str    sp, [R9, #THREAD_TOP_OF_MANAGED_STACK_OFFSET]    @ record top of stack and pc in case of
     str    lr, [R9, #THREAD_TOP_OF_MANAGED_STACK_PC_OFFSET] @ walking stack
     stmdb  sp!, {lr}              @ Save LR
     sub    sp, #12                @ Align stack
-    bl     artArrayAllocFromCode  @ (uint32_t type_idx, Method* method, int32_t component_count)
+    bl     artAllocArrayFromCode  @ (uint32_t type_idx, Method* method, int32_t component_count)
     add    sp, #12
     ldmia  sp!, {lr}              @ restore LR
     cmp    r0, #0                 @ success if result is non-null
@@ -297,17 +297,17 @@
     mov    r1, sp                 @ pass SP
     b      artDeliverPendingExceptionFromCode  @ artDeliverPendingExceptionFromCode(Thread*, SP)
 
-    .global art_check_and_array_alloc_from_code
-    .extern artCheckAndArrayAllocFromCode
+    .global art_check_and_alloc_array_from_code
+    .extern artCheckAndAllocArrayFromCode
     /*
      * Called by managed code to allocate an array
      */
-art_check_and_array_alloc_from_code:
+art_check_and_alloc_array_from_code:
     str    sp, [R9, #THREAD_TOP_OF_MANAGED_STACK_OFFSET]    @ record top of stack and pc in case of
     str    lr, [R9, #THREAD_TOP_OF_MANAGED_STACK_PC_OFFSET] @ walking stack
     stmdb  sp!, {lr}                      @ Save LR
     sub    sp, #12                        @ Align stack
-    bl     artCheckAndArrayAllocFromCode  @ (uint32_t type_idx, Method* method, int32_t count)
+    bl     artCheckAndAllocArrayFromCode  @ (uint32_t type_idx, Method* method, int32_t count)
     add    sp, #12
     ldmia  sp!, {lr}                      @ restore LR
     cmp    r0, #0                         @ success if result is non-null