Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: src/trusted/service_runtime/arch/mips/sel_rt.h

Issue 1536713003: [MIPS] Make $t8 point to the address of TLS pointers (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client@master
Patch Set: Move EditMipsCode() below EditArmCode(). Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/trusted/service_runtime/arch/mips/nacl_tls.c ('k') | src/trusted/service_runtime/arch/mips/sel_rt.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/trusted/service_runtime/arch/mips/sel_rt.h
diff --git a/src/trusted/service_runtime/arch/mips/sel_rt.h b/src/trusted/service_runtime/arch/mips/sel_rt.h
index 35328c6f4f3067fc1eea1b3c254407313c6df357..9d71b6fb6f6735a2a5f4774a7eabf23115bf0dd4 100644
--- a/src/trusted/service_runtime/arch/mips/sel_rt.h
+++ b/src/trusted/service_runtime/arch/mips/sel_rt.h
@@ -57,8 +57,12 @@ struct NaClThreadContext {
/* 38 */
uint32_t tls_idx;
/* 3c */
- uint32_t tls_value2;
+ uint32_t tls_value1;
/* 40 */
+ uint32_t tls_value2;
+ /* 44 */
+ uint32_t guard_token;
+ /* 48 */
};
static INLINE uintptr_t NaClGetThreadCtxSp(struct NaClThreadContext *th_ctx) {
@@ -85,7 +89,9 @@ NORETURN void NaClStartSwitch(struct NaClThreadContext *);
#define NACL_THREAD_CONTEXT_OFFSET_NEW_PROG_CTR 0x34
#define NACL_THREAD_CONTEXT_OFFSET_TRUSTED_STACK_PTR 0x38
#define NACL_THREAD_CONTEXT_OFFSET_TLS_IDX 0x3c
-#define NACL_THREAD_CONTEXT_OFFSET_TLS_VALUE2 0x40
+#define NACL_THREAD_CONTEXT_OFFSET_TLS_VALUE1 0x40
+#define NACL_THREAD_CONTEXT_OFFSET_TLS_VALUE2 0x44
+#define NACL_THREAD_CONTEXT_OFFSET_GUARD_TOKEN 0x48
#if !defined(__ASSEMBLER__)
@@ -120,7 +126,9 @@ static INLINE void NaClThreadContextOffsetCheck(void) {
NACL_CHECK_FIELD(NACL_THREAD_CONTEXT_OFFSET_TRUSTED_STACK_PTR,
trusted_stack_ptr);
NACL_CHECK_FIELD(NACL_THREAD_CONTEXT_OFFSET_TLS_IDX, tls_idx);
+ NACL_CHECK_FIELD(NACL_THREAD_CONTEXT_OFFSET_TLS_VALUE1, tls_value1);
NACL_CHECK_FIELD(NACL_THREAD_CONTEXT_OFFSET_TLS_VALUE2, tls_value2);
+ NACL_CHECK_FIELD(NACL_THREAD_CONTEXT_OFFSET_GUARD_TOKEN, guard_token);
CHECK(offset == sizeof(struct NaClThreadContext));
#undef NACL_CHECK_FIELD
« no previous file with comments | « src/trusted/service_runtime/arch/mips/nacl_tls.c ('k') | src/trusted/service_runtime/arch/mips/sel_rt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698