src/trusted/service_runtime/sel_ldr-inl.h - Issue 10919162: [MIPS] Implementation of sel_ldr for MIPS architecture.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« src/trusted/service_runtime/posix/nacl_signal.c ('K') | « src/trusted/service_runtime/posix/nacl_signal.c ('k') | src/trusted/service_runtime/sel_qualify.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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..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