[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, master, updated. v2.1.0-419-gc4f7923
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] GNU Guile branch, master, updated. v2.1.0-419-gc4f7923 |
|
Date: |
Tue, 19 Nov 2013 20:48:06 +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=c4f7923fa9148204c7237e400c6e69056b69d4b2
The branch, master has been updated
via c4f7923fa9148204c7237e400c6e69056b69d4b2 (commit)
via 4cbc95f1507249d757391927da42feaaf969a60a (commit)
via c0a1a0b12d2e63c62ecdb82c570b5bb7faf637e1 (commit)
from 74870c0d2f2cfb2a15ab732c0cc0378bbf268682 (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 c4f7923fa9148204c7237e400c6e69056b69d4b2
Author: Andy Wingo <address@hidden>
Date: Tue Nov 19 21:47:55 2013 +0100
Remove VM_ENABLE_STACK_NULLING
* libguile/vm.c: Remove code dependent on VM_ENABLE_STACK_NULLING. This
defined didn't work and doesn't apply to the RTL model.
commit 4cbc95f1507249d757391927da42feaaf969a60a
Author: Andy Wingo <address@hidden>
Date: Tue Nov 19 21:45:07 2013 +0100
Rename objcodes?.{scm,c,h} to loader.{scm,c,h}
* libguile/loader.c:
* libguile/loader.h: Rename from objcodes.[ch].
* module/system/vm/loader.scm: Rename from objcode.scm.
* libguile/Makefile.am:
* libguile/gsubr.c:
* libguile/init.c:
* libguile/procs.c:
* libguile/vm.c:
* module/Makefile.am:
* module/ice-9/eval-string.scm:
* module/language/rtl/spec.scm:
* module/system/base/target.scm:
* module/system/repl/command.scm:
* module/system/repl/common.scm:
* module/system/vm/debug.scm:
* module/system/vm/disassembler.scm:
* module/system/vm/objcode.scm:
* test-suite/tests/compiler.test:
* test-suite/tests/dwarf.test:
* test-suite/tests/rtl-compilation.test:
* test-suite/tests/rtl.test: Adapt.
commit c0a1a0b12d2e63c62ecdb82c570b5bb7faf637e1
Author: Andy Wingo <address@hidden>
Date: Tue Nov 19 21:32:42 2013 +0100
Remove (oop goops) <objcode> export
* module/oop/goops.scm (oop): Remove objcode export.
-----------------------------------------------------------------------
Summary of changes:
libguile/Makefile.am | 12 +++++----
libguile/gsubr.c | 5 +---
libguile/init.c | 4 +-
libguile/{objcodes.c => loader.c} | 12 ++++----
libguile/{objcodes.h => loader.h} | 10 ++++----
libguile/procs.c | 2 +-
libguile/vm.c | 34 +-------------------------
module/Makefile.am | 2 +-
module/ice-9/eval-string.scm | 2 +-
module/language/rtl/spec.scm | 2 +-
module/oop/goops.scm | 4 +-
module/system/base/target.scm | 2 -
module/system/repl/command.scm | 2 +-
module/system/repl/common.scm | 2 +-
module/system/vm/debug.scm | 2 +-
module/system/vm/disassembler.scm | 2 +-
module/system/vm/{objcode.scm => loader.scm} | 4 +-
test-suite/tests/compiler.test | 2 +-
test-suite/tests/dwarf.test | 2 +-
test-suite/tests/rtl-compilation.test | 2 +-
test-suite/tests/rtl.test | 2 +-
21 files changed, 38 insertions(+), 73 deletions(-)
rename libguile/{objcodes.c => loader.c} (99%)
rename libguile/{objcodes.h => loader.h} (85%)
rename module/system/vm/{objcode.scm => loader.scm} (93%)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index b2a9faf..273e1b6 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -169,13 +169,13 @@ address@hidden@_la_SOURCES =
\
keywords.c \
list.c \
load.c \
+ loader.c \
macros.c \
mallocs.c \
memoize.c \
modules.c \
null-threads.c \
numbers.c \
- objcodes.c \
objprop.c \
options.c \
pairs.c \
@@ -255,6 +255,7 @@ DOT_X_FILES = \
fluids.x \
foreign.x \
fports.x \
+ frames.x \
gc-malloc.x \
gc.x \
gettext.x \
@@ -268,10 +269,12 @@ DOT_X_FILES = \
hooks.x \
i18n.x \
init.x \
+ instructions.x \
ioext.x \
keywords.x \
list.x \
load.x \
+ loader.x \
macros.x \
mallocs.x \
memoize.x \
@@ -284,6 +287,7 @@ DOT_X_FILES = \
print.x \
procprop.x \
procs.x \
+ programs.x \
promises.x \
r6rs-ports.x \
random.x \
@@ -318,14 +322,12 @@ DOT_X_FILES = \
variable.x \
vectors.x \
version.x \
+ vm.x \
vports.x \
weak-set.x \
weak-table.x \
weak-vector.x
-# vm-related snarfs
-DOT_X_FILES += frames.x instructions.x objcodes.x programs.x vm.x
-
EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
DOT_DOC_FILES = \
@@ -577,6 +579,7 @@ modinclude_HEADERS = \
keywords.h \
list.h \
load.h \
+ loader.h \
macros.h \
mallocs.h \
memoize.h \
@@ -584,7 +587,6 @@ modinclude_HEADERS = \
net_db.h \
null-threads.h \
numbers.h \
- objcodes.h \
objprop.h \
options.h \
pairs.h \
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 49edd3c..650ea66 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -28,7 +28,6 @@
#include "libguile/gsubr.h"
#include "libguile/foreign.h"
#include "libguile/instructions.h"
-#include "libguile/objcodes.h"
#include "libguile/srfi-4.h"
#include "libguile/programs.h"
@@ -43,9 +42,7 @@
/* OK here goes nothing: we're going to define VM assembly trampolines for
- invoking subrs, along with their meta-information, and then wrap them into
- statically allocated objcode values. Ready? Right!
-*/
+ invoking subrs. Ready? Right! */
/* There's a maximum of 10 args, so the number of possible combinations is:
(REQ-OPT-REST)
diff --git a/libguile/init.c b/libguile/init.c
index 6787483..da6a857 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -85,7 +85,7 @@
#include "libguile/modules.h"
#include "libguile/net_db.h"
#include "libguile/numbers.h"
-#include "libguile/objcodes.h"
+#include "libguile/loader.h"
#include "libguile/objprop.h"
#include "libguile/options.h"
#include "libguile/pairs.h"
@@ -391,7 +391,7 @@ scm_i_init_guile (void *base)
scm_init_array_handle ();
scm_bootstrap_bytevectors (); /* Requires array-handle */
scm_bootstrap_instructions ();
- scm_bootstrap_objcodes ();
+ scm_bootstrap_loader ();
scm_bootstrap_programs ();
scm_bootstrap_vm ();
scm_register_r6rs_ports ();
diff --git a/libguile/objcodes.c b/libguile/loader.c
similarity index 99%
rename from libguile/objcodes.c
rename to libguile/loader.c
index 52ba7b8..ce56991 100644
--- a/libguile/objcodes.c
+++ b/libguile/loader.c
@@ -40,7 +40,7 @@
#include "_scm.h"
#include "elf.h"
#include "programs.h"
-#include "objcodes.h"
+#include "loader.h"
/* This file contains the loader for Guile's on-disk format: ELF with
some custom tags in the dynamic segment. */
@@ -688,18 +688,18 @@ scm_all_mapped_elf_images (void)
void
-scm_bootstrap_objcodes (void)
+scm_bootstrap_loader (void)
{
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
- "scm_init_objcodes",
- (scm_t_extension_init_func)scm_init_objcodes,
NULL);
+ "scm_init_loader",
+ (scm_t_extension_init_func)scm_init_loader, NULL);
}
void
-scm_init_objcodes (void)
+scm_init_loader (void)
{
#ifndef SCM_MAGIC_SNARFER
-#include "libguile/objcodes.x"
+#include "libguile/loader.x"
#endif
scm_c_define_gsubr ("find-mapped-elf-image", 1, 0, 0,
diff --git a/libguile/objcodes.h b/libguile/loader.h
similarity index 85%
rename from libguile/objcodes.h
rename to libguile/loader.h
index 2d439f7..194faff 100644
--- a/libguile/objcodes.h
+++ b/libguile/loader.h
@@ -16,18 +16,18 @@
* 02110-1301 USA
*/
-#ifndef _SCM_OBJCODES_H_
-#define _SCM_OBJCODES_H_
+#ifndef _SCM_LOADER_H_
+#define _SCM_LOADER_H_
#include <libguile.h>
SCM_API SCM scm_load_thunk_from_file (SCM filename);
SCM_API SCM scm_load_thunk_from_memory (SCM bv);
-SCM_INTERNAL void scm_bootstrap_objcodes (void);
-SCM_INTERNAL void scm_init_objcodes (void);
+SCM_INTERNAL void scm_bootstrap_loader (void);
+SCM_INTERNAL void scm_init_loader (void);
-#endif /* _SCM_OBJCODES_H_ */
+#endif /* _SCM_LOADER_H_ */
/*
Local Variables:
diff --git a/libguile/procs.c b/libguile/procs.c
index bbc80cf..1be7fd1 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -33,7 +33,7 @@
#include "libguile/validate.h"
#include "libguile/procs.h"
#include "libguile/procprop.h"
-#include "libguile/objcodes.h"
+#include "libguile/loader.h"
#include "libguile/programs.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 8758088..5aaf624 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -33,7 +33,7 @@
#include "control.h"
#include "frames.h"
#include "instructions.h"
-#include "objcodes.h"
+#include "loader.h"
#include "programs.h"
#include "vm.h"
#include "vm-builtins.h"
@@ -54,19 +54,8 @@ static SCM sym_debug;
necessary, but might be if you think you found a bug in the VM. */
#define VM_ENABLE_ASSERTIONS
-/* We can add a mode that ensures that all stack items above the stack pointer
- are NULL. This is useful for checking the internal consistency of the VM's
- assumptions and its operators, but isn't necessary for normal operation. It
- will ensure that assertions are enabled. Slows down the VM by about 30%. */
-/* NB! If you enable this, search for NULLING in throw.c */
-/* #define VM_ENABLE_STACK_NULLING */
-
/* #define VM_ENABLE_PARANOID_ASSERTIONS */
-#if defined (VM_ENABLE_STACK_NULLING) && !defined (VM_ENABLE_ASSERTIONS)
-#define VM_ENABLE_ASSERTIONS
-#endif
-
/* When defined, arrange so that the GC doesn't scan the VM stack beyond its
current SP. This should help avoid excess data retention. See
http://thread.gmane.org/gmane.comp.programming.garbage-collection.boehmgc/3001
@@ -112,15 +101,6 @@ scm_i_vm_capture_stack (SCM *stack_base, SCM *fp, SCM *sp,
scm_t_uint32 *ra,
p->stack_size = sp - stack_base + 1;
p->stack_base = scm_gc_malloc (p->stack_size * sizeof (SCM),
"capture_vm_cont");
-#if defined(VM_ENABLE_STACK_NULLING) && 0
- /* Tail continuations leave their frame on the stack for subsequent
- application, but don't capture the frame -- so there are some elements on
- the stack then, and this check doesn't work, so disable it for now. */
- if (sp >= vp->stack_base)
- if (!vp->sp[0] || vp->sp[1])
- abort ();
- memset (p->stack_base, 0, p->stack_size * sizeof (SCM));
-#endif
p->ra = ra;
p->sp = sp;
p->fp = fp;
@@ -148,15 +128,6 @@ vm_return_to_continuation (SCM vm, SCM cont, size_t n, SCM
*argv)
scm_misc_error ("vm-engine", "not enough space to reinstate continuation",
scm_list_2 (vm, cont));
-#ifdef VM_ENABLE_STACK_NULLING
- {
- scm_t_ptrdiff nzero = (vp->sp - cp->sp);
- if (nzero > 0)
- memset (vp->stack_base + cp->stack_size, 0, nzero * sizeof (SCM));
- /* actually nzero should always be negative, because vm_reset_stack will
- unwind the stack to some point *below* this continuation */
- }
-#endif
vp->sp = cp->sp;
vp->fp = cp->fp;
memcpy (vp->stack_base, cp->stack_base, cp->stack_size * sizeof (SCM));
@@ -808,9 +779,6 @@ make_vm (void)
"stack-base");
#endif
-#ifdef VM_ENABLE_STACK_NULLING
- memset (vp->stack_base, 0, vp->stack_size * sizeof (SCM));
-#endif
vp->stack_limit = vp->stack_base + vp->stack_size - VM_STACK_RESERVE_SIZE;
vp->ip = NULL;
vp->sp = vp->stack_base - 1;
diff --git a/module/Makefile.am b/module/Makefile.am
index d3878cd..b5a31f2 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -355,7 +355,7 @@ SYSTEM_SOURCES = \
system/vm/elf.scm \
system/vm/linker.scm \
system/vm/frame.scm \
- system/vm/objcode.scm \
+ system/vm/loader.scm \
system/vm/program.scm \
system/vm/trace.scm \
system/vm/traps.scm \
diff --git a/module/ice-9/eval-string.scm b/module/ice-9/eval-string.scm
index ae6792e..3cf73b9 100644
--- a/module/ice-9/eval-string.scm
+++ b/module/ice-9/eval-string.scm
@@ -22,7 +22,7 @@
#:use-module (system base compile)
#:use-module (system base language)
#:use-module (system vm program)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:replace (eval-string))
(define (ensure-language x)
diff --git a/module/language/rtl/spec.scm b/module/language/rtl/spec.scm
index 0dabf94..0d9fa6a 100644
--- a/module/language/rtl/spec.scm
+++ b/module/language/rtl/spec.scm
@@ -20,7 +20,7 @@
(define-module (language rtl spec)
#:use-module (system base language)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:use-module (ice-9 binary-ports)
#:export (rtl))
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index 2e875fa..eb2b67c 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -1,6 +1,6 @@
;;; installed-scm-file
-;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011 Free
Software Foundation, Inc.
+;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011,
2013 Free Software Foundation, Inc.
;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI <address@hidden>
;;;;
;;;; This library is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@
;; Types with their own allocated typecodes.
<boolean> <char> <list> <pair> <null> <string> <symbol>
<vector> <bytevector> <uvec> <foreign> <hashtable>
- <fluid> <dynamic-state> <frame> <objcode> <vm> <vm-continuation>
+ <fluid> <dynamic-state> <frame> <vm> <vm-continuation>
;; Numbers.
<number> <complex> <real> <integer> <fraction>
diff --git a/module/system/base/target.scm b/module/system/base/target.scm
index c74ae67..ce5ff33 100644
--- a/module/system/base/target.scm
+++ b/module/system/base/target.scm
@@ -35,8 +35,6 @@
;;;
(define %native-word-size
- ;; The native word size. Note: don't use `word-size' from
- ;; (system vm objcode) to avoid a circular dependency.
((@ (system foreign) sizeof) '*))
(define %target-type (make-fluid %host-type))
diff --git a/module/system/repl/command.scm b/module/system/repl/command.scm
index c0a5dd6..62bc297 100644
--- a/module/system/repl/command.scm
+++ b/module/system/repl/command.scm
@@ -26,7 +26,7 @@
#:use-module (system repl common)
#:use-module (system repl debug)
#:use-module (system vm disassembler)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:use-module (system vm program)
#:use-module (system vm trap-state)
#:use-module (system vm vm)
diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index 1da3669..4e21679 100644
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -25,7 +25,7 @@
#:use-module (system base language)
#:use-module (system base message)
#:use-module (system vm program)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:autoload (language tree-il optimize) (optimize)
#:use-module (ice-9 control)
#:use-module (ice-9 history)
diff --git a/module/system/vm/debug.scm b/module/system/vm/debug.scm
index d201e50..0ad387a 100644
--- a/module/system/vm/debug.scm
+++ b/module/system/vm/debug.scm
@@ -27,7 +27,7 @@
(define-module (system vm debug)
#:use-module (system vm elf)
#:use-module (system vm dwarf)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:use-module (system foreign)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 match)
diff --git a/module/system/vm/disassembler.scm
b/module/system/vm/disassembler.scm
index 6e8c631..f09f057 100644
--- a/module/system/vm/disassembler.scm
+++ b/module/system/vm/disassembler.scm
@@ -23,7 +23,7 @@
#:use-module (system vm elf)
#:use-module (system vm debug)
#:use-module (system vm program)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:use-module (system foreign)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 format)
diff --git a/module/system/vm/objcode.scm b/module/system/vm/loader.scm
similarity index 93%
rename from module/system/vm/objcode.scm
rename to module/system/vm/loader.scm
index ba4ba53..186bcc3 100644
--- a/module/system/vm/objcode.scm
+++ b/module/system/vm/loader.scm
@@ -18,10 +18,10 @@
;;; Code:
-(define-module (system vm objcode)
+(define-module (system vm loader)
#:export (load-thunk-from-file
load-thunk-from-memory
find-mapped-elf-image all-mapped-elf-images))
(load-extension (string-append "libguile-" (effective-version))
- "scm_init_objcodes")
+ "scm_init_loader")
diff --git a/test-suite/tests/compiler.test b/test-suite/tests/compiler.test
index ee202b6..70213ca 100644
--- a/test-suite/tests/compiler.test
+++ b/test-suite/tests/compiler.test
@@ -19,7 +19,7 @@
#:use-module (test-suite lib)
#:use-module (test-suite guile-test)
#:use-module (system base compile)
- #:use-module ((system vm objcode) #:select (load-thunk-from-memory))
+ #:use-module ((system vm loader) #:select (load-thunk-from-memory))
#:use-module ((system vm program) #:select (program-sources source:addr)))
(define read-and-compile
diff --git a/test-suite/tests/dwarf.test b/test-suite/tests/dwarf.test
index 0c43d61..c6deaee 100644
--- a/test-suite/tests/dwarf.test
+++ b/test-suite/tests/dwarf.test
@@ -22,7 +22,7 @@
#:use-module (system base compile)
#:use-module (system vm debug)
#:use-module (system vm program)
- #:use-module (system vm objcode))
+ #:use-module (system vm loader))
(define prog
(string-concatenate
diff --git a/test-suite/tests/rtl-compilation.test
b/test-suite/tests/rtl-compilation.test
index d5cd81a..f461533 100644
--- a/test-suite/tests/rtl-compilation.test
+++ b/test-suite/tests/rtl-compilation.test
@@ -19,7 +19,7 @@
(define-module (test-suite rtl-compilation)
#:use-module (test-suite lib)
#:use-module (system base compile)
- #:use-module (system vm objcode))
+ #:use-module (system vm loader))
(define* (compile-via-rtl exp #:key peval? cse? (env (make-fresh-user-module)))
(load-thunk-from-memory
diff --git a/test-suite/tests/rtl.test b/test-suite/tests/rtl.test
index e900d34..713667a 100644
--- a/test-suite/tests/rtl.test
+++ b/test-suite/tests/rtl.test
@@ -20,7 +20,7 @@
#:use-module (test-suite lib)
#:use-module (system vm assembler)
#:use-module (system vm program)
- #:use-module (system vm objcode)
+ #:use-module (system vm loader)
#:use-module (system vm linker)
#:use-module (system vm debug))
hooks/post-receive
--
GNU Guile
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, master, updated. v2.1.0-419-gc4f7923,
Andy Wingo <=