From 566d0e53ca22bb5c5cd2de3a7cd332aeca2f298a Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Mon, 16 Jun 2008 12:11:34 -0700
Subject: [PATCH] 16-jun

darcs-hash:20080616191134-5007d-5eeb6d47f7cc9e8de40c4e82ad1999f3301da383.gz
---
 am33.tex |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/am33.tex b/am33.tex
index 19eea2f..c29ce94 100644
--- a/am33.tex
+++ b/am33.tex
@@ -66,10 +66,12 @@ Adam Megacz
 Changes:
 
 \begin{tabular}{rl}
-\color{red} 
+16-Jun
+& \color{red} When a torpedo strikes, {\tt ILC} is set to {\tt 1} \\
+& \color{red} Only {\tt move} can be torpedoed (removed {\tt I}-bit from {\tt set}/{\tt shift}) \\
 11-Jun
-& \color{red} Changed all uses of ``Payload'' to ``Immediate'' \color{black} (not in red) \\
-& \color{red} Reworked encoding of {\tt set} instruction \\
+& Changed all uses of ``Payload'' to ``Immediate'' \color{black} (not in red) \\
+& Reworked encoding of {\tt set} instruction \\
 \color{black} 
 06-Jun
 & Factored in Russell Kao's comments (thanks!)\\
@@ -177,8 +179,8 @@ are known as {\it tokens}, and consume less energy than data packets.
 
 \begin{center}
 \epsfig{file=overview-new,width=2.5in}\\
-{\it Overview of a Fleet processor; gray shading represents the switch
-  fabric; docks are shown in blue.}
+{\it Overview of a Fleet processor; dark gray shading represents the
+  switch fabric, ships are shown in light gray, and docks are shown in blue.}
 \end{center}
 \color{black}
 
@@ -289,6 +291,11 @@ All instruction words have the following format:
   \bitbox{1}{OS}
   \bitbox{3}{P} 
 }
+\newcommand{\bitsHeaderNoI}{
+  \bitbox{1}{} 
+  \bitbox{1}{OS}
+  \bitbox{3}{P} 
+}
 
 \setlength{\bitwidth}{3.5mm}
 {\tt \footnotesize
@@ -304,7 +311,7 @@ All instruction words have the following format:
 
 \begin{itemize}
 \item The {\tt I} bit stands for {\tt Interruptible}, and indicates if an
-instruction is vulnerable to torpedoes.
+instruction is vulnerable to torpedoes.  This bit only appears in {\tt move} instructions.
 
 \item The {\tt OS} (``One Shot'') bit indicates whether or not this
   instruction can pass through the pump more than once.  If set to
@@ -419,6 +426,7 @@ processes have completed:
       {\it Otherwise} if the instruction is interruptible ({\tt I=0})
       and a torpedo is present in the waiting area: consume the
       torpedo, set the outer loop counter to zero ({\tt OLC=0}),
+      \color{red}set the inner loop counter to one ({\tt ILC=1}),\color{black}\ 
       unseal the hatch, and transmit a token along in the
       {\it torpedo acknowledgment path latch} ({\tt TAPL}).
 
@@ -531,7 +539,7 @@ counter, outer loop counter, and data latch.
 {\tt
 \begin{bytefield}{26}
   \bitheader[b]{19-25}\\
-  \bitsHeader
+  \bitsHeaderNoI
   \bitbox{1}{1}
   \bitbox{1}{0} 
 \color{light}
@@ -540,7 +548,6 @@ counter, outer loop counter, and data latch.
 \color{black}
 \end{bytefield}}
 
-\color{red}
 \begin{bytefield}{26}
   \bitheader[b]{0,5,11-18}\\
   \bitbox[1]{6}{\raggedleft {\tt Immediate}\to{\tt OLC}}
@@ -695,7 +702,7 @@ into the data latch \shiftImmediateSize\ bits at a time.
 \begin{bytefield}{26}
   \bitheader[b]{0,18-20}\\
 \color{light}
-  \bitsHeader
+  \bitsHeaderNoI
 \color{black}
   \bitbox{1}{0} 
   \bitbox{1}{0} 
-- 
1.7.10.4