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

Side by Side Diff: tests/faulted_thread_queue/faultqueue_test_guest.c

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
OLDNEW
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 <assert.h> 7 #include <assert.h>
8 #include <setjmp.h> 8 #include <setjmp.h>
9 #include <stdio.h> 9 #include <stdio.h>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 ".byte 0x90\n" /* nop */ 62 ".byte 0x90\n" /* nop */
63 ".byte 0x66, 0x90\n" /* xchg %ax, %ax */ 63 ".byte 0x66, 0x90\n" /* xchg %ax, %ax */
64 ".byte 0x0f, 0x1f, 0x00\n" /* nopl (%eax) */ 64 ".byte 0x0f, 0x1f, 0x00\n" /* nopl (%eax) */
65 ".byte 0x0f, 0x1f, 0x40, 0x00\n" /* nopl 0x0(%eax) */ 65 ".byte 0x0f, 0x1f, 0x40, 0x00\n" /* nopl 0x0(%eax) */
66 ".byte 0x0f, 0x1f, 0x44, 0x00, 0x00\n" /* nopl 0x0(%eax, %eax, 1) */ 66 ".byte 0x0f, 0x1f, 0x44, 0x00, 0x00\n" /* nopl 0x0(%eax, %eax, 1) */
67 "jmp DoLongjmp\n"); 67 "jmp DoLongjmp\n");
68 #elif defined(__arm__) 68 #elif defined(__arm__)
69 ASM_WITH_REGS( 69 ASM_WITH_REGS(
70 expected_regs, 70 expected_regs,
71 ".p2align 4\n" 71 ".p2align 4\n"
72 "FaultAddr: .word " NACL_TO_STRING(NACL_INSTR_BREAKPOINT) "\n" 72 "FaultAddr: .word " NACL_TO_STRING(NACL_INSTR_ARM_BREAKPOINT) "\n"
73 /* 73 /*
74 * ARM does not provide hardware single-stepping so we do not 74 * ARM does not provide hardware single-stepping so we do not
75 * test it here, unlike in the x86 case. 75 * test it here, unlike in the x86 case.
76 */ 76 */
77 "b DoLongjmp\n" 77 "b DoLongjmp\n"
78 ".p2align 4\n"); 78 ".p2align 4\n");
79 #else 79 #else
80 # error Unknown architecture 80 # error Unknown architecture
81 #endif 81 #endif
82 } 82 }
83 return 0; 83 return 0;
84 } 84 }
OLDNEW
« no previous file with comments | « tests/dynamic_code_loading/templates_arm.S ('k') | tests/syscall_return_sandboxing/sandboxed_arm.S » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698