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

* iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.

Browse Source 
* iseq.c, proc.c: add ISeq.disasm(method).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-12-24 09:09:21 +00:00
parent c332266ee0
commit e2e23e688f
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Dec 24 18:05:09 2007 Koichi Sasada <ko1@atdot.net>
* iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.
* iseq.c, proc.c: add ISeq.disasm(method).
Mon Dec 24 18:06:03 2007 Tanaka Akira <akr@fsij.org> Mon Dec 24 18:06:03 2007 Tanaka Akira <akr@fsij.org>
* eval_method.c (Init_eval_method): extracted from Init_eval * eval_method.c (Init_eval_method): extracted from Init_eval

30
iseq.c
View File

@ -881,6 +881,23 @@ ruby_iseq_disasm(VALUE self)
return str; return str;
} }
static VALUE
iseq_s_disasm(VALUE klass, VALUE body)
{
extern NODE *rb_method_body(VALUE body);
NODE *node;
VALUE ret = Qnil;
if ((node = rb_method_body(body)) != 0) {
if (nd_type(node) == RUBY_VM_METHOD_NODE) {
VALUE iseqval = (VALUE)node->nd_body;
ret = ruby_iseq_disasm(iseqval);
}
}
return ret;
}
const char * const char *
ruby_node_name(int node) ruby_node_name(int node)
{ {
@ -1250,16 +1267,19 @@ Init_ISeq(void)
rb_define_alloc_func(rb_cISeq, iseq_alloc); rb_define_alloc_func(rb_cISeq, iseq_alloc);
rb_define_method(rb_cISeq, "inspect", iseq_inspect, 0); rb_define_method(rb_cISeq, "inspect", iseq_inspect, 0);
rb_define_method(rb_cISeq, "disasm", ruby_iseq_disasm, 0); rb_define_method(rb_cISeq, "disasm", ruby_iseq_disasm, 0);
rb_define_method(rb_cISeq, "disassemble", ruby_iseq_disasm, 0);
rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0); rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0);
rb_define_method(rb_cISeq, "eval", iseq_eval, 0); rb_define_method(rb_cISeq, "eval", iseq_eval, 0);
rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); /* disable this feature because there is no verifier. */
/* rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); */
rb_define_singleton_method(rb_cISeq, "compile", iseq_s_compile, -1); rb_define_singleton_method(rb_cISeq, "compile", iseq_s_compile, -1);
rb_define_singleton_method(rb_cISeq, "new", iseq_s_compile, -1); rb_define_singleton_method(rb_cISeq, "new", iseq_s_compile, -1);
rb_define_singleton_method(rb_cISeq, "compile_file", iseq_s_compile_file, -1); rb_define_singleton_method(rb_cISeq, "compile_file", iseq_s_compile_file, -1);
rb_define_singleton_method(rb_cISeq, "compile_option", rb_define_singleton_method(rb_cISeq, "compile_option", iseq_s_compile_option_get, 0);
iseq_s_compile_option_get, 0); rb_define_singleton_method(rb_cISeq, "compile_option=", iseq_s_compile_option_set, 1);
rb_define_singleton_method(rb_cISeq, "compile_option=", rb_define_singleton_method(rb_cISeq, "disasm", iseq_s_disasm, 1);
iseq_s_compile_option_set, 1); rb_define_singleton_method(rb_cISeq, "disassemble", iseq_s_disasm, 1);
} }

17
proc.c
View File

@ -652,7 +652,7 @@ proc_to_proc(VALUE self)
* eval("param", b) #=> 99 * eval("param", b) #=> 99
*/ */
void static void
bm_mark(struct METHOD *data) bm_mark(struct METHOD *data)
{ {
rb_gc_mark(data->rclass); rb_gc_mark(data->rclass);
@ -661,6 +661,21 @@ bm_mark(struct METHOD *data)
rb_gc_mark((VALUE)data->body); rb_gc_mark((VALUE)data->body);
} }
NODE *
rb_method_body(VALUE method)
{
struct METHOD *data;
if (TYPE(method) == T_DATA &&
RDATA(method)->dmark == (RUBY_DATA_FUNC) bm_mark) {
Data_Get_Struct(method, struct METHOD, data);
return data->body;
}
else {
return 0;
}
}
NODE *rb_get_method_body(VALUE klass, ID id, ID *idp); NODE *rb_get_method_body(VALUE klass, ID id, ID *idp);
static VALUE static VALUE