5876 - address -> addr

1 files changed, 15 insertions, 15 deletions

diff --git a/apps/mulisp.subx b/apps/mulisp.subx
index 1cfdeb03..d9fbb594 100644
--- a/apps/mulisp.subx
+++ b/apps/mulisp.subx
@@ -49,7 +49,7 @@ $main:end:
 #     NIL NUM CHAR STRING SYMBOL PAIR ARRAY
 #   memory type: a type specifying memory layout at the SubX level. Starts
 #   with a '$'.
-#     $int $array $(address _)
+#     $int $array $(addr _)
 #
 # Lisp values are represented in memory by the _cell_ data structure. A cell
 # is 12 bytes long:
@@ -63,18 +63,18 @@ $main:end:
 #   - char: cell{ tag: 2/CHAR, data: $int 0 }
 #     data contains the utf-8 code of the character (no compound glyphs, no
 #     modifiers, etc., etc.)
-#   - string: cell{ tag: 3/STRING, data: $(address stream byte)
-#     data contains an (address array byte) containing the string in utf-8
-#   - symbol: cell{ tag: 4/SYMBOL, data: $(address array byte) 0 }
-#     data contains an (address array byte) containing the name of the symbol in utf-8
+#   - string: cell{ tag: 3/STRING, data: $(addr stream byte)
+#     data contains an (addr array byte) containing the string in utf-8
+#   - symbol: cell{ tag: 4/SYMBOL, data: $(addr array byte) 0 }
+#     data contains an (addr array byte) containing the name of the symbol in utf-8
 #     alternatively, data could contain an index into the table of interned symbols
-#   - pair: cell{ tag: 5/PAIR, data: $(address cell) $(address cell)  }
+#   - pair: cell{ tag: 5/PAIR, data: $(addr cell) $(addr cell)  }
 #     data contains pointers to car and cdr
-#   - array: cell{ tag: 6/ARRAY, data: $tag $(address stream data)
+#   - array: cell{ tag: 6/ARRAY, data: $tag $(addr stream data)
 #     data contains a pointer to an array of 8-byte data fields and the common
 #     tag for them all
 
-repl:  # in : (address buffered-file), out : (address buffered-file)
+repl:  # in : (addr buffered-file), out : (addr buffered-file)
     # . prologue
     55/push-ebp
     89/<- %ebp 4/r32/esp
@@ -104,7 +104,7 @@ $repl:end:
 # arrays start with '['
 # symbols start with anything else but quote, backquote, unquote or splice
 # only one s-expression per line
-lisp-read:  # in : (address buffered-file) -> eax : (handle cell)
+lisp-read:  # in : (addr buffered-file) -> eax : (handle cell)
     # . prologue
     55/push-ebp
     89/<- %ebp 4/r32/esp
@@ -142,14 +142,14 @@ $lisp-read:end:
     5d/pop-to-ebp
     c3/return
 
-# lisp-read:  in : (address buffered-file) -> (handle cell)
+# lisp-read:  in : (addr buffered-file) -> (handle cell)
 #   token tmp = next-mulisp-token(in)
 #   if is-int(tmp) return cell(tmp)
 #   if is-string(tmp) return cell(tmp)
 #   if is-pair(tmp) ...
 #   if is-array(tmp) ...
 
-next-mulisp-token:  # in : (address buffered-file), line : (address stream byte), result : (address slice)
+next-mulisp-token:  # in : (addr buffered-file), line : (addr stream byte), result : (addr slice)
     # pseudocode:
     #   if (line->read >= line->write)
     #     read-line-buffered(in, line)
@@ -194,11 +194,11 @@ $next-mulisp-token:end:
     5d/pop-to-ebp
     c3/return
 
-new-int-cell:  # in : (address slice) -> eax : (handle cell)
+new-int-cell:  # in : (addr slice) -> eax : (handle cell)
 
-new-string-cell:  # in : (address slice) -> eax : (handle cell)
+new-string-cell:  # in : (addr slice) -> eax : (handle cell)
 
-lisp-eval:  # in : (address cell) -> eax : (handle cell)
+lisp-eval:  # in : (addr cell) -> eax : (handle cell)
     # . prologue
     55/push-ebp
     89/<- %ebp 4/r32/esp
@@ -211,7 +211,7 @@ $lisp-eval:end:
     5d/pop-to-ebp
     c3/return
 
-lisp-print:  # out : (address buffered-file), x : (address cell)
+lisp-print:  # out : (addr buffered-file), x : (addr cell)
     # . prologue
     55/push-ebp
     89/<- %ebp 4/r32/esp