yarv-diff:99
From: ko1 atdot.net
Date: 13 Sep 2005 21:14:10 -0000
Subject: [yarv-diff:99] r255 - trunk
Author: ko1
Date: 2005-09-14 06:14:09 +0900 (Wed, 14 Sep 2005)
New Revision: 255
Modified:
trunk/ChangeLog
trunk/common.mk
trunk/compile.c
trunk/vm.h
trunk/vm_dump.c
trunk/vm_evalbody.h
trunk/vm_opts.h
trunk/yarvcore.c
trunk/yarvcore.h
Log:
* yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
compile.c, yarvcore.c : use #ifdef insted of #if for recognize
vm options
* vm_opts.h : fix default options
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/ChangeLog 2005-09-13 21:14:09 UTC (rev 255)
@@ -4,6 +4,15 @@
# from Mon, 03 May 2004 01:24:19 +0900
#
+2005-09-14(Wed) 06:11:43 +0900 Koichi Sasada <ko1 atdot.net>
+
+ * yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
+ compile.c, yarvcore.c : use #ifdef insted of #if for recognize
+ vm options
+
+ * vm_opts.h : fix default options
+
+
2005-09-10(Sat) 14:10:08 +0900 Koichi Sasada <ko1 atdot.net>
* vm_opts.h : added
Modified: trunk/common.mk
===================================================================
--- trunk/common.mk 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/common.mk 2005-09-13 21:14:09 UTC (rev 255)
@@ -352,7 +352,6 @@
debug.$(OBJEXT): {$(VPATH)}debug.h
yarvsubst.$(OBJEXT): {$(VPATH)}yarv.h
-
BASERUBY = ruby
INSNS2VMOPT = $(CPPFLAGS) --srcdir=$(srcdir)
Modified: trunk/compile.c
===================================================================
--- trunk/compile.c 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/compile.c 2005-09-13 21:14:09 UTC (rev 255)
@@ -565,7 +565,7 @@
static INSN *new_insn_send(yarv_iseq_t *iseqobj, int line_no,
VALUE id, VALUE argc, VALUE block, VALUE flag){
INSN *iobj = 0;
-#ifdef OPT_BASIC_OPERATIONS
+#if OPT_BASIC_OPERATIONS
if(block == 0 && flag == I2F(0)){
ID mid = SYM2ID(id);
@@ -1336,7 +1336,7 @@
* useless jump elimination:
* jump LABEL1
* ...
- * LABEL2:
+ * LABEL1:
* jump LABEL2
*
* => in this case, first jump instruction should jump tp
@@ -1443,7 +1443,7 @@
* It's future work (if compile time was bottle neck).
*/
static int iseq_insns_unification(yarv_iseq_t *iseqobj, LINK_ANCHOR *anchor){
-#ifdef OPT_INSTRUCTIONS_UNIFICATION
+#if OPT_INSTRUCTIONS_UNIFICATION
LINK_ELEMENT *list;
INSN *iobj, *niobj;
int id, j, k;
@@ -1488,7 +1488,7 @@
return COMPILE_OK;
}
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
#define SC_NEXT(insn) sc_insn_next[insn]
@@ -1547,7 +1547,7 @@
#endif
static int set_sequence_stackcaching(yarv_iseq_t *iseqobj, LINK_ANCHOR *anchor){
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
LINK_ELEMENT *list;
int state, insn_id;
@@ -3291,7 +3291,7 @@
}
-#ifdef OPT_BASIC_OPERATIONS
+#if OPT_BASIC_OPERATIONS
/* TODO: detect by node */
if(recv->last == recv->anchor.next &&
INSN_OF(recv->last) == BIN(putobject)){
Modified: trunk/vm.h
===================================================================
--- trunk/vm.h 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/vm.h 2005-09-13 21:14:09 UTC (rev 255)
@@ -56,7 +56,7 @@
#define DEBUG_ENTER_INSN(insn) \
debug_print_pre(th, GET_CFP());
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
#define SC_REGS() , reg_a, reg_b
#else
#define SC_REGS()
@@ -141,7 +141,7 @@
/**********************************/
-#ifdef OPT_DIRECT_THREADED_CODE
+#if OPT_DIRECT_THREADED_CODE
/* for GCC 3.4.x */
#define TC_DISPATCH(insn) \
Modified: trunk/vm_dump.c
===================================================================
--- trunk/vm_dump.c 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/vm_dump.c 2005-09-13 21:14:09 UTC (rev 255)
@@ -271,7 +271,7 @@
void
debug_print_post(yarv_thread_t *th, yarv_control_frame_t *cfp
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
, VALUE reg_a, VALUE reg_b
#endif
)
@@ -289,7 +289,7 @@
#if VMDEBUG > 2
// stack_dump_thobj(th);
stack_dump_each(th, th->cfp);
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
{
VALUE rstr;
rstr = rb_inspect(reg_a);
Modified: trunk/vm_evalbody.h
===================================================================
--- trunk/vm_evalbody.h 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/vm_evalbody.h 2005-09-13 21:14:09 UTC (rev 255)
@@ -22,7 +22,7 @@
#if !OPT_CALL_THREADED_CODE
VALUE th_eval(yarv_thread_t *th, VALUE initial){
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
#if 0
#elif __GNUC__ && __x86_64
DECL_SC_REG(VALUE, a, "12");
@@ -70,7 +70,7 @@
#if OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE
#include "vmtc.inc"
if(th == 0){
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
yarv_finish_insn_seq[0] = (VALUE)&&LABEL(finish_SC_ax_ax);
#else
yarv_finish_insn_seq[0] = (VALUE)&&LABEL(finish);
@@ -82,7 +82,7 @@
reg_cfp = th->cfp;
reg_pc = reg_cfp->pc;
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
reg_a = initial;
reg_b = 0;
#endif
Modified: trunk/vm_opts.h
===================================================================
--- trunk/vm_opts.h 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/vm_opts.h 2005-09-13 21:14:09 UTC (rev 255)
@@ -22,7 +22,7 @@
#define OPT_INSTRUCTIONS_UNIFICATION 1
#define OPT_UNIFY_ALL_COMBINATION 1
-#define OPT_STACK_CACHING 1
+#define OPT_STACK_CACHING 0
#endif /* IGNORE_OPTIMIZE */
Modified: trunk/yarvcore.c
===================================================================
--- trunk/yarvcore.c 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/yarvcore.c 2005-09-13 21:14:09 UTC (rev 255)
@@ -697,27 +697,27 @@
"[call threaded code] "
#endif
-#ifdef FAKE_INLINE_METHOD_CACHE
+#if FAKE_INLINE_METHOD_CACHE
"[fake inline method cache] "
#endif
-#ifdef OPT_BASIC_OPERATIONS
+#if OPT_BASIC_OPERATIONS
"[optimize basic operation] "
#endif
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
"[stack caching] "
#endif
-#ifdef OPT_OPERANDS_UNIFICATION
+#if OPT_OPERANDS_UNIFICATION
"[operands unification] "
#endif
-#ifdef OPT_INSTRUCTIONS_UNIFICATION
+#if OPT_INSTRUCTIONS_UNIFICATION
"[instructions unification] "
#endif
-#ifdef OPT_INLINE_METHOD_CACHE
+#if OPT_INLINE_METHOD_CACHE
"[inline method cache] "
#endif
;
Modified: trunk/yarvcore.h
===================================================================
--- trunk/yarvcore.h 2005-09-10 05:12:02 UTC (rev 254)
+++ trunk/yarvcore.h 2005-09-13 21:14:09 UTC (rev 255)
@@ -16,8 +16,8 @@
/* gcc ver. check */
#if defined(__GNUC__) && __GNUC__ >= 2
-#ifdef OPT_TOKEN_THREADED_CODE
-#ifdef OPT_DIRECT_THREADED_CODE
+#if OPT_TOKEN_THREADED_CODE
+#if OPT_DIRECT_THREADED_CODE
#undef OPT_DIRECT_THREADED_CODE
#endif
#endif
@@ -25,20 +25,20 @@
#else
/* disable threaded code options */
-#ifdef OPT_DIRECT_THREADED_CODE
+#if OPT_DIRECT_THREADED_CODE
#undef OPT_DIRECT_THREADED_CODE
#endif
-#ifdef OPT_TOKEN_THREADED_CODE
+#if OPT_TOKEN_THREADED_CODE
#undef OPT_TOKEN_THREADED_CODE
#endif
#endif
/* call threaded code */
-#ifdef OPT_CALL_THREADED_CODE
-#ifdef OPT_DIRECT_THREADED_CODE
+#if OPT_CALL_THREADED_CODE
+#if OPT_DIRECT_THREADED_CODE
#undef OPT_DIRECT_THREADED_CODE
#endif
-#ifdef OPT_STACK_CACHING
+#if OPT_STACK_CACHING
#undef OPT_STACK_CACHING
#endif
#define YARV_AOT_COMPILED 1
--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml