1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* cont.c (cont_restore_1): workaround for x64-mswin64's SEH.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-07-08 17:19:01 +00:00
parent f880de86ed
commit a6ae274c3b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,10 @@
Sun Jul 08 02:08:53 2007 NARUSE, Yui <naruse@ruby-lang.org> Mon Jul 9 02:17:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/json.rb, lib/json/, ext/json/: * cont.c (cont_restore_1): workaround for x64-mswin64's SEH.
import JSON 1.1.1
Sun Jul 8 02:08:53 2007 NARUSE, Yui <naruse@ruby-lang.org>
* lib/json.rb, lib/json/, ext/json/: import JSON 1.1.1
Sat Jul 7 21:59:29 2007 Tanaka Akira <akr@fsij.org> Sat Jul 7 21:59:29 2007 Tanaka Akira <akr@fsij.org>

9
cont.c
View File

@ -237,6 +237,15 @@ cont_restore_1(rb_context_t *cont)
th->first_proc = sth->first_proc; th->first_proc = sth->first_proc;
/* restore machine stack */ /* restore machine stack */
#ifdef _M_AMD64
{
/* workaround for x64 SEH */
jmp_buf buf;
setjmp(buf);
((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
((_JUMP_BUFFER*)(&buf))->Frame;
}
#endif
if (cont->machine_stack_src) { if (cont->machine_stack_src) {
MEMCPY(cont->machine_stack_src, cont->machine_stack, MEMCPY(cont->machine_stack_src, cont->machine_stack,
VALUE, cont->machine_stack_size); VALUE, cont->machine_stack_size);