2006-12-31 18:02:22 +03:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
debug.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: 04/08/25 02:31:54 JST
|
|
|
|
|
* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
id.c, insnhelper.h, insns.def, thread.c, thread_pthread.ci,
thread_pthread.h, thread_win32.ci, thread_win32.h, vm.h,
vm_dump.c, vm_evalbody.ci, vm_opts.h: fix comments and
copyright year.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-14 01:13:04 +03:00
|
|
|
Copyright (C) 2004-2007 Koichi Sasada
|
2006-12-31 18:02:22 +03:00
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
2007-10-16 13:21:11 +04:00
|
|
|
#include "ruby/encoding.h"
|
2008-02-24 00:13:05 +03:00
|
|
|
#include "ruby/util.h"
|
2007-02-02 17:41:50 +03:00
|
|
|
#include "debug.h"
|
2008-05-08 10:56:59 +04:00
|
|
|
#include "eval_intern.h"
|
* blockinlining.c: remove "yarv" prefix.
* array.c, numeric.c: ditto.
* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
* yarvcore.c: removed.
* yarvcore.h: renamed to core.h.
* cont.c, debug.c, error.c, process.c, signal.c : ditto.
* ext/probeprofiler/probeprofiler.c: ditto.
* id.c, id.h: added.
* inits.c: ditto.
* compile.c: rename internal functions.
* compile.h: fix debug flag.
* eval.c, object.c, vm.c: remove ruby_top_self.
use rb_vm_top_self() instead.
* eval_intern.h, eval_load: ditto.
* gc.c: rename yarv_machine_stack_mark() to
rb_gc_mark_machine_stack().
* insnhelper.h: remove unused macros.
* iseq.c: add iseq_compile() to create iseq object
from source string.
* proc.c: rename a internal function.
* template/insns.inc.tmpl: remove YARV prefix.
* thread.c:
* vm.c (rb_iseq_eval): added.
* vm.c: move some functions from yarvcore.c.
* vm_dump.c: fix to remove compiler warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-12 08:25:46 +04:00
|
|
|
#include "vm_core.h"
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2007-10-16 13:21:11 +04:00
|
|
|
/* for gdb */
|
|
|
|
static const union {
|
|
|
|
enum ruby_special_consts special_consts;
|
|
|
|
enum ruby_value_type value_type;
|
2008-05-08 10:56:59 +04:00
|
|
|
enum ruby_tag_type tag_type;
|
2007-10-16 13:21:11 +04:00
|
|
|
enum node_type node_type;
|
|
|
|
enum {
|
2007-12-21 11:31:24 +03:00
|
|
|
RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
|
2007-10-16 13:29:32 +04:00
|
|
|
RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
|
2007-12-21 11:31:24 +03:00
|
|
|
RUBY_ENCODING_MASK = ENCODING_MASK,
|
|
|
|
RUBY_ENC_CODERANGE_MASK = ENC_CODERANGE_MASK,
|
|
|
|
RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
|
|
|
|
RUBY_ENC_CODERANGE_7BIT = ENC_CODERANGE_7BIT,
|
|
|
|
RUBY_ENC_CODERANGE_VALID = ENC_CODERANGE_VALID,
|
2009-02-22 17:23:33 +03:00
|
|
|
RUBY_ENC_CODERANGE_BROKEN = ENC_CODERANGE_BROKEN,
|
2007-10-16 13:29:32 +04:00
|
|
|
RUBY_FL_MARK = FL_MARK,
|
|
|
|
RUBY_FL_RESERVED = FL_RESERVED,
|
|
|
|
RUBY_FL_FINALIZE = FL_FINALIZE,
|
|
|
|
RUBY_FL_TAINT = FL_TAINT,
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
RUBY_FL_UNTRUSTED = FL_UNTRUSTED,
|
2007-10-16 13:29:32 +04:00
|
|
|
RUBY_FL_EXIVAR = FL_EXIVAR,
|
|
|
|
RUBY_FL_FREEZE = FL_FREEZE,
|
|
|
|
RUBY_FL_SINGLETON = FL_SINGLETON,
|
|
|
|
RUBY_FL_USER0 = FL_USER0,
|
|
|
|
RUBY_FL_USER1 = FL_USER1,
|
|
|
|
RUBY_FL_USER2 = FL_USER2,
|
|
|
|
RUBY_FL_USER3 = FL_USER3,
|
|
|
|
RUBY_FL_USER4 = FL_USER4,
|
|
|
|
RUBY_FL_USER5 = FL_USER5,
|
|
|
|
RUBY_FL_USER6 = FL_USER6,
|
|
|
|
RUBY_FL_USER7 = FL_USER7,
|
|
|
|
RUBY_FL_USER8 = FL_USER8,
|
|
|
|
RUBY_FL_USER9 = FL_USER9,
|
|
|
|
RUBY_FL_USER10 = FL_USER10,
|
|
|
|
RUBY_FL_USER11 = FL_USER11,
|
|
|
|
RUBY_FL_USER12 = FL_USER12,
|
|
|
|
RUBY_FL_USER13 = FL_USER13,
|
|
|
|
RUBY_FL_USER14 = FL_USER14,
|
|
|
|
RUBY_FL_USER15 = FL_USER15,
|
|
|
|
RUBY_FL_USER16 = FL_USER16,
|
|
|
|
RUBY_FL_USER17 = FL_USER17,
|
|
|
|
RUBY_FL_USER18 = FL_USER18,
|
|
|
|
RUBY_FL_USHIFT = FL_USHIFT,
|
|
|
|
RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
|
|
|
|
RUBY_NODE_TYPEMASK = NODE_TYPEMASK,
|
|
|
|
RUBY_NODE_LSHIFT = NODE_LSHIFT,
|
2007-10-16 13:39:04 +04:00
|
|
|
RUBY_NODE_LMASK = NODE_LMASK,
|
2008-07-01 12:27:58 +04:00
|
|
|
RUBY_NODE_FL_NEWLINE = NODE_FL_NEWLINE
|
2007-10-16 13:21:11 +04:00
|
|
|
} various;
|
|
|
|
} dummy_gdb_enums;
|
|
|
|
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
const VALUE RUBY_FL_USER19 = FL_USER19;
|
2007-10-16 13:21:11 +04:00
|
|
|
|
2008-04-14 09:34:04 +04:00
|
|
|
int
|
2007-06-24 21:19:22 +04:00
|
|
|
ruby_debug_print_indent(int level, int debug_level, int indent_level)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
|
|
|
if (level < debug_level) {
|
2008-02-23 22:03:32 +03:00
|
|
|
fprintf(stderr, "%*s", indent_level, "");
|
2006-12-31 18:02:22 +03:00
|
|
|
fflush(stderr);
|
2008-04-14 09:34:04 +04:00
|
|
|
return Qtrue;
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
2008-04-14 09:34:04 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_debug_printf(const char *format, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, format);
|
|
|
|
vfprintf(stderr, format, ap);
|
|
|
|
va_end(ap);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2007-06-29 11:57:24 +04:00
|
|
|
ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
|
|
|
if (level < debug_level) {
|
|
|
|
VALUE str;
|
|
|
|
str = rb_inspect(obj);
|
|
|
|
fprintf(stderr, "DBG> %s: %s\n", header,
|
2007-08-15 08:52:56 +04:00
|
|
|
obj == -1 ? "" : StringValueCStr(str));
|
2006-12-31 18:02:22 +03:00
|
|
|
fflush(stderr);
|
|
|
|
}
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2007-06-24 21:19:22 +04:00
|
|
|
ruby_debug_print_v(VALUE v)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
2007-06-24 21:19:22 +04:00
|
|
|
ruby_debug_print_value(0, 1, "", v);
|
2006-12-31 18:02:22 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
ID
|
2007-06-29 11:57:24 +04:00
|
|
|
ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
|
|
|
if (level < debug_level) {
|
|
|
|
fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
|
|
|
|
fflush(stderr);
|
|
|
|
}
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 14:15:15 +03:00
|
|
|
NODE *
|
2007-06-29 11:57:24 +04:00
|
|
|
ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 14:15:15 +03:00
|
|
|
{
|
|
|
|
if (level < debug_level) {
|
2007-06-29 11:57:24 +04:00
|
|
|
fprintf(stderr, "DBG> %s: %s (%lu)\n", header,
|
2007-05-17 08:00:36 +04:00
|
|
|
ruby_node_name(nd_type(node)), nd_line(node));
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 14:15:15 +03:00
|
|
|
}
|
2007-06-29 11:57:24 +04:00
|
|
|
return (NODE *)node;
|
* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
debug.c, debug.h: merge half-baked-1.9 changes. The biggest change
is to change node structure around NODE_SCOPE, NODE_ARGS. Every
scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
represents more details of arguments information. I'll write a
document about detail of node structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-03-21 14:15:15 +03:00
|
|
|
}
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
void
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-07 04:25:05 +03:00
|
|
|
ruby_debug_breakpoint(void)
|
2006-12-31 18:02:22 +03:00
|
|
|
{
|
|
|
|
/* */
|
|
|
|
}
|
2007-06-29 11:57:24 +04:00
|
|
|
|
|
|
|
#ifdef RUBY_DEBUG_ENV
|
2008-02-24 00:13:05 +03:00
|
|
|
static void
|
|
|
|
set_debug_option(const char *str, int len, void *arg)
|
2007-06-29 11:57:24 +04:00
|
|
|
{
|
2008-02-24 00:13:05 +03:00
|
|
|
#define SET_WHEN(name, var) do { \
|
2007-06-29 11:57:24 +04:00
|
|
|
if (len == sizeof(name) - 1 && \
|
|
|
|
strncmp(str, name, len) == 0) { \
|
2008-06-14 02:57:41 +04:00
|
|
|
extern int var; \
|
|
|
|
var = 1; \
|
2008-02-24 00:13:05 +03:00
|
|
|
return; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
2008-06-14 02:57:41 +04:00
|
|
|
SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
|
|
|
|
SET_WHEN("core", ruby_enable_coredump);
|
2009-02-16 10:46:24 +03:00
|
|
|
#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
|
|
|
|
SET_WHEN("rtc_error", ruby_w32_rtc_error);
|
|
|
|
#endif
|
2008-02-24 00:13:05 +03:00
|
|
|
fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ruby_set_debug_option(const char *str)
|
|
|
|
{
|
|
|
|
ruby_each_words(str, set_debug_option, 0);
|
2007-06-29 11:57:24 +04:00
|
|
|
}
|
|
|
|
#endif
|