Chromium Code Reviews| Index: src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c |
| =================================================================== |
| --- src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c (revision 6937) |
| +++ src/trusted/service_runtime/arch/arm/nacl_switch_to_app_arm.c (working copy) |
| @@ -44,8 +44,7 @@ |
| */ |
| CHECK((nap->user_entry_pt & 0x1) | (nap->initial_entry_pt & 0x1)); |
| /* The real springboard target addresses are aligned 0xe mod 16. */ |
| - /* Skipping a 2-byte halt brings us to 0 mod 16. */ |
|
robertm
2011/10/18 21:19:55
this change was not mentioned in the description
sehr (please use chromium)
2011/10/18 22:44:11
Thanks. This was not intended for this CL.
|
| - CHECK((nap->springboard_addr & 0xf) == 0x0); |
| + CHECK((nap->springboard_addr & 0xf) == 0xe); |
| return nap->springboard_addr | 0x1; |
| #else |
| return nap->springboard_addr; |