Author: ko1
Date: 2005-06-28 20:37:34 +0900 (Tue, 28 Jun 2005)
New Revision: 178

Modified:
   trunk/ChangeLog
   trunk/compile.c
   trunk/extconf.rb
   trunk/tmpl/optinsn.inc.tmpl
   trunk/vm.c
   trunk/vm.h
Log:
	* extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
	change extconf options



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/ChangeLog	2005-06-28 11:37:34 UTC (rev 178)
@@ -4,6 +4,11 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2005-06-28(Tue) 20:35:55 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
+	change extconf options
+
 2005-06-28(Tue) 13:20:59 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* benchmark/run.rb : add -y, --yarv-only option

Modified: trunk/compile.c
===================================================================
--- trunk/compile.c	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/compile.c	2005-06-28 11:37:34 UTC (rev 178)
@@ -1244,7 +1244,7 @@
  * It's future work (if compile time was bottle neck).
  */
 static int iseq_insns_unification(struct iseq_object *iseqobj, ISEQ_LINK_ANCHOR *anchor){
-#ifdef OPT_INSNS_UNIFICATION
+#ifdef OPT_INSTRUCTIONS_UNIFICATION
   ISEQ_LINK_ELEMENT *list;
   struct insn_object *iobj, *niobj;
   int id, j, k;

Modified: trunk/extconf.rb
===================================================================
--- trunk/extconf.rb	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/extconf.rb	2005-06-28 11:37:34 UTC (rev 178)
@@ -15,9 +15,10 @@
   optimization option (default enable):
   * opt-basic-operations
   * opt-regexp-match
-  * opt-insns-unification
+  * opt-operands-unification
+  * opt-instructions-unification
   * opt-stack-caching
-  * inline-method-cache
+  * opt-inline-method-cache
   
   others (default disable):
   * opt-jit-compile          (experimental, support only few insns)
@@ -56,10 +57,11 @@
 check_arg('opt-basic-operations', true)
 check_arg('opt-regexp-match'    , true)
 
-check_arg('opt-insns-unification', true)
+check_arg('opt-operand-unification', true)
+check_arg('opt-instruction-unification', true)
 check_arg('opt-stack-caching'   , true)
 
-check_arg('inline-method-cache', true)
+check_arg('opt-inline-method-cache', true)
 
 # danger
 check_arg('opt-jit-compile', false)

Modified: trunk/tmpl/optinsn.inc.tmpl
===================================================================
--- trunk/tmpl/optinsn.inc.tmpl	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/tmpl/optinsn.inc.tmpl	2005-06-28 11:37:34 UTC (rev 178)
@@ -13,6 +13,7 @@
  */
 
 static INSN_OBJECT *insn_optimize(INSN_OBJECT *insnobj){
+#ifdef OPT_OPERANDS_UNIFICATION
   /* optimize rule */
   switch(insnobj->insn_id){
 
@@ -22,6 +23,7 @@
     /* do nothing */;
     break;
   }
+#endif
   return insnobj;
 }
 

Modified: trunk/vm.c
===================================================================
--- trunk/vm.c	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/vm.c	2005-06-28 11:37:34 UTC (rev 178)
@@ -916,7 +916,7 @@
       ic->ic_method = mn;
     }
   }
-#elif defined(INLINE_METHOD_CACHE)
+#elif defined(OPT_INLINE_METHOD_CACHE)
   {
     if(LIKELY(klass == ic->ic_klass) &&
        LIKELY(GET_VM_STATE_VERSION() == ic->ic_vmstat)){

Modified: trunk/vm.h
===================================================================
--- trunk/vm.h	2005-06-28 04:34:07 UTC (rev 177)
+++ trunk/vm.h	2005-06-28 11:37:34 UTC (rev 178)
@@ -104,7 +104,8 @@
 /* for GCC 3.4.x */
 #define TC_DISPATCH(insn) \
   x86_dispatch(*((void **)reg_pc)); \
-  goto *GET_CURRENT_INSN();
+  goto *GET_CURRENT_INSN(); \
+  ;
 #else
 
 #define TC_DISPATCH(insn) \


--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml