harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r956723 - in /harmony/enhanced/java/branches/mrh/drlvm: ./ make/vm/ modules/vm/src/main/native/gc_gen/ modules/vm/src/main/native/gc_gen/shared/ modules/vm/src/main/native/gc_gen/shared/common/ modules/vm/src/main/native/gc_gen/shared/final...
Date Mon, 21 Jun 2010 22:52:19 GMT
Author: hindessm
Date: Mon Jun 21 22:52:18 2010
New Revision: 956723

URL: http://svn.apache.org/viewvc?rev=956723&view=rev
Log:
Moving gc_gen to new structure - still need to handle refs modes.

Added:
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/COPYRIGHT
      - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/COPYRIGHT
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/LICENSE
      - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/LICENSE
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/NOTICE
      - copied unchanged from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/NOTICE
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/common/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/common/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/finalizer_weakref/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/finalizer_weakref/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/gen/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/gen/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/jni/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/jni/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/los/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/los/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/mark_compact/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/mark_compact/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/mark_sweep/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/mark_sweep/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/move_compact/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/move_compact/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/semi_space/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/semi_space/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/thread/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/thread/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/trace_forward/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/trace_forward/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/utils/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/utils/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/shared/verify/
      - copied from r956253, harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/verify/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt
  (with props)
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
  (with props)
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/windows/
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt
  (with props)
    harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
  (with props)
Removed:
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/COPYRIGHT
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/LICENSE
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/NOTICE
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/common/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/finalizer_weakref/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/gen/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/jni/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/los/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/mark_compact/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/mark_sweep/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/move_compact/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/semi_space/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/thread/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/trace_forward/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/utils/
    harmony/enhanced/java/branches/mrh/drlvm/vm/gc_gen/src/verify/
Modified:
    harmony/enhanced/java/branches/mrh/drlvm/build.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml

Modified: harmony/enhanced/java/branches/mrh/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/build.xml?rev=956723&r1=956722&r2=956723&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/build.xml Mon Jun 21 22:52:18 2010
@@ -197,9 +197,7 @@ Usage:
     </target>
 
     <target name="gc_gen" depends="vmcore,kernel">
-        <ant antfile="make/vm/gc_gen.xml" inheritall="false">
-            <propertyset refid="module.props" />
-        </ant>
+        <make dir="modules/vm/src/main/native/gc_gen/${hy.os.family}" />
     </target>
 
 

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml?rev=956723&r1=956722&r2=956723&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/vm/gc_gen.xml Mon Jun 21 22:52:18 2010
@@ -26,12 +26,6 @@
     <import file="../build-java.xml"/>
     
     <target name="build">
-        <antcall target="build-uncompressed">
-            <param name="hy.module" value="gc_gen_uncomp"/>
-        </antcall>
-        <antcall target="build-compressed">
-            <param name="hy.module" value="gc_gen"/>
-        </antcall>
         <make-java component="gc_gen" src="${vm.home}/gc_gen/javasrc"
             manifest="${vm.home}/gc_gen/resource/MANIFEST.MF">
             <classpath>
@@ -41,100 +35,6 @@
             </classpath>
         </make-java>
     </target>
