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

Unified Diff: src/trusted/service_runtime/sel_ldr-inl.h

Issue 10919162: [MIPS] Implementation of sel_ldr for MIPS architecture. (Closed) Base URL: http://src.chromium.org/native_client/trunk/src/native_client/
Patch Set: Rebase (Saturday morning). Created 8 years, 3 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/posix/nacl_signal.c ('k') | src/trusted/service_runtime/sel_rt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..cf4305ba6826d90b3d05ad4707f31050f9052f75 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,9 @@ 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);
+ return addr & NACL_CONTROL_FLOW_MASK;
#else
# error "What architecture are we on?!?"
#endif
« no previous file with comments | « src/trusted/service_runtime/posix/nacl_signal.c ('k') | src/trusted/service_runtime/sel_rt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698