guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-0-58-g3b0


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-0-58-g3b0b6bc
Date: Wed, 15 Jul 2009 22:24:28 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=3b0b6bc1dd2eb24405ad8e75889df0874f879892

The branch, master has been updated
       via  3b0b6bc1dd2eb24405ad8e75889df0874f879892 (commit)
       via  10331eac7e3c7b802718af515d17e50dca525b3f (commit)
       via  ec99fe8ecb412e49e8e981246eb62ca46b32754b (commit)
       via  5bd047cefa9ffcf17751dbeda1fa56ae56f45199 (commit)
       via  b67cb2864e0de124bd7c4f9b0fda442329e09f3f (commit)
       via  e1203ea00f033954e385a0f2f6aa8b886778dab1 (commit)
      from  a823e7272e7e2800491704a342c6853bc5d95d4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b0b6bc1dd2eb24405ad8e75889df0874f879892
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 23:57:18 2009 +0200

    Bump version number for 1.9.1.
    
    * GUILE-VERSION (GUILE_MICRO_VERSION): Increment.

commit 10331eac7e3c7b802718af515d17e50dca525b3f
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 23:56:27 2009 +0200

    Make the non-integrated VM test-suite less verbose.
    
    * testsuite/run-vm-tests.scm (run-vm-tests): Don't display the number of
      tests passed since it's always 1 or 0.

