diff --git a/html/mu_instructions.html b/html/mu_instructions.html
index 6d91ec55..a6b0f37c 100644
--- a/html/mu_instructions.html
+++ b/html/mu_instructions.html
@@ -14,8 +14,8 @@ pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
body { font-family: monospace; color: #000000; background-color: #c6c6c6; }
* { font-size: 1em; }
.Comment { color: #005faf; }
+.SpecialChar { color: #d70000; }
.Constant { color: #008787; }
-.Special { color: #d70000; }
.PreProc { color: #c000c0; }
.SalientComment { color: #0000af; }
-->
@@ -28,7 +28,7 @@ body { font-family: monospace; color: #000000; background-color: #c6c6c6; }
See http://akkartik.name/akkartik-convivial-20200315.pdf for the complete
story. In brief: Mu is a statement-oriented language. Blocks consist of flat
lists of instructions. Instructions can have inputs after the operation, and
-outputs to the left of a '<-'. Inputs and outputs must be variables. They can't
+outputs to the left of a '<-'. Inputs and outputs must be variables. They can't
include nested expressions. Variables can be literals ('n'), or live in a
register ('var/reg') or in memory ('var') at some 'stack-offset' from the 'ebp'
register. Outputs must be registers. To modify a variable in memory, pass it in
@@ -38,92 +38,92 @@ Conversely, registers that are just read from must not be passed as inputs.
The following chart shows all the instruction forms supported by Mu, along with
the SubX instruction they're translated to.
-var/eax <- increment => "40/increment-eax"
-var/ecx <- increment => "41/increment-ecx"
-var/edx <- increment => "42/increment-edx"
-var/ebx <- increment => "43/increment-ebx"
-var/esi <- increment => "46/increment-esi"
-var/edi <- increment => "47/increment-edi"
+var/eax <- increment => "40/increment-eax"
+var/ecx <- increment => "41/increment-ecx"
+var/edx <- increment => "42/increment-edx"
+var/ebx <- increment => "43/increment-ebx"
+var/esi <- increment => "46/increment-esi"
+var/edi <- increment => "47/increment-edi"
increment var => "ff 0/subop/increment *(ebp+" var.stack-offset ")"
increment *var/reg => "ff 0/subop/increment *" reg
-var/eax <- decrement => "48/decrement-eax"
-var/ecx <- decrement => "49/decrement-ecx"
-var/edx <- decrement => "4a/decrement-edx"
-var/ebx <- decrement => "4b/decrement-ebx"
-var/esi <- decrement => "4e/decrement-esi"
-var/edi <- decrement => "4f/decrement-edi"
+var/eax <- decrement => "48/decrement-eax"
+var/ecx <- decrement => "49/decrement-ecx"
+var/edx <- decrement => "4a/decrement-edx"
+var/ebx <- decrement => "4b/decrement-ebx"
+var/esi <- decrement => "4e/decrement-esi"
+var/edi <- decrement => "4f/decrement-edi"
decrement var => "ff 1/subop/decrement *(ebp+" var.stack-offset ")"
decrement *var/reg => "ff 1/subop/decrement *" reg
-var/reg <- add var2/reg2 => "01/add-to %" reg " " reg2 "/r32"
-var/reg <- add var2 => "03/add *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- add *var2/reg2 => "03/add *" reg2 " " reg "/r32"
+var/reg <- add var2/reg2 => "01/add-to %" reg " " reg2 "/r32"
+var/reg <- add var2 => "03/add *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- add *var2/reg2 => "03/add *" reg2 " " reg "/r32"
add-to var1, var2/reg => "01/add-to *(ebp+" var1.stack-offset ") " reg "/r32"
-var/eax <- add n => "05/add-to-eax " n "/imm32"
-var/reg <- add n => "81 0/subop/add %" reg " " n "/imm32"
+var/eax <- add n => "05/add-to-eax " n "/imm32"
+var/reg <- add n => "81 0/subop/add %" reg " " n "/imm32"
add-to var, n => "81 0/subop/add *(ebp+" var.stack-offset ") " n "/imm32"
add-to *var/reg, n => "81 0/subop/add *" reg " " n "/imm32"
-var/reg <- subtract var2/reg2 => "29/subtract-from %" reg " " reg2 "/r32"
-var/reg <- subtract var2 => "2b/subtract *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- subtract *var2/reg2 => "2b/subtract *" reg2 " " reg1 "/r32"
+var/reg <- subtract var2/reg2 => "29/subtract-from %" reg " " reg2 "/r32"
+var/reg <- subtract var2 => "2b/subtract *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- subtract *var2/reg2 => "2b/subtract *" reg2 " " reg1 "/r32"
subtract-from var1, var2/reg2 => "29/subtract-from *(ebp+" var1.stack-offset ") " reg2 "/r32"
-var/eax <- subtract n => "2d/subtract-from-eax " n "/imm32"
-var/reg <- subtract n => "81 5/subop/subtract %" reg " " n "/imm32"
+var/eax <- subtract n => "2d/subtract-from-eax " n "/imm32"
+var/reg <- subtract n => "81 5/subop/subtract %" reg " " n "/imm32"
subtract-from var, n => "81 5/subop/subtract *(ebp+" var.stack-offset ") " n "/imm32"
subtract-from *var/reg, n => "81 5/subop/subtract *" reg " " n "/imm32"
-var/reg <- and var2/reg2 => "21/and-with %" reg " " reg2 "/r32"
-var/reg <- and var2 => "23/and *(ebp+" var2.stack-offset " " reg "/r32"
-var/reg <- and *var2/reg2 => "23/and *" reg2 " " reg "/r32"
+var/reg <- and var2/reg2 => "21/and-with %" reg " " reg2 "/r32"
+var/reg <- and var2 => "23/and *(ebp+" var2.stack-offset " " reg "/r32"
+var/reg <- and *var2/reg2 => "23/and *" reg2 " " reg "/r32"
and-with var1, var2/reg => "21/and-with *(ebp+" var1.stack-offset ") " reg "/r32"
-var/eax <- and n => "25/and-with-eax " n "/imm32"
-var/reg <- and n => "81 4/subop/and %" reg " " n "/imm32"
+var/eax <- and n => "25/and-with-eax " n "/imm32"
+var/reg <- and n => "81 4/subop/and %" reg " " n "/imm32"
and-with var, n => "81 4/subop/and *(ebp+" var.stack-offset ") " n "/imm32"
and-with *var/reg, n => "81 4/subop/and *" reg " " n "/imm32"
-var/reg <- or var2/reg2 => "09/or-with %" reg " " reg2 "/r32"
-var/reg <- or var2 => "0b/or *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- or *var2/reg2 => "0b/or *" reg2 " " reg "/r32"
+var/reg <- or var2/reg2 => "09/or-with %" reg " " reg2 "/r32"
+var/reg <- or var2 => "0b/or *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- or *var2/reg2 => "0b/or *" reg2 " " reg "/r32"
or-with var1, var2/reg2 => "09/or-with *(ebp+" var1.stack-offset " " reg2 "/r32"
-var/eax <- or n => "0d/or-with-eax " n "/imm32"
-var/reg <- or n => "81 1/subop/or %" reg " " n "/imm32"
+var/eax <- or n => "0d/or-with-eax " n "/imm32"
+var/reg <- or n => "81 1/subop/or %" reg " " n "/imm32"
or-with var, n => "81 1/subop/or *(ebp+" var.stack-offset ") " n "/imm32"
or-with *var/reg, n => "81 1/subop/or *" reg " " n "/imm32"
-var/reg <- xor var2/reg2 => "31/xor-with %" reg " " reg2 "/r32"
-var/reg <- xor var2 => "33/xor *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- xor *var2/reg2 => "33/xor *" reg2 " " reg "/r32"
+var/reg <- xor var2/reg2 => "31/xor-with %" reg " " reg2 "/r32"
+var/reg <- xor var2 => "33/xor *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- xor *var2/reg2 => "33/xor *" reg2 " " reg "/r32"
xor-with var1, var2/reg => "31/xor-with *(ebp+" var1.stack-offset ") " reg "/r32"
-var/eax <- xor n => "35/xor-with-eax " n "/imm32"
-var/reg <- xor n => "81 6/subop/xor %" reg " " n "/imm32"
+var/eax <- xor n => "35/xor-with-eax " n "/imm32"
+var/reg <- xor n => "81 6/subop/xor %" reg " " n "/imm32"
xor-with var, n => "81 6/subop/xor *(ebp+" var.stack-offset ") " n "/imm32"
xor-with *var/reg, n => "81 6/subop/xor *" reg " " n "/imm32"
-var/reg <- shift-left n
-var/reg <- shift-right n
-var/reg <- shift-right-signed n
+var/reg <- shift-left n
+var/reg <- shift-right n
+var/reg <- shift-right-signed n
shift-left var, n
shift-right var, n
shift-right-signed var, n
-var/eax <- copy n => "b8/copy-to-eax " n "/imm32"
-var/ecx <- copy n => "b9/copy-to-ecx " n "/imm32"
-var/edx <- copy n => "ba/copy-to-edx " n "/imm32"
-var/ebx <- copy n => "bb/copy-to-ebx " n "/imm32"
-var/esi <- copy n => "be/copy-to-esi " n "/imm32"
-var/edi <- copy n => "bf/copy-to-edi " n "/imm32"
-var/reg <- copy var2/reg2 => "89/<- %" reg " " reg2 "/r32"
+var/eax <- copy n => "b8/copy-to-eax " n "/imm32"
+var/ecx <- copy n => "b9/copy-to-ecx " n "/imm32"
+var/edx <- copy n => "ba/copy-to-edx " n "/imm32"
+var/ebx <- copy n => "bb/copy-to-ebx " n "/imm32"
+var/esi <- copy n => "be/copy-to-esi " n "/imm32"
+var/edi <- copy n => "bf/copy-to-edi " n "/imm32"
+var/reg <- copy var2/reg2 => "89/<- %" reg " " reg2 "/r32"
copy-to var1, var2/reg => "89/<- *(ebp+" var1.stack-offset ") " reg "/r32"
-var/reg <- copy var2 => "8b/-> *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- copy *var2/reg2 => "8b/-> *" reg2 " " reg "/r32"
-var/reg <- copy n => "c7 0/subop/copy %" reg " " n "/imm32"
+var/reg <- copy var2 => "8b/-> *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- copy *var2/reg2 => "8b/-> *" reg2 " " reg "/r32"
+var/reg <- copy n => "c7 0/subop/copy %" reg " " n "/imm32"
copy-to var, n => "c7 0/subop/copy *(ebp+" var.stack-offset ") " n "/imm32"
copy-to *var/reg, n => "c7 0/subop/copy *" reg " " n "/imm32"
-var/reg <- copy-byte var2/reg2 => "8a/byte-> %" reg2 " " reg "/r32"
-var/reg <- copy-byte *var2/reg2 => "8a/byte-> *" reg2 " " reg "/r32"
+var/reg <- copy-byte var2/reg2 => "8a/byte-> %" reg2 " " reg "/r32"
+var/reg <- copy-byte *var2/reg2 => "8a/byte-> *" reg2 " " reg "/r32"
copy-byte-to *var1/reg1, var2/reg2 => "88/byte<- *" reg1 " " reg2 "/r32"
compare var1, var2/reg2 => "39/compare *(ebp+" var1.stack-offset ") " reg2 "/r32"
@@ -135,8 +135,8 @@ compare var/reg, n => "81 7/subop/
compare var, n => "81 7/subop/compare *(ebp+" var.stack-offset ") " n "/imm32"
compare *var/reg, n => "81 7/subop/compare *" reg " " n "/imm32"
-var/reg <- multiply var2 => "0f af/multiply *(ebp+" var2.stack-offset ") " reg "/r32"
-var/reg <- multiply *var2/reg2 => "0f af/multiply *" reg2 " " reg "/r32"
+var/reg <- multiply var2 => "0f af/multiply *(ebp+" var2.stack-offset ") " reg "/r32"
+var/reg <- multiply *var2/reg2 => "0f af/multiply *" reg2 " " reg "/r32"
break => "e9/jump break/disp32"
break label => "e9/jump " label ":break/disp32"
@@ -198,32 +198,32 @@ be provided in an earlier 'var' declaration.
-var/reg: (addr T) <- address var2: T
+var/reg: (addr T) <- address var2: T
=> "8d/copy-address *(ebp+" var2.stack-offset ") " reg "/r32"
(TODO: bounds-checking)
-var/reg <- index arr/rega: (addr array T), idx/regi: int
+var/reg <- index arr/rega: (addr array T), idx/regi: int
| if size-of(T) is 4 or 8
=> "8d/copy-address *(" rega "+" regi "<<" log2(size-of(T)) "+4) " reg "/r32"
-var/reg <- index arr: (array T sz), idx/regi: int
+var/reg <- index arr: (array T sz), idx/regi: int
=> "8d/copy-address *(ebp+" regi "<<" log2(size-of(T)) "+" (arr.stack-offset + 4) ") " reg "/r32"
-var/reg <- index arr/rega: (addr array T), n
+var/reg <- index arr/rega: (addr array T), n
=> "8d/copy-address *(" rega "+" (n*size-of(T)+4) ") " reg "/r32"
-var/reg <- index arr: (array T sz), n
+var/reg <- index arr: (array T sz), n
=> "8d/copy-address *(ebp+" (arr.stack-offset+4+n*size-of(T)) ") " reg "/r32"
-var/reg: (offset T) <- compute-offset arr: (addr array T), idx/regi: int
+var/reg: (offset T) <- compute-offset arr: (addr array T), idx/regi: int
=> "69/multiply %" regi " " size-of(T) "/imm32 " reg "/r32"
-var/reg: (offset T) <- compute-offset arr: (addr array T), idx: int
+var/reg: (offset T) <- compute-offset arr: (addr array T), idx: int
=> "69/multiply *(ebp+" idx.stack-offset ") " size-of(T) "/imm32 " reg "/r32"
-var/reg <- index arr/rega: (addr array T), o/rego: offset
+var/reg <- index arr/rega: (addr array T), o/rego: offset
=> "8d/copy-address *(" rega "+" rego "+4) " reg "/r32"
Computing the length of an array is complex.
-var/reg <- length arr/reg2: (addr array T)
+var/reg <- length arr/reg2: (addr array T)
| if T is byte (TODO)
=> "8b/-> *" reg2 " " reg "/r32"
| if size-of(T) is 4 or 8 or 16 or 32 or 64 or 128
@@ -256,24 +256,11 @@ var/reg <- length arr/reg2: (addr array T)
If a record (product) type T was defined to have elements a, b, c, ... of
types T_a, T_b, T_c, ..., then accessing one of those elements f of type T_f:
-var/reg: (addr T_f) <- get var2/reg2: (addr T), f
+var/reg: (addr T_f) <- get var2/reg2: (addr T), f
=> "8d/copy-address *(" reg2 "+" offset(f) ") " reg "/r32"
-var/reg: (addr T_f) <- get var2: T, f
+var/reg: (addr T_f) <- get var2: T, f
=> "8d/copy-address *(ebp+" var2.stack-offset "+" offset(f) ") " reg "/r32"
-
-
-out/reg: (addr T) <- lookup in: (handle T)
- =>
- "8b/-> *(epb+" (in.stack-offset+4) ") " reg "/r32"
- "8b/-> *" reg " " reg "/r32"
-
- "39/compare *(ebp+" in.stack-offset ") " reg "/r32"
- "0f 85/jump-if-!= $lookup:abort/disp32"
-
- "8b/-> *(epb+" (in.stack-offset+4) ") " reg "/r32"
- "81 0/subop/add %" reg " 4/imm32"
-
allocate in: (addr handle T)
@@ -282,6 +269,15 @@ allocate in: (addr handle T)
populate in: (addr handle array T), num
=> "(allocate-array2 Heap " size-of(T) " " num " " in ")"
+populate-stream in: (addr handle stream T), num
+ => "(new-stream Heap " size-of(T) " " num " " in ")"
+
+read-from-stream s: (addr stream T), out: (addr T)
+ => "(read-from-stream " s " " out " " size-of(T) ")"
+
+write-to-stream s: (addr stream T), in: (addr T)
+ => "(write-to-stream " s " " in " " size-of(T) ")"
+
vim:ft=mu:nowrap:textwidth=0