1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-07 08:40:21 +02:00
Commit graph

10726 commits

Author SHA1 Message Date
Ludovic Courtès
47463c8fd7 Add `scm_c_symbol_length ()'. 2008-07-05 20:11:22 +02:00
Ludovic Courtès
3f324bb3b8 Update `THANKS'. 2008-07-04 22:23:03 +02:00
Ludovic Courtès
bc566d672f Fix `SCM_INTERNAL' with GCC 4.3. 2008-07-04 22:22:54 +02:00
Ludovic Courtès
e01343d646 Modernize Automake files. 2008-06-28 22:14:40 +02:00
Ludovic Courtès
ecb5d146f7 Fix doc typo regarding `use-syntax' and "syntax transformers". 2008-06-28 20:39:38 +02:00
Ludovic Courtès
9472870b85 Fix harmless typo in SRFI-19. 2008-06-28 20:39:30 +02:00
Ludovic Courtès
a9f32e12c4 Disable type-checking of `SCM_UNPACK' for the broken HP compilers. 2008-06-28 20:38:36 +02:00
Ludovic Courtès
22ba77df3d Update `THANKS'. 2008-06-02 21:51:46 +02:00
Ludovic Courtès
787abee8d3 guile-config: Show -L$libdir' before -lguile'. 2008-06-02 21:51:43 +02:00
Ludovic Courtès
c4df2cca63 Work around `#define except' on Tru64. 2008-06-02 21:51:27 +02:00
Ludovic Courtès
90e97a7b4b Support systems whose <inttypes.h> doesn't define `PRIiMAX'. 2008-06-02 21:51:16 +02:00
Ludovic Courtès
5c22f3e51f Fix SRFI-88 URL in the manual. 2008-06-01 13:11:05 +02:00
Ludovic Courtès
ee68246a84 Update `NEWS'. 2008-05-31 23:19:55 +02:00
Ludovic Courtès
f0c64044d3 Add `SCM_INTERNAL' macro, use it. 2008-05-31 23:16:41 +02:00
Neil Jerram
0d185db93e Expand DEFFROM and DEFTO macros in discouraged.c
* discouraged.c: Expand DEFFROM and DEFTO macros, to avoid
compiler warnings about excess semicolons.  (Reported by Didier
Godefroy.)
2008-05-13 00:01:57 +01:00
Neil Jerram
78aa4a8850 Fix continuation problems on IA64.
* Specific problems in IA64 make check

** test-unwind

Representation of the relevant dynamic context:

                  non-rewindable
           catch      frame       make cont.
  o----o-----a----------b-------------c
        \
         \             call cont.
          o-----o-----------d

A continuation is captured at (c), with a non-rewindable frame in the
dynamic context at (b).  If a rewind through that frame was attempted,
Guile would throw to the catch at (a).  Then the context unwinds back
past (a), then winds forwards again, and the captured continuation is
called at (d).

We should end up at the catch at (a).  On ia64, we get an "illegal
instruction".

The problem is that Guile does not restore the ia64 register backing
store (RBS) stack (which is saved off when the continuation is
captured) until all the unwinding and rewinding is done.  Therefore,
when the rewind code (scm_i_dowinds) hits the non-rewindable frame at
(b), the RBS stack hasn't yet been restored.  The throw finds the
jmp_buf (for the catch at (a)) correctly from the dynamic context, and
jumps back to (a), but the RBS stack is invalid, hence the illegal
instruction.

This could be fixed by restoring the RBS stack earlier, at the same
point (copy_stack) where the normal stack is restored.  But that
causes a problem in the next test...

** continuations.test

The dynamic context diagram for this case is similar:

                   non-rewindable
  catch                 frame       make cont.
    a----x-----o----------b-------------c
          \
           \    call cont.
            o-------d

The only significant difference is that the catch point (a) is
upstream of where the dynamic context forks.  This means that the RBS
stack at (d) already contains the correct RBS contents for throwing
back to (a), so it doesn't matter whether the RBS stack that was saved
off with the continuation gets restored.

This test passes with the Guile 1.8.4 code, but fails (with an
"illegal instruction") when the code is changed to restore the RBS
stack earlier as described above.