commit ec99fe8ecb412e49e8e981246eb62ca46b32754b
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 23:53:22 2009 +0200

    Add FIXMEs about misaligned objcode-metas.
    
    * libguile/objcodes.c (scm_c_make_objcode_slice): Add comment about
      misaligned `objcode-meta'.
    
    * module/language/assembly/compile-bytecode.scm (write-bytecode):
      Likewise.

commit 5bd047cefa9ffcf17751dbeda1fa56ae56f45199
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 23:51:42 2009 +0200

    Fix unaligned access in the VM code.
    
    * libguile/vm.c (struct t_32bit_aligned): New.
      (really_make_boot_program)[bytes]: Use it.  This fixes possibly
      unaligned accesses, which cause a "bus error" on some platforms (e.g.,
      sparc-*).

commit b67cb2864e0de124bd7c4f9b0fda442329e09f3f
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 23:12:43 2009 +0200

    Const-qualify buffers passed to `scm_c_make_objcode_slice ()'.
    
    * libguile/objcodes.c (scm_c_make_objcode_slice): Add `const' qualifier
      for PTR and DATA.
    
    * libguile/objcodes.h: Update accordingly.

commit e1203ea00f033954e385a0f2f6aa8b886778dab1
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 22:46:54 2009 +0200

    Switch remaining GPLv2+ Guile-VM headers to LGPLv3+.
    
    * module/system/base/compile.scm, module/system/base/syntax.scm,
      module/system/repl/common.scm, module/system/repl/describe.scm,
      module/system/vm/instruction.scm, module/system/vm/objcode.scm,
      module/system/vm/profile.scm, module/system/vm/program.scm,
      module/system/vm/trace.scm: Switch header from GPLv2+ to LGPLv3+.

-----------------------------------------------------------------------

Summary of changes:
 GUILE-VERSION                                 |    2 +-
 libguile/objcodes.c                           |   10 ++++++-
 libguile/objcodes.h                           |    4 +-
 libguile/vm.c                                 |   34 +++++++++++++++++++-----
 module/language/assembly/compile-bytecode.scm |    3 ++
 module/system/base/compile.scm                |   27 +++++++++----------
 module/system/base/syntax.scm                 |   27 +++++++++----------
 module/system/repl/common.scm                 |   27 +++++++++----------
 module/system/repl/describe.scm               |   27 +++++++++----------
 module/system/vm/instruction.scm              |   27 +++++++++----------
 module/system/vm/objcode.scm                  |   27 +++++++++----------
 module/system/vm/profile.scm                  |   27 +++++++++----------
 module/system/vm/program.scm                  |   21 +++++++--------
 module/system/vm/trace.scm                    |   27 +++++++++----------
 testsuite/run-vm-tests.scm                    |    7 +---
 15 files changed, 157 insertions(+), 140 deletions(-)

diff --git a/GUILE-VERSION b/GUILE-VERSION
index c23f8f6..fa96ed9 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -2,7 +2,7 @@
 
 GUILE_MAJOR_VERSION=1
 GUILE_MINOR_VERSION=9
-GUILE_MICRO_VERSION=0
+GUILE_MICRO_VERSION=1
 
 GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_VERSION}
 GUILE_VERSION=${GUILE_EFFECTIVE_VERSION}.${GUILE_MICRO_VERSION}
diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index 038c4c7..a210553 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -120,10 +120,10 @@ make_objcode_by_mmap (int fd)
 #undef FUNC_NAME
 
 SCM
-scm_c_make_objcode_slice (SCM parent, scm_t_uint8 *ptr)
+scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr)
 #define FUNC_NAME "make-objcode-slice"
 {
-  struct scm_objcode *data, *parent_data;
+  const struct scm_objcode *data, *parent_data;
   SCM ret;
 
   SCM_VALIDATE_OBJCODE (1, parent);
@@ -138,6 +138,12 @@ scm_c_make_objcode_slice (SCM parent, scm_t_uint8 *ptr)
                                scm_from_uint32 (parent_data->len),
                                scm_from_uint32 (parent_data->metalen)));
 
+#if 0
+  /* FIXME: We currently generate bytecode where the objcode-meta isn't
+     suitable aligned, which is an issue on some arches (e.g., SPARC).  */
+  assert ((((uintptr_t) ptr) & (__alignof__ (struct scm_objcode) - 1UL)) == 0);
+#endif
+
   data = (struct scm_objcode*)ptr;
   if (data->base + data->len + data->metalen > parent_data->base + 
parent_data->len + parent_data->metalen)
     abort ();
diff --git a/libguile/objcodes.h b/libguile/objcodes.h
index 21e4add..e9b1cdb 100644
--- a/libguile/objcodes.h
+++ b/libguile/objcodes.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -56,7 +56,7 @@ SCM_API scm_t_bits scm_tc16_objcode;
 #define SCM_OBJCODE_IS_U8VECTOR(x) (SCM_SMOB_FLAGS (x) & 
SCM_F_OBJCODE_IS_U8VECTOR)
 #define SCM_OBJCODE_IS_SLICE(x) (SCM_SMOB_FLAGS (x) & SCM_F_OBJCODE_IS_SLICE)
 
-SCM scm_c_make_objcode_slice (SCM parent, scm_t_uint8 *ptr);
+SCM scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr);
 SCM_API SCM scm_load_objcode (SCM file);
 SCM_API SCM scm_objcode_p (SCM obj);
 SCM_API SCM scm_objcode_meta (SCM objcode);
diff --git a/libguile/vm.c b/libguile/vm.c
index 514ff8d..f753ea2 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -227,21 +227,41 @@ static SCM make_u8vector (const scm_t_uint8 *bytes, 
size_t len)
   return scm_take_u8vector (new_bytes, len);
 }
 
+/* Dummy structure to guarantee 32-bit alignment.  */
+struct t_32bit_aligned
+{
+  scm_t_int32 dummy;
+  scm_t_uint8 bytes[18];
+};
+
 static SCM
 really_make_boot_program (long nargs)
 {
-  scm_byte_t bytes[] = {0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        0, 0, 0, 0,
-                        scm_op_mv_call, 0, 0, 1, scm_op_make_int8_1, 
scm_op_halt};
+  SCM u8vec;
+  struct t_32bit_aligned bytes =
+    {
+      .dummy = 0,
+      .bytes = { 0, 0, 0, 0,
+                0, 0, 0, 0,
+                0, 0, 0, 0,
+                scm_op_mv_call, 0, 0, 1,
+                scm_op_make_int8_1, scm_op_halt }
+    };
+
   SCM ret;
-  ((scm_t_uint32*)bytes)[1] = 6; /* set len in current endianness, no meta */
+
+  /* Set length in current endianness, no meta.  */
+  ((scm_t_uint32 *) bytes.bytes)[1] = 6;
+
   if (SCM_UNLIKELY (nargs > 255 || nargs < 0))
     abort ();
-  bytes[13] = (scm_byte_t)nargs;
-  ret = scm_make_program (scm_bytecode_to_objcode (make_u8vector (bytes, 
sizeof(bytes))),
+  bytes.bytes[13] = (scm_byte_t) nargs;
+
+  u8vec = make_u8vector (bytes.bytes, sizeof (bytes.bytes));
+  ret = scm_make_program (scm_bytecode_to_objcode (u8vec),
                           SCM_BOOL_F, SCM_EOL);
   SCM_SET_SMOB_FLAGS (ret, SCM_F_PROGRAM_IS_BOOT);
+
   return ret;
 }
 #define NUM_BOOT_PROGS 8
diff --git a/module/language/assembly/compile-bytecode.scm 
b/module/language/assembly/compile-bytecode.scm
index 73ed620..4b9f7b7 100644
--- a/module/language/assembly/compile-bytecode.scm
+++ b/module/language/assembly/compile-bytecode.scm
@@ -110,6 +110,9 @@
                                (set! i (1+ i))
                                (if (> i 0) (write-byte x))))
                       (get-addr (lambda () i)))
+               ;; FIXME: We should add padding here so that META's bytecode
+               ;; meets the alignment requirements of `scm_objcode'.  See
+               ;; `scm_c_make_objcode_slice ()'.
                (write-bytecode meta write get-addr '()))))
         ((load-unsigned-integer ,str) (write-loader str))
         ((load-integer ,str) (write-loader str))
diff --git a/module/system/base/compile.scm b/module/system/base/compile.scm
index 22f8e04..7e26609 100644
--- a/module/system/base/compile.scm
+++ b/module/system/base/compile.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/base/syntax.scm b/module/system/base/syntax.scm
index d968bdf..cc73f38 100644
--- a/module/system/base/syntax.scm
+++ b/module/system/base/syntax.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version
-;;
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details
-;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 1978255..2db4518 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/repl/describe.scm b/module/system/repl/describe.scm
index 0563def..590d223 100644
--- a/module/system/repl/describe.scm
+++ b/module/system/repl/describe.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/vm/instruction.scm b/module/system/vm/instruction.scm
index 3ad718e..403e9cd 100644
--- a/module/system/vm/instruction.scm
+++ b/module/system/vm/instruction.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm
index ab6bb4b..7c0490d 100644
--- a/module/system/vm/objcode.scm
+++ b/module/system/vm/objcode.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/vm/profile.scm b/module/system/vm/profile.scm
index 2c17fc7..6ab418a 100644
--- a/module/system/vm/profile.scm
+++ b/module/system/vm/profile.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm
index 5a490b9..9db4a75 100644
--- a/module/system/vm/program.scm
+++ b/module/system/vm/program.scm
@@ -1,21 +1,20 @@
 ;;; Guile VM program functions
 
 ;;; Copyright (C) 2001 Free Software Foundation, Inc.
-;;; Copyright (C) 2005 Ludovic Courtès  <address@hidden>
 ;;;
-;;; This program is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2 of the License, or
-;;; (at your option) any later version.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
 ;;;
-;;; This program is distributed in the hope that it will be useful,
+;;; This library is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
 ;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/module/system/vm/trace.scm b/module/system/vm/trace.scm
index 2ba5280..6ff09a7 100644
--- a/module/system/vm/trace.scm
+++ b/module/system/vm/trace.scm
@@ -2,20 +2,19 @@
 
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-;; 
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;; 
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 
USA
 
 ;;; Code:
 
diff --git a/testsuite/run-vm-tests.scm b/testsuite/run-vm-tests.scm
index c6c7a5d..f7eba40 100644
--- a/testsuite/run-vm-tests.scm
+++ b/testsuite/run-vm-tests.scm
@@ -1,7 +1,6 @@
 ;;; run-vm-tests.scm -- Run Guile-VM's test suite.
 ;;;
-;;; Copyright 2005  Ludovic Courtès <address@hidden>
-;;;
+;;; Copyright 2005, 2009 Free Software Foundation, Inc.
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public License
@@ -85,9 +84,7 @@ equal in the sense of @var{equal?}."
         (failed (length (filter not res))))
 
     (if (= 0 failed)
-       (begin
-         (format #t "~%All ~a tests passed~%" total)
-         (exit 0))
+        (exit 0)
        (begin
          (format #t "~%~a tests failed out of ~a~%"
                  failed total)


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]