Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/arch/arm/springboard_thumb2.S

Index: src/trusted/service_runtime/arch/arm/springboard_thumb2.S
diff --git a/src/trusted/service_runtime/arch/arm/springboard_thumb2.S b/src/trusted/service_runtime/arch/arm/springboard_thumb2.S
index a44d9886219abe450db4ff3b73577f0190c4af6c..6bcc77f634a787e79586575f25373075fb3d9e82 100644
--- a/src/trusted/service_runtime/arch/arm/springboard_thumb2.S
+++ b/src/trusted/service_runtime/arch/arm/springboard_thumb2.S
@@ -11,37 +11,37 @@
 .thumb
 .syntax unified
 
-/*
- * NOTE: it is not clear whether we need a spring board for ARM at all
- * TODO(robertm): maybe delete the code
- *
- * Assembly code template.
- * This is linked into the service runtime but is unused as code -- it is used
- * as data to be patched into a NaCl app's address space as a "hidden" part of
- * its trampoline region.
- *
- * This code takes the last slot in trampoline region, and it is
- * loaded by NaClLoadSpringboard() (sel_ldr.c).
- *
- * NaCl_springboard is used for syscall return and any time we want
- * to do an upcall into NaCl application.
- *
- * r0 -- syscall return value
- * r1 -- new pc (already sandboxed)
- * == user stack ==
- * top
- * =====
- * arg 1
- * arg 2
- * .....
- * arg N
- */
-
  /*
-  * We will load the springboard to be aligned 14mod16, as a thumb2 branch
-  * target must be.  To ensure that the instructions in the springboard are
-  * properly aligned, we misalign by 2 here.
+  * NOTE: it is not clear whether we need a spring board for ARM at all
+  * TODO(robertm): maybe delete the code
+  *
+  * Assembly code template.
+  * This is linked into the service runtime but is unused as code -- it is used
+  * as data to be patched into a NaCl app's address space as a "hidden" part of
+  * its trampoline region.
+  *
+  * This code takes the last slot in trampoline region, and it is
+  * loaded by NaClLoadSpringboard() (sel_ldr.c).
+  *
+  * NaCl_springboard is used for syscall return and any time we want
+  * to do an upcall into NaCl application.
+  *
+  * r0 -- syscall return value
+  * r1 -- new pc (already sandboxed)
+  * == user stack ==
+  * top
+  * =====
+  * arg 1
+  * arg 2
+  * .....
+  * arg N
   */
+
+/*
+ * We will load the springboard to be aligned 14mod16, as a thumb2 branch
+ * target must be.  To ensure that the instructions in the springboard are
+ * properly aligned, we misalign by 2 here.
+ */
 .p2align 4
 .skip 2
 DEFINE_GLOBAL_HIDDEN_IDENTIFIER(NaCl_springboard):