The problem now is that the RBS stack is being restored _too_ early;
specifically when there is still stuff to do that relies on the old
RBS contents.  When a continuation is called, the sequence of relevant
events is:

  (1) Grow the (normal) stack until it is bigger than the (normal)
      stack saved off in the continuation.  (scm_dynthrow, grow_stack)

  (2) scm_i_dowinds calls itself recursively, such that

      (2.1) for each rewind (from (x) to (c)) that will be needed,
            another frame is added to the stack (both normal and RBS),
            with local variables specifying the required rewind; the
            rewinds don't actually happen yet, they will happen when
            the stack unwinds again through these frames

      (2.2) required unwinds - back from where the continuation was
            called (d) to the fork point (x) - are done immediately.

  (3) The normal (i.e. non-RBS) stack that was stored in the
      continuation is restored (i.e. copied on top of the actual
      stack).

      Note that this doesn't overwrite the frames that were added in
      (2.1), because the growth in (1) ensures that the added frames
      are beyond the end of the restored stack.

  (4) ? Restore the RBS stack here too ?

  (5) Return (from copy_stack) through the (2.1) frames, which means
      that the rewinds now happen.

  (6) setcontext (or longjmp) to the context (c) where the
      continuation was captured.

The trouble is that step (1) does not create space in the RBS stack in
the same kind of way that it does for the normal stack.  Therefore, if
the saved (in the continuation) RBS stack is big enough, it can
overwrite the RBS of the (2.1) frames that still need to complete.
This causes an illegal instruction when we return through those frames
and try to perform the rewinds.

* Fix

The key to the fix is that the saved RBS stack only needs to be
restored at some point before the next setcontext call, and that doing
it as close to the setcontext call as possible will avoid bad
interactions with the pre-setcontext stack.  Therefore we do the
restoration at the last possible point, immediately before the next
setcontext call.

The situation is complicated by there being two ways that the next
setcontext call can happen.

  - If the unwinding and rewinding is all successful, the next
    setcontext will be the one from step (6) above.  This is the
    "normal" continuation invocation case.

  - If one of the rewinds throws an error, the next setcontext will
    come from the throw implementation code.  (And the one in step (6)
    will never happen.)  This is the rewind error case.

In the rewind error case, the code calling setcontext knows nothing
about the continuation.  So to cover both cases, we:

  - copy (in step (4) above) the address and length of the
    continuation's saved RBS stack to the current thread state
    (SCM_I_CURRENT_THREAD)

  - modify all setcontext callers so that they check the current
    thread state for a saved RBS stack, and restore it if so before
    calling setcontext.

* Notes

** I think rewinders cannot rely on using any stack data

Unless it can be guaranteed that the data won't go into a register.
I'm not 100% sure about this, but I think it follows from the fact
that the RBS stack is not restored until after the rewinds have
happened.

Note that this isn't a regression caused by the current fix.  In Guile
1.8.4, the RBS stack was restored _after_ the rewinds, and this is
still the case now.