-        
-    <target name="init" depends="-common-vm">
-        <condition property="build.compressed.gc">
-            <not><!-- refs.comp.mode is not REFS_USE_UNCOMPRESSED for compressed
and runtime switching modes -->
-                <equals arg1="${refs.comp.mode}" arg2="REFS_USE_UNCOMPRESSED" />
-            </not>
-        </condition>
-        <condition property="build.uncompressed.gc">
-            <not><!-- refs.comp.mode is not REFS_USE_COMPRESSED for uncompressed
and runtime switching modes -->
-                <equals arg1="${refs.comp.mode}" arg2="REFS_USE_COMPRESSED" />
-            </not>
-        </condition>
-        
-        <path id="gc.includes">
-            <dirset dir="${vm.home}">
-                <include name="include" />
-                <include name="port/include" />
-                <include name="vmcore/include" />
-                <include name="vmcore/src/util/win/include" if="is.windows"/>
-                <include name="vmcore/src/util/linux/include" if="is.unix"/>
-            </dirset>
-            <dirset dir="${vm.home}/gc_gen/src">
-            	<include name="common" />
-                <include name="gen" />
-                <include name="mark_compact" />
-                <include name="mark_sweep" />
-                <include name="move_compact" />
-                <include name="semi_space" />
-                <include name="los" />
-                <include name="thread" />
-                <include name="trace_forward" />
-                <include name="utils" />
-                <include name="jni" />
-                <include name="verify" />
-                <include name="finalizer_weakref" />
-            </dirset>
-            <pathelement location="${drlvm.include.dir}" />
-        </path>
-        
-        <compiler id="cpp.compiler" extends="common.cpp.compiler">
-            <includepath><path refid="gc.includes"/></includepath>
-            <fileset dir="${vm.home}/gc_gen/src">
-                <selector refid="gc.depends"/>
-                <include name="common/*.cpp" />
-                <include name="gen/*.cpp" />
-                <include name="mark_compact/*.cpp" />
-                <include name="mark_sweep/*.cpp" />
-                <include name="move_compact/*.cpp" />
-                <include name="semi_space/*.cpp" />
-                <include name="los/*.cpp" />
-                <include name="thread/*.cpp" />
-                <include name="trace_forward/*.cpp" />
-                <include name="utils/*.cpp" />
-                <include name="jni/*.cpp" />
-                <include name="verify/*.cpp" />
-                <include name="finalizer_weakref/*.cpp" />
-            </fileset>
-
-            <defineset define="BUILDING_GC" />
-        </compiler>
-
-        <linker id="linker" extends="common.linker">
-            <libset libs="harmonyvm" dir="${drlvm.lib.dir}" if="is.windows"/>
-            <libset libs="hythr" dir="${drlvm.shlib.dir}" />
-            <linkerarg value="-Bsymbolic" if="is.unix"/>
-            <linkerarg value="--version-script=${vm.home}/gc_gen/build/gc_gen.exp" if="is.unix"/>
-        </linker>
-
-    </target>
-    
-    <target name="build-uncompressed" depends="init" if="build.uncompressed.gc">
-        <init-native />
-        <depend-includes paths="gc.includes"/>
-        <depend-selector rebuild-flag="gc.includes.uptodate" id="gc.depends"/>
-        <compile-cc>
-            <compiler refid="cpp.compiler"/>
-        </compile-cc>
-        <link-lib name="gc_gen_uncomp" type="shared">
-            <linker refid="linker"/>
-        </link-lib>
-   </target>
-    
-    <target name="build-compressed" depends="init" if="build.compressed.gc">
-        <init-native/>
-        <depend-includes paths="gc.includes"/>
-        <depend-selector rebuild-flag="gc.includes.uptodate" id="gc.depends"/>
-        <compile-cc>
-            <compiler refid="cpp.compiler"/>
-            <defineset define="COMPRESS_REFERENCE" />
-        </compile-cc>
-        <link-lib name="gc_gen" type="shared">
-            <linker refid="linker"/>
-        </link-lib>        
-   </target>
     
     <target name="clean" >
         <clean-native component="gc_gen"/>

Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt?rev=956723&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt
(added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt
Mon Jun 21 22:52:18 2010
@@ -0,0 +1,55 @@
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_TLSGCOffset
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getGenMode
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getNosBoundary
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_helperCallback
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getPrefetchDist
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getZeroingSize
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getPrefetchStride
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getTlaFreeOffset
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getTlaCeilingOffset
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getTlaEndOffset
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getGCObjectAlignment
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getLargeObjectSize
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_isPrefetchEnabled
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getVTBase
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getArrayElemSizeOffsetInGCVT
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getArrayFirstElemOffsetInGCVT
+Java_org_apache_harmony_drlvm_gc_1gen_GCHelper_getGCAllocatedSizeOffsetInGCVT
+gc_add_compressed_root_set_entry
+gc_add_root_set_entry
+gc_add_root_set_entry_interior_pointer
+gc_add_weak_root_set_entry
+gc_alloc
+gc_alloc_fast
+gc_class_prepared
+gc_clear_mutator_block_flag
+gc_finalize_on_exit
+gc_force_gc
+gc_free_memory
+gc_get_collection_count
+gc_get_collection_time
+gc_get_hashcode
+gc_get_next_live_object
+gc_heap_base_address
+gc_heap_ceiling_address
+gc_heap_slot_write_ref
+gc_heap_write_global_slot
+gc_heap_write_ref
+gc_heap_wrote_object
+gc_heap_copy_object_array
+gc_init
+gc_is_object_pinned
+gc_iterate_heap
+gc_max_memory
+gc_pin_object
+gc_requires_barriers
+gc_set_mutator_block_flag
+gc_supports_class_unloading
+gc_supports_compressed_references
+gc_thread_init
+gc_thread_kill
+gc_time_since_last_gc
+gc_total_memory
+gc_unpin_object
+gc_vm_initialized
+gc_wrapup

Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/exports.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile?rev=956723&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
(added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
Mon Jun 21 22:52:18 2010
@@ -0,0 +1,81 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'gc_gen_uncomp'
+#
+
+HY_BIN=$(HY_TARGET)/build/drlvm/vm/native/gc_gen_uncomp/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+VM_HOME=../../../../../../../vm/
+
+DEFINES += \
+  -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+  -D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE \
+  -DBUILDING_GC -DREFS_USE_COMPRESSED
+
+OPT += -fexceptions
+
+INCLUDES := \
+  -I$(VM_HOME)port/include \
+  -I$(VM_HOME)include -I$(VM_HOME)vmcore/include \
+  -I$(SHAREDSUB)common \
+  $(INCLUDES)
+
+BUILDFILES := \
+  common/collection_scheduler.o common/compressed_ref.o \
+  common/concurrent_collection_scheduler.o common/gc_block.o \
+  common/gc_common.o common/gc_concurrent.o common/gc_for_barrier.o \
+  common/gc_for_class.o common/gc_for_vm.o common/gc_metadata.o \
+  common/gc_options.o common/hashcode.o common/interior_pointer.o \
+  common/large_pages.o common/mark_scan_pool.o common/space_tuner.o \
+  common/weak_roots.o \
+  finalizer_weakref/finalizer_weakref.o \
+  finalizer_weakref/finalizer_weakref_metadata.o \
+  gen/gen.o gen/gen_adapt.o gen/gen_stats.o gen/gen_utils.o \
+  jni/java_natives.o jni/java_support.o \
+  los/free_area_pool.o los/lspace.o los/lspace_alloc_collect.o \
+  mark_compact/fallback_mark_scan.o mark_compact/mspace.o \
+  mark_compact/mspace_alloc.o mark_compact/mspace_collect_compact.o \
+  mark_compact/mspace_extend_compact.o mark_compact/mspace_move_compact.o \
+  mark_compact/mspace_slide_compact.o mark_compact/space_tune_mark_scan.o \
+  mark_sweep/gc_ms.o mark_sweep/sspace_compact.o \
+  mark_sweep/sspace_mark_concurrent.o mark_sweep/wspace.o \
+  mark_sweep/wspace_alloc.o mark_sweep/wspace_chunk.o \
+  mark_sweep/wspace_compact.o mark_sweep/wspace_concurrent_gc_stats.o \
+  mark_sweep/wspace_fallback_mark.o mark_sweep/wspace_mark.o \
+  mark_sweep/wspace_mark_mostly_concurrent.o \
+  mark_sweep/wspace_mark_otf_concurrent.o mark_sweep/wspace_mark_sweep.o \
+  mark_sweep/wspace_sweep.o mark_sweep/wspace_sweep_concurrent.o \
+  mark_sweep/wspace_verify.o \
+  move_compact/gc_mc.o \
+  semi_space/sspace.o semi_space/sspace_alloc.o semi_space/sspace_forward.o \
+  semi_space/sspace_gen_ss_pool.o semi_space/sspace_nongen_ss_pool.o \
+  thread/collector.o thread/conclctor.o thread/gc_thread.o thread/mutator.o \
+  thread/mutator_alloc.o \
+  trace_forward/fspace.o trace_forward/fspace_alloc.o \
+  trace_forward/fspace_gen_forward_pool.o \
+  trace_forward/fspace_nongen_forward_pool.o trace_forward/sspace_temp.o \
+  verify/verifier_common.o verify/verifier_metadata.o \
+  verify/verifier_scanner.o verify/verify_blocked_space.o \
+  verify/verify_concurrent_mark.o verify/verify_gc_effect.o \
+  verify/verify_live_heap.o verify/verify_mutator_effect.o
+
+LDFLAGS += -Bsymbolic
+
+DLLNAME = $(DLLPATH)default/libgc_gen_uncomp$(HY_SHLIB_SUFFIX)
+EXPNAME = GC_GEN_0.1
+
+include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/gc_gen/unix/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt?rev=956723&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt
(added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt
Mon Jun 21 22:52:18 2010
@@ -0,0 +1,37 @@
+JIT_call_returns_a_reference
+JIT_can_enumerate
+JIT_compile_method
+JIT_compile_method_with_params
+JIT_deinit
+JIT_enable_profiling
+JIT_extended_class_callback
+JIT_fix_handler_context
+JIT_gc_end
+JIT_gc_object_died
+JIT_gc_start
+JIT_gen_method_info
+JIT_get_address_of_this
+JIT_get_address_of_var
+JIT_get_break_point_offset
+JIT_get_breakpoints
+JIT_get_exe_capabilities
+JIT_get_inline_depth
+JIT_get_inlined_bc
+JIT_get_inlined_method
+JIT_get_root_set_for_thread_dump
+JIT_get_root_set_from_stack_frame
+JIT_init
+JIT_init_with_data
+JIT_is_soe_area
+JIT_next_command_line_argument
+JIT_num_breakpoints
+JIT_overridden_method_callback
+JIT_profile_notification_callback
+JIT_recompiled_method_callback
+JIT_set_profile_access_interface
+JIT_supports_compressed_references
+JIT_unwind_stack_frame
+get_bc_location_for_native
+get_local_var
+get_native_location_for_bc
+set_local_var

Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/exports.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile?rev=956723&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
(added)
+++ harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
Mon Jun 21 22:52:18 2010
@@ -0,0 +1,127 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Makefile for module 'jitrino'
+#
+
+HY_BIN=$(HY_TARGET)/build/drlvm/vm/native/jitrino/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+VM_HOME=../../../../../../../vm/
+
+DEFINES += \
+  -DREFS_USE_UNCOMPRESSED -D_IA32_ -DPLATFORM_POSIX \
+  -D__SMP__ -DLINUX_TLS_OPT -D_LARGEFILE64_SOURCE \
+  -DPROJECT_JITRINO
+
+ifeq ($(HY_CFG),debug)
+DEFINES += -DJIT_LOGS -DJIT_STATS
+endif
+
+OPT += -fexceptions
+CXXFLAGS += -Wno-deprecated -fmessage-length=0 -Wall -Werror -Wno-uninitialized
+
+ifeq ($(HY_ARCH),ia64)
+JIT_ARCH := ia64
+else
+JIT_ARCH := x86_or_x86_64
+endif
+
+INCLUDES := -I$(VM_HOME)include -I$(VM_HOME)vmcore/include \
+  -I$(VM_HOME)port/include \
+  -I$(SHAREDSUB)main -I$(SHAREDSUB)shared -I$(SHAREDSUB)vm \
+  -I$(SHAREDSUB)codegenerator -I$(SHAREDSUB)$(JIT_ARCH)/codegenerator \
+  -I$(SHAREDSUB)optimizer -I$(SHAREDSUB)dynopt \
+  -I$(SHAREDSUB)translator -I$(SHAREDSUB)translator/java \
+  $(INCLUDES)
+
+BUILDFILES := \
+  codegenerator/RuntimeInterface.o \
+  codegenerator/Ia32APIMagics.o codegenerator/Ia32BBPolling.o \
+  codegenerator/Ia32BranchTrans.o codegenerator/Ia32CFG.o \
+  codegenerator/Ia32CallingConvention.o codegenerator/Ia32CgUtils.o \
+  codegenerator/Ia32CodeEmitter.o codegenerator/CodeGenerator_arch.o \
+  codegenerator/Ia32CodeLayout.o codegenerator/Ia32CodeLayoutBottomUp.o \
+  codegenerator/Ia32CodeLayoutTopDown.o codegenerator/Ia32CodeSelector.o \
+  codegenerator/Ia32ComplexAddrFormLoader.o codegenerator/Ia32Constraint.o \
+  codegenerator/Ia32ConstraintsResolver.o codegenerator/Ia32CopyExpansion.o \
+  codegenerator/Ia32DCE.o codegenerator/Ia32EarlyPropagation.o \
+  codegenerator/Ia32Encoder.o codegenerator/Ia32FastArrayFilling.o \
+  codegenerator/Ia32GCMap.o codegenerator/Ia32GCSafePoints.o \
+  codegenerator/Ia32GlobalPropagation.o codegenerator/Ia32I8Lowerer.o \
+  codegenerator/Ia32IRConstants.o codegenerator/Ia32IRManager.o \
+  codegenerator/Ia32Inst.o codegenerator/Ia32InstCodeSelector.o \
+  codegenerator/Ia32InternalProfiler.o codegenerator/Ia32InternalTrace.o \
+  codegenerator/Ia32LightJNI.o codegenerator/Ia32PeepHole.o \
+  codegenerator/Ia32Printer.o codegenerator/Ia32ProfileUtils.o \
+  codegenerator/Ia32RCE.o codegenerator/Ia32RegAlloc0.o \
+  codegenerator/Ia32RegAlloc2.o codegenerator/Ia32RegAlloc3.o \
+  codegenerator/Ia32RegAllocCheck.o codegenerator/RuntimeInterface_arch.o \
+  codegenerator/Ia32SpillGen.o codegenerator/Ia32StackInfo.o \
+  codegenerator/Ia32StackLayout.o codegenerator/Ia32Tls.o \
+  codegenerator/Ia32WebMaker.o codegenerator/Ia32i586InstsExpansion.o \
+  dynopt/EdgeProfiler.o dynopt/StaticProfiler.o dynopt/ValueProfiler.o \
+  main/CompilationContext.o main/JITInstanceContext.o main/Jitrino.o \
+  main/Log.o main/PMF.o \
+  optimizer/CSEHash.o optimizer/CodeGenerator.o optimizer/CodeSelectors.o \
+  optimizer/FastArrayFilling.o optimizer/FlowGraph.o optimizer/HLOAPIMagics.o \
+  optimizer/IRBuilder.o optimizer/Inst.o optimizer/Loop.o \
+  optimizer/LoopUtils.o optimizer/Opcode.o optimizer/Opnd.o \
+  optimizer/abcd/abcdbounds.o optimizer/abcd/classic_abcd.o \
+  optimizer/abcd/classic_abcd_solver.o optimizer/abcd/insertpi.o \
+  optimizer/aliasanalyzer.o optimizer/codelowerer.o \
+  optimizer/constantfolder.o optimizer/dabce.o \
+  optimizer/deadcodeeliminator.o optimizer/devirtualizer.o \
+  optimizer/escanalyzer.o optimizer/escapeanalyzer.o \
+  optimizer/gcmanagedpointeranalyzer.o optimizer/globalcodemotion.o \
+  optimizer/globalopndanalyzer.o optimizer/hashvaluenumberer.o \
+  optimizer/helper_inliner.o optimizer/inliner.o \
+  optimizer/lazyexceptionopt.o optimizer/loop_unroll.o optimizer/memoryopt.o \
+  optimizer/multiplybyconstant.o optimizer/optimizer.o optimizer/optpass.o \
+  optimizer/osr.o optimizer/pidgenerator.o optimizer/reassociate.o \
+  optimizer/simplifier.o optimizer/simplifytaus.o optimizer/ssa/SSA.o \
+  optimizer/syncopt.o optimizer/tailduplicator.o optimizer/throwopt.o \
+  optimizer/walkers.o \
+  shared/Algorithms.o shared/Arena.o shared/BitSet.o shared/ControlFlowGraph.o \
+  shared/CountWriters.o shared/Dominator.o shared/FixFileName.o \
+  shared/Interval.o shared/LoopTree.o shared/MemoryAttribute.o \
+  shared/MemoryManager.o shared/PrintDotFile.o shared/Type.o shared/VMMagic.o \
+  shared/XTimer.o shared/methodtable.o shared/mkernel.o \
+  translator/TranslatorIntfc.o translator/java/JavaByteCodeParser.o \
+  translator/java/JavaByteCodeTranslator.o \
+  translator/java/JavaFlowGraphBuilder.o \
+  translator/java/JavaLabelPrepass.o translator/java/JavaTranslator.o \
+  vm/EMInterface.o vm/JITInterface.o vm/VMInterface.o
+
+ifneq ($(HY_ARCH),ia64)
+BUILDFILES += \
+  jet/arith_rt.o jet/bcproc.o jet/cg.o jet/cg_arith.o jet/cg_br.o \
+  jet/cg_dbg.o jet/cg_fld_arr.o jet/cg_ia32.o jet/cg_instr.o jet/cg_meth.o \
+  jet/cg_obj.o jet/cg_regs.o jet/cg_stk.o jet/compiler.o jet/csig.o \
+  jet/enc.o jet/enc_ia32.o jet/jdefs.o jet/jet.o jet/jframe.o jet/magics.o \
+  jet/mib.o jet/rt.o jet/rt_ia32.o jet/sconsts.o jet/stats.o jet/trace.o
+endif
+
+DLLNAME = $(DLLPATH)default/libjitrino$(HY_SHLIB_SUFFIX)
+EXPNAME = JITRINO_0.1
+
+#OSLIBS += -lm
+MDLLIBFILES += $(LIBPATH)libapr-1.a $(LIBPATH)libport.a
+
+include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: $(SHAREDSUB)$(JIT_ARCH)/%.cpp
+	@mkdir -p $(@D)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Propchange: harmony/enhanced/java/branches/mrh/drlvm/modules/vm/src/main/native/jitrino/unix/makefile
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message