Skip to content

Commit 7ac91b3

Browse files
fabbingfabbing
authored
Merge pull request #1 from NickBarnes/handler-typo
Fix typo hanlder -> handler
2 parents 47a815d + f3bbce8 commit 7ac91b3

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎presentation/catching.tex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ \subsection{Installing a trap}
239239
\begin{itemize}
240240
\item<1-> \typename{caml\_domain\_state} is a C structure part of the runtime
241241
\item<1-> It holds information useful to the runtime to manage a domain (each domain has its \typename{caml\_domain\_state})
242-
\item<3-> \localname{exn\_hanlder} is a pointer to the \emph{last} installed \typename{trap}
242+
\item<3-> \localname{exn\_handler} is a pointer to the \emph{last} installed \typename{trap}
243243
\end{itemize}
244244
}
245245
\onslide*<2>{\mintc[lastline=32]{src/ocaml/domain\_state.h}}
@@ -287,7 +287,7 @@ \subsection{Installing a trap}
287287
\item The address of the handler's code is pushed onto the stack
288288
\item The value of \localname{exn\_handler} from \typename{caml\_domain\_state} is pushed onto the stack
289289
% TODO /grey color
290-
\item \localname{domain\_state->exn\_hanlder} has to point to the last installed trap
290+
\item \localname{domain\_state->exn\_handler} has to point to the last installed trap
291291
\item Its value is updated to the just-constructed trap's address
292292
\end{itemize}
293293
}
@@ -386,7 +386,7 @@ \subsection{Removing a trap}
386386
\begin{column}{0.5\textwidth}
387387
\only<1>{
388388
\begin{itemize}
389-
\item \localname{domain\_state->exn\_hanlder} is restored to its previous value from the trap
389+
\item \localname{domain\_state->exn\_handler} is restored to its previous value from the trap
390390
\end{itemize}
391391
}%
392392
\only<2>{
@@ -410,7 +410,7 @@ \subsection{Removing a trap}
410410
\only<1>{
411411
\begin{itemize}
412412
% TODO grey
413-
\item \localname{domain\_state->exn\_hanlder} is restored to its previous value from the trap
413+
\item \localname{domain\_state->exn\_handler} is restored to its previous value from the trap
414414
% TODO /grey
415415
\item Discards the exception handler code address
416416
\end{itemize}

‎presentation/default.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ \subsection*{Runtime's default exception handler}
99
\begin{columns}
1010
\begin{column}{0.5\textwidth}
1111
\begin{itemize}
12-
\item \localname{domain\_state->exn\_hanlder} points to a trap located before \funcname{entry}!
12+
\item \localname{domain\_state->exn\_handler} points to a trap located before \funcname{entry}!
1313
\item What installed this very first trap there?
1414
\end{itemize}
1515
\bigskip

‎presentation/nested.tex‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ \subsection{Multiple handlers, multiple traps}
2929
\item<1-> \funcname{main} installs the trap for \typename{ExnC}
3030
\begin{itemize}
3131
\item<2-> Pushes address of \typename{ExnC} handler
32-
\item<2-> Saves the current value of \localname{domain\_state->exn\_hanlder} into the trap
33-
\item<2-> Updates \localname{domain\_state->exn\_hanlder} to point to \typename{ExnC} trap
32+
\item<2-> Saves the current value of \localname{domain\_state->exn\_handler} into the trap
33+
\item<2-> Updates \localname{domain\_state->exn\_handler} to point to \typename{ExnC} trap
3434
\end{itemize}
3535
\end{itemize}
3636
}%
@@ -56,8 +56,8 @@ \subsection{Multiple handlers, multiple traps}
5656
\item<1-> \funcname{main} now installs the trap for \typename{ExnB}
5757
\begin{itemize}
5858
\item<2-> Pushes address of \typename{ExnB} handler
59-
\item<2-> Saves the current value of \localname{domain\_state->exn\_hanlder}, which is pointing to \typename{ExnC} into the trap
60-
\item<4-> Updates \localname{domain\_state->exn\_hanlder} to point to \typename{ExnB} trap
59+
\item<2-> Saves the current value of \localname{domain\_state->exn\_handler}, which is pointing to \typename{ExnC} into the trap
60+
\item<4-> Updates \localname{domain\_state->exn\_handler} to point to \typename{ExnB} trap
6161
\end{itemize}
6262
\end{itemize}
6363
}
@@ -79,7 +79,7 @@ \subsection{Multiple handlers, multiple traps}
7979

8080
\begin{frame}{OCaml exception trap}
8181
\begin{itemize}
82-
\item Traps form a linked list of exception handlers whose head is \localname{domain\_state->exn\_hanlder}
82+
\item Traps form a linked list of exception handlers whose head is \localname{domain\_state->exn\_handler}
8383
\item On amd64, an exception trap could be represented with this C structure
8484
\end{itemize}
8585
\bigskip
@@ -129,7 +129,7 @@ \subsection{Raise and reraise}
129129
\item \funcname{definitely\_raise} raises \typename{ExnC}
130130
\begin{itemize}
131131
\item Loads the \typename{ExnC} exception value into \regname{RAX} % FIXME phrasing
132-
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_hanlder}
132+
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_handler}
133133
\end{itemize}
134134
\end{itemize}
135135
}%
@@ -155,9 +155,9 @@ \subsection{Raise and reraise}
155155
\item \funcname{definitely\_raise} raises \typename{ExnC}
156156
\begin{itemize}
157157
\item Loads the \typename{ExnC} exception value into \regname{RAX} % FIXME phrasing
158-
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_hanlder}
158+
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_handler}
159159
% TODO /gray
160-
\item Updates \localname{domain\_state->exn\_hanlder} to the next handler: \typename{ExnB} handler
160+
\item Updates \localname{domain\_state->exn\_handler} to the next handler: \typename{ExnB} handler
161161
\end{itemize}
162162
\end{itemize}
163163
}%
@@ -183,8 +183,8 @@ \subsection{Raise and reraise}
183183
\item \funcname{definitely\_raise} raises \typename{ExnC}
184184
\begin{itemize}
185185
\item Loads the \typename{ExnC} exception value into \regname{RAX} % FIXME phrasing
186-
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_hanlder}
187-
\item Updates \localname{domain\_state->exn\_hanlder} to the next handler: \typename{ExnB} handler
186+
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_handler}
187+
\item Updates \localname{domain\_state->exn\_handler} to the next handler: \typename{ExnB} handler
188188
% TODO /gray
189189
\item Loads the address of \typename{ExnA} handler and jumps to it
190190
\end{itemize}
@@ -216,8 +216,8 @@ \subsection{Raise and reraise}
216216
\item \funcname{definitely\_raise} raises \typename{ExnC}
217217
\begin{itemize}
218218
\item Loads the \typename{ExnC} exception value into \regname{RAX} % FIXME phrasing
219-
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_hanlder}
220-
\item Updates \localname{domain\_state->exn\_hanlder} to the next handler: \typename{ExnB} handler
219+
\item Restores \regname{RSP} to the value of \localname{domain\_state->exn\_handler}
220+
\item Updates \localname{domain\_state->exn\_handler} to the next handler: \typename{ExnB} handler
221221
\item Loads the address of \typename{ExnA} handler and jumps to it
222222
% TODO /gray
223223
\item \typename{ExnA} handler is executed

0 commit comments

Comments
 (0)