Move from code field routines to runtime support.
Add support for exceptions from these routines. Use a macro for pending
exception delivery. Fix bug in object_test where the signature of a
FromCode function had changed.
Change-Id: If486eff8659e5f6bb38d95b1139e8981656e4fb0
diff --git a/src/thread.cc b/src/thread.cc
index b3dbcb6..079954b 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -110,9 +110,16 @@
pCanPutArrayElementFromCode = art_can_put_array_element_from_code;
pCheckAndAllocArrayFromCode = art_check_and_alloc_array_from_code;
pCheckCastFromCode = art_check_cast_from_code;
+ pFindInstanceFieldFromCode = art_find_instance_field_from_code;
+ pGet32Static = art_get32_static_from_code;
+ pGet64Static = art_get64_static_from_code;
+ pGetObjStatic = art_get_obj_static_from_code;
pHandleFillArrayDataFromCode = art_handle_fill_data_from_code;
pInitializeStaticStorage = art_initialize_static_storage_from_code;
pInvokeInterfaceTrampoline = art_invoke_interface_trampoline;
+ pSet32Static = art_set32_static_from_code;
+ pSet64Static = art_set64_static_from_code;
+ pSetObjStatic = art_set_obj_static_from_code;
pTestSuspendFromCode = art_test_suspend;
pThrowArrayBoundsFromCode = art_throw_array_bounds_from_code;
pThrowDivZeroFromCode = art_throw_div_zero_from_code;
@@ -130,16 +137,9 @@
pF2l = F2L;
pD2l = D2L;
pMemcpy = memcpy;
- pGet32Static = Field::Get32StaticFromCode;
- pSet32Static = Field::Set32StaticFromCode;
- pGet64Static = Field::Get64StaticFromCode;
- pSet64Static = Field::Set64StaticFromCode;
- pGetObjStatic = Field::GetObjStaticFromCode;
- pSetObjStatic = Field::SetObjStaticFromCode;
pInitializeTypeFromCode = InitializeTypeFromCode;
pResolveMethodFromCode = ResolveMethodFromCode;
pInstanceofNonTrivialFromCode = Class::IsAssignableFromCode;
- pFindInstanceFieldFromCode = Field::FindInstanceFieldFromCode;
pCheckSuspendFromCode = artCheckSuspendFromJni;
pFindNativeMethod = FindNativeMethod;
pDecodeJObjectInThread = DecodeJObjectInThread;