harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r659108 [1/19] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/mark_compact/ gc_gen/src/mark_sweep/ gc_gen/src/semi_space/ gc_gen/src/trace_forward/ include/open/ interpreter/src/ jitrino/src/codegenerator/ jitr...
Date Thu, 22 May 2008 13:34:09 GMT
Author: mcfirst
Date: Thu May 22 06:33:38 2008
New Revision: 659108

URL: http://svn.apache.org/viewvc?rev=659108&view=rev
Log:
Unifying types with hycomp.h: changed u/int32 to U/I_32

Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h
    harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/fix_repointed_refs.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_barrier.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/fallback_mark_scan.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp
    harmony/enhanced/drlvm/trunk/vm/include/open/em_profile_access.h
    harmony/enhanced/drlvm/trunk/vm/include/open/gc.h
    harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
    harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
    harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
    harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h
    harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/CodeGenIntfc.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/RuntimeInterface.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32APIMagics.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BBPolling.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CallingConvention.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CallingConvention.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeGenerator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayout.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeSelector.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ComplexAddrFormLoader.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Constraint.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Constraint.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32ConstraintsResolver.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CopyExpansion.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32DCE.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32EarlyPropagation.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCSafePoints.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32I8Lowerer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRConstants.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRConstants.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32LightJNI.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32PeepHole.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc0.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc2.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAlloc3.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RegAllocCheck.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32SpillGen.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackLayout.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32WebMaker.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32i586InstsExpansion.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCfg.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeLayouter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEmitter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfIrPrinter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfOpnd.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfOpndManager.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfPrologEpilogGenerator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRegisterAllocator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfSpillGen.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfVerifier.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfCfg.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfCodeLayouter.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfCodeSelector.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfEmitter.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfOpndManager.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfPrologEpilogGenerator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRegisterAllocator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfSpillGen.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfType.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/EdgeProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/ValueProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_br.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_fld_arr.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/mib.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/mib.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/sconsts.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/sframe.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Jitrino.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Log.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/Log.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CSEHash.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CSEHash.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/CodeSelectors.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FlowGraph.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/HLOAPIMagics.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/HLOAPIMagics.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/IRBuilder.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Loop.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/LoopUtils.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opcode.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcd.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdbounds.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdbounds.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/abcdsolver.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd_solver.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/insertpi.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/codelowerer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dabce.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/dataflow.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/devirtualizer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escanalyzer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/escapeanalyzer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/gcmanagedpointeranalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalcodemotion.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/globalopndanalyzer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/hashvaluenumberer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/helper_inliner.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/irmanager.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/lazyexceptionopt.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/loop_unroll.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryoptrep.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/multiplybyconstant.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/opndmap.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optimizer.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optpass.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/osr.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/reassociate.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifier.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/simplifytaus.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/ssa/SSA.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/syncopt.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/throwopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/BitSet.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/BitSet.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/ControlFlowGraph.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Dominator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Event.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/HashSet.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/HashTable.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/LoopTree.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MapSet.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Tree.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/unionfind.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ExceptionInfo.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/TranslatorIntfc.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeParser.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeParser.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaFlowGraphBuilder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/EMInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/EMInterface.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h
    harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h
    harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h
    harmony/enhanced/drlvm/trunk/vm/port/src/atomic/linux_ipf/port_atomic_asm.asm
    harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/ia32/native_unwind_arch.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_defs.h
    harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/enc_tabl.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/encoder.h
    harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/encoder.inl
    harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c
    harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c
    harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_asm_em64t.asm
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_asm_ia32.asm
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_stress_suspend.h
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/Class.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/String_Pool.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/annotation.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/bytereader.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/inline_info.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_direct.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/m2n.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/mon_enter_exit.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_generic.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_layout.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/slot.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_iterator.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/stack_walker.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_arrays.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/inline_info.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_break_intf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_pop_frame.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_stack.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_step.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/m2n_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/m2n_em64t_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/stack_iterator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/m2n_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/m2n_ia32_internal.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ia32/stack_iterator_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil_code_generator_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/stack_iterator/m2n.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/stack_iterator/stack_iterator.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/ncai_utils_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/ncai_utils_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ipf/nt_exception_filter.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp

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?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Thu May 22 06:33:38 2008
@@ -578,7 +578,7 @@
 //______________________________________________________________________________
 // Profile collectors initialization and recompilation
 
-static uint32 toNum(const std::string& numStr, bool *rc ) {
+static U_32 toNum(const std::string& numStr, bool *rc ) {
     if (isNum(numStr)) {
         *rc = true;
         return atoi(numStr.c_str());
@@ -610,17 +610,17 @@
         }
         
         bool ok = false;
-        uint32 eThreshold = toNum(getParam(config, profilerName+".entryThreshold"), &ok);//todo: default values..
+        U_32 eThreshold = toNum(getParam(config, profilerName+".entryThreshold"), &ok);//todo: default values..
             if (!ok) {
             LECHO(9, "EM: illegal '{0}' value" << "entryThreshold");
             return NULL;
             }
-                uint32 bThreshold = toNum(getParam(config, profilerName+".backedgeThreshold"), &ok);
+                U_32 bThreshold = toNum(getParam(config, profilerName+".backedgeThreshold"), &ok);
         if (!ok) {
             LECHO(9, "EM: illegal '{0}' value" << "backedgeThreshold");
             return NULL;
         }
-        uint32 tbsTimeout = 0, tbsInitialTimeout = 0;
+        U_32 tbsTimeout = 0, tbsInitialTimeout = 0;
         if (ebMode == EBProfileCollector::EB_PCMODE_ASYNC) {
             tbsTimeout= toNum(getParam(config, profilerName+".tbsTimeout"), &ok);
             if (!ok) {

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h Thu May 22 06:33:38 2008
@@ -136,7 +136,7 @@
     
     EM_ProfileAccessInterface profileAccessInterface;
 
-    uint32 tick;
+    U_32 tick;
     
     osmutex_t recompilationLock;
     std::set<Method_Profile_Handle> methodsInRecompile;

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h Thu May 22 06:33:38 2008
@@ -78,14 +78,14 @@
     TbsEMClient() : nextTick(0) {}
     virtual ~TbsEMClient(){};
 
-    virtual uint32 getInitialTimeout() const  = 0;
-    virtual uint32 getTimeout() const = 0;
+    virtual U_32 getInitialTimeout() const  = 0;
+    virtual U_32 getTimeout() const = 0;
     virtual void onTimeout() = 0;
 
-    virtual uint32 getNextTick() const {return nextTick;}
-    virtual void setNextTick(uint32 n) {nextTick = n;}
+    virtual U_32 getNextTick() const {return nextTick;}
+    virtual void setNextTick(U_32 n) {nextTick = n;}
 private:
-    uint32 nextTick;
+    U_32 nextTick;
 };
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp Thu May 22 06:33:38 2008
@@ -35,8 +35,8 @@
 
 
 EBProfileCollector::EBProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit, 
-                                       EB_ProfilerMode _mode, uint32 _eThreshold, uint32 _bThreshold,
-                                       uint32 _initialTimeout, uint32 _timeout) 
+                                       EB_ProfilerMode _mode, U_32 _eThreshold, U_32 _bThreshold,
+                                       U_32 _initialTimeout, U_32 _timeout) 
                                        : ProfileCollector(em, name, EM_PCTYPE_ENTRY_BACKEDGE, genJit),
                                         mode(_mode), eThreshold(_eThreshold), bThreshold(_bThreshold), 
                                         initialTimeout(_initialTimeout), timeout(_timeout), loggingEnabled(false)
@@ -95,14 +95,14 @@
     ((EBProfileCollector*)mp->pc)->syncModeJitCallback(mp);
 }
 
-uint32 eb_profiler_get_entry_threshold(PC_Handle pch) {
+U_32 eb_profiler_get_entry_threshold(PC_Handle pch) {
     assert(pch!=NULL);
     ProfileCollector* pc = (ProfileCollector*)pch;
     assert(pc->type == EM_PCTYPE_ENTRY_BACKEDGE);
     return ((EBProfileCollector*)pc)->getEntryThreshold();
 }
 
-uint32 eb_profiler_get_backedge_threshold(PC_Handle pch) {
+U_32 eb_profiler_get_backedge_threshold(PC_Handle pch) {
     assert(pch!=NULL);
     ProfileCollector* pc = (ProfileCollector*)pch;
     assert(pc->type == EM_PCTYPE_ENTRY_BACKEDGE);

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h Thu May 22 06:33:38 2008
@@ -50,14 +50,14 @@
     };
 
     EBProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit, EB_ProfilerMode _mode,
-        uint32 _eThreshold, uint32 _bThreshold, uint32 _initialTimeout=0, uint32 _timeout=0);
+        U_32 _eThreshold, U_32 _bThreshold, U_32 _initialTimeout=0, U_32 _timeout=0);
         
     virtual ~EBProfileCollector();
 
     virtual TbsEMClient* getTbsEmClient() const {return mode == EB_PCMODE_ASYNC ? (TbsEMClient*)this : NULL;}
     
-    virtual uint32 getInitialTimeout() const {return initialTimeout;}
-    virtual uint32 getTimeout() const {return timeout;}
+    virtual U_32 getInitialTimeout() const {return initialTimeout;}
+    virtual U_32 getTimeout() const {return timeout;}
     virtual void onTimeout();
     virtual MethodProfile* getMethodProfile(Method_Handle mh) const ;
     virtual void classloaderUnloadingCallback(Class_Loader_Handle h);
@@ -65,8 +65,8 @@
     EBMethodProfile* createProfile(Method_Handle mh);
     void syncModeJitCallback(MethodProfile* mp);
 
-    uint32 getEntryThreshold() const {return eThreshold;}
-    uint32 getBackedgeThreshold() const {return bThreshold;}
+    U_32 getEntryThreshold() const {return eThreshold;}
+    U_32 getBackedgeThreshold() const {return bThreshold;}
 
     EB_ProfilerMode getMode() const {return mode;}
 
@@ -75,10 +75,10 @@
     void cleanUnloadedProfiles(bool removeFromGreen);
 
     EB_ProfilerMode mode;
-    uint32 eThreshold;
-    uint32 bThreshold;
-    uint32 initialTimeout;
-    uint32 timeout;
+    U_32 eThreshold;
+    U_32 bThreshold;
+    U_32 initialTimeout;
+    U_32 timeout;
     bool loggingEnabled;
     std::string catName;
     
@@ -105,7 +105,7 @@
 public:
     EBMethodProfile(EBProfileCollector* pc, Method_Handle mh) 
         : MethodProfile(pc, mh), entryCounter(0), backedgeCounter(0){}
-    uint32 entryCounter, backedgeCounter;
+    U_32 entryCounter, backedgeCounter;
 };
 
 
@@ -114,7 +114,7 @@
 void*eb_profiler_get_backedge_counter_addr(Method_Profile_Handle mph);
 void  __stdcall eb_profiler_sync_mode_callback(PC_Handle mph);
 char  eb_profiler_is_in_sync_mode(PC_Handle pch);
-uint32 eb_profiler_get_entry_threshold(PC_Handle pch);
-uint32 eb_profiler_get_backedge_threshold(PC_Handle pch);
+U_32 eb_profiler_get_entry_threshold(PC_Handle pch);
+U_32 eb_profiler_get_backedge_threshold(PC_Handle pch);
 
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp Thu May 22 06:33:38 2008
@@ -35,9 +35,9 @@
 
 Method_Profile_Handle edge_profiler_create_profile( PC_Handle ph,
                                                     Method_Handle mh,
-                                                    uint32 numCounters,
-                                                    uint32* counterKeys,
-                                                    uint32 checkSum )
+                                                    U_32 numCounters,
+                                                    U_32* counterKeys,
+                                                    U_32 checkSum )
 {
     ProfileCollector* pc = (ProfileCollector*)ph;
     assert(pc->type == EM_PCTYPE_EDGE);
@@ -54,7 +54,7 @@
     return &emp->entryCounter;
 }
 
-void* edge_profiler_get_counter_addr(Method_Profile_Handle mph, uint32 key)
+void* edge_profiler_get_counter_addr(Method_Profile_Handle mph, U_32 key)
 {
     MethodProfile* mp = (MethodProfile*)mph;
     assert(mp->pc->type == EM_PCTYPE_EDGE);
@@ -62,29 +62,29 @@
 }
 
 
-uint32 edge_profiler_get_num_counters(Method_Profile_Handle mph)
+U_32 edge_profiler_get_num_counters(Method_Profile_Handle mph)
 {
     MethodProfile* mp = (MethodProfile*)mph;
     assert(mp->pc->type == EM_PCTYPE_EDGE);
-    return (uint32)((EdgeMethodProfile*)mp)->counters.size();
+    return (U_32)((EdgeMethodProfile*)mp)->counters.size();
 }
 
 
-uint32 edge_profiler_get_checksum(Method_Profile_Handle mph)
+U_32 edge_profiler_get_checksum(Method_Profile_Handle mph)
 {
     MethodProfile* mp = (MethodProfile*)mph;
     assert(mp->pc->type == EM_PCTYPE_EDGE);
     return ((EdgeMethodProfile*)mp)->checkSum;
 }
 
