summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-27 01:29:22 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-27 01:29:22 +0000
commit967129832f157204ff17fb9f114b4748aaa0e0f2 (patch)
treeb0bc84224e8601ae95530a0bbe10d6adbd229e15
parenta3439768e42a3f40fe170059d91a460cade15af0 (diff)
downloadruby-967129832f157204ff17fb9f114b4748aaa0e0f2.tar.gz
ruby-967129832f157204ff17fb9f114b4748aaa0e0f2.tar.xz
ruby-967129832f157204ff17fb9f114b4748aaa0e0f2.zip
* gc.c (SET_MACHINE_STACK_END): add x86_64 version by nobu.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--gc.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69d4f1d1c..513a6304d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 27 09:40:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * gc.c (SET_MACHINE_STACK_END): add x86_64 version by nobu.
+
Tue Oct 27 09:27:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
* vm_exec.c (DECL_SC_REG): use __clang__.
@@ -27,7 +31,7 @@ Tue Oct 27 05:56:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
Tue Oct 27 05:11:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
* vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
- LLVM/clang defines __GNUC__ but doesn't have __asm__..
+ LLVM/clang defines __GNUC__ but doesn't have __asm__.
Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/gc.h b/gc.h
index 82fbcb53e..42ea4a835 100644
--- a/gc.h
+++ b/gc.h
@@ -2,7 +2,9 @@
#ifndef RUBY_GC_H
#define RUBY_GC_H 1
-#if defined(__i386) && defined(__GNUC__)
+#if defined(__x86_64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("mov %%rsp, %0" : "=r" (*p))
+#elif defined(__i386) && defined(__GNUC__)
#define SET_MACHINE_STACK_END(p) __asm__("mov %%esp, %0" : "=r" (*p))
#else
NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));