diff options
| author | Andy Wingo <wingo@pobox.com> | 2014-01-26 20:55:04 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2014-01-26 20:55:04 +0100 |
| commit | 02c624fc09079491660317977a5f202ecc2b1fc8 (patch) | |
| tree | c7b70b76408eaf633a2e1537e589be11ca9b96d4 /libguile/loader.h | |
| parent | b3f1bb5d31a85447c4e7f6084a4f8d7ea374bdbe (diff) | |
| download | guile-02c624fc09079491660317977a5f202ecc2b1fc8.tar.gz | |
More precise stack marking via .guile.frame-maps section
* module/language/cps/slot-allocation.scm (lookup-dead-slot-map)
(allocate-slots): For each non-tail call in a function, compute the
set of slots that are dead after the function has begun the call.
* module/language/cps/compile-bytecode.scm (compile-fun): Emit the
`dead-slot-map' macro instruction for non-tail calls.
* module/system/vm/assembler.scm (<asm>): Add `dead-slot-maps' member.
(dead-slot-map): New macro-instruction.
(link-frame-maps, link-dynamic-section, link-objects): Write dead
slots information into .guile.frame-maps sections of ELF files.
* module/system/vm/elf.scm (DT_GUILE_FRAME_MAPS): New definition.
* libguile/loader.h:
* libguile/loader.c (DT_GUILE_FRAME_MAPS, process_dynamic_segment):
(load_thunk_from_memory, register_elf): Arrange to parse
DT_GUILE_FRAME_MAPS out of the dynamic section.
(find_mapped_elf_image_unlocked, find_mapped_elf_image): New helpers.
(scm_find_mapped_elf_image): Refactor.
(scm_find_dead_slot_map_unlocked): New interface.
* libguile/vm.c (scm_i_vm_mark_stack): Mark the hottest frame
conservatively, as before. Otherwise use the dead slots map, if
available, to avoid marking data that isn't live.
Diffstat (limited to 'libguile/loader.h')
| -rw-r--r-- | libguile/loader.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libguile/loader.h b/libguile/loader.h index 194faff22..6fd950279 100644 --- a/libguile/loader.h +++ b/libguile/loader.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -24,6 +24,9 @@ SCM_API SCM scm_load_thunk_from_file (SCM filename); SCM_API SCM scm_load_thunk_from_memory (SCM bv); +SCM_INTERNAL const scm_t_uint8 * +scm_find_dead_slot_map_unlocked (const scm_t_uint32 *ip); + SCM_INTERNAL void scm_bootstrap_loader (void); SCM_INTERNAL void scm_init_loader (void); |