-uint32 edge_profiler_get_entry_threshold(PC_Handle pch) {
+U_32 edge_profiler_get_entry_threshold(PC_Handle pch) {
     assert(pch!=NULL);
     ProfileCollector* pc = (ProfileCollector*)pch;
     assert(pc->type == EM_PCTYPE_EDGE);
     return ((EdgeProfileCollector*)pc)->getEntryThreshold();
 }
 
-uint32 edge_profiler_get_backedge_threshold(PC_Handle pch) {
+U_32 edge_profiler_get_backedge_threshold(PC_Handle pch) {
     assert(pch!=NULL);
     ProfileCollector* pc = (ProfileCollector*)pch;
     assert(pc->type == EM_PCTYPE_EDGE);
@@ -95,8 +95,8 @@
 
 
 EdgeProfileCollector::EdgeProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit,
-                                           uint32 _initialTimeout, uint32 _timeout, 
-                                           uint32 _eThreshold, uint32 _bThreshold)
+                                           U_32 _initialTimeout, U_32 _timeout, 
+                                           U_32 _eThreshold, U_32 _bThreshold)
                                            : ProfileCollector(em, name, EM_PCTYPE_EDGE, genJit), initialTimeout(_initialTimeout), 
                                            timeout(_timeout),eThreshold(_eThreshold), bThreshold(_bThreshold)
 {
@@ -136,15 +136,15 @@
 
 
 
-uint32* EdgeMethodProfile::getCounter( uint32 key ) const 
+U_32* EdgeMethodProfile::getCounter( U_32 key ) const 
 {
     //log2 search
     EdgeMap::const_iterator it = lower_bound(cntMap.begin(), cntMap.end(), key);
     if (it == cntMap.end() || *it != key) {
         return NULL;
     }
-    uint32 idx = (uint32)(it - cntMap.begin());
-    return (uint32*)&counters.front() + idx;
+    U_32 idx = (U_32)(it - cntMap.begin());
+    return (U_32*)&counters.front() + idx;
 }
 
 void EdgeMethodProfile::dump( const char* banner )
@@ -153,14 +153,14 @@
     Class_Handle ch = method_get_class(mh);
     const char* className = class_get_name(ch);
     const char* signature = method_get_descriptor(mh);
-    uint32 backEdgeCounter = entryCounter;
-    uint32 instrCost = entryCounter;
+    U_32 backEdgeCounter = entryCounter;
+    U_32 instrCost = entryCounter;
 
     assert(  banner != NULL );
 
     fprintf( stderr, "%s: %s::%s%s\n", banner, className, methodName, signature );
 
-    for( uint32 i = 0; i < counters.size(); i++ ){
+    for( U_32 i = 0; i < counters.size(); i++ ){
         instrCost += counters[i];
         if( counters[i] > backEdgeCounter ){
             backEdgeCounter = counters[i];
@@ -178,9 +178,9 @@
 
 
 EdgeMethodProfile* EdgeProfileCollector::createProfile( Method_Handle mh,
-                                                        uint32 numCounters,
-                                                        uint32* counterKeys,
-                                                        uint32 checkSum)
+                                                        U_32 numCounters,
+                                                        U_32* counterKeys,
+                                                        U_32 checkSum)
 {
     port_mutex_lock(&profilesLock);
 
@@ -206,14 +206,14 @@
 
 bool EdgeProfileCollector::isMethodHot( EdgeMethodProfile* profile )
 {
-    uint32 entryCounter = profile->entryCounter;
+    U_32 entryCounter = profile->entryCounter;
     if( entryCounter >= eThreshold ){
         return true;
     }
 
-    const uint32 cutoff = bThreshold;
+    const U_32 cutoff = bThreshold;
 
-    for( uint32 i = 0; i < profile->counters.size(); i++ ){
+    for( U_32 i = 0; i < profile->counters.size(); i++ ){
         if( profile->counters[i] >= cutoff ){
             return true;
         }
@@ -229,7 +229,7 @@
     const char* className = class_get_name(ch);
     const char* signature = method_get_descriptor(mp->mh);
 
-    uint32 backEgdeMaxValue = mp->counters.empty() ? 0 : *std::max_element( mp->counters.begin(), mp->counters.end());
+    U_32 backEgdeMaxValue = mp->counters.empty() ? 0 : *std::max_element( mp->counters.begin(), mp->counters.end());
     std::ostringstream msg;
     msg <<"EM: profiler["<<profilerName.c_str()<<"] profile is ready [e:"
         << mp->entryCounter<<" b:"<<backEgdeMaxValue<<"] " <<className<<"::"<<methodName<<signature;

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h Thu May 22 06:33:38 2008
@@ -36,31 +36,31 @@
 class EdgeProfileCollector : public ProfileCollector, public TbsEMClient {
 public:
     EdgeProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit,
-                                           uint32 _initialTimeout, uint32 _timeout, 
-                                           uint32 _eThreshold, uint32 _bThreshold);
+                                           U_32 _initialTimeout, U_32 _timeout, 
+                                           U_32 _eThreshold, U_32 _bThreshold);
     virtual ~EdgeProfileCollector();
 
     virtual TbsEMClient* getTbsEmClient() const {return (TbsEMClient*)this;}
 
-    virtual uint32 getInitialTimeout() const {return initialTimeout;}
-    virtual uint32 getTimeout() const {return timeout;}
+    virtual U_32 getInitialTimeout() const {return initialTimeout;}
+    virtual U_32 getTimeout() const {return timeout;}
     virtual void onTimeout();
     virtual void classloaderUnloadingCallback(Class_Loader_Handle h);
 
     MethodProfile* getMethodProfile(Method_Handle mh) const ;
-    EdgeMethodProfile* createProfile(Method_Handle mh, uint32 numCounters, uint32* counterKeys, uint32 checkSum);
+    EdgeMethodProfile* createProfile(Method_Handle mh, U_32 numCounters, U_32* counterKeys, U_32 checkSum);
 
-    uint32 getEntryThreshold() const {return eThreshold;}
-    uint32 getBackedgeThreshold() const {return bThreshold;}
+    U_32 getEntryThreshold() const {return eThreshold;}
+    U_32 getBackedgeThreshold() const {return bThreshold;}
 
 
 private:
     void cleanUnloadedProfiles();
 
-    uint32 initialTimeout;
-    uint32 timeout;
-    uint32 eThreshold;
-    uint32 bThreshold;
+    U_32 initialTimeout;
+    U_32 timeout;
+    U_32 eThreshold;
+    U_32 bThreshold;
     bool   loggingEnabled;
     std::string catName;
    
@@ -76,7 +76,7 @@
 
 class EdgeMethodProfile : public MethodProfile {
 private:
-    typedef std::vector<uint32> EdgeMap;
+    typedef std::vector<U_32> EdgeMap;
 public:
     EdgeMethodProfile(EdgeProfileCollector* pc, Method_Handle mh) 
         : MethodProfile(pc, mh), entryCounter(0),
@@ -85,25 +85,25 @@
     void dump( const char* banner );
     void setHotMethod() { _isHot = true; }
     bool isHot() const  { return _isHot; }
-    uint32* getCounter( uint32 key ) const;
+    U_32* getCounter( U_32 key ) const;
 
-    uint32 entryCounter;   // point to the method entry counter
-    std::vector<uint32> counters;
+    U_32 entryCounter;   // point to the method entry counter
+    std::vector<U_32> counters;
     EdgeMap cntMap;        // map to a counter, given a key
 
-    uint32  checkSum;       // checksum provided by instrumentation
+    U_32  checkSum;       // checksum provided by instrumentation
 
 private:
     bool    _isHot;
 };
 
 
-Method_Profile_Handle edge_profiler_create_profile(PC_Handle ph, Method_Handle mh, uint32 numCounters, uint32* counterKeys, uint32 checkSum);
-uint32  edge_profiler_get_num_counters(Method_Profile_Handle mph);
-uint32  edge_profiler_get_checksum(Method_Profile_Handle mph);
+Method_Profile_Handle edge_profiler_create_profile(PC_Handle ph, Method_Handle mh, U_32 numCounters, U_32* counterKeys, U_32 checkSum);
+U_32  edge_profiler_get_num_counters(Method_Profile_Handle mph);
+U_32  edge_profiler_get_checksum(Method_Profile_Handle mph);
 void* edge_profiler_get_entry_counter_addr(Method_Profile_Handle mph);
-void* edge_profiler_get_counter_addr(Method_Profile_Handle mph, uint32 key);
-uint32  edge_profiler_get_entry_threshold(PC_Handle pch);
-uint32  edge_profiler_get_backedge_threshold(PC_Handle pch);
+void* edge_profiler_get_counter_addr(Method_Profile_Handle mph, U_32 key);
+U_32  edge_profiler_get_entry_threshold(PC_Handle pch);
+U_32  edge_profiler_get_backedge_threshold(PC_Handle pch);
 
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp Thu May 22 06:33:38 2008
@@ -41,13 +41,13 @@
 {
     VPInstructionProfileData* data = new VPInstructionProfileData();
     data->TNV_Table =  new (struct Simple_TNV_Table[steadySize]);
-    for (uint32 i = 0; i < steadySize; i++) {
+    for (U_32 i = 0; i < steadySize; i++) {
         (data->TNV_Table[i]).frequency = 0;
         (data->TNV_Table[i]).value = 0;
     }
     if (clearSize > 0) {
         data->TNV_clear_part = new (struct Simple_TNV_Table[clearSize]);
-        for (uint32 i = 0; i < clearSize; i++) {
+        for (U_32 i = 0; i < clearSize; i++) {
             (data->TNV_clear_part[i]).frequency = 0;
             (data->TNV_clear_part[i]).value = 0;
         }
@@ -55,9 +55,9 @@
     return data;
 }
 
-int32 TNVTableManager::find(TableT* where, ValueT value_to_search, uint32 size)
+I_32 TNVTableManager::find(TableT* where, ValueT value_to_search, U_32 size)
 {
-    uint32 search_index;
+    U_32 search_index;
     for (search_index = 0; search_index < size; search_index++){
         if (where[search_index].value == value_to_search)
             return (search_index);
@@ -67,17 +67,17 @@
 
 void TNVTableManager::clearTopElements(TableT* where)
 {
-    uint32 temp_index;
+    U_32 temp_index;
     for (temp_index = 0; temp_index < clearSize; temp_index++) {
         where[temp_index].frequency = TNV_DEFAULT_CLEAR_VALUE;
     }
 }
 
-int32 TNVTableManager::findMinIdx(TableT* where, uint32 size)
+I_32 TNVTableManager::findMinIdx(TableT* where, U_32 size)
 {
-    uint32 temp_index;
-    uint32 temp_min_index = 0;
-    uint32 temp_min = where[temp_min_index].frequency;
+    U_32 temp_index;
+    U_32 temp_min_index = 0;
+    U_32 temp_min = where[temp_min_index].frequency;
     for (temp_index = 0; temp_index < size; temp_index++){
         if (where[temp_index].frequency == TNV_DEFAULT_CLEAR_VALUE) {
             return (temp_index); 
@@ -93,7 +93,7 @@
 TNVTableManager::ValueT TNVTableManager::findMax(TableT *where)
 {
     ValueT max_value = 0;
-    uint32 temp_index, temp_max_frequency = 0;
+    U_32 temp_index, temp_max_frequency = 0;
     for (temp_index = 0; temp_index < steadySize; temp_index++) {
         TableT *current_tbl = &(where[temp_index]);
         if (current_tbl->frequency > temp_max_frequency){
@@ -107,7 +107,7 @@
 void TNVTableManager::flushLastValueCounter(VPData *instProfile)
 {
     POINTER_SIZE_INT last_value = instProfile->last_value;
-    uint32* num_times_profiled = &(instProfile->num_times_profiled);
+    U_32* num_times_profiled = &(instProfile->num_times_profiled);
     struct Simple_TNV_Table* clear_part = instProfile->TNV_clear_part;
     struct Simple_TNV_Table* steady_part = instProfile->TNV_Table;
 
@@ -123,9 +123,9 @@
         << ", profile_tick: " << data->profile_tick << std::endl;
     struct Simple_TNV_Table * TNV_steady_part = data->TNV_Table;
     if (TNV_steady_part != NULL) {
-        uint32 size = steadySize;
+        U_32 size = steadySize;
         os << "= TNV_steady_part, size = " << size << std::endl;
-        for (uint32 i = 0; i < size; i++) {
+        for (U_32 i = 0; i < size; i++) {
             os << "== Frequency: " << TNV_steady_part[i].frequency << " = Value: ";
             POINTER_SIZE_INT value = TNV_steady_part[i].value;
             if (value != 0) {
@@ -138,9 +138,9 @@
     }
     struct Simple_TNV_Table * TNV_clear_part = data->TNV_clear_part;
     if (TNV_clear_part != NULL) {
-        uint32 size = clearSize;
+        U_32 size = clearSize;
         os << "= TNV_clear_part, size = " << size << std::endl;
-        for (uint32 i = 0; i < size; i++) {
+        for (U_32 i = 0; i < size; i++) {
             os << "== " << TNV_clear_part[i].frequency << " = Value: ";
             POINTER_SIZE_INT value = TNV_clear_part[i].value;
             if (value != 0) {
@@ -155,9 +155,9 @@
 //------------------------------------------------------------------------------
 
 void TNVTableFirstNManager::insert(TableT* where, TableT* clear_part,
-        ValueT value_to_insert, uint32 times_met)
+        ValueT value_to_insert, U_32 times_met)
 {
-    uint32 insert_index = find(where, value_to_insert, steadySize);
+    U_32 insert_index = find(where, value_to_insert, steadySize);
     if ((insert_index != -1) &&
         (where[insert_index].frequency != TNV_DEFAULT_CLEAR_VALUE)){
         where[insert_index].frequency += times_met;
@@ -186,7 +186,7 @@
     }
     UNSAFE_REGION_START
     ValueT* last_value = &(instProfile->last_value);
-    uint32* num_times_profiled = &(instProfile->num_times_profiled);
+    U_32* num_times_profiled = &(instProfile->num_times_profiled);
     if (curr_value == *last_value){
         // We increment the counter safely with UPDATE_FLAGGED_ALL and
         // UPDATE_LOCKED
@@ -221,15 +221,15 @@
 //------------------------------------------------------------------------------
 
 void TNVTableDividedManager::insert(TableT* where, TableT* clear_part,
-        ValueT value_to_insert, uint32 times_met)
+        ValueT value_to_insert, U_32 times_met)
 {
-    uint32 insert_index = find(where, value_to_insert, steadySize);
+    U_32 insert_index = find(where, value_to_insert, steadySize);
     if ((insert_index != -1) &&
         (where[insert_index].frequency != TNV_DEFAULT_CLEAR_VALUE)){
         where[insert_index].frequency += times_met;
     }else{
         ValueT temp_min_value;
-        uint32 temp_min_index, temp_min_freq;
+        U_32 temp_min_index, temp_min_freq;
         insert_index = find(clear_part, value_to_insert, clearSize);
         if (insert_index != -1){
             clear_part[insert_index].frequency = clear_part[insert_index].frequency + times_met;
@@ -276,7 +276,7 @@
 {
     methProfile->lockProfile();
     struct Simple_TNV_Table* clear_part = instProfile->TNV_clear_part;
-    uint32* profile_tick = &(instProfile->profile_tick);
+    U_32* profile_tick = &(instProfile->profile_tick);
     if (*profile_tick == clearInterval){
         *profile_tick = 0;
         clearTopElements(clear_part);
@@ -284,7 +284,7 @@
     (*profile_tick)++;
 
     ValueT* last_value = &(instProfile->last_value);
-    uint32* num_times_profiled = &(instProfile->num_times_profiled);
+    U_32* num_times_profiled = &(instProfile->num_times_profiled);
     if (curr_value == *last_value){
         (*num_times_profiled)++;
     } else {
@@ -299,15 +299,15 @@
 //------------------------------------------------------------------------------
 
 ValueMethodProfile* ValueProfileCollector::createProfile
-    (Method_Handle mh, uint32 numkeys, uint32 keys[])
+    (Method_Handle mh, U_32 numkeys, U_32 keys[])
 {
     port_mutex_lock(&profilesLock);
     ValueMethodProfile* profile = new ValueMethodProfile(this, mh);
     // Allocate space for value maps
-    for (uint32 index = 0; index < numkeys; index++){
+    for (U_32 index = 0; index < numkeys; index++){
         VPInstructionProfileData* profileData =
             getTnvMgr()->createProfileData();
-        uint32 key = keys[index];
+        U_32 key = keys[index];
         (profile->ValueMap)[key] = profileData;
     }
     assert(profilesByMethod.find(mh) == profilesByMethod.end());
@@ -317,8 +317,8 @@
 }
 
 ValueProfileCollector::ValueProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit, 
-                                             uint32 _TNV_steady_size, uint32 _TNV_clear_size,
-                                             uint32 _clear_interval, algotypes _TNV_algo_type,
+                                             U_32 _TNV_steady_size, U_32 _TNV_clear_size,
+                                             U_32 _clear_interval, algotypes _TNV_algo_type,
                                              ProfileUpdateStrategy update_strategy)
                                            : ProfileCollector(em, name, EM_PCTYPE_VALUE, genJit),
                                              updateStrategy(update_strategy)
@@ -373,7 +373,7 @@
 }
 
 void ValueMethodProfile::addNewValue
-    (uint32 instructionKey, POINTER_SIZE_INT valueToAdd)
+    (U_32 instructionKey, POINTER_SIZE_INT valueToAdd)
 {
     VPDataMap::const_iterator it =  ValueMap.find(instructionKey);
     assert(it != ValueMap.end());
@@ -381,7 +381,7 @@
     getVPC()->getTnvMgr()->addNewValue(this, it->second, valueToAdd);
 }
 
-POINTER_SIZE_INT ValueMethodProfile::getResult(uint32 instructionKey)
+POINTER_SIZE_INT ValueMethodProfile::getResult(U_32 instructionKey)
 {
     lockProfile();
     VPDataMap::const_iterator it =  ValueMap.find(instructionKey);
@@ -424,7 +424,7 @@
 }
 //------------------------------------------------------------------------------
 
-POINTER_SIZE_INT value_profiler_get_top_value(Method_Profile_Handle mph, uint32 instructionKey)
+POINTER_SIZE_INT value_profiler_get_top_value(Method_Profile_Handle mph, U_32 instructionKey)
 {
     assert(mph != NULL);
     MethodProfile* mp = (MethodProfile*)mph;
@@ -433,7 +433,7 @@
     return vmp->getResult(instructionKey);
 }
 
-void value_profiler_add_value(Method_Profile_Handle mph, uint32 instructionKey, POINTER_SIZE_INT valueToAdd)
+void value_profiler_add_value(Method_Profile_Handle mph, U_32 instructionKey, POINTER_SIZE_INT valueToAdd)
 {
     assert(mph != NULL);
     MethodProfile* mp = (MethodProfile*)mph;
@@ -451,7 +451,7 @@
     vmp->dumpValues(os);
 }
 
-Method_Profile_Handle value_profiler_create_profile(PC_Handle pch, Method_Handle mh, uint32 numkeys, uint32 keys[])
+Method_Profile_Handle value_profiler_create_profile(PC_Handle pch, Method_Handle mh, U_32 numkeys, U_32 keys[])
 {
     assert(pch!=NULL);
     ProfileCollector* pc = (ProfileCollector*)pch;

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h Thu May 22 06:33:38 2008
@@ -40,7 +40,7 @@
 struct Simple_TNV_Table
 {
     POINTER_SIZE_INT value;
-    uint32 frequency;
+    U_32 frequency;
 };
 
 enum ProfileUpdateStrategy {
@@ -71,8 +71,8 @@
     typedef struct Simple_TNV_Table TableT;
     typedef POINTER_SIZE_INT ValueT;
     typedef VPInstructionProfileData VPData;
-    TNVTableManager(uint32 steady_size, uint32 clear_size,
-            uint32 clear_interval, ProfileUpdateStrategy update_strategy) :
+    TNVTableManager(U_32 steady_size, U_32 clear_size,
+            U_32 clear_interval, ProfileUpdateStrategy update_strategy) :
         steadySize(steady_size),
         clearSize(clear_size),
         clearInterval(clear_interval),
@@ -82,13 +82,13 @@
     VPInstructionProfileData* createProfileData();
 
     // finds a given value in TNV table, returns the index, (-1) if not found
-    int32 find(TableT* where, ValueT value_to_search, uint32 size);
+    I_32 find(TableT* where, ValueT value_to_search, U_32 size);
 
     // clearSize elements are cleared from the top
     void clearTopElements(TableT* where);
 
     // returns the index of the minimum element
-    int32 findMinIdx(TableT* where, uint32 size);
+    I_32 findMinIdx(TableT* where, U_32 size);
 
     // returns the maximum value in a given steady TNV table
     ValueT findMax(TableT* TNV_where);
@@ -105,17 +105,17 @@
 
 protected:
     virtual void insert(TableT* where, TableT* clear_part,
-            ValueT value_to_insert, uint32 times_met) = 0;
+            ValueT value_to_insert, U_32 times_met) = 0;
 
-    const uint32 steadySize, clearSize, clearInterval;
+    const U_32 steadySize, clearSize, clearInterval;
     const ProfileUpdateStrategy updateStrategy;
 };
 
 class TNVTableDividedManager : public TNVTableManager {
 public:
     // c-tor
-    TNVTableDividedManager(uint32 steady_size, uint32 clear_size,
-            uint32 clear_interval, ProfileUpdateStrategy us) :
+    TNVTableDividedManager(U_32 steady_size, U_32 clear_size,
+            U_32 clear_interval, ProfileUpdateStrategy us) :
         TNVTableManager(steady_size, clear_size, clear_interval, us)
     {}
 
@@ -124,14 +124,14 @@
 
 protected:
     virtual void insert(TableT* where, TableT* clear_part,
-            ValueT value_to_insert, uint32 times_met);
+            ValueT value_to_insert, U_32 times_met);
 };
 
 class TNVTableFirstNManager : public TNVTableManager {
 public:
     // c-tor
-    TNVTableFirstNManager(uint32 steady_size, uint32 clear_size,
-            uint32 clear_interval, ProfileUpdateStrategy us) :
+    TNVTableFirstNManager(U_32 steady_size, U_32 clear_size,
+            U_32 clear_interval, ProfileUpdateStrategy us) :
         TNVTableManager(steady_size, clear_size, clear_interval, us)
     {}
 
@@ -140,7 +140,7 @@
 
 private:
     void insert(TableT* where, TableT* clear_part,
-            ValueT value_to_insert, uint32 times_met);
+            ValueT value_to_insert, U_32 times_met);
 
 };
 
@@ -152,14 +152,14 @@
     };
 
     ValueProfileCollector(EM_PC_Interface* em, const std::string& name, JIT_Handle genJit,
-                                                uint32 _TNV_steady_size, uint32 _TNV_clear_size,
-                                                uint32 _clear_interval, algotypes _TNV_algo_type,
+                                                U_32 _TNV_steady_size, U_32 _TNV_clear_size,
+                                                U_32 _clear_interval, algotypes _TNV_algo_type,
                                                 ProfileUpdateStrategy update_strategy);
 
     virtual TbsEMClient* getTbsEmClient() const {return (NULL);}
     virtual ~ValueProfileCollector();
     MethodProfile* getMethodProfile(Method_Handle mh) const ;
-    ValueMethodProfile* createProfile(Method_Handle mh, uint32 numkeys, uint32 keys[]);
+    ValueMethodProfile* createProfile(Method_Handle mh, U_32 numkeys, U_32 keys[]);
 
     TNVTableManager* getTnvMgr() { return tnvTableManager; }
 private:
@@ -185,11 +185,11 @@
     {}
 public:
     POINTER_SIZE_INT last_value;
-    uint32 num_times_profiled;
-    uint32 profile_tick;
+    U_32 num_times_profiled;
+    U_32 profile_tick;
 };
 
-typedef std::map<uint32, VPInstructionProfileData*> VPDataMap;
+typedef std::map<U_32, VPInstructionProfileData*> VPDataMap;
 class ValueMethodProfile : public MethodProfile {
 public:
     ValueMethodProfile(ValueProfileCollector* pc, Method_Handle mh);
@@ -197,8 +197,8 @@
     void lockProfile() {port_mutex_lock(&lock);}
     void unlockProfile() {port_mutex_unlock(&lock);}
     void dumpValues(std::ostream& os);
-    void addNewValue(uint32 instructionKey, POINTER_SIZE_INT valueToAdd);
-    POINTER_SIZE_INT getResult(uint32 instructionKey);
+    void addNewValue(U_32 instructionKey, POINTER_SIZE_INT valueToAdd);
+    POINTER_SIZE_INT getResult(U_32 instructionKey);
 
     // UpatingState is used to implement UPDATE_FLAGGED_* strategies.
     //     (updatingState == 1) when method profile is being updated to skip
@@ -217,9 +217,9 @@
     uint8 updatingState;
 };
 
-POINTER_SIZE_INT value_profiler_get_top_value (Method_Profile_Handle mph, uint32 instructionKey);
-void value_profiler_add_value (Method_Profile_Handle mph, uint32 instructionKey, POINTER_SIZE_INT valueToAdd);
-Method_Profile_Handle value_profiler_create_profile(PC_Handle pch, Method_Handle mh, uint32 numkeys, uint32 keys[]);
+POINTER_SIZE_INT value_profiler_get_top_value (Method_Profile_Handle mph, U_32 instructionKey);
+void value_profiler_add_value (Method_Profile_Handle mph, U_32 instructionKey, POINTER_SIZE_INT valueToAdd);
+Method_Profile_Handle value_profiler_create_profile(PC_Handle pch, Method_Handle mh, U_32 numkeys, U_32 keys[]);
 void value_profiler_dump_values(Method_Profile_Handle mph, std::ostream& os);
 
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/fix_repointed_refs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/fix_repointed_refs.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/fix_repointed_refs.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/fix_repointed_refs.h Thu May 22 06:33:38 2008
@@ -77,7 +77,7 @@
     Partial_Reveal_Array* array = (Partial_Reveal_Array*)p_obj;
     assert(!obj_is_primitive_array(p_obj));
     
-    int32 array_length = array->array_len;
+    I_32 array_length = array->array_len;
     REF* p_refs = (REF *)((POINTER_SIZE_INT)array + (int)array_first_element_offset(array));
     for (int i = 0; i < array_length; i++) {
       slot_fix(p_refs + i);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h Thu May 22 06:33:38 2008
@@ -93,7 +93,7 @@
 #endif
 
 #ifdef COMPRESS_REFERENCE
-    #define REF uint32
+    #define REF U_32
 #else
     #define REF Partial_Reveal_Object*
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_barrier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_barrier.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_barrier.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_barrier.cpp Thu May 22 06:33:38 2008
@@ -41,7 +41,7 @@
     Partial_Reveal_Object* array = p_object;
     assert(!obj_is_primitive_array(array));
 
-    int32 array_length = vector_get_length((Vector_Handle) array);
+    I_32 array_length = vector_get_length((Vector_Handle) array);
     for (int i = 0; i < array_length; i++) {
       p_slot = (REF *)vector_get_element_address_ref((Vector_Handle)array, i);
       if( read_slot(p_slot) != NULL && addr_belongs_to_nos(read_slot(p_slot))){
@@ -137,7 +137,7 @@
     Partial_Reveal_Object* array = (Partial_Reveal_Object*)p_object;
     assert(!obj_is_primitive_array(array));
     
-    int32 array_length = vector_get_length((Vector_Handle) array);
+    I_32 array_length = vector_get_length((Vector_Handle) array);
     for (int i = 0; i < array_length; i++) {
       p_slot = (REF*)vector_get_element_address_ref((Vector_Handle) array, i);
       if( read_slot(p_slot) != NULL && addr_belongs_to_nos(read_slot(p_slot))){
@@ -175,7 +175,7 @@
 
       Partial_Reveal_Object* obj_to_snapshot; 
       
-      int32 array_length = vector_get_length((Vector_Handle) array);
+      I_32 array_length = vector_get_length((Vector_Handle) array);
       for (int i = 0; i < array_length; i++) {
         p_obj_slot = (REF*)vector_get_element_address_ref((Vector_Handle) array, i);
         obj_to_snapshot = (Partial_Reveal_Object*)read_slot(p_obj_slot);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h Thu May 22 06:33:38 2008
@@ -78,8 +78,8 @@
 #endif
 
 #ifdef COMPRESS_VTABLE
-    #define VT uint32
-    #define VT_SIZE_INT uint32
+    #define VT U_32
+    #define VT_SIZE_INT U_32
 #else
     #define VT Partial_Reveal_VTable*
     #define VT_SIZE_INT POINTER_SIZE_INT
@@ -104,7 +104,7 @@
 
   unsigned int gc_number_of_ref_fields;
 
-  uint32 gc_class_properties;    // This is the same as class_properties in VM's VTable.
+  U_32 gc_class_properties;    // This is the same as class_properties in VM's VTable.
 
   unsigned int gc_allocated_size;
 

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp Thu May 22 06:33:38 2008
@@ -335,7 +335,7 @@
 
 #ifndef USE_32BITS_HASHCODE
 #define GCGEN_HASH_MASK 0x1fc
-int32 gc_get_hashcode(Managed_Object_Handle p_object) 
+I_32 gc_get_hashcode(Managed_Object_Handle p_object) 
 {  
    Partial_Reveal_Object *obj = (Partial_Reveal_Object *)p_object;
    if(!obj) return 0;
@@ -357,10 +357,10 @@
    return hash;
 }
 #else //USE_32BITS_HASHCODE
-int32 gc_get_hashcode(Managed_Object_Handle p_object)
+I_32 gc_get_hashcode(Managed_Object_Handle p_object)
 {
 #if defined(USE_UNIQUE_MARK_SWEEP_GC) || defined(USE_UNIQUE_MOVE_COMPACT_GC)
-  return (int32)0;//p_object;
+  return (I_32)0;//p_object;
 #endif
 
   Partial_Reveal_Object* p_obj = (Partial_Reveal_Object*)p_object;

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h Thu May 22 06:33:38 2008
@@ -176,19 +176,19 @@
 #endif
 }
 
-inline uint32 atomic_cas32(volatile unsigned int *mem,
+inline U_32 atomic_cas32(volatile unsigned int *mem,
                                            apr_uint32_t swap,
                                            apr_uint32_t cmp) 
-{  return (uint32)apr_atomic_cas32(mem, swap, cmp); }
+{  return (U_32)apr_atomic_cas32(mem, swap, cmp); }
 
-inline uint32 atomic_inc32(volatile unsigned int *mem)
-{  return (uint32)apr_atomic_inc32(mem); }
+inline U_32 atomic_inc32(volatile unsigned int *mem)
+{  return (U_32)apr_atomic_inc32(mem); }
 
-inline uint32 atomic_dec32(volatile unsigned int  *mem)
-{  return (uint32)apr_atomic_dec32(mem); }
+inline U_32 atomic_dec32(volatile unsigned int  *mem)
+{  return (U_32)apr_atomic_dec32(mem); }
 
-inline uint32 atomic_add32(volatile unsigned int  *mem, unsigned int  val) 
-{  return (uint32)apr_atomic_add32(mem, val); }
+inline U_32 atomic_add32(volatile unsigned int  *mem, unsigned int  val) 
+{  return (U_32)apr_atomic_add32(mem, val); }
 
 #ifndef _WINDOWS_
 #include <sys/mman.h>

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.cpp Thu May 22 06:33:38 2008
@@ -52,7 +52,7 @@
         collector_hashcodeset_add_entry(collector, (Partial_Reveal_Object**)obj_end_pos);
         collector_hashcodeset_add_entry(collector, (Partial_Reveal_Object**)hashcode);
       }else{
-        hashcode_buf_add((Partial_Reveal_Object*)dest_addr, (int32)hashcode, new_buf);          
+        hashcode_buf_add((Partial_Reveal_Object*)dest_addr, (I_32)hashcode, new_buf);          
       }
       break;
       

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h Thu May 22 06:33:38 2008
@@ -161,7 +161,7 @@
   return 0;
 }
 
-inline void hashcode_buf_add(Partial_Reveal_Object* p_obj, int32 hashcode, Hashcode_Buf* hashcode_buf)
+inline void hashcode_buf_add(Partial_Reveal_Object* p_obj, I_32 hashcode, Hashcode_Buf* hashcode_buf)
 {
   Seq_List* list = hashcode_buf->list; 
   Vector_Block* tail_block = (Vector_Block*)seq_list_end_node(list);
@@ -177,7 +177,7 @@
   return;
 }
 
-inline void hashcode_buf_update(Partial_Reveal_Object* p_obj, int32 hashcode, Hashcode_Buf* hashcode_buf)
+inline void hashcode_buf_update(Partial_Reveal_Object* p_obj, I_32 hashcode, Hashcode_Buf* hashcode_buf)
 {
   POINTER_SIZE_INT obj_addr = (POINTER_SIZE_INT)p_obj;
   lock(hashcode_buf->lock);
@@ -264,7 +264,7 @@
     iter =vector_block_iterator_advance(first_block, iter);
     POINTER_SIZE_INT hashcode = (POINTER_SIZE_INT)*iter;
     iter =vector_block_iterator_advance(first_block, iter);
-    hashcode_buf_add(p_obj, (int32)hashcode, new_buf);
+    hashcode_buf_add(p_obj, (I_32)hashcode, new_buf);
   }
   first_block->tail = old_buf->checkpoint;
 
@@ -279,7 +279,7 @@
       POINTER_SIZE_INT hashcode = (POINTER_SIZE_INT)*iter;
       iter =vector_block_iterator_advance(curr_block, iter);
 
-      hashcode_buf_add(p_obj, (int32)hashcode, new_buf);
+      hashcode_buf_add(p_obj, (I_32)hashcode, new_buf);
     }
     hashcode_buf_remove(old_buf, curr_block);
   } 

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/fallback_mark_scan.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/fallback_mark_scan.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/fallback_mark_scan.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/fallback_mark_scan.cpp Thu May 22 06:33:38 2008
@@ -70,7 +70,7 @@
     Partial_Reveal_Object* array = p_obj;
     assert(!obj_is_primitive_array(array));
     
-    int32 array_length = vector_get_length((Vector_Handle) array);
+    I_32 array_length = vector_get_length((Vector_Handle) array);
     for (int i = 0; i < array_length; i++) {
       REF *p_ref = (REF*)vector_get_element_address_ref((Vector_Handle) array, i);
       scan_slot(collector, p_ref);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp Thu May 22 06:33:38 2008
@@ -146,7 +146,7 @@
     Partial_Reveal_Array* array = (Partial_Reveal_Array*)p_obj;
     assert(!obj_is_primitive_array(p_obj));
     
-    int32 array_length = array->array_len;
+    I_32 array_length = array->array_len;
     REF* p_refs = (REF*)((POINTER_SIZE_INT)array + (int)array_first_element_offset(array));
 
     for (int i = 0; i < array_length; i++) {

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp Thu May 22 06:33:38 2008
@@ -148,7 +148,7 @@
     Partial_Reveal_Array *array = (Partial_Reveal_Array*)p_obj;
     assert(!obj_is_primitive_array(p_obj));
     
-    int32 array_length = array->array_len;
+    I_32 array_length = array->array_len;
     REF *p_refs = (REF*)((POINTER_SIZE_INT)array + (int)array_first_element_offset(array));
     for(int i = 0; i < array_length; i++){
       slot_double_fix(p_refs + i);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp Thu May 22 06:33:38 2008
@@ -55,7 +55,7 @@
     Partial_Reveal_Object* array = p_obj;
     assert(!obj_is_primitive_array(array));
 
-    int32 array_length = vector_get_length((Vector_Handle) array);        
+    I_32 array_length = vector_get_length((Vector_Handle) array);        
     for (int i = 0; i < array_length; i++) {
       p_ref= (REF *)vector_get_element_address_ref((Vector_Handle) array, i);
       scan_slot(collector, p_ref);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp Thu May 22 06:33:38 2008
@@ -67,7 +67,7 @@
     Partial_Reveal_Object* array = p_obj;
     assert(!obj_is_primitive_array(array));
 
-    int32 array_length = vector_get_length((Vector_Handle) array);        
+    I_32 array_length = vector_get_length((Vector_Handle) array);        
     for (int i = 0; i < array_length; i++) {
       p_ref= (REF *)vector_get_element_address_ref((Vector_Handle) array, i);
       scan_slot(collector, p_ref);

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/em_profile_access.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/em_profile_access.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/em_profile_access.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/em_profile_access.h Thu May 22 06:33:38 2008
@@ -160,13 +160,13 @@
  * @return The counter's limit for entry threshold for a given
  *         profile collector.
  */
-    uint32 (*eb_profiler_get_entry_threshold)(PC_Handle pch);
+    U_32 (*eb_profiler_get_entry_threshold)(PC_Handle pch);
 
 /** 
  * @return The counter's limit for backedge threshold for a given
  *         profile collector.
  */
-    uint32 (*eb_profiler_get_backedge_threshold)(PC_Handle pch);
+    U_32 (*eb_profiler_get_backedge_threshold)(PC_Handle pch);
 
 
 
@@ -187,23 +187,23 @@
      *
      * @return A handle to access method profile data.
      */
-    Method_Profile_Handle (*edge_profiler_create_profile) (PC_Handle ph, Method_Handle mh, uint32 numEdgeCounters, uint32* counterKeys, uint32 checkSum);
+    Method_Profile_Handle (*edge_profiler_create_profile) (PC_Handle ph, Method_Handle mh, U_32 numEdgeCounters, U_32* counterKeys, U_32 checkSum);
 
 
     /** 
      * Return number of edge counters in profile.
      */
-    uint32 (*edge_profiler_get_num_counters)(Method_Profile_Handle mph);
+    U_32 (*edge_profiler_get_num_counters)(Method_Profile_Handle mph);
 
     /** 
      * Return profile checksum.
      */
-    uint32 (*edge_profiler_get_checksum)(Method_Profile_Handle mph);
+    U_32 (*edge_profiler_get_checksum)(Method_Profile_Handle mph);
 
     /** 
      * Return the address of counter associated with key.
      */
-    void* (*edge_profiler_get_counter_addr)(Method_Profile_Handle mph, uint32 key);
+    void* (*edge_profiler_get_counter_addr)(Method_Profile_Handle mph, U_32 key);
 
     /** 
      * Return the address of entry counter.
@@ -213,13 +213,13 @@
     /** 
      * Return the entry threshold for profile collector.
      */
-    uint32 (*edge_profiler_get_entry_threshold)(PC_Handle pch);
+    U_32 (*edge_profiler_get_entry_threshold)(PC_Handle pch);
     
     /** 
      * Return the edge threshold for profile collector.
      */
 
-    uint32 (*edge_profiler_get_backedge_threshold)(PC_Handle pch);
+    U_32 (*edge_profiler_get_backedge_threshold)(PC_Handle pch);
     
     // Value profiler interface
 
@@ -235,17 +235,17 @@
      *                           each instruction. The key must be used to access to
      *                           instruction value
      */
-    Method_Profile_Handle (*value_profiler_create_profile) (PC_Handle pch, Method_Handle mh, uint32 numKeys, uint32* keys);
+    Method_Profile_Handle (*value_profiler_create_profile) (PC_Handle pch, Method_Handle mh, U_32 numKeys, U_32* keys);
     
     /** 
      * Update frequency or insert the new value of given instruction.
      */
-    void (*value_profiler_add_value)(Method_Profile_Handle mph, uint32 instructionKey, POINTER_SIZE_INT valueToAdd);
+    void (*value_profiler_add_value)(Method_Profile_Handle mph, U_32 instructionKey, POINTER_SIZE_INT valueToAdd);
     
     /** 
      * @return The maximum value(by frequency) of give instruction.
      */
-    POINTER_SIZE_INT (*value_profiler_get_top_value) (Method_Profile_Handle mph, uint32 instructionKey);
+    POINTER_SIZE_INT (*value_profiler_get_top_value) (Method_Profile_Handle mph, U_32 instructionKey);
 
     void (*value_profiler_dump_values) (Method_Profile_Handle mph, std::ostream& os);
 

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/gc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/gc.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/gc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/gc.h Thu May 22 06:33:38 2008
@@ -155,7 +155,7 @@
  * Resembles <code>gc_add_root_set_entry()</code> but is passed the address of a slot
  * containing a compressed reference.
  */
-GCExport void gc_add_compressed_root_set_entry(uint32 *ref, Boolean is_pinned);
+GCExport void gc_add_compressed_root_set_entry(U_32 *ref, Boolean is_pinned);
 
 /**
  * Is called by the VM to enumerate weak root reference.
@@ -560,7 +560,7 @@
  */
 
 extern void (*gc_add_root_set_entry)(Managed_Object_Handle *ref, Boolean is_pinned);
-extern void (*gc_add_compressed_root_set_entry)(uint32 *ref, Boolean is_pinned);
+extern void (*gc_add_compressed_root_set_entry)(U_32 *ref, Boolean is_pinned);
 extern void (*gc_add_root_set_entry_interior_pointer)(void **slot, int offset, Boolean is_pinned);
 extern void (*gc_add_weak_root_set_entry)(Managed_Object_Handle *ref1, Boolean is_pinned,Boolean is_short_weak);
 extern void (*gc_add_root_set_entry_managed_pointer)(void **slot, Boolean is_pinned);
@@ -591,8 +591,8 @@
 
 extern void (*gc_pin_object)(Managed_Object_Handle* p_object);
 extern void (*gc_unpin_object)(Managed_Object_Handle* p_object);
-extern int32 (*gc_get_hashcode)(Managed_Object_Handle);
-extern int32 (*gc_get_hashcode0) (Managed_Object_Handle p_object);
+extern I_32 (*gc_get_hashcode)(Managed_Object_Handle);
+extern I_32 (*gc_get_hashcode0) (Managed_Object_Handle p_object);
 extern Managed_Object_Handle (*gc_get_next_live_object)(void *iterator);
 extern void (*gc_iterate_heap)();
 extern void (*gc_finalize_on_exit)();
@@ -613,10 +613,10 @@
  * Arrays will be required to start on the indicated alignement. This means that
  * for 8 byte alignment on the IA32 the header will look like this:
  *
- * uint32 gc_header_lock_hash
+ * U_32 gc_header_lock_hash
  * VTable *vt
- * uint32 array_length
- * uint32 padding
+ * U_32 array_length
+ * U_32 padding
  * the array elements.
  */
 #ifdef POINTER64
@@ -643,11 +643,11 @@
                                       Managed_Object_Handle *p_slot,
                                       Managed_Object_Handle value);
 extern void (*gc_heap_slot_write_ref_compressed)(Managed_Object_Handle p_base_of_object_with_slot,
-                                                 uint32 *p_slot,
+                                                 U_32 *p_slot,
                                                  Managed_Object_Handle value);
 extern void (*gc_heap_write_global_slot)(Managed_Object_Handle *p_slot,
                                          Managed_Object_Handle value);
-extern void (*gc_heap_write_global_slot_compressed)(uint32 *p_slot,
+extern void (*gc_heap_write_global_slot_compressed)(U_32 *p_slot,
                                                     Managed_Object_Handle value);
 extern void (*gc_heap_wrote_object)(Managed_Object_Handle p_base_of_object_just_written);
 
@@ -712,7 +712,7 @@
  * compressed references that are heap offsets; these functions handle details of 
  * converting raw reference pointers to compressed references before updating slots.
  */
-GCExport void gc_heap_write_global_slot_compressed(uint32 *p_slot,
+GCExport void gc_heap_write_global_slot_compressed(U_32 *p_slot,
                                                    Managed_Object_Handle value);
 
 /**
@@ -732,7 +732,7 @@
  * @copydoc gc_heap_write_ref()
  */
 GCExport void gc_heap_slot_write_ref_compressed (Managed_Object_Handle p_base_of_object_with_slot,
-                                                 uint32 *p_slot,
+                                                 U_32 *p_slot,
                                                  Managed_Object_Handle value);
 
 
@@ -750,12 +750,12 @@
 /**
  * Get identity hashcode.
  */
-GCExport int32 gc_get_hashcode (Managed_Object_Handle object);
+GCExport I_32 gc_get_hashcode (Managed_Object_Handle object);
 
 /**
  * Get object hashcode.
  */
-GCExport int32 gc_get_hashcode (Managed_Object_Handle p_object);
+GCExport I_32 gc_get_hashcode (Managed_Object_Handle p_object);
 
 /**
  * Iterate all live objects in heap.

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h Thu May 22 06:33:38 2008
@@ -343,7 +343,7 @@
      *    2. hythread_exception_safe_point()
      *          - removes safe point callback request for current thread
      */
-    int32 request;
+    I_32 request;
 
     /**
      * Field indicating that thread can safely be suspended.

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h Thu May 22 06:33:38 2008
@@ -213,7 +213,7 @@
      *    2. hythread_exception_safe_point()
      *          - removes safe point callback request for current thread
      */
-    uint32 request;
+    U_32 request;
 
     /**
      * Field indicating that thread can safely be suspended.
@@ -267,7 +267,7 @@
      * After increment/decrement of suspend_count, request field
      * should be incremented/decremented too.
      */
-    uint32 suspend_count;
+    U_32 suspend_count;
 
     /**
      * Function to be executed at safepoint upon thread resume.
@@ -353,7 +353,7 @@
     /**
      * Flag of interruption
      */
-    uint32 interrupted;
+    U_32 interrupted;
 
 // Monitors
 

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h Thu May 22 06:33:38 2008
@@ -57,7 +57,7 @@
  * Various Numeric Types
  */
 
-// Boolean, uint8, int8, uint16, int16, uint32, int32, uint64, int64,
+// Boolean, uint8, int8, uint16, int16, uint64, int64,
 // POINTER_SIZE_INT
 
 // We can't use bool in non-C++ code
@@ -85,12 +85,10 @@
 #ifdef PLATFORM_POSIX
 typedef unsigned char uint8;
 typedef unsigned short uint16;
-typedef unsigned int uint32;
 typedef unsigned long long uint64;
 
 typedef   signed char  int8;
 typedef   signed short int16;
-typedef   signed int  int32; 
 typedef   signed long long int64;
 
 #else //!PLATFORM_POSIX
@@ -99,28 +97,17 @@
 // these give Insure++ problems:
 typedef unsigned __int8  uint8;
 typedef unsigned __int16 uint16;
-typedef unsigned __int32 uint32;
 typedef   signed __int8  int8;
 typedef   signed __int16 int16;
 #else
 // so use these definitions instead with Insure++:
 typedef unsigned char uint8;
 typedef unsigned short uint16;
-typedef unsigned int uint32;
 typedef   signed char int8;
 typedef   signed short int16;
 #endif
 typedef unsigned __int64 uint64;
 typedef   signed __int64 int64;
-#if (_MSC_VER != 1100 || !defined _WINSOCK2API_)
-#ifndef __INSURE__
-// this gives Insure++ problems:
-typedef   signed __int32 int32;
-#else
-// so use this definition instead with Insure++:
-typedef signed int int32;
-#endif // __INSURE__
-#endif
 
 #endif //!PLATFORM_POSIX
 
@@ -147,8 +134,8 @@
 #endif
 #define W_PI_FMT "016"PI_FMT"x"
 #else
-#define POINTER_SIZE_INT uint32
-#define POINTER_SIZE_SINT int32
+#define POINTER_SIZE_INT U_32
+#define POINTER_SIZE_SINT I_32
 #define PI_FMT ""
 #define W_PI_FMT "08"PI_FMT"x"
 #endif // POINTER64
@@ -204,7 +191,7 @@
     uint64 r10;
     uint64 r11;
 
-    uint32 eflags;
+    U_32 eflags;
 
 #ifdef __cplusplus
     void  reset_ip() { rip = 0; }
@@ -218,23 +205,23 @@
 #else // ! _EM64T_
 
 struct Registers {
-    uint32 eax;
-    uint32 ebx;
-    uint32 ecx;
-    uint32 edx;
-    uint32 edi;
-    uint32 esi;
-    uint32 ebp;
-    uint32 esp;
-    uint32 eip;
-    uint32 eflags;
+    U_32 eax;
+    U_32 ebx;
+    U_32 ecx;
+    U_32 edx;
+    U_32 edi;
+    U_32 esi;
+    U_32 ebp;
+    U_32 esp;
+    U_32 eip;
+    U_32 eflags;
 
 #ifdef __cplusplus
     void  reset_ip() { eip = 0; }
     void* get_ip() { return (void*)eip; }
-    void  set_ip(void* src_ip) { eip = (uint32)src_ip; }
+    void  set_ip(void* src_ip) { eip = (U_32)src_ip; }
     void* get_sp() { return (void*)esp; }
-    void  set_sp(void* src_sp) { esp = (uint32)src_sp; }
+    void  set_sp(void* src_sp) { esp = (U_32)src_sp; }
 #endif
 }; //Registers
 



Mime
View raw message