summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.in12
-rw-r--r--gc.c17
3 files changed, 34 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2511c81f5f..6602097a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 8 19:27:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (rb_cv_stack_end_address): detect stack end address
+ variable supplied by system. [ruby-core:03115]
+
+ * gc.c (Init_stack): use system provided address if possible.
+
Thu Jul 8 00:05:23 2004 akira yamada <akira@ruby-lang.org>
* lib/tempfile.rb (Tempfile::initialize): got out code of
@@ -19,7 +26,7 @@ Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
Tue Jul 6 18:38:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib : improve framework of developping Tcl/Tk extension
+ * ext/tk/lib : improve framework of developping Tcl/Tk extension
wrappers
Mon Jul 5 23:56:42 2004 Kouhei Sutou <kou@cozmixng.org>
diff --git a/configure.in b/configure.in
index 0a4e2fd830..79dde00a87 100644
--- a/configure.in
+++ b/configure.in
@@ -389,6 +389,18 @@ AC_STRUCT_ST_BLKSIZE
AC_STRUCT_ST_BLOCKS
AC_STRUCT_ST_RDEV
+AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
+[rb_cv_stack_end_address=no
+for addr in __libc_stack_end _SEND; do
+ AC_TRY_LINK(
+ [extern void *$addr;],
+ [if (!$addr) return 1;],
+ [rb_cv_stack_end_address="$addr"; break])
+done])
+if test $rb_cv_stack_end_address != no; then
+ AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
+fi
+
dnl Checks for library functions.
AC_TYPE_GETGROUPS
AC_TYPE_SIGNAL
diff --git a/gc.c b/gc.c
index c1f761f5ef..bcdf693307 100644
--- a/gc.c
+++ b/gc.c
@@ -44,6 +44,10 @@ extern unsigned long __libc_ia64_register_backing_store_base;
#endif
#endif
+#if defined _WIN32 || defined __CYGWIN__
+#include <windows.h>
+#endif
+
void re_free_registers _((struct re_registers*));
int rb_io_fptr_finalize _((struct OpenFile*));
@@ -1408,9 +1412,16 @@ void
Init_stack(addr)
VALUE *addr;
{
-#if defined(__human68k__)
- extern void *_SEND;
- rb_gc_stack_start = _SEND;
+#if defined(_WIN32) || defined(__CYGWIN__)
+ MEMORY_BASIC_INFORMATION m;
+ memset(&m, 0, sizeof(m));
+ VirtualQuery(&m, &m, sizeof(m));
+ rb_gc_stack_start =
+ STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
+ (VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
+#elif defined(STACK_END_ADDRESS)
+ extern void *STACK_END_ADDRESS;
+ rb_gc_stack_start = STACK_END_ADDRESS;
#else
if (!addr) addr = (VALUE *)&addr;
STACK_UPPER(&addr, addr, ++addr);