From f8da207de2e878daf544c9ccf2a0b4078667a423 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 23 May 2022 16:24:02 -0700
Subject: [PATCH] Remove MIPS-specific Sail and instruction reference commands.

---
 chap-sail.tex | 5 ++---
 preamble.tex  | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/chap-sail.tex b/chap-sail.tex
index e5ebbd41..06941ae4 100644
--- a/chap-sail.tex
+++ b/chap-sail.tex
@@ -17,7 +17,6 @@ \chapter{Sail Overview}
 
 Types used in Sail:
 
-\label{sailMIPSzbits}
 \label{sailRISCVzbits}
 \begin{itemize}
 \item \isail{int} Sail integers are of arbitrary precision (therefore there are no overflows) but can be constrained using simple first-order constraints. As a common case integer range types can be defined using \isail{range(a,b)} to indicate an integer in the range $a$ to $b$ inclusive. Operations on integers repsect the constraints on their operands so, for example, if \isail{x} and \isail{y} have type \isail{range(a, b)} then \isail{x + y} has type \isail{range(a + a, b + b)}. Integer literals are written in decimal.
@@ -29,7 +28,7 @@ \chapter{Sail Overview}
 The following operators and expression syntax are used in the Sail code:
 
 \begin{itemize}
-\item \label{sailRISCVznot}\label{sailMIPSznot}Boolean operators:
+\item \label{sailRISCVznot}Boolean operators:
 \isail{not}, \isail{|} (logical OR), \isail{&} (logical AND), \isail{^} (exclusive OR)
 
 \item Integer operators:
@@ -66,7 +65,7 @@ \chapter{Sail Overview}
 \item Foreach loop:
 
 % XXX: for some reason sail generates a link to "to" for ccleartags/cloadtags
-\begin{lstlisting}[language=sail,label=sailMIPSzto]
+\begin{lstlisting}[language=sail,label=sailRISCVzto]
 foreach(i from start_exp to end_exp) {
   body
 };
diff --git a/preamble.tex b/preamble.tex
index 6c737e3c..91032843 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -86,7 +86,6 @@
 
 \input{preamble-saildoc-macros}
 
-\makesailcmds{sailMIPS}{sail_latex_mips}
 \makesailcmds{sailRISCV}{sail_latex_riscv}
 
 % Must be included later than setspace, otherwise all footnote hyperlinks
@@ -209,7 +208,6 @@
 % Register names
 \newcommand{\reg}[1]{{\bf R#1}}		% MIPS register numbers
 \newcommand{\creg}[1]{{\bf C#1}}	% Capability register numbers
-\newcommand{\mreg}[1]{{\bf \$#1}}	% MIPS ABI register names
 \newcommand{\PC}{{\bf PC}}
 \newcommand{\SP}{{\bf SP}}
 \newcommand{\EPC}{{\bf EPC}}
@@ -427,7 +425,6 @@
 }
 \newcommand{\@makeinsncmds}[1]{\@makeinsncmds@explicit{#1}{#1}}
 
-\@makeinsncmds{mips}
 \@makeinsncmds{riscv}
 
 \newcommand{\definsnarch}[1]{\def\@definsnarch{#1}}