You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/04/17 18:13:06 UTC

svn commit: r529663 - in /harmony/enhanced/drlvm/trunk/vm: em/src/ jitrino/config/em64t/ jitrino/config/ia32/ jitrino/config/ipf/

Author: gshimansky
Date: Tue Apr 17 09:13:05 2007
New Revision: 529663

URL: http://svn.apache.org/viewvc?view=rev&rev=529663
Log:
Applied HARMONY-3657 [drlvm] Replacing obsolete -XD prefix with -XX: in all EM configuration files


Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf
    harmony/enhanced/drlvm/trunk/vm/jitrino/config/ipf/client.emconf

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Tue Apr 17 09:13:05 2007
@@ -296,8 +296,8 @@
                 std::string name;
                 std::string value;
                 if (idx != std::string::npos) {
-                    std::string name = line.substr(4, idx-4);                   
-                    std::string value = line.substr(idx+1);
+                    name = line.substr(4, idx-4);                   
+                    value = line.substr(idx+1);
                 } else {
                     if (line[4] == '-' ) {
                         value = "off";

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/client.emconf Tue Apr 17 09:13:05 2007
@@ -48,28 +48,28 @@
 
 # Options to be passed to JIT
 
--XDjit.JET_CLINIT.path=
--XDjit.JET_DPGO.path=
+-XX:jit.JET_CLINIT.path=
+-XX:jit.JET_DPGO.path=
 
--XDjit.CD_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.CD_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.CD_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
--XDjit.CD_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.CD_OPT.path.dce1=cg_dce
--XDjit.CD_OPT.path.dce2=cg_dce
--XDjit.CD_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.CD_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.CD_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.CD_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
+-XX:jit.CD_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.CD_OPT.path.dce1=cg_dce
+-XX:jit.CD_OPT.path.dce2=cg_dce
+-XX:jit.CD_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.CD_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.CD_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.CD_OPT.CD_OPT_inliner_pipeline.filter=-
--XDjit.CD_OPT.CD_OPT_inliner_pipeline.path=ssa,devirt
--XDjit.CD_OPT.arg.optimizer.inline.pipeline=CD_OPT_inliner_pipeline
+-XX:jit.CD_OPT.CD_OPT_inliner_pipeline.filter=-
+-XX:jit.CD_OPT.CD_OPT_inliner_pipeline.path=ssa,devirt
+-XX:jit.CD_OPT.arg.optimizer.inline.pipeline=CD_OPT_inliner_pipeline
 
--XDjit.CD_OPT.arg.codegen.dce1.early=yes
--XDjit.CD_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.CD_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.arg.codegen.emitter.align=0
+-XX:jit.CD_OPT.arg.codegen.dce1.early=yes
+-XX:jit.CD_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.CD_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.arg.codegen.emitter.align=0
 
 #system properties
 -Djava.compiler=client

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/jet.emconf Tue Apr 17 09:13:05 2007
@@ -20,7 +20,7 @@
 JET.file=jitrino
 
 #JIT options
--XDjit.JET.path=
+-XX:jit.JET.path=
 
 
 #system properties

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/opt.emconf Tue Apr 17 09:13:05 2007
@@ -22,26 +22,26 @@
 
 # Options to be passed to JIT
 
--XDjit.CS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.CS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.CS_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
--XDjit.CS_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.CS_OPT.path.dce1=cg_dce
--XDjit.CS_OPT.path.dce2=cg_dce
--XDjit.CS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.CS_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.CS_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.CS_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
+-XX:jit.CS_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.CS_OPT.path.dce1=cg_dce
+-XX:jit.CS_OPT.path.dce2=cg_dce
+-XX:jit.CS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.CS_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.CS_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.CS_OPT.CS_OPT_inliner_pipeline.filter=-
--XDjit.CS_OPT.CS_OPT_inliner_pipeline.path=ssa,devirt
--XDjit.CS_OPT.arg.optimizer.inline.pipeline=CS_OPT_inliner_pipeline
+-XX:jit.CS_OPT.CS_OPT_inliner_pipeline.filter=-
+-XX:jit.CS_OPT.CS_OPT_inliner_pipeline.path=ssa,devirt
+-XX:jit.CS_OPT.arg.optimizer.inline.pipeline=CS_OPT_inliner_pipeline
 
 
--XDjit.CS_OPT.arg.codegen.dce1.early=yes
--XDjit.CS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.CS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.arg.codegen.emitter.align=0
+-XX:jit.CS_OPT.arg.codegen.dce1.early=yes
+-XX:jit.CS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.CS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.arg.codegen.emitter.align=0
 
 #system properties
 -Djava.compiler=client static

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server.emconf Tue Apr 17 09:13:05 2007
@@ -40,110 +40,110 @@
 
 #options for JIT
 
--XDjit.JET_CLINIT.path=
+-XX:jit.JET_CLINIT.path=
 
 
--XDjit.SD1_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.SD1_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.SD1_OPT.path.optimizer=ssa,simplify,dce,uce,vp_instrument,devirt_virtual,edge_instrument,dessa,statprof,markglobals
--XDjit.SD1_OPT.path.devirt_virtual=devirt
--XDjit.SD1_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SD1_OPT.path.dce1=cg_dce
--XDjit.SD1_OPT.path.dce2=cg_dce
--XDjit.SD1_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SD1_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SD1_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.SD1_OPT.path.optimizer=ssa,simplify,dce,uce,vp_instrument,devirt_virtual,edge_instrument,dessa,statprof,markglobals
+-XX:jit.SD1_OPT.path.devirt_virtual=devirt
+-XX:jit.SD1_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SD1_OPT.path.dce1=cg_dce
+-XX:jit.SD1_OPT.path.dce2=cg_dce
+-XX:jit.SD1_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SD1_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SD1_OPT.path.bp_regalloc2=bp_regalloc
 
--XDjit.SD1_OPT.arg.codegen.dce1.early=yes
--XDjit.SD1_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SD1_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.SD1_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SD1_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SD1_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
 
 
 
--XDjit.SD2_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.SD2_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.SD2_OPT.path.optimizer=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf,inline,uce,purge,simplify,dce,uce,so2-,simplify,dce,uce,escape,hvn,dce,uce,inline_helpers,purge,simplify,uce,dce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,fastArrayFill,statprof,markglobals
--XDjit.SD2_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,cg_fastArrayFill,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SD2_OPT.path.dce1=cg_dce
--XDjit.SD2_OPT.path.dce2=cg_dce
--XDjit.SD2_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SD2_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SD2_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.SD2_OPT.path.optimizer=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf,inline,uce,purge,simplify,dce,uce,so2-,simplify,dce,uce,escape,hvn,dce,uce,inline_helpers,purge,simplify,uce,dce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,fastArrayFill,statprof,markglobals
+-XX:jit.SD2_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,cg_fastArrayFill,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SD2_OPT.path.dce1=cg_dce
+-XX:jit.SD2_OPT.path.dce2=cg_dce
+-XX:jit.SD2_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SD2_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SD2_OPT.path.bp_regalloc2=bp_regalloc
 
 #devirt configuration
--XDjit.SD2_OPT.path.devirt_virtual=devirt
--XDjit.SD2_OPT.path.devirt_intf=devirt
--XDjit.SD2_OPT.arg.optimizer.devirt_intf.devirt_intf_calls=true
--XDjit.SD2_OPT.arg.optimizer.devirt_intf.devirt_virtual_calls=false
+-XX:jit.SD2_OPT.path.devirt_virtual=devirt
+-XX:jit.SD2_OPT.path.devirt_intf=devirt
+-XX:jit.SD2_OPT.arg.optimizer.devirt_intf.devirt_intf_calls=true
+-XX:jit.SD2_OPT.arg.optimizer.devirt_intf.devirt_virtual_calls=false
 
 #inliner configuration
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.filter=-
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf
--XDjit.SD2_OPT.arg.optimizer.inline.pipeline=SD2_OPT_inliner_pipeline
--XDjit.SD2_OPT.arg.optimizer.inline.connect_early=false
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.filter=-
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf
+-XX:jit.SD2_OPT.arg.optimizer.inline.pipeline=SD2_OPT_inliner_pipeline
+-XX:jit.SD2_OPT.arg.optimizer.inline.connect_early=false
 #devirt configuration for inliner pipeline
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_virtual=devirt
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_intf=devirt
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_intf_calls=true
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_virtual_calls=false
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_virtual=devirt
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_intf=devirt
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_intf_calls=true
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_virtual_calls=false
 
 
 #helper inliner configuration
--XDjit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.filter=-
--XDjit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.path=ssa
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.pipeline=SD2_OPT_helper_inliner_pipeline
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_className=org/apache/harmony/drlvm/gc_cc/GCHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_methodName=alloc
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_className=org/apache/harmony/drlvm/gc_cc/GCHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_methodName=allocArray
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_className=org/apache/harmony/drlvm/thread/ThreadHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_methodName=monitorEnterUseReservation
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_className=org/apache/harmony/drlvm/thread/ThreadHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_methodName=monitorExit
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface=off
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_methodName=getInterfaceVTable3
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast=off
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_methodName=checkCast
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf=off
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_methodName=instanceOf
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_hotnessPercent=1
-
-
--XDjit.SD2_OPT.arg.codegen.dce1.early=yes
--XDjit.SD2_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SD2_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.arg.codegen.emitter.align=0
+-XX:jit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.filter=-
+-XX:jit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.path=ssa
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.pipeline=SD2_OPT_helper_inliner_pipeline
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_className=org/apache/harmony/drlvm/gc_cc/GCHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_methodName=alloc
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_className=org/apache/harmony/drlvm/gc_cc/GCHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_methodName=allocArray
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_className=org/apache/harmony/drlvm/thread/ThreadHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_methodName=monitorEnterUseReservation
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_className=org/apache/harmony/drlvm/thread/ThreadHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_methodName=monitorExit
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface=off
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_methodName=getInterfaceVTable3
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast=off
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_methodName=checkCast
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf=off
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_methodName=instanceOf
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_hotnessPercent=1
+
+
+-XX:jit.SD2_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SD2_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SD2_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.arg.codegen.emitter.align=0
 
 #system properties
 -Djava.compiler=server
 
 #GC magics support
 -Dvm.components.gc_cc.startupclass=org.apache.harmony.drlvm.gc_cc.GCHelper
--XDvm.component.classpath.gc_cc=gc_cc.jar
+-XX:vm.component.classpath.gc_cc=gc_cc.jar
 
 #TM properties
 -Dvm.components.hythr.startupclass=org.apache.harmony.drlvm.thread.ThreadHelper
--XDvm.component.classpath.hythr=hythr.jar
+-XX:vm.component.classpath.hythr=hythr.jar
 
 #VM helpers
 -Dvm.components.vmcore1.startupclass=org.apache.harmony.drlvm.VMHelper

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/server_static.emconf Tue Apr 17 09:13:05 2007
@@ -22,25 +22,25 @@
 
 # Options to be passed to JIT
 
--XDjit.SS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.SS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.SS_OPT.path.optimizer=ssa,simplify,dce,uce,statprof,devirt,inline,uce,purge,simplify,dce,uce,hvn,dce,uce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,statprof,markglobals
--XDjit.SS_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SS_OPT.path.dce1=cg_dce
--XDjit.SS_OPT.path.dce2=cg_dce
--XDjit.SS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SS_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SS_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.SS_OPT.path.optimizer=ssa,simplify,dce,uce,statprof,devirt,inline,uce,purge,simplify,dce,uce,hvn,dce,uce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,statprof,markglobals
+-XX:jit.SS_OPT.path.codegen=lock_method,bbp,gcpoints,cafl,dce1,i8l-,early_prop-,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce-,stack,break-,iprof-,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SS_OPT.path.dce1=cg_dce
+-XX:jit.SS_OPT.path.dce2=cg_dce
+-XX:jit.SS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SS_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SS_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.SS_OPT.SS_OPT_inliner_pipeline.filter=-
--XDjit.SS_OPT.SS_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,statprof,devirt
--XDjit.SS_OPT.arg.optimizer.inline.pipeline=SS_OPT_inliner_pipeline
+-XX:jit.SS_OPT.SS_OPT_inliner_pipeline.filter=-
+-XX:jit.SS_OPT.SS_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,statprof,devirt
+-XX:jit.SS_OPT.arg.optimizer.inline.pipeline=SS_OPT_inliner_pipeline
 
--XDjit.SS_OPT.arg.codegen.dce1.early=yes
--XDjit.SS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.arg.codegen.emitter.align=0
+-XX:jit.SS_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.arg.codegen.emitter.align=0
 
 #system properties
 -Djava.compiler=server static

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/em64t/ti.emconf Tue Apr 17 09:13:05 2007
@@ -20,7 +20,7 @@
 JET_TI.file=jitrino
 
 #JIT options
--XDjit.JET_TI.path=
+-XX:jit.JET_TI.path=
 
 #system properties
 -Djava.compiler=jet ti

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/client.emconf Tue Apr 17 09:13:05 2007
@@ -48,30 +48,30 @@
 
 # Options to be passed to JIT
 
--XDjit.JET_CLINIT.path=
--XDjit.JET_DPGO.path=
+-XX:jit.JET_CLINIT.path=
+-XX:jit.JET_DPGO.path=
 
--XDjit.CD_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.CD_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.CD_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
--XDjit.CD_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.CD_OPT.path.dce1=cg_dce
--XDjit.CD_OPT.path.dce2=cg_dce
--XDjit.CD_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.CD_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.CD_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.CD_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
+-XX:jit.CD_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.CD_OPT.path.dce1=cg_dce
+-XX:jit.CD_OPT.path.dce2=cg_dce
+-XX:jit.CD_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.CD_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.CD_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.CD_OPT.CD_OPT_inliner_pipeline.filter=-
--XDjit.CD_OPT.CD_OPT_inliner_pipeline.path=ssa,devirt
--XDjit.CD_OPT.arg.optimizer.inline.pipeline=CD_OPT_inliner_pipeline
+-XX:jit.CD_OPT.CD_OPT_inliner_pipeline.filter=-
+-XX:jit.CD_OPT.CD_OPT_inliner_pipeline.path=ssa,devirt
+-XX:jit.CD_OPT.arg.optimizer.inline.pipeline=CD_OPT_inliner_pipeline
 
--XDjit.CD_OPT.arg.codegen.dce1.early=yes
--XDjit.CD_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.CD_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.CD_OPT.arg.codegen.btr.insertCMOVs=no
--XDjit.CD_OPT.arg.codegen.btr.removeConstCompare=yes
--XDjit.arg.codegen.emitter.align=4
+-XX:jit.CD_OPT.arg.codegen.dce1.early=yes
+-XX:jit.CD_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.CD_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.CD_OPT.arg.codegen.btr.insertCMOVs=no
+-XX:jit.CD_OPT.arg.codegen.btr.removeConstCompare=yes
+-XX:jit.arg.codegen.emitter.align=4
 
 #system properties
 -Djava.compiler=client

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/jet.emconf Tue Apr 17 09:13:05 2007
@@ -21,7 +21,7 @@
 
 # Options to be passed to JIT
 
--XDjit.JET.path=
+-XX:jit.JET.path=
 
 #system properties
 -Djava.compiler=jet

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/opt.emconf Tue Apr 17 09:13:05 2007
@@ -22,32 +22,32 @@
 
 # Options to be passed to JIT
 
--XDjit.CS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.CS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.CS_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
--XDjit.CS_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.CS_OPT.path.dce1=cg_dce
--XDjit.CS_OPT.path.dce2=cg_dce
--XDjit.CS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.CS_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.CS_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.CS_OPT.path.optimizer=ssa,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,memopt,simplify,dce,uce,lower,dessa,statprof,markglobals
+-XX:jit.CS_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.CS_OPT.path.dce1=cg_dce
+-XX:jit.CS_OPT.path.dce2=cg_dce
+-XX:jit.CS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.CS_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.CS_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.CS_OPT.CS_OPT_inliner_pipeline.filter=-
--XDjit.CS_OPT.CS_OPT_inliner_pipeline.path=ssa,devirt
--XDjit.CS_OPT.arg.optimizer.inline.pipeline=CS_OPT_inliner_pipeline
+-XX:jit.CS_OPT.CS_OPT_inliner_pipeline.filter=-
+-XX:jit.CS_OPT.CS_OPT_inliner_pipeline.path=ssa,devirt
+-XX:jit.CS_OPT.arg.optimizer.inline.pipeline=CS_OPT_inliner_pipeline
 
 
--XDjit.CS_OPT.arg.codegen.dce1.early=yes
--XDjit.CS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.CS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.CS_OPT.arg.codegen.dce1.early=yes
+-XX:jit.CS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.CS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
 
--XDjit.CS_OPT.arg.codegen.btr.insertCMOVs=no
--XDjit.CS_OPT.arg.codegen.btr.removeConstCompare=yes
--XDjit.arg.codegen.emitter.align=4
+-XX:jit.CS_OPT.arg.codegen.btr.insertCMOVs=no
+-XX:jit.CS_OPT.arg.codegen.btr.removeConstCompare=yes
+-XX:jit.arg.codegen.emitter.align=4
 
-#-XDjit.CS_OPT.arg.log.irdump.file=log/%jit%/%log%/%seqnb%_%class%.%method%.log
-#-XDjit.CS_OPT.arg.log=ct,ir,irdump,all
+#-XX:jit.CS_OPT.arg.log.irdump.file=log/%jit%/%log%/%seqnb%_%class%.%method%.log
+#-XX:jit.CS_OPT.arg.log=ct,ir,irdump,all
 
 
 #system properties

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server.emconf Tue Apr 17 09:13:05 2007
@@ -40,100 +40,100 @@
 
 #options for JIT
 
--XDjit.JET_CLINIT.path=
+-XX:jit.JET_CLINIT.path=
 
 
--XDjit.SD1_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.SD1_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.SD1_OPT.path.optimizer=ssa,simplify,dce,uce,vp_instrument,devirt_virtual,edge_instrument,dessa,statprof,markglobals
--XDjit.SD1_OPT.path.devirt_virtual=devirt
--XDjit.SD1_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SD1_OPT.path.dce1=cg_dce
--XDjit.SD1_OPT.path.dce2=cg_dce
--XDjit.SD1_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SD1_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SD1_OPT.path.bp_regalloc2=bp_regalloc
-
--XDjit.SD1_OPT.arg.codegen.dce1.early=yes
--XDjit.SD1_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SD1_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.SD1_OPT.arg.codegen.btr.insertCMOVs=no
--XDjit.SD1_OPT.arg.codegen.btr.removeConstCompare=yes
-
-
--XDjit.SD2_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
-
--XDjit.SD2_OPT.path.optimizer=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf,inline,uce,purge,simplify,dce,uce,lazyexc,so2-,simplify,dce,uce,escape,inline_helpers,purge,simplify,uce,dce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,fastArrayFill,statprof,markglobals
--XDjit.SD2_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,cg_fastArrayFill,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SD2_OPT.path.dce1=cg_dce
--XDjit.SD2_OPT.path.dce2=cg_dce
--XDjit.SD2_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SD2_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SD2_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.SD1_OPT.path.optimizer=ssa,simplify,dce,uce,vp_instrument,devirt_virtual,edge_instrument,dessa,statprof,markglobals
+-XX:jit.SD1_OPT.path.devirt_virtual=devirt
+-XX:jit.SD1_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SD1_OPT.path.dce1=cg_dce
+-XX:jit.SD1_OPT.path.dce2=cg_dce
+-XX:jit.SD1_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SD1_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SD1_OPT.path.bp_regalloc2=bp_regalloc
+
+-XX:jit.SD1_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SD1_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SD1_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.SD1_OPT.arg.codegen.btr.insertCMOVs=no
+-XX:jit.SD1_OPT.arg.codegen.btr.removeConstCompare=yes
+
+
+-XX:jit.SD2_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+
+-XX:jit.SD2_OPT.path.optimizer=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf,inline,uce,purge,simplify,dce,uce,lazyexc,so2-,simplify,dce,uce,escape,inline_helpers,purge,simplify,uce,dce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,fastArrayFill,statprof,markglobals
+-XX:jit.SD2_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,cg_fastArrayFill,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SD2_OPT.path.dce1=cg_dce
+-XX:jit.SD2_OPT.path.dce2=cg_dce
+-XX:jit.SD2_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SD2_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SD2_OPT.path.bp_regalloc2=bp_regalloc
 
 #devirt configuration
--XDjit.SD2_OPT.path.devirt_virtual=devirt
--XDjit.SD2_OPT.path.devirt_intf=devirt
--XDjit.SD2_OPT.arg.optimizer.devirt_intf.devirt_intf_calls=true
--XDjit.SD2_OPT.arg.optimizer.devirt_intf.devirt_virtual_calls=false
+-XX:jit.SD2_OPT.path.devirt_virtual=devirt
+-XX:jit.SD2_OPT.path.devirt_intf=devirt
+-XX:jit.SD2_OPT.arg.optimizer.devirt_intf.devirt_intf_calls=true
+-XX:jit.SD2_OPT.arg.optimizer.devirt_intf.devirt_virtual_calls=false
 
 #inliner configuration
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.filter=-
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf
--XDjit.SD2_OPT.arg.optimizer.inline.pipeline=SD2_OPT_inliner_pipeline
--XDjit.SD2_OPT.arg.optimizer.inline.connect_early=false
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.filter=-
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,devirt_virtual,edge_annotate,unguard,devirt_intf
+-XX:jit.SD2_OPT.arg.optimizer.inline.pipeline=SD2_OPT_inliner_pipeline
+-XX:jit.SD2_OPT.arg.optimizer.inline.connect_early=false
 #devirt configuration for inliner pipeline
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_virtual=devirt
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_intf=devirt
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_intf_calls=true
--XDjit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_virtual_calls=false
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_virtual=devirt
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.path.devirt_intf=devirt
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_intf_calls=true
+-XX:jit.SD2_OPT.SD2_OPT_inliner_pipeline.arg.devirt_intf.devirt_virtual_calls=false
 
 #helper inliner configuration
--XDjit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.filter=-
--XDjit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.path=ssa
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.pipeline=SD2_OPT_helper_inliner_pipeline
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_className=org/apache/harmony/drlvm/gc_cc/GCHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_methodName=alloc
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newObj_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_className=org/apache/harmony/drlvm/gc_cc/GCHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_methodName=allocArray
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.newArray_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_className=org/apache/harmony/drlvm/thread/ThreadHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_methodName=monitorEnterUseReservation
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_className=org/apache/harmony/drlvm/thread/ThreadHelper
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_methodName=monitorExit
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_methodName=getInterfaceVTable3
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_methodName=checkCast
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf=on
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_className=org/apache/harmony/drlvm/VMHelperFastPath
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_methodName=instanceOf
--XDjit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_hotnessPercent=1
-
--XDjit.SD2_OPT.arg.codegen.dce1.early=yes
--XDjit.SD2_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SD2_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.SD2_OPT.arg.codegen.btr.insertCMOVs=no
--XDjit.SD2_OPT.arg.codegen.btr.removeConstCompare=yes
--XDjit.arg.codegen.emitter.align=4
+-XX:jit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.filter=-
+-XX:jit.SD2_OPT.SD2_OPT_helper_inliner_pipeline.path=ssa
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.pipeline=SD2_OPT_helper_inliner_pipeline
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_className=org/apache/harmony/drlvm/gc_cc/GCHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_methodName=alloc
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newObj_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_className=org/apache/harmony/drlvm/gc_cc/GCHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_methodName=allocArray
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.newArray_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_className=org/apache/harmony/drlvm/thread/ThreadHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_methodName=monitorEnterUseReservation
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonEnter_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_className=org/apache/harmony/drlvm/thread/ThreadHelper
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_methodName=monitorExit
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.objMonExit_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_methodName=getInterfaceVTable3
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.ldInterface_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_methodName=checkCast
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.checkCast_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf=on
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_className=org/apache/harmony/drlvm/VMHelperFastPath
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_methodName=instanceOf
+-XX:jit.SD2_OPT.arg.optimizer.inline_helpers.instanceOf_hotnessPercent=1
+
+-XX:jit.SD2_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SD2_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SD2_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.SD2_OPT.arg.codegen.btr.insertCMOVs=no
+-XX:jit.SD2_OPT.arg.codegen.btr.removeConstCompare=yes
+-XX:jit.arg.codegen.emitter.align=4
 
 
 #system properties
@@ -141,11 +141,11 @@
 
 #GC magics support
 -Dvm.components.gc_cc.startupclass=org.apache.harmony.drlvm.gc_cc.GCHelper
--XDvm.component.classpath.gc_cc=gc_cc.jar
+-XX:vm.component.classpath.gc_cc=gc_cc.jar
 
 #TM properties
 -Dvm.components.hythr.startupclass=org.apache.harmony.drlvm.thread.ThreadHelper
--XDvm.component.classpath.hythr=hythr.jar
+-XX:vm.component.classpath.hythr=hythr.jar
 
 #VM helpers
 -Dvm.components.vmcore1.startupclass=org.apache.harmony.drlvm.VMHelper

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/server_static.emconf Tue Apr 17 09:13:05 2007
@@ -22,27 +22,27 @@
 
 # Options to be passed to JIT
 
--XDjit.SS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
+-XX:jit.SS_OPT.path=opt_init,translator,optimizer,hir2lir,codegen
 
--XDjit.SS_OPT.path.optimizer=ssa,simplify,dce,uce,statprof,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,hvn,dce,uce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,statprof,markglobals
--XDjit.SS_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
--XDjit.SS_OPT.path.dce1=cg_dce
--XDjit.SS_OPT.path.dce2=cg_dce
--XDjit.SS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
--XDjit.SS_OPT.path.bp_regalloc1=bp_regalloc
--XDjit.SS_OPT.path.bp_regalloc2=bp_regalloc
+-XX:jit.SS_OPT.path.optimizer=ssa,simplify,dce,uce,statprof,devirt,inline,uce,purge,simplify,dce,uce,lazyexc,hvn,dce,uce,dessa,statprof,peel,ssa,hvn,simplify,dce,uce,lower,dce,uce,memopt,reassoc,dce,uce,hvn,dce,uce,abcd,dce,uce,gcm,dessa,statprof,markglobals
+-XX:jit.SS_OPT.path.codegen=lock_method,bbp,btr,gcpoints,cafl,dce1,i8l,api_magic,early_prop,peephole,itrace-,native,constraints,dce2,regalloc,spillgen,layout,copy,rce+,stack,break-,iprof-,peephole,emitter!,si_insts,gcmap,info,unlock_method
+-XX:jit.SS_OPT.path.dce1=cg_dce
+-XX:jit.SS_OPT.path.dce2=cg_dce
+-XX:jit.SS_OPT.path.regalloc=bp_regalloc1,bp_regalloc2
+-XX:jit.SS_OPT.path.bp_regalloc1=bp_regalloc
+-XX:jit.SS_OPT.path.bp_regalloc2=bp_regalloc
 
 #inliner configuration
--XDjit.SS_OPT.SS_OPT_inliner_pipeline.filter=-
--XDjit.SS_OPT.SS_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,statprof,devirt
--XDjit.SS_OPT.arg.optimizer.inline.pipeline=SS_OPT_inliner_pipeline
+-XX:jit.SS_OPT.SS_OPT_inliner_pipeline.filter=-
+-XX:jit.SS_OPT.SS_OPT_inliner_pipeline.path=ssa,simplify,dce,uce,statprof,devirt
+-XX:jit.SS_OPT.arg.optimizer.inline.pipeline=SS_OPT_inliner_pipeline
 
--XDjit.SS_OPT.arg.codegen.dce1.early=yes
--XDjit.SS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
--XDjit.SS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
--XDjit.SS_OPT.arg.codegen.btr.insertCMOVs=no
--XDjit.SS_OPT.arg.codegen.btr.removeConstCompare=yes
--XDjit.arg.codegen.emitter.align=4
+-XX:jit.SS_OPT.arg.codegen.dce1.early=yes
+-XX:jit.SS_OPT.arg.codegen.regalloc.bp_regalloc1.regs=ALL_GP
+-XX:jit.SS_OPT.arg.codegen.regalloc.bp_regalloc2.regs=ALL_XMM
+-XX:jit.SS_OPT.arg.codegen.btr.insertCMOVs=no
+-XX:jit.SS_OPT.arg.codegen.btr.removeConstCompare=yes
+-XX:jit.arg.codegen.emitter.align=4
 
 
 #system properties

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ia32/ti.emconf Tue Apr 17 09:13:05 2007
@@ -20,7 +20,7 @@
 JET_TI.file=jitrino
 
 #JIT options
--XDjit.JET_TI.path=
+-XX:jit.JET_TI.path=
 
 
 #system properties

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/config/ipf/client.emconf
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/config/ipf/client.emconf?view=diff&rev=529663&r1=529662&r2=529663
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/config/ipf/client.emconf (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/config/ipf/client.emconf Tue Apr 17 09:13:05 2007
@@ -21,10 +21,10 @@
 
 # Options to be passed to JIT
 
--XDjit.CS_OPT.path=opt_init,translator,hir2lir,lock_method,ipf_codegen,unlock_method
-#-XDjit.arg.ipf_codegen.log=ct,dot
--XDjit.arg.genArrayCopyRepMove=false
--XDjit.arg.genArrayCopy=true
+-XX:jit.CS_OPT.path=opt_init,translator,hir2lir,lock_method,ipf_codegen,unlock_method
+#-XX:jit.arg.ipf_codegen.log=ct,dot
+-XX:jit.arg.genArrayCopyRepMove=false
+-XX:jit.arg.genArrayCopy=true
 
 #system properties
 -Djava.compiler=client static