summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/doc_generated
diff options
context:
space:
mode:
authorjfb@chromium.org <jfb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-23 22:05:49 +0000
committerjfb@chromium.org <jfb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-23 22:05:49 +0000
commitbe0c0050e6df6f18447fba2a85f2b9a7770e1955 (patch)
tree4376fa4a8ef17b43ddf85db70758e57a2d6c4296 /native_client_sdk/doc_generated
parente1797e628d00730e5b95c337d1720de770be970f (diff)
downloadchromium_src-be0c0050e6df6f18447fba2a85f2b9a7770e1955.zip
chromium_src-be0c0050e6df6f18447fba2a85f2b9a7770e1955.tar.gz
chromium_src-be0c0050e6df6f18447fba2a85f2b9a7770e1955.tar.bz2
NaCl documentation: nits on ARM sandbox documentation
R= sbc@chromium.org, binji@chromium.org, awatson@chromium.org TEST= none BUG= none NOTRY=true (documentation only change) Review URL: https://codereview.chromium.org/173343004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/doc_generated')
-rw-r--r--native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html b/native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html
index 618e8b54..32f8a84 100644
--- a/native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html
+++ b/native_client_sdk/doc_generated/reference/sandbox_internals/arm-32-bit-sandbox.html
@@ -411,9 +411,9 @@ the possible places that any <em>indirect branch</em> can land. On Native
Client for ARM, <em>indirect branch</em> can target any address that has its
bottom four bits clear&#8212;any address that&#8217;s <code>0 mod 16</code>. We call these
16-byte chunks of code &#8220;bundles&#8221;. The validator makes sure that no
-pseudo-instruction straddles a bundle boundary. Compilers must pad with`
-<cite>nop`</cite>s to ensure that every pseudo-instruction fits entirely inside
-one bundle.</p>
+pseudo-instruction straddles a bundle boundary. Compilers must pad with
+<code>nop</code> to ensure that every pseudo-instruction fits entirely inside one
+bundle.</p>
<p>Here is the <em>indirect branch</em> pseudo-instruction. As you can see, it
clears the top two and bottom four bits of the address:</p>
<pre>
@@ -580,6 +580,7 @@ way, if an <em>indirect branch</em> tries to enter the data bundle, the process
will take a fault and the trusted runtime will intervene (by terminating
the program). For example:</p>
<pre>
+.p2align 4
bkpt #0x5BE0 ; Must be aligned 0 mod 16!
.word 0xDEADBEEF ; Arbitrary constants are A-OK.
svc #30 ; Trying to make a syscall? OK!