** Most setcontext calls for `throw' don't need to change the RBS stack

In the absence of continuation invocation, the setcontext call in the
throw implementation code always sets context to a place higher up the
same stack (both normal and RBS), hence no stack restoration is
needed.

* Other changes

** Using setcontext for all non-local jumps (for __ia64__)

Along the way, I read a claim somewhere that setcontext was more
reliable than longjmp, in cases where the stack has been manipulated.

I don't now have any reason to believe this, but it seems reasonable
anyway to leave the __ia64__ code using getcontext/setcontext, instead
of setjmp/longjmp.

(I think the only possible argument against this would be performance -
if getcontext was significantly slower than setjmp.  It that proves to
be the case, we should revisit this.)

** Capping RBS base for non-main threads

Somewhere else along the way, I hit a problem in GC, involving the RBS
stack of a non-main thread.  The problem was, in
SCM_MARK_BACKING_STORE, that scm_ia64_register_backing_store_base was
returning a value that was massively greater than the value of
scm_ia64_ar_bsp, leading to a seg fault.  This is because the
implementation of scm_ia64_register_backing_store_base is only valid
for the main thread.  I couldn't find a neat way of getting the true
RBS base of a non-main thread, but one idea is simply to call
scm_ia64_ar_bsp when guilifying a thread, and use the value returned
as an upper bound for that thread's RBS base.  (Note that the RBS
stack grows upwards.)

(Were it not for scm_init_guile, we could be much more definitive
about this.  We could take the value of scm_ia64_ar_bsp as a
definitive base address for the part of the RBS stack that Guile cares
about.  We could also then discard
scm_ia64_register_backing_store_base.)
2008-05-12 23:06:04 +01:00
Ludovic Courtès
43f8f8c2b0 Bump version to 1.8.5 for release. 2008-05-07 20:52:59 +02:00
Ludovic Courtès
f078ba4351 Remove uses of non-portable makefile constructs. 2008-05-07 20:11:19 +02:00
Ludovic Courtès
19da7c42c1 Avoid warning with GCC on FreeBSD 6.2 in `numbers.c'. 2008-05-07 17:43:17 +02:00
Neil Jerram
00ec6b610f Fix c-tokenize.c error: 'input' defined but not used, when compiling with GCC 4.3.0 2008-05-05 23:49:02 +01:00
Neil Jerram
32d1c5733a Add NEWS and concept index entries for traps infrastructure and Emacs support. 2008-05-05 22:31:07 +01:00
Ludovic Courtès
dd78f3e5dd Fix omissions and typos in previous commit. 2008-05-04 22:41:34 +02:00
Ludovic Courtès
627bae78af Add `pkg-config' support. 2008-05-04 22:19:30 +02:00
Ludovic Courtès
5338352e56 Fix type-checking of SRFI-1 `partition'. 2008-04-28 18:03:41 +02:00
Ludovic Courtès
1465ccf0bf Include <config.h> in SRFI-1. 2008-04-27 00:50:05 +02:00
Ludovic Courtès
88b665dd1b Actually remove ANON-CVS' and SNAPSHOTS'.
These files were outdated and not available in the 1.9/master branch.
2008-04-26 22:05:00 +02:00
Ludovic Courtès
e16733a84a Only run `test-with-guile-module' when pthread support is built. 2008-04-26 21:55:29 +02:00
Ludovic Courtès
6b20cbaebd Remove extraneous semi-colon in `read.c'. 2008-04-26 21:39:27 +02:00
Ludovic Courtès
23978ff30a Make (srfi srfi-35)' visible through cond-expand'. 2008-04-26 21:25:51 +02:00
Ludovic Courtès
efbc70de56 Add `(srfi srfi-88)'. 2008-04-26 21:25:32 +02:00
Ludovic Courtès
e9680652d6 Fix dangling references to files that have been removed. 2008-04-26 21:12:43 +02:00
Ludovic Courtès
3df8fc1ba9 Don't use "-I$(srcdir)", so that our "random.h" doesn't shadow libc's on Tru64. 2008-04-24 19:25:30 +02:00
Neil Jerram
5de6e0954f Document file-exists? 2008-04-17 21:36:20 +01:00
Ludovic Courtès
27902f6cb6 Add `read' benchmark. 2008-04-17 10:25:05 +02:00
Ludovic Courtès
4be911f50c Update `NEWS'. 2008-04-16 12:00:49 +02:00
Ludovic Courtès
5a606a8dca Copy srcprop implementation from the 1.9 branch, fixes a deadlock. 2008-04-16 11:58:42 +02:00
Ludovic Courtès
f2fd8962e5 Inline scm_getc', scm_putc' and `scm_puts'. 2008-04-16 09:47:21 +02:00
Ludovic Courtès
b49419c88c Merge branch 'branch_release-1-8' of ssh://civodul@git.sv.gnu.org/srv/git/guile into branch_release-1-8 2008-04-16 09:05:20 +02:00
Ludovic Courtès
6ac06e82d8 Don't use "echo -n" in `guile-readline/configure.in'. 2008-04-16 09:01:58 +02:00
Neil Jerram
7c5490cf17 Merge commit 'gds-el-experiment^' into branch_release-1-8 2008-04-16 00:02:58 +01:00
Neil Jerram
d8c8b8135f Add TAGS to .gitignore 2008-04-15 23:52:58 +01:00
Neil Jerram
7e938c49aa Add TAGS to .gitignore 2008-04-15 22:09:53 +01:00
Ludovic Courtès
6160ec1653 Fix typo in `read.c'. 2008-04-15 20:01:13 +02:00
Ludovic Courtès
75946eddfc Add support for SRFI-88-like postfix keyword read syntax. 2008-04-15 20:00:32 +02:00
Neil Jerram
cd0b9402b1 A few elisp fixes and enhancements 2008-04-14 21:25:17 +01:00
Neil Jerram
f54b1b5d3c * gds-client.scm (gds-debug-trap): Ensure that frame index passed to Emacs is always positive. 2008-04-14 19:40:02 +01:00
Ludovic Courtès
b337315785 Test the interaction of GOOPS objects with `struct-{ref,set!}'. 2008-04-13 20:41:39 +02:00
Ludovic Courtès
a3d27a5499 Slightly simplify inline machinery. 2008-04-13 19:38:42 +02:00
Ludovic Courtès
d59b2fc738 Really fix inline machinery for MacOS X. 2008-04-13 19:35:46 +02:00
Ludovic Courtès
2aab74f6b9 Fix inline machinery in C99 mode on MacOS X. 2008-04-10 23:57:05 +02:00