Merge branch 'master' of git://git.savannah.gnu.org/guile into elisp

diff --cc doc/ref/vm.texi
Simple merge

diff --cc lib/iconv_open-aix.h
index 0ffc3fe,0ffc3fe..a598e81
--- 1/lib/iconv_open-aix.h
--- 2/lib/iconv_open-aix.h
+++ b/lib/iconv_open-aix.h
@@@ -229,7 -229,7 +229,7 @@@ static const struct mapping mappings[] 
  
  #ifdef __GNUC__
  __inline
--#ifdef __GNUC_STDC_INLINE__
++#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
  __attribute__ ((__gnu_inline__))
  #endif
  #endif

diff --cc libguile/vm-i-system.c
index ad0ec54,0662f81..377cbf9
--- 1/libguile/vm-i-system.c
--- 2/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@@ -107,13 -101,7 +101,13 @@@ VM_DEFINE_INSTRUCTION (7, make_false, "
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (57, make_nil, "make-nil", 0, 0, 1)
 -VM_DEFINE_INSTRUCTION (8, make_eol, "make-eol", 0, 0, 1)
++VM_DEFINE_INSTRUCTION (8, make_nil, "make-nil", 0, 0, 1)
 +{
 +  PUSH (SCM_ELISP_NIL);
 +  NEXT;
 +}
 +
 +VM_DEFINE_INSTRUCTION (9, make_eol, "make-eol", 0, 0, 1)
  {
    PUSH (SCM_EOL);
    NEXT;
@@@ -187,7 -175,7 +181,7 @@@ VM_DEFINE_INSTRUCTION (16, make_char8, 
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (42, make_char32, "make-char32", 4, 0, 1)
 -VM_DEFINE_INSTRUCTION (16, make_char32, "make-char32", 4, 0, 1)
++VM_DEFINE_INSTRUCTION (17, make_char32, "make-char32", 4, 0, 1)
  {
    scm_t_wchar v = 0;
    v += FETCH ();
@@@ -200,7 -188,7 +194,7 @@@
  
  
  
--VM_DEFINE_INSTRUCTION (17, list, "list", 2, -1, 1)
++VM_DEFINE_INSTRUCTION (18, list, "list", 2, -1, 1)
  {
    unsigned h = FETCH ();
    unsigned l = FETCH ();
@@@ -209,7 -197,7 +203,7 @@@
    NEXT;
  }
  
--VM_DEFINE_INSTRUCTION (18, vector, "vector", 2, -1, 1)
++VM_DEFINE_INSTRUCTION (19, vector, "vector", 2, -1, 1)
  {
    unsigned h = FETCH ();
    unsigned l = FETCH ();
@@@ -277,7 -237,7 +243,7 @@@
  
  /* ref */
  
- VM_DEFINE_INSTRUCTION (23, object_ref, "object-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (19, object_ref, "object-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (20, object_ref, "object-ref", 1, 0, 1)
  {
    register unsigned objnum = FETCH ();
    CHECK_OBJECT (objnum);
@@@ -286,7 -246,7 +252,7 @@@
  }
  
  /* FIXME: necessary? elt 255 of the vector could be a vector... */
- VM_DEFINE_INSTRUCTION (24, long_object_ref, "long-object-ref", 2, 0, 1)
 -VM_DEFINE_INSTRUCTION (20, long_object_ref, "long-object-ref", 2, 0, 1)
++VM_DEFINE_INSTRUCTION (21, long_object_ref, "long-object-ref", 2, 0, 1)
  {
    unsigned int objnum = FETCH ();
    objnum <<= 8;
@@@ -296,14 -256,14 +262,14 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (25, local_ref, "local-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (21, local_ref, "local-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (22, local_ref, "local-ref", 1, 0, 1)
  {
    PUSH (LOCAL_REF (FETCH ()));
    ASSERT_BOUND (*sp);
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (26, long_local_ref, "long-local-ref", 2, 0, 1)
 -VM_DEFINE_INSTRUCTION (22, long_local_ref, "long-local-ref", 2, 0, 1)
++VM_DEFINE_INSTRUCTION (23, long_local_ref, "long-local-ref", 2, 0, 1)
  {
    unsigned int i = FETCH ();
    i <<= 8;
@@@ -313,7 -273,7 +279,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (27, variable_ref, "variable-ref", 0, 0, 1)
 -VM_DEFINE_INSTRUCTION (23, variable_ref, "variable-ref", 0, 0, 1)
++VM_DEFINE_INSTRUCTION (24, variable_ref, "variable-ref", 0, 0, 1)
  {
    SCM x = *sp;
  
@@@ -332,7 -292,7 +298,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (28, toplevel_ref, "toplevel-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (24, toplevel_ref, "toplevel-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (25, toplevel_ref, "toplevel-ref", 1, 0, 1)
  {
    unsigned objnum = FETCH ();
    SCM what;
@@@ -355,7 -315,7 +321,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (29, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
 -VM_DEFINE_INSTRUCTION (25, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
++VM_DEFINE_INSTRUCTION (26, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
  {
    SCM what;
    unsigned int objnum = FETCH ();
@@@ -382,14 -342,14 +348,14 @@@
  
  /* set */
  
- VM_DEFINE_INSTRUCTION (30, local_set, "local-set", 1, 1, 0)
 -VM_DEFINE_INSTRUCTION (26, local_set, "local-set", 1, 1, 0)
++VM_DEFINE_INSTRUCTION (27, local_set, "local-set", 1, 1, 0)
  {
    LOCAL_SET (FETCH (), *sp);
    DROP ();
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (31, long_local_set, "long-local-set", 2, 1, 0)
 -VM_DEFINE_INSTRUCTION (27, long_local_set, "long-local-set", 2, 1, 0)
++VM_DEFINE_INSTRUCTION (28, long_local_set, "long-local-set", 2, 1, 0)
  {
    unsigned int i = FETCH ();
    i <<= 8;
@@@ -399,14 -359,14 +365,14 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (32, variable_set, "variable-set", 0, 1, 0)
 -VM_DEFINE_INSTRUCTION (28, variable_set, "variable-set", 0, 1, 0)
++VM_DEFINE_INSTRUCTION (29, variable_set, "variable-set", 0, 1, 0)
  {
    VARIABLE_SET (sp[0], sp[-1]);
    DROPN (2);
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (33, toplevel_set, "toplevel-set", 1, 1, 0)
 -VM_DEFINE_INSTRUCTION (29, toplevel_set, "toplevel-set", 1, 1, 0)
++VM_DEFINE_INSTRUCTION (30, toplevel_set, "toplevel-set", 1, 1, 0)
  {
    unsigned objnum = FETCH ();
    SCM what;
@@@ -425,7 -385,7 +391,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (34, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
 -VM_DEFINE_INSTRUCTION (30, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
++VM_DEFINE_INSTRUCTION (31, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
  {
    SCM what;
    unsigned int objnum = FETCH ();
@@@ -470,7 -430,7 +436,7 @@@
    NEXT;                                               \
  }
  
- VM_DEFINE_INSTRUCTION (35, br, "br", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (31, br, "br", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (32, br, "br", 2, 0, 0)
  {
    scm_t_int16 offset;
    FETCH_OFFSET (offset);
@@@ -478,34 -438,34 +444,34 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (36, br_if, "br-if", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (32, br_if, "br-if", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (33, br_if, "br-if", 2, 0, 0)
  {
    BR (!SCM_FALSEP (*sp));
  }
  
- VM_DEFINE_INSTRUCTION (37, br_if_not, "br-if-not", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (33, br_if_not, "br-if-not", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (34, br_if_not, "br-if-not", 2, 0, 0)
  {
    BR (SCM_FALSEP (*sp));
  }
  
- VM_DEFINE_INSTRUCTION (38, br_if_eq, "br-if-eq", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (34, br_if_eq, "br-if-eq", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (35, br_if_eq, "br-if-eq", 2, 0, 0)
  {
    sp--; /* underflow? */
    BR (SCM_EQ_P (sp[0], sp[1]));
  }
  
- VM_DEFINE_INSTRUCTION (39, br_if_not_eq, "br-if-not-eq", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (35, br_if_not_eq, "br-if-not-eq", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (36, br_if_not_eq, "br-if-not-eq", 2, 0, 0)
  {
    sp--; /* underflow? */
    BR (!SCM_EQ_P (sp[0], sp[1]));
  }
  
- VM_DEFINE_INSTRUCTION (40, br_if_null, "br-if-null", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (36, br_if_null, "br-if-null", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (37, br_if_null, "br-if-null", 2, 0, 0)
  {
    BR (SCM_NULLP (*sp));
  }
  
- VM_DEFINE_INSTRUCTION (41, br_if_not_null, "br-if-not-null", 2, 0, 0)
 -VM_DEFINE_INSTRUCTION (37, br_if_not_null, "br-if-not-null", 2, 0, 0)
++VM_DEFINE_INSTRUCTION (38, br_if_not_null, "br-if-not-null", 2, 0, 0)
  {
    BR (!SCM_NULLP (*sp));
  }
@@@ -515,7 -475,15 +481,15 @@@
   * Subprogram call
   */
  
- VM_DEFINE_INSTRUCTION (43, call, "call", 1, -1, 1)
 -VM_DEFINE_INSTRUCTION (38, new_frame, "new-frame", 0, 0, 3)
++VM_DEFINE_INSTRUCTION (39, new_frame, "new-frame", 0, 0, 3)
+ {
+   PUSH ((SCM)fp); /* dynamic link */
+   PUSH (0);  /* mvra */
+   PUSH (0);  /* ra */
+   NEXT;
+ }
+ 
 -VM_DEFINE_INSTRUCTION (39, call, "call", 1, -1, 1)
++VM_DEFINE_INSTRUCTION (40, call, "call", 1, -1, 1)
  {
    SCM x;
    nargs = FETCH ();
@@@ -636,7 -545,7 +551,7 @@@
    goto vm_error_wrong_type_apply;
  }
  
- VM_DEFINE_INSTRUCTION (44, goto_args, "goto/args", 1, -1, 1)
 -VM_DEFINE_INSTRUCTION (40, goto_args, "goto/args", 1, -1, 1)
++VM_DEFINE_INSTRUCTION (41, goto_args, "goto/args", 1, -1, 1)
  {
    register SCM x;
    nargs = FETCH ();
@@@ -810,13 -624,7 +630,7 @@@
    goto vm_error_wrong_type_apply;
  }
  
- VM_DEFINE_INSTRUCTION (45, goto_nargs, "goto/nargs", 0, 0, 1)
 -VM_DEFINE_INSTRUCTION (41, goto_nargs, "goto/nargs", 0, 0, 1)
++VM_DEFINE_INSTRUCTION (42, goto_nargs, "goto/nargs", 0, 0, 1)
  {
    SCM x;
    POP (x);
@@@ -825,7 -633,7 +639,7 @@@
    goto vm_goto_args;
  }
  
- VM_DEFINE_INSTRUCTION (46, call_nargs, "call/nargs", 0, 0, 1)
 -VM_DEFINE_INSTRUCTION (42, call_nargs, "call/nargs", 0, 0, 1)
++VM_DEFINE_INSTRUCTION (43, call_nargs, "call/nargs", 0, 0, 1)
  {
    SCM x;
    POP (x);
@@@ -834,7 -642,7 +648,7 @@@
    goto vm_call;
  }
  
- VM_DEFINE_INSTRUCTION (47, mv_call, "mv-call", 3, -1, 1)
 -VM_DEFINE_INSTRUCTION (43, mv_call, "mv-call", 3, -1, 1)
++VM_DEFINE_INSTRUCTION (44, mv_call, "mv-call", 3, -1, 1)
  {
    SCM x;
    scm_t_int16 offset;
@@@ -897,7 -705,7 +711,7 @@@
    goto vm_error_wrong_type_apply;
  }
  
- VM_DEFINE_INSTRUCTION (48, apply, "apply", 1, -1, 1)
 -VM_DEFINE_INSTRUCTION (44, apply, "apply", 1, -1, 1)
++VM_DEFINE_INSTRUCTION (45, apply, "apply", 1, -1, 1)
  {
    int len;
    SCM ls;
@@@ -916,7 -724,7 +730,7 @@@
    goto vm_call;
  }
  
- VM_DEFINE_INSTRUCTION (49, goto_apply, "goto/apply", 1, -1, 1)
 -VM_DEFINE_INSTRUCTION (45, goto_apply, "goto/apply", 1, -1, 1)
++VM_DEFINE_INSTRUCTION (46, goto_apply, "goto/apply", 1, -1, 1)
  {
    int len;
    SCM ls;
@@@ -935,7 -743,7 +749,7 @@@
    goto vm_goto_args;
  }
  
- VM_DEFINE_INSTRUCTION (50, call_cc, "call/cc", 0, 1, 1)
 -VM_DEFINE_INSTRUCTION (46, call_cc, "call/cc", 0, 1, 1)
++VM_DEFINE_INSTRUCTION (47, call_cc, "call/cc", 0, 1, 1)
  {
    int first;
    SCM proc, cont;
@@@ -969,7 -780,7 +786,7 @@@
      }
  }
  
- VM_DEFINE_INSTRUCTION (51, goto_cc, "goto/cc", 0, 1, 1)
 -VM_DEFINE_INSTRUCTION (47, goto_cc, "goto/cc", 0, 1, 1)
++VM_DEFINE_INSTRUCTION (48, goto_cc, "goto/cc", 0, 1, 1)
  {
    int first;
    SCM proc, cont;
@@@ -1001,7 -812,7 +818,7 @@@
      }
  }
  
- VM_DEFINE_INSTRUCTION (52, return, "return", 0, 1, 1)
 -VM_DEFINE_INSTRUCTION (48, return, "return", 0, 1, 1)
++VM_DEFINE_INSTRUCTION (49, return, "return", 0, 1, 1)
  {
   vm_return:
    EXIT_HOOK ();
@@@ -1039,7 -849,7 +855,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (53, return_values, "return/values", 1, -1, -1)
 -VM_DEFINE_INSTRUCTION (49, return_values, "return/values", 1, -1, -1)
++VM_DEFINE_INSTRUCTION (50, return_values, "return/values", 1, -1, -1)
  {
    /* nvalues declared at top level, because for some reason gcc seems to think
       that perhaps it might be used without declaration. Fooey to that, I say. */
@@@ -1099,7 -906,7 +912,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (54, return_values_star, "return/values*", 1, -1, -1)
 -VM_DEFINE_INSTRUCTION (50, return_values_star, "return/values*", 1, -1, -1)
++VM_DEFINE_INSTRUCTION (51, return_values_star, "return/values*", 1, -1, -1)
  {
    SCM l;
  
@@@ -1122,7 -929,7 +935,7 @@@
    goto vm_return_values;
  }
  
- VM_DEFINE_INSTRUCTION (55, truncate_values, "truncate-values", 2, -1, -1)
 -VM_DEFINE_INSTRUCTION (51, truncate_values, "truncate-values", 2, -1, -1)
++VM_DEFINE_INSTRUCTION (52, truncate_values, "truncate-values", 2, -1, -1)
  {
    SCM x;
    int nbinds, rest;
@@@ -1145,7 -952,7 +958,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (56, box, "box", 1, 1, 0)
 -VM_DEFINE_INSTRUCTION (52, box, "box", 1, 1, 0)
++VM_DEFINE_INSTRUCTION (53, box, "box", 1, 1, 0)
  {
    SCM val;
    POP (val);
@@@ -1159,7 -966,7 +972,7 @@@
       (set! a (lambda () (b ...)))
       ...)
   */
- VM_DEFINE_INSTRUCTION (57, empty_box, "empty-box", 1, 0, 0)
 -VM_DEFINE_INSTRUCTION (53, empty_box, "empty-box", 1, 0, 0)
++VM_DEFINE_INSTRUCTION (54, empty_box, "empty-box", 1, 0, 0)
  {
    SYNC_BEFORE_GC ();
    LOCAL_SET (FETCH (),
@@@ -1167,7 -974,7 +980,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (58, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (54, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (55, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
  {
    SCM v = LOCAL_REF (FETCH ());
    ASSERT_BOUND_VARIABLE (v);
@@@ -1175,7 -982,7 +988,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (59, local_boxed_set, "local-boxed-set", 1, 1, 0)
 -VM_DEFINE_INSTRUCTION (55, local_boxed_set, "local-boxed-set", 1, 1, 0)
++VM_DEFINE_INSTRUCTION (56, local_boxed_set, "local-boxed-set", 1, 1, 0)
  {
    SCM v, val;
    v = LOCAL_REF (FETCH ());
@@@ -1185,7 -992,7 +998,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (60, free_ref, "free-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (56, free_ref, "free-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (57, free_ref, "free-ref", 1, 0, 1)
  {
    scm_t_uint8 idx = FETCH ();
    
@@@ -1196,7 -1003,7 +1009,7 @@@
  
  /* no free-set -- if a var is assigned, it should be in a box */
  
- VM_DEFINE_INSTRUCTION (61, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
 -VM_DEFINE_INSTRUCTION (57, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
++VM_DEFINE_INSTRUCTION (58, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
  {
    SCM v;
    scm_t_uint8 idx = FETCH ();
@@@ -1207,7 -1014,7 +1020,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (62, free_boxed_set, "free-boxed-set", 1, 1, 0)
 -VM_DEFINE_INSTRUCTION (58, free_boxed_set, "free-boxed-set", 1, 1, 0)
++VM_DEFINE_INSTRUCTION (59, free_boxed_set, "free-boxed-set", 1, 1, 0)
  {
    SCM v, val;
    scm_t_uint8 idx = FETCH ();
@@@ -1219,7 -1026,7 +1032,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (63, make_closure, "make-closure", 0, 2, 1)
 -VM_DEFINE_INSTRUCTION (59, make_closure, "make-closure", 0, 2, 1)
++VM_DEFINE_INSTRUCTION (60, make_closure, "make-closure", 0, 2, 1)
  {
    SCM vect;
    POP (vect);
@@@ -1230,7 -1037,7 +1043,7 @@@
    NEXT;
  }
  
- VM_DEFINE_INSTRUCTION (64, make_variable, "make-variable", 0, 0, 1)
 -VM_DEFINE_INSTRUCTION (60, make_variable, "make-variable", 0, 0, 1)
++VM_DEFINE_INSTRUCTION (61, make_variable, "make-variable", 0, 0, 1)
  {
    SYNC_BEFORE_GC ();
    /* fixme underflow */
@@@ -1238,6 -1045,48 +1051,48 @@@
    NEXT;
  }
  
 -VM_DEFINE_INSTRUCTION (61, fix_closure, "fix-closure", 2, 0, 1)
++VM_DEFINE_INSTRUCTION (62, fix_closure, "fix-closure", 2, 0, 1)
+ {
+   SCM x, vect;
+   unsigned int i = FETCH ();
+   i <<= 8;
+   i += FETCH ();
+   POP (vect);
+   /* FIXME CHECK_LOCAL (i) */ 
+   x = LOCAL_REF (i);
+   /* FIXME ASSERT_PROGRAM (x); */
+   SCM_SET_CELL_WORD_3 (x, vect);
+   NEXT;
+ }
+ 
 -VM_DEFINE_INSTRUCTION (62, define, "define", 0, 0, 2)
++VM_DEFINE_INSTRUCTION (63, define, "define", 0, 0, 2)
+ {
+   SCM sym, val;
+   POP (sym);
+   POP (val);
+   SYNC_REGISTER ();
+   VARIABLE_SET (scm_sym2var (sym, scm_current_module_lookup_closure (),
+                              SCM_BOOL_T),
+                 val);
+   NEXT;
+ }
+ 
 -VM_DEFINE_INSTRUCTION (63, make_keyword, "make-keyword", 0, 1, 1)
++VM_DEFINE_INSTRUCTION (64, make_keyword, "make-keyword", 0, 1, 1)
+ {
+   CHECK_UNDERFLOW ();
+   SYNC_REGISTER ();
+   *sp = scm_symbol_to_keyword (*sp);
+   NEXT;
+ }
+ 
 -VM_DEFINE_INSTRUCTION (64, make_symbol, "make-symbol", 0, 1, 1)
++VM_DEFINE_INSTRUCTION (65, make_symbol, "make-symbol", 0, 1, 1)
+ {
+   CHECK_UNDERFLOW ();
+   SYNC_REGISTER ();
+   *sp = scm_string_to_symbol (*sp);
+   NEXT;
+ }
+ 
  
  /*
  (defun renumber-ops ()
@@@ -1249,6 -1098,6 +1104,7 @@@
          (replace-match
           (number-to-string (setq counter (1+ counter)))
            t t nil 1)))))
++(renumber-ops)
  */
  /*
    Local Variables:

diff --cc module/language/assembly.scm
Simple merge