Ensure R4 is initialized for upcall. Sort suspend naming.
Change-Id: I73eb49e1af2ced971eeaafb7c07f5d964dae1824
diff --git a/src/thread.h b/src/thread.h
index 12302ad..0d0f107 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -116,12 +116,13 @@
int (*pIdiv)(int, int);
long long (*pLmul)(long long, long long);
long long (*pLdivmod)(long long, long long);
+ void (*pCheckSuspendFromCode)(Thread*); // Stub that is called when the suspend count is non-zero
+ void (*pTestSuspendFromCode)(); // Stub that is periodically called to test the suspend count
void* (*pAllocObjectFromCode)(uint32_t, void*);
void* (*pAllocArrayFromCode)(uint32_t, void*, int32_t);
void (*pCanPutArrayElementFromCode)(void*, void*);
void* (*pCheckAndAllocArrayFromCode)(uint32_t, void*, int32_t);
void (*pCheckCastFromCode) (void*, void*);
- void (*pCheckSuspendFromCode)(Thread*);
Object* (*pDecodeJObjectInThread)(Thread* thread, jobject obj);
void (*pDeliverException)(void*);
void* (*pFindInstanceFieldFromCode)(uint32_t, void*);
@@ -142,7 +143,6 @@
int (*pSet32Static)(uint32_t, void*, int32_t);
int (*pSet64Static)(uint32_t, void*, int64_t);
int (*pSetObjStatic)(uint32_t, void*, void*);
- void (*pTestSuspendFromCode)();
void (*pThrowStackOverflowFromCode)(void*);
void (*pThrowNullPointerFromCode)();
void (*pThrowArrayBoundsFromCode)(int32_t, int32_t);