Index: src/trusted/service_runtime/sel_ldr-inl.h |
diff --git a/src/trusted/service_runtime/sel_ldr-inl.h b/src/trusted/service_runtime/sel_ldr-inl.h |
index 0083dc1daedb1a1f1bc9da80cb79664d0ea7fde3..b9bcf8b419719f8cb846ff657647a2fa05c8b7c8 100644 |
--- a/src/trusted/service_runtime/sel_ldr-inl.h |
+++ b/src/trusted/service_runtime/sel_ldr-inl.h |
@@ -49,6 +49,8 @@ |
* 0 is a valid user address.) |
*/ |
+#include "native_client/src/trusted/service_runtime/arch/sel_ldr_arch.h" |
+ |
static INLINE uintptr_t NaClUserToSysAddrNullOkay(struct NaClApp *nap, |
uintptr_t uaddr) { |
if (((uintptr_t) 1U << nap->addr_bits <= uaddr)) { |
@@ -188,6 +190,10 @@ static INLINE uintptr_t NaClSandboxCodeAddr(struct NaClApp *nap, |
addr |= 0xf; |
# endif /* defined(NACL_TARGET_ARM_THUMB2_MODE) */ |
return addr; |
+#elif NACL_ARCH(NACL_BUILD_ARCH) == NACL_mips |
+ UNREFERENCED_PARAMETER(nap); |
+ addr &= NACL_CONTROL_FLOW_MASK; |
+ return addr; |
Mark Seaborn
2012/09/08 02:43:14
Nit: combine this and just do "return addr & NACL_
petarj
2012/09/11 16:58:13
Done.
|
#else |
# error "What architecture are we on?!?" |
#endif |