diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 09:09:21 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 09:09:21 +0000 |
commit | e2e23e688fd655c55112872b10a7bd6840314653 (patch) | |
tree | 1be14c402bfd9c6b51b1e674b5e2df8ec1ccd3ab | |
parent | c332266ee0d026340e369c9b67d01837ba2ed2e4 (diff) | |
download | bundler-e2e23e688fd655c55112872b10a7bd6840314653.tar.gz |
* iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | iseq.c | 30 | ||||
-rw-r--r-- | proc.c | 17 |
3 files changed, 47 insertions, 6 deletions
@@ -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> * eval_method.c (Init_eval_method): extracted from Init_eval @@ -881,6 +881,23 @@ ruby_iseq_disasm(VALUE self) 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 * ruby_node_name(int node) { @@ -1250,16 +1267,19 @@ Init_ISeq(void) rb_define_alloc_func(rb_cISeq, iseq_alloc); rb_define_method(rb_cISeq, "inspect", iseq_inspect, 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, "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, "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_option", - 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", 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, "disasm", iseq_s_disasm, 1); + rb_define_singleton_method(rb_cISeq, "disassemble", iseq_s_disasm, 1); } @@ -652,7 +652,7 @@ proc_to_proc(VALUE self) * eval("param", b) #=> 99 */ -void +static void bm_mark(struct METHOD *data) { rb_gc_mark(data->rclass); @@ -661,6 +661,21 @@ bm_mark(struct METHOD *data) 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); static VALUE |