Skip to content

Commit 344c945

Browse files
committed
Spelling / typo fixes.
1 parent e767a16 commit 344c945

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# CHERIoT Specification and Sail model
22

33
This repository contains the specification for the [CHERIoT](https://cheriot.org) ISA.
4-
It consists of a document written in [latex](/archdoc) which includes exerpts of the [reference model](/src) written in [Sail](http://github.com/rems-project/sail).
4+
It consists of a document written in [latex](/archdoc) which includes excerpts of the [reference model](/src) written in [Sail](http://github.com/rems-project/sail).
55
The [current draft architecture document](https://microsoft.github.io/cheriot-sail/cheriot-architecture.pdf) built from this repository contains a full description of the ISA and its intended use by [CHERIoT RTOS](https://github.com/microsoft/cheriot-rtos/).
6-
The Sail code is used to build an instruction set simulator which is included in the [CHERIoT RTOS dev containter](https://github.com/microsoft/cheriot-rtos/blob/main/docs/GettingStarted.md).
6+
The Sail code is used to build an instruction set simulator which is included in the [CHERIoT RTOS dev container](https://github.com/microsoft/cheriot-rtos/blob/main/docs/GettingStarted.md).
77
It can also be used to prove [properties](properties) of the ISA using Sail's SMT support.
88

99
The architecture is based on the [CHERI specification](https://github.com/CTSRD-CHERI/cheri-specification).
10-
The code is dervied from [sail-cheri-riscv](http://github.com/CTSRD-CHERI/sail-cheri-riscv) and uses [sail-riscv](http://github.com/rems-project/sail-riscv) as a submodule.
10+
The code is derived from [sail-cheri-riscv](http://github.com/CTSRD-CHERI/sail-cheri-riscv) and uses [sail-riscv](http://github.com/rems-project/sail-riscv) as a submodule.
1111

1212
# Building
1313

archdoc/chap-abi.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ \section{Export table layout}
7171

7272
\cref{fig:exporttable} shows the layout of the export table for a compartment.
7373
Each export table starts with a copy of the \PCC{} and \CGP{} for the target compartment.
74-
The next 32-bits is the offset of the compartment's error handler realtive to \PCC{}.\cbase{}, or $-1$ if the compartment does not have an error handler.
74+
The next 32-bits is the offset of the compartment's error handler relative to \PCC{}.\cbase{}, or $-1$ if the compartment does not have an error handler.
7575
If an error occurs the switcher may jump to this as described in \cref{sec:errorhandling}.
7676
After the header, the export table is comprised of one 32-bit entry per exported function.
7777
The first 16 bits of each entry provide the displacement from the start of the compartment's \PCC{} to the entry point.

archdoc/chap-changes.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ \chapter{Version history}
3434
\item[\ghissue{14}] When loading a sealed capability through an authority lacking \cappermILG,
3535
the loaded capability will lack \cappermG but will retain \cappermILG if present under seal.
3636
This is more in line with our handling of \cappermLM, which does not modify sealed capabilities.
37-
Software accepting sealed capabilities must be prepared to recieve local (that is, \cappermG-lacking) variants,
37+
Software accepting sealed capabilities must be prepared to receive local (that is, \cappermG-lacking) variants,
3838
even if none were ever explicitly constructed.
3939
\end{description}
4040
\end{description}

archdoc/chap-cheri-riscv.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,6 @@ \section{Stack high water mark}
748748
Note that only the address of the store is accounted for, not the width.
749749
This means that it is possible for an unaligned store with an address below \mshwmb{} to write bytes above \mshwmb{} without updating \mshwm{}.
750750
For example, a 4-byte store to \mshwmb{}$ - 1$ would write the bytes at \mshwmb{}$\dots{}$\mshwmb$+ 2$ but leave \mshwm{} unchanged, potentially breaking the RTOS's invariant.
751-
In practice this is not a problem as the RTOS will never issue a capability to untrusted code that crosses the stack base and would therefore premit such a write.%
751+
In practice this is not a problem as the RTOS will never issue a capability to untrusted code that crosses the stack base and would therefore permit such a write.%
752752
\footnote{In fact, no such capabilities should exist after the loader has run and initialised the thread data structures.}
753753
Given this, we choose not to unnecessarily complicate the hardware by requiring it to handle this corner case.

archdoc/chap-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ \section{The \cherimcuos{} Model}
5555

5656
A \defn{compartment} is a collection of code, data, and capabilities that serves as an invocable security context.
5757
Compartments statically export \keyword{entry-points}, which may be statically imported by other compartments or passed as opaque \keyword{cross-compartment function pointers}.
58-
A compartment they (statically or dynamically) imports an entry point may then invoke it to perform a \keyword{cross-compartment call}.
58+
A compartment that (statically or dynamically) imports an entry point may then invoke it to perform a \keyword{cross-compartment call}.
5959
Such calls are synchronous and transition the calling thread from one compartment to another.
6060
The thread's stack is used, with appropriate bounds adjustment, in both the caller and callee compartment.
6161

0 commit comments

Comments
 (0)