tests/syscall_return_sandboxing/sandboxed_arm.S - Issue 11269063: Fix the NACL_INSTR_* names that I just checked in to NACL_INSTR_ARM_*, as suggested by mseaborn.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: tests/syscall_return_sandboxing/sandboxed_arm.S

Issue 11269063: Fix the NACL_INSTR_* names that I just checked in to NACL_INSTR_ARM_*, as suggested by mseaborn. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2012 The Native Client Authors. All rights reserved.	2 * Copyright (c) 2012 The Native Client Authors. All rights reserved.

3 * Use of this source code is governed by a BSD-style license that can be	3 * Use of this source code is governed by a BSD-style license that can be

4 * found in the LICENSE file.	4 * found in the LICENSE file.

5 */	5 */

6	6

7 #include "native_client/src/include/arm_sandbox.h"	7 #include "native_client/src/include/arm_sandbox.h"

8	8

9 /*	9 /*

10 * assume 32-byte trampoline slots, 16-byte bundles.	10 * assume 32-byte trampoline slots, 16-byte bundles.

(...skipping 16 matching lines...) Expand all Loading...
27 ldr r2, addrOfGetTimeOfDaySyscallAddr	27 ldr r2, addrOfGetTimeOfDaySyscallAddr

28 bic r2, r2, #0xf000000f	28 bic r2, r2, #0xf000000f

29 bx r2	29 bx r2

30	30

31 eor r0, r0, #1	31 eor r0, r0, #1

32 bad: pop {lr}	32 bad: pop {lr}

33 bic lr, lr, #0xf000000f	33 bic lr, lr, #0xf000000f

34 bx lr	34 bx lr

35	35

36	36

37 .word NACL_INSTR_LITERAL_POOL_HEAD	37 .word NACL_INSTR_ARM_LITERAL_POOL_HEAD

38 /*	38 /*

39 * Put a disallowed instruction here to ensure that the bkpt	39 * Put a disallowed instruction here to ensure that the bkpt

40 * data bundle marker works. If the marker does not work, then	40 * data bundle marker works. If the marker does not work, then

41 * whether this code passes the validator is a matter of chance.	41 * whether this code passes the validator is a matter of chance.

42 */	42 */

43 mov pc, r0	43 mov pc, r0

44 addrOfGetTimeOfDaySyscallAddr:	44 addrOfGetTimeOfDaySyscallAddr:

45 .word GETTIMEOFDAY_ADDR	45 .word GETTIMEOFDAY_ADDR

46 addrOfTimeBuf:	46 addrOfTimeBuf:

47 .word timebuf	47 .word timebuf

OLD	NEW

« no previous file with comments | « tests/faulted_thread_queue/faultqueue_test_guest.c ('k') | no next file » | no next file with comments »