Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / doc / ref / vm.texi

diff --git a/doc/ref/vm.texi b/doc/ref/vm.texi
index fa73f9b..851e2b2 100644 (file)
--- a/doc/ref/vm.texi
+++ b/doc/ref/vm.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
-@c Copyright (C)  2008, 2009, 2010, 2011
+@c Copyright (C)  2008,2009,2010,2011
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -79,9 +79,9 @@ but it is not normally used at runtime.)
 
 The upside of implementing the interpreter in Scheme is that we preserve
 tail calls and multiple-value handling between interpreted and compiled
-code. The downside is that the interpreter in Guile 2.0 is slower than
-the interpreter in 1.8. We hope the that the compiler's speed makes up
-for the loss!
+code. The downside is that the interpreter in Guile 2.@var{x} is slower
+than the interpreter in 1.8. We hope the that the compiler's speed makes
+up for the loss!
 
 Also note that this decision to implement a bytecode compiler does not
 preclude native compilation. We can compile from bytecode to native
@@ -432,13 +432,13 @@ then @code{local-set}, used when binding boxed variables.
 @end deffn
 
 @deffn Instruction empty-box index
-Set the @var{indext}h local variable to a box containing a variable
+Set the @var{index}th local variable to a box containing a variable
 whose value is unbound. Used when compiling some @code{letrec}
 expressions.
 @end deffn
 
 @deffn Instruction local-boxed-ref index
-@deffnx Instruction local-boxed-ref index
+@deffnx Instruction local-boxed-set index
 Get or set the value of the variable located at @var{index} within the
 current stack frame. A shortcut for @code{local-ref} then
 @code{variable-ref} or @code{variable-set}, respectively.
@@ -862,13 +862,6 @@ arguments from the stack. Return the resulting value to the calling
 procedure.
 @end deffn
 
-@deffn Instruction smob-call nargs
-Pop off the smob object from the stack (which should have been pushed on
-by the trampoline), and call its descriptor's @code{apply} function with
-the @var{nargs} arguments from the stack. Return the resulting value or
-values to the calling procedure.
-@end deffn
-
 @deffn Instruction continuation-call
 Pop off an internal continuation object (which should have been pushed
 on by the trampoline), and reinstate that continuation. All of the
@@ -918,13 +911,13 @@ Jump to @var{offset} if the object on the stack is false.
 
 @deffn Instruction br-if-eq offset
 Jump to @var{offset} if the two objects located on the stack are
-equal in the sense of @var{eq?}.  Note that, for this instruction, the
+equal in the sense of @code{eq?}.  Note that, for this instruction, the
 stack pointer is decremented by two Scheme objects instead of only
 one.
 @end deffn
 
 @deffn Instruction br-if-not-eq offset
-Same as @var{br-if-eq} for non-@code{eq?} objects.
+Same as @code{br-if-eq} for non-@code{eq?} objects.
 @end deffn
 
 @deffn Instruction br-if-null offset
@@ -1063,7 +1056,7 @@ embedded in the stream as a string.
 @end deffn
 @deffn Instruction load-string length
 Load a string from the instruction stream. The string is assumed to be
-Latin-1-encoded.
+encoded in the ``latin1'' locale.
 @end deffn
 @deffn Instruction load-wide-string length
 Load a UTF-32 string from the instruction stream. @var{length} is the
@@ -1071,7 +1064,7 @@ length in bytes, not in codepoints.
 @end deffn
 @deffn Instruction load-symbol length
 Load a symbol from the instruction stream. The symbol is assumed to be
-Latin-1-encoded. Symbols backed by wide strings may
+encoded in the ``latin1'' locale. Symbols backed by wide strings may
 be loaded via @code{load-wide-string} then @code{make-symbol}.
 @end deffn
 @deffn Instruction load-array length