src/trusted/service_runtime/arch/arm/nacl_switch.S - Issue 10806080: ARM: Rename the "new_eip" field in NaClThreadContext to "new_prog_ctr"

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/arch/arm/nacl_switch.S

Issue 10806080: ARM: Rename the "new_eip" field in NaClThreadContext to "new_prog_ctr" (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Rebase + copyright Created 8 years, 5 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

Index: src/trusted/service_runtime/arch/arm/nacl_switch.S

diff --git a/src/trusted/service_runtime/arch/arm/nacl_switch.S b/src/trusted/service_runtime/arch/arm/nacl_switch.S

index a85d6053400d3b718d50fc7b8b6e8c4d272e1280..2a513d5f2f2441a3e0671bd281a4e5a2615477b8 100644

--- a/src/trusted/service_runtime/arch/arm/nacl_switch.S

+++ b/src/trusted/service_runtime/arch/arm/nacl_switch.S

@@ -34,7 +34,7 @@ DEFINE_GLOBAL_HIDDEN_IDENTIFIER(NaClSwitch):

ldmia r0!, NACL_CALLEE_SAVE_LIST

add r0, #4 /* skip prog_ctr in struct NaClThreadContext */

- /* Read sysret and new_eip from struct NaClThreadContext */

+ /* Read sysret and new_prog_ctr from struct NaClThreadContext */

ldmia r0, {r0, r1}

/* Pop 4 arguments saved on the stack by the trampoline code */

add sp, #16

« no previous file with comments | « no previous file | src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c » ('j') | no next file with comments »