summaryrefslogtreecommitdiff
path: root/vm.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-12 04:25:46 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-07-12 04:25:46 +0000
commit6b6bf4dd481f744faf54b5efcda5f32e4565bd7d (patch)
tree793fe567ccc6f9f6a8588a9ae2d5d5b040984b37 /vm.h
parent2e601474e7dc483aca0e7c7b7ced750e869aab7f (diff)
* 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
Diffstat (limited to 'vm.h')
-rw-r--r--vm.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/vm.h b/vm.h
index de8365b411..c496e59df3 100644
--- a/vm.h
+++ b/vm.h
@@ -10,13 +10,8 @@
**********************************************************************/
-#ifndef _VM_H_INCLUDED_
-#define _VM_H_INCLUDED_
-
-#if YARVDEBUG > VMDEBUG
-#undef VMDEBUG
-#define VMDEBUG YARVDEBUG
-#endif
+#ifndef RUBY_VM_H
+#define RUBY_VM_H
typedef long OFFSET;
typedef unsigned long rb_num_t;
@@ -42,6 +37,11 @@ extern VALUE ruby_vm_redefined_flag;
* 10: gc check
*/
+
+#ifndef VMDEBUG
+#define VMDEBUG 0
+#endif
+
#if 0
#undef VMDEBUG
#define VMDEBUG 3
@@ -52,9 +52,9 @@ extern VALUE ruby_vm_redefined_flag;
#define USAGE_ANALYSIS_OPERAND(insn, n, op) vm_analysis_operand(insn, n, (VALUE)op)
#define USAGE_ANALYSIS_REGISTER(reg, s) vm_analysis_register(reg, s)
#else
-#define USAGE_ANALYSIS_INSN(insn) /* none */
+#define USAGE_ANALYSIS_INSN(insn) /* none */
#define USAGE_ANALYSIS_OPERAND(insn, n, op) /* none */
-#define USAGE_ANALYSIS_REGISTER(reg, s) /* none */
+#define USAGE_ANALYSIS_REGISTER(reg, s) /* none */
#endif
#ifdef __GCC__
@@ -298,4 +298,4 @@ while (0)
#define BOP_GT 0x2000
#define BOP_GE 0x4000
-#endif /* _VM_H_INCLUDED_ */
+#endif /* RUBY_VM_H */