mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* vm_exec.c (cfp): Avoid generating invalid binary for
NativeClient. r15 on x86_64 is reserved by NativeClient. So r15 to cfp used to generate invalid binary under some combinations of compiler optimization flags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
aee9f2879d
commit
e85e95c409
2 changed files with 12 additions and 0 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
Fri Jan 10 16:27:20 2014 Yuki Yugui Sonoda <yugui@google.com>
|
||||||
|
|
||||||
|
* vm_exec.c (cfp): Avoid generating invalid binary for
|
||||||
|
NativeClient.
|
||||||
|
r15 on x86_64 is reserved by NativeClient. So r15 to cfp used to
|
||||||
|
generate invalid binary under some combinations of compiler
|
||||||
|
optimization flags.
|
||||||
|
|
||||||
Fri Jan 10 18:01:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Jan 10 18:01:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* vm_insnhelper.c (vm_search_super_method): allow bound method from a
|
* vm_insnhelper.c (vm_search_super_method): allow bound method from a
|
||||||
|
|
|
@ -63,7 +63,11 @@ vm_exec_core(rb_thread_t *th, VALUE initial)
|
||||||
|
|
||||||
#elif defined(__GNUC__) && defined(__x86_64__)
|
#elif defined(__GNUC__) && defined(__x86_64__)
|
||||||
DECL_SC_REG(VALUE *, pc, "14");
|
DECL_SC_REG(VALUE *, pc, "14");
|
||||||
|
# if defined(__native_client__)
|
||||||
|
DECL_SC_REG(rb_control_frame_t *, cfp, "11");
|
||||||
|
# else
|
||||||
DECL_SC_REG(rb_control_frame_t *, cfp, "15");
|
DECL_SC_REG(rb_control_frame_t *, cfp, "15");
|
||||||
|
# endif
|
||||||
#define USE_MACHINE_REGS 1
|
#define USE_MACHINE_REGS 1
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue