--- old/make/linux/makefiles/adlc.make 2010-11-16 18:00:52.000000000 +0100 +++ new/make/linux/makefiles/adlc.make 2010-11-16 18:00:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -42,16 +42,14 @@ SOURCES.AD = $(GAMMADIR)/src/cpu/$(ARCH)/vm/$(Platform_arch_model).ad \ $(GAMMADIR)/src/os_cpu/$(OS)_$(ARCH)/vm/$(OS)_$(Platform_arch_model).ad -Src_Dirs += $(GAMMADIR)/src/share/vm/adlc - EXEC = $(OUTDIR)/adlc # set VPATH so make knows where to look for source files -Src_Dirs_V = ${Src_Dirs} $(GENERATED)/incls -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(GAMMADIR)/src/share/vm/adlc +VPATH += $(Src_Dirs_V:%=%:) # set INCLUDES for C preprocessor -Src_Dirs_I = ${Src_Dirs} $(GENERATED) +Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%) # set flags for adlc compilation --- old/make/linux/makefiles/amd64.make 2010-11-16 18:00:53.000000000 +0100 +++ new/make/linux/makefiles/amd64.make 2010-11-16 18:00:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,9 +22,6 @@ # # -# Not included in includeDB because it has no dependencies -Obj_Files += linux_x86_64.o - # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized --- old/make/linux/makefiles/buildtree.make 2010-11-16 18:00:54.000000000 +0100 +++ new/make/linux/makefiles/buildtree.make 2010-11-16 18:00:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -113,7 +113,7 @@ COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE)) SIMPLE_DIRS = \ - $(PLATFORM_DIR)/generated/incls \ + $(PLATFORM_DIR)/generated/dependencies \ $(PLATFORM_DIR)/generated/adfiles \ $(PLATFORM_DIR)/generated/jvmtifiles @@ -197,11 +197,27 @@ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo; \ - echo "Src_Dirs = \\"; \ + echo "# Used for platform dispatching"; \ + echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ + echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ + echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ + echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \ + echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \ + echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \ + echo "CFLAGS += \$$(TARGET_DEFINES)"; \ + echo; \ + echo "Src_Dirs_V = \\"; \ sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \ echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ + echo; \ + echo "Src_Dirs_I = \\"; \ + echo "\$$(GAMMADIR)/src/share/vm \\"; \ + echo "\$$(GAMMADIR)/src/share/vm/prims \\"; \ + echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ + echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ + echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ [ -n "$(CFLAGS_BROWSE)" ] && \ echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \ [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ --- old/make/linux/makefiles/core.make 2010-11-16 18:00:55.000000000 +0100 +++ new/make/linux/makefiles/core.make 2010-11-16 18:00:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,8 +24,7 @@ # Sets make macros for making core version of VM -# Note the effect on includeDB lists in top.make: -# includeDB_compiler* and ad_.*pp are excluded from the build, +# Select which files to use (in top.make) TYPE=CORE # There is no "core" directory in JDK. Install core build in server directory. --- old/make/linux/makefiles/gcc.make 2010-11-16 18:00:56.000000000 +0100 +++ new/make/linux/makefiles/gcc.make 2010-11-16 18:00:55.000000000 +0100 @@ -44,7 +44,8 @@ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" USE_PRECOMPILED_HEADER=1 PRECOMPILED_HEADER_DIR=. -PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch +PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp +PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch endif @@ -144,6 +145,11 @@ OPT_CFLAGS/mulnode.o += -O0 endif +# Flags for generating make dependency flags. +ifneq ("${CC_VER_MAJOR}", "2") +DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) +endif + #------------------------------------------------------------------------ # Linker flags --- old/make/linux/makefiles/i486.make 2010-11-16 18:00:56.000000000 +0100 +++ new/make/linux/makefiles/i486.make 2010-11-16 18:00:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,6 @@ # # TLS helper, assembled from .s file -# Not included in includeDB because it has no dependencies -Obj_Files += linux_x86_32.o # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) --- old/make/linux/makefiles/jvmti.make 2010-11-16 18:00:57.000000000 +0100 +++ new/make/linux/makefiles/jvmti.make 2010-11-16 18:00:57.000000000 +0100 @@ -37,11 +37,10 @@ JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter -Src_Dirs += $(JvmtiSrcDir) # set VPATH so make knows where to look for source files -Src_Dirs_V = ${Src_Dirs} -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(JvmtiSrcDir) +VPATH += $(Src_Dirs_V:%=%:) JvmtiGeneratedNames = \ jvmtiEnv.hpp \ --- old/make/linux/makefiles/launcher.make 2010-11-16 18:00:58.000000000 +0100 +++ new/make/linux/makefiles/launcher.make 2010-11-16 18:00:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -56,7 +56,7 @@ LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK) launcher.o: launcher.c $(LAUNCHERDIR)/java.c $(LAUNCHERDIR)/java_md.c - $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) + $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) $(TARGET_DEFINES) launcher.c: @echo Generating $@ --- old/make/linux/makefiles/rules.make 2010-11-16 18:00:59.000000000 +0100 +++ new/make/linux/makefiles/rules.make 2010-11-16 18:00:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -151,20 +151,20 @@ %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) + $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) else %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ - $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \ - $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)) + $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ + $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) endif %.o: %.s @echo Assembling $< $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE) + $(QUIETLY) $(AS.S) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) %.s: %.cpp @echo Generating assembly for $< --- old/make/linux/makefiles/sparc.make 2010-11-16 18:01:00.000000000 +0100 +++ new/make/linux/makefiles/sparc.make 2010-11-16 18:00:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,3 @@ # # -# Not included in includeDB because it has no dependencies -Obj_Files += linux_sparc.o - --- old/make/linux/makefiles/sparcWorks.make 2010-11-16 18:01:00.000000000 +0100 +++ new/make/linux/makefiles/sparcWorks.make 2010-11-16 18:01:00.000000000 +0100 @@ -74,6 +74,11 @@ OPT_CFLAGS+=-xO4 OPT_CFLAGS/NOOPT=-xO0 +# Flags for creating the dependency files. +ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) +DEPFLAGS = -xMMD -xMF $(DEP_DIR)/$(@:%=%.d) +endif + #------------------------------------------------------------------------ # Linker flags --- old/make/linux/makefiles/sparcv9.make 2010-11-16 18:01:01.000000000 +0100 +++ new/make/linux/makefiles/sparcv9.make 2010-11-16 18:01:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -21,10 +21,6 @@ # questions. # -# -# Not included in includeDB because it has no dependencies -Obj_Files += linux_sparc.o - # gcc 4.0 miscompiles this code in -m64 OPT_CFLAGS/macro.o = -O0 --- old/make/linux/makefiles/top.make 2010-11-16 18:01:02.000000000 +0100 +++ new/make/linux/makefiles/top.make 2010-11-16 18:01:02.000000000 +0100 @@ -31,7 +31,7 @@ # -generate sa-jdi.jar (JDI binding to core files) # It assumes the following flags are set: -# CFLAGS Platform_file, Src_Dirs, SYSDEFS, AOUT, Obj_Files +# CFLAGS Platform_file, Src_Dirs_I, Src_Dirs_V, SYSDEFS, AOUT, Obj_Files # -- D. Ungar (5/97) from a file by Bill Bush @@ -45,10 +45,6 @@ Plat_File = $(Platform_file) CDG = cd $(GENERATED); -# Pick up MakeDeps' sources and definitions -include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/makedeps.make -MakeDepsClass = MakeDeps.class - ifdef USE_PRECOMPILED_HEADER PrecompiledOption = -DUSE_PRECOMPILED_HEADER UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) @@ -57,33 +53,7 @@ PrecompiledOption = endif -MakeDeps = $(RUN.JAVA) $(PrecompiledOption) -classpath $(GENERATED) MakeDeps - -Include_DBs/GC = $(VM)/includeDB_gc \ - $(VM)/includeDB_gc_parallel \ - $(VM)/gc_implementation/includeDB_gc_parallelScavenge \ - $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \ - $(VM)/gc_implementation/includeDB_gc_parNew \ - $(VM)/gc_implementation/includeDB_gc_g1 \ - $(VM)/gc_implementation/includeDB_gc_serial \ - $(VM)/gc_implementation/includeDB_gc_shared - -Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \ - $(VM)/includeDB_jvmti \ - $(VM)/includeDB_features -Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 -Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2 -Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2 -Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero -Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark -Include_DBs = $(Include_DBs/$(TYPE)) - Cached_plat = $(GENERATED)/platform.current -Cached_db = $(GENERATED)/includeDB.current - -Incremental_Lists = $(Cached_db) -# list generation also creates $(GENERATED)/$(Cached_plat) - AD_Dir = $(GENERATED)/adfiles ADLC = $(AD_Dir)/adlc @@ -102,7 +72,7 @@ MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` -# default target: make makeDeps, update lists, make vm +# default target: update lists, make vm # done in stages to force sequential order with parallel make # @@ -110,39 +80,18 @@ @echo All done. # This is an explicit dependency for the sake of parallel makes. -vm_build_preliminaries: checks $(Incremental_Lists) $(AD_Files_If_Required) jvmti_stuff sa_stuff +vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff @# We need a null action here, so implicit rules don't get consulted. -# make makeDeps: (and zap the cached db files to force a nonincremental run) - -$(GENERATED)/$(MakeDepsClass): $(MakeDepsSources) - @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources) - @echo Removing $(Incremental_Lists) to force regeneration. - @rm -f $(Incremental_Lists) - @$(CDG) echo >$(Cached_plat) - -# make incremental_lists, if cached files out of date, run makeDeps - -$(Incremental_Lists): $(Include_DBs) $(Plat_File) $(GENERATED)/$(MakeDepsClass) - $(CDG) cat $(Include_DBs) > $(GENERATED)/includeDB - $(CDG) if [ ! -r incls ] ; then \ - mkdir incls ; \ - fi - $(CDG) (echo $(CDG) echo $(MakeDeps) diffs UnixPlatform $(Cached_plat) $(Cached_db) $(Plat_File) $(GENERATED)/includeDB $(MakeDepsOptions)) > makeDeps.sh - $(CDG) $(REMOTE) sh $(GENERATED)/makeDeps.sh - $(CDG) cp includeDB $(Cached_db) +$(Cached_plat): $(Plat_File) $(CDG) cp $(Plat_File) $(Cached_plat) -# symbolic target for command lines -lists: $(Incremental_Lists) - @: lists are now up to date - # make AD files as necessary -ad_stuff: $(Incremental_Lists) $(adjust-mflags) +ad_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f adlc.make $(MFLAGS-adjusted) # generate JVMTI files from the spec -jvmti_stuff: $(Incremental_Lists) $(adjust-mflags) +jvmti_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f jvmti.make $(MFLAGS-adjusted) # generate SA jar files and native header @@ -169,7 +118,7 @@ install: the_vm @$(MAKE) -f vm.make install -# next rules support "make foo.[oi]" +# next rules support "make foo.[ois]" %.o %.i %.s: $(UpdatePCH) @@ -179,7 +128,6 @@ # this should force everything to be rebuilt clean: rm -f $(GENERATED)/*.class - $(MAKE) $(MFLAGS) $(GENERATED)/$(MakeDepsClass) $(MAKE) -f vm.make $(MFLAGS) clean # just in case it doesn't, this should do it --- old/make/linux/makefiles/vm.make 2010-11-16 18:01:03.000000000 +0100 +++ new/make/linux/makefiles/vm.make 2010-11-16 18:01:03.000000000 +0100 @@ -35,9 +35,10 @@ # Defs GENERATED = ../generated +DEP_DIR = $(GENERATED)/dependencies -# read a generated file defining the set of .o's and the .o .h dependencies -include $(GENERATED)/Dependencies +# reads the generated files defining the set of .o's and the .o .h dependencies +-include $(DEP_DIR)/*.d # read machine-specific adjustments (%%% should do this via buildtree.make?) ifeq ($(ZERO_BUILD), true) @@ -47,16 +48,16 @@ endif # set VPATH so make knows where to look for source files -# Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm -# The incls directory contains generated header file lists for inclusion. +# Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm # The adfiles directory contains ad_.[ch]pp. # The jvmtifiles directory contains jvmti*.[ch]pp -Src_Dirs_V = $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED)/incls -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles +VPATH += $(Src_Dirs_V:%=%:) -# set INCLUDES for C preprocessor -Src_Dirs_I = $(PRECOMPILED_HEADER_DIR) $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED) -INCLUDES += $(Src_Dirs_I:%=-I%) +# set INCLUDES for C preprocessor. +Src_Dirs_I += $(GENERATED) +# The order is important for the precompiled headers to work. +INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%) ifeq (${VERSION}, debug) SYMFLAG = -g @@ -118,6 +119,62 @@ LIBJVM = lib$(JVM).so LIBJVM_G = lib$(JVM)$(G_SUFFIX).so +CORE_PATHS := $(shell find $(GAMMADIR)/src/share/vm/* -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)) +CORE_PATHS += $(GAMMADIR)/src/os/$(Platform_os_family)/vm +CORE_PATHS += $(GAMMADIR)/src/cpu/$(Platform_arch)/vm +CORE_PATHS += $(GAMMADIR)/src/os_cpu/$(Platform_os_arch)/vm +CORE_PATHS += $(GENERATED)/jvmtifiles + +COMPILER1_PATHS := $(GAMMADIR)/src/share/vm/c1 + +COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto +COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt +COMPILER2_PATHS += $(GENERATED)/adfiles + +# Include dirs per type. +Src_Dirs/CORE := $(CORE_PATHS) +Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) +Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) +Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) +Src_Dirs/ZERO := $(CORE_PATHS) +Src_Dirs/SHARK := $(CORE_PATHS) +Src_Dirs := $(Src_Dirs/$(TYPE)) + +COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* +COMPILER1_SPECIFIC_FILES := c1_\* +SHARK_SPECIFIC_FILES := shark +ZERO_SPECIFIC_FILES := zero + +# Always exclude these. +Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp + +# Exclude per type. +Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) +Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) +Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) + +Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) + +# Special handling of arch model. +ifeq ($(Platform_arch_model), x86_32) +Src_Files_EXCLUDE += \*x86_64\* +endif +ifeq ($(Platform_arch_model), x86_64) +Src_Files_EXCLUDE += \*x86_32\* +endif + +# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. +define findsrc + $(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) )) +endef + +Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e))) + +Obj_Files = $(addsuffix .o,$(basename $(Src_Files))) + JVM_OBJ_FILES = $(Obj_Files) vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) @@ -180,10 +237,10 @@ LINK_VM = $(LINK_LIB.c) # rule for building precompiled header -$(PRECOMPILED_HEADER): $(Precompiled_Files) +$(PRECOMPILED_HEADER): $(QUIETLY) echo Generating precompiled header $@ - $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)/incls - $(QUIETLY) $(COMPILE.CC) -x c++-header -c $(GENERATED)/incls/_precompiled.incl -o $@ $(COMPILE_DONE) + $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR) + $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE) # making the library: --- old/make/linux/makefiles/zero.make 2010-11-16 18:01:04.000000000 +0100 +++ new/make/linux/makefiles/zero.make 2010-11-16 18:01:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2009 Red Hat, Inc. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -25,7 +25,7 @@ # Setup for Zero (non-Shark) version of VM -# Select which includeDB files to use (in top.make) +# Select which files to use (in top.make) TYPE = ZERO # Install libjvm.so, etc in in server directory. --- old/make/solaris/makefiles/adlc.make 2010-11-16 18:01:04.000000000 +0100 +++ new/make/solaris/makefiles/adlc.make 2010-11-16 18:01:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -42,16 +42,14 @@ SOURCES.AD = $(GAMMADIR)/src/cpu/$(ARCH)/vm/$(Platform_arch_model).ad \ $(GAMMADIR)/src/os_cpu/$(OS)_$(ARCH)/vm/$(OS)_$(Platform_arch_model).ad -Src_Dirs += $(GAMMADIR)/src/share/vm/adlc - EXEC = $(OUTDIR)/adlc # set VPATH so make knows where to look for source files -Src_Dirs_V = ${Src_Dirs} $(GENERATED)/incls -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(GAMMADIR)/src/share/vm/adlc +VPATH += $(Src_Dirs_V:%=%:) # set INCLUDES for C preprocessor -Src_Dirs_I = ${Src_Dirs} $(GENERATED) +Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%) # set flags for adlc compilation --- old/make/solaris/makefiles/amd64.make 2010-11-16 18:01:05.000000000 +0100 +++ new/make/solaris/makefiles/amd64.make 2010-11-16 18:01:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,9 +25,6 @@ # Must also specify if CPU is little endian CFLAGS += -DVM_LITTLE_ENDIAN -# Not included in includeDB because it has no dependencies -Obj_Files += solaris_x86_64.o - # # Special case flags for compilers and compiler versions on amd64. # --- old/make/solaris/makefiles/buildtree.make 2010-11-16 18:01:06.000000000 +0100 +++ new/make/solaris/makefiles/buildtree.make 2010-11-16 18:01:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -106,7 +106,7 @@ COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE)) SIMPLE_DIRS = \ - $(PLATFORM_DIR)/generated/incls \ + $(PLATFORM_DIR)/generated/dependencies \ $(PLATFORM_DIR)/generated/adfiles \ $(PLATFORM_DIR)/generated/jvmtifiles @@ -191,11 +191,27 @@ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo "$(LP64_SETTING/$(DATA_MODE))"; \ echo; \ - echo "Src_Dirs = \\"; \ + echo "# Used for platform dispatching"; \ + echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ + echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \ + echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \ + echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \ + echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \ + echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \ + echo "CFLAGS += \$$(TARGET_DEFINES)"; \ + echo; \ + echo "Src_Dirs_V = \\"; \ sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \ echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ + echo; \ + echo "Src_Dirs_I = \\"; \ + echo "\$$(GAMMADIR)/src/share/vm \\"; \ + echo "\$$(GAMMADIR)/src/share/vm/prims \\"; \ + echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \ + echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \ + echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \ [ -n "$(CFLAGS_BROWSE)" ] && \ echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \ [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ --- old/make/solaris/makefiles/core.make 2010-11-16 18:01:07.000000000 +0100 +++ new/make/solaris/makefiles/core.make 2010-11-16 18:01:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,8 +24,7 @@ # Sets make macros for making core version of VM -# Note the effect on includeDB lists in top.make: -# includeDB_compiler* and ad_.*pp are excluded from the build, +# Select which files to use (in top.make) TYPE=CORE # There is no "core" directory in JDK. Install core build in server directory. --- old/make/solaris/makefiles/dtrace.make 2010-11-16 18:01:08.000000000 +0100 +++ new/make/solaris/makefiles/dtrace.make 2010-11-16 18:01:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -63,8 +63,6 @@ # making libjvm_db -INCLS = $(GENERATED)/incls - # Use mapfile with libjvm_db.so LIBJVM_DB_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jvm_db LFLAGS_JVM_DB += $(MAPFLAG:FILENAME=$(LIBJVM_DB_MAPFILE)) @@ -114,7 +112,7 @@ endif lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \ - $(INCLS)/_vmStructs.cpp.incl $(LIBJVM.o) + $(LIBJVM.o) $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \ $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc @@ -161,6 +159,27 @@ $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d $(QUIETLY) cat $^ > $@ +DTraced_Files = ciEnv.o \ + classLoadingService.o \ + compileBroker.o \ + hashtable.o \ + instanceKlass.o \ + java.o \ + jni.o \ + jvm.o \ + memoryManager.o \ + nmethod.o \ + objectMonitor.o \ + runtimeService.o \ + sharedRuntime.o \ + synchronizer.o \ + thread.o \ + unsafe.o \ + vmThread.o \ + vmCMSOperations.o \ + vmPSOperations.o \ + vmGCOperations.o \ + # Dtrace is available, so we build $(DTRACE.o) $(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files) @echo Compiling $(DTRACE).d --- old/make/solaris/makefiles/gcc.make 2010-11-16 18:01:08.000000000 +0100 +++ new/make/solaris/makefiles/gcc.make 2010-11-16 18:01:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,8 @@ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" USE_PRECOMPILED_HEADER=1 PRECOMPILED_HEADER_DIR=. -PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch +PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp +PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch endif @@ -131,6 +132,12 @@ endif OPT_CFLAGS/NOOPT=-O0 + +# Flags for generating make dependency flags. +ifneq ("${CC_VER_MAJOR}", "2") +DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) +endif + #------------------------------------------------------------------------ # Linker flags --- old/make/solaris/makefiles/i486.make 2010-11-16 18:01:09.000000000 +0100 +++ new/make/solaris/makefiles/i486.make 2010-11-16 18:01:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,8 +26,6 @@ CFLAGS += -DVM_LITTLE_ENDIAN # TLS helper, assembled from .s file -# Not included in includeDB because it has no dependencies -Obj_Files += solaris_x86_32.o # # Special case flags for compilers and compiler versions on i486. --- old/make/solaris/makefiles/jvmti.make 2010-11-16 18:01:10.000000000 +0100 +++ new/make/solaris/makefiles/jvmti.make 2010-11-16 18:01:10.000000000 +0100 @@ -36,11 +36,10 @@ JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter -Src_Dirs += $(JvmtiSrcDir) # set VPATH so make knows where to look for source files -Src_Dirs_V = ${Src_Dirs} -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(JvmtiSrcDir) +VPATH += $(Src_Dirs_V:%=%:) JvmtiGeneratedNames = \ jvmtiEnv.hpp \ --- old/make/solaris/makefiles/launcher.make 2010-11-16 18:01:11.000000000 +0100 +++ new/make/solaris/makefiles/launcher.make 2010-11-16 18:01:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -69,7 +69,7 @@ endif # Platform_compiler == sparcWorks launcher.o: launcher.c $(LAUNCHERDIR)/java.c $(LAUNCHERDIR)/java_md.c - $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) + $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) ${TARGET_DEFINES} launcher.c: @echo Generating $@ --- old/make/solaris/makefiles/rules.make 2010-11-16 18:01:12.000000000 +0100 +++ new/make/solaris/makefiles/rules.make 2010-11-16 18:01:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -151,14 +151,14 @@ %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) - $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) + $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE) else %.o: %.cpp @echo Compiling $< $(QUIETLY) $(REMOVE_TARGET) $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ - $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \ - $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)) + $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \ + $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)) endif %.o: %.s --- old/make/solaris/makefiles/sparcWorks.make 2010-11-16 18:01:12.000000000 +0100 +++ new/make/solaris/makefiles/sparcWorks.make 2010-11-16 18:01:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -145,7 +145,12 @@ OPT_CFLAGS/O2=-xO2 OPT_CFLAGS/NOOPT=-xO1 -################################################# +# Flags for creating the dependency files. +ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) +DEPFLAGS = -xMMD -xMF $(DEP_DIR)/$(@:%=%.d) +endif + +################################################ # Begin current (>=5.9) Forte compiler options # ################################################# --- old/make/solaris/makefiles/sparcv9.make 2010-11-16 18:01:13.000000000 +0100 +++ new/make/solaris/makefiles/sparcv9.make 2010-11-16 18:01:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,6 @@ # # -Obj_Files += solaris_sparc.o ASFLAGS += $(AS_ARCHFLAG) ifeq ("${Platform_compiler}", "sparcWorks") --- old/make/solaris/makefiles/top.make 2010-11-16 18:01:14.000000000 +0100 +++ new/make/solaris/makefiles/top.make 2010-11-16 18:01:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ # -generate sa-jdi.jar (JDI binding to core files) # It assumes the following flags are set: -# CFLAGS Platform_file, Src_Dirs, SYSDEFS, AOUT, Jvm_Obj_Files +# CFLAGS Platform_file, Src_Dirs_I, Src_Dirs_V, SYSDEFS, AOUT, Jvm_Obj_Files # -- D. Ungar (5/97) from a file by Bill Bush @@ -44,42 +44,7 @@ Plat_File = $(Platform_file) CDG = cd $(GENERATED); -# Pick up MakeDeps' sources and definitions -include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/makedeps.make -MakeDepsClass = MakeDeps.class -MakeDeps = $(RUN.JAVA) -classpath . MakeDeps - -Include_DBs/GC = $(VM)/includeDB_gc \ - $(VM)/includeDB_gc_parallel \ - $(VM)/gc_implementation/includeDB_gc_parallelScavenge \ - $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \ - $(VM)/gc_implementation/includeDB_gc_parNew \ - $(VM)/gc_implementation/includeDB_gc_g1 \ - $(VM)/gc_implementation/includeDB_gc_serial \ - $(VM)/gc_implementation/includeDB_gc_shared - - -Include_DBs/KERNEL = $(VM)/includeDB_core $(VM)/includeDB_gc \ - $(VM)/gc_implementation/includeDB_gc_serial \ - $(VM)/includeDB_jvmti \ - $(VM)/includeDB_compiler1 - -Include_DBs/CORE = $(VM)/includeDB_core $(Include_DBs/GC) \ - $(VM)/includeDB_jvmti \ - $(VM)/includeDB_features -Include_DBs/COMPILER1 = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 -Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2 -Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 \ - $(VM)/includeDB_compiler2 - -Include_DBs = $(Include_DBs/$(TYPE)) - -Cached_plat = platform.current -Cached_db = includeDB.current - -Incremental_Lists =$(GENERATED)/$(Cached_db) -# list generation also creates $(GENERATED)/$(Cached_plat) - +Cached_plat = $(GENERATED)/platform.current AD_Dir = $(GENERATED)/adfiles ADLC = $(AD_Dir)/adlc @@ -98,7 +63,7 @@ MFLAGS-adjusted = -r `$(adjust-mflags) "$(MFLAGS)" "$(HOTSPOT_BUILD_JOBS)"` -# default target: make makeDeps, update lists, make vm +# default target: update lists, make vm # done in stages to force sequential order with parallel make # @@ -106,38 +71,18 @@ @echo All done. # This is an explicit dependency for the sake of parallel makes. -vm_build_preliminaries: checks $(Incremental_Lists) $(AD_Files_If_Required) jvmti_stuff sa_stuff +vm_build_preliminaries: checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff @# We need a null action here, so implicit rules don't get consulted. -# make makeDeps: (and zap the cached db files to force a nonincremental run) - -$(GENERATED)/$(MakeDepsClass): $(MakeDepsSources) - @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources) - @echo Removing $(Incremental_Lists) to force regeneration. - @rm -f $(Incremental_Lists) - @$(CDG) echo >$(Cached_plat) - -# make incremental_lists, if cached files out of date, run makeDeps - -$(Incremental_Lists): $(Include_DBs) $(Plat_File) $(GENERATED)/$(MakeDepsClass) - $(CDG) cat $(Include_DBs) > includeDB - $(CDG) if [ ! -r incls ] ; then \ - mkdir incls ; \ - fi - $(CDG) $(MakeDeps) diffs UnixPlatform $(Cached_plat) $(Cached_db) $(Plat_File) includeDB $(MakeDepsOptions) - $(CDG) cp includeDB $(Cached_db) - $(CDG) cp $(Plat_File) $(Cached_plat) - -# symbolic target for command lines -lists: $(Incremental_Lists) - @: lists are now up to date +$(Cached_plat): $(Plat_File) + $(CDG) cp $(Plat_File) $(Cached_plat) # make AD files as necessary -ad_stuff: $(Incremental_Lists) $(adjust-mflags) +ad_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f adlc.make $(MFLAGS-adjusted) # generate JVMTI files from the spec -jvmti_stuff: $(Incremental_Lists) $(adjust-mflags) +jvmti_stuff: $(Cached_plat) $(adjust-mflags) @$(MAKE) -f jvmti.make $(MFLAGS-adjusted) # generate SA jar files and native header @@ -172,7 +117,6 @@ # this should force everything to be rebuilt clean: rm -f $(GENERATED)/*.class - $(MAKE) $(MFLAGS) $(GENERATED)/$(MakeDepsClass) $(MAKE) -f vm.make $(MFLAGS) clean # just in case it doesn't, this should do it --- old/make/solaris/makefiles/vm.make 2010-11-16 18:01:15.000000000 +0100 +++ new/make/solaris/makefiles/vm.make 2010-11-16 18:01:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -35,23 +35,23 @@ # Defs GENERATED = ../generated +DEP_DIR = $(GENERATED)/dependencies -# read a generated file defining the set of .o's and the .o .h dependencies -include $(GENERATED)/Dependencies +# reads the generated files defining the set of .o's and the .o .h dependencies +-include $(DEP_DIR)/*.d # read machine-specific adjustments (%%% should do this via buildtree.make?) include $(MAKEFILES_DIR)/$(BUILDARCH).make # set VPATH so make knows where to look for source files -# Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm -# The incls directory contains generated header file lists for inclusion. +# Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm # The adfiles directory contains ad_.[ch]pp. # The jvmtifiles directory contains jvmti*.[ch]pp -Src_Dirs_V = $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED)/incls -VPATH += $(Src_Dirs_V:%=%:) +Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles +VPATH += $(Src_Dirs_V:%=%:) # set INCLUDES for C preprocessor -Src_Dirs_I = $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED) +Src_Dirs_I += $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%) ifeq (${VERSION}, debug) @@ -135,6 +135,62 @@ LIBJVM = lib$(JVM).so LIBJVM_G = lib$(JVM)$(G_SUFFIX).so +CORE_PATHS := $(shell find $(GAMMADIR)/src/share/vm/* -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)) +CORE_PATHS += $(GAMMADIR)/src/os/$(Platform_os_family)/vm +CORE_PATHS += $(GAMMADIR)/src/cpu/$(Platform_arch)/vm +CORE_PATHS += $(GAMMADIR)/src/os_cpu/$(Platform_os_arch)/vm +CORE_PATHS += $(GENERATED)/jvmtifiles + +COMPILER1_PATHS := $(GAMMADIR)/src/share/vm/c1 + +COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto +COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt +COMPILER2_PATHS += $(GENERATED)/adfiles + +# Include dirs per type. +Src_Dirs/CORE := $(CORE_PATHS) +Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) +Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) +Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) +Src_Dirs/ZERO := $(CORE_PATHS) +Src_Dirs/SHARK := $(CORE_PATHS) +Src_Dirs := $(Src_Dirs/$(TYPE)) + +COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* +COMPILER1_SPECIFIC_FILES := c1_\* +SHARK_SPECIFIC_FILES := shark +ZERO_SPECIFIC_FILES := zero + +# Always exclude these. +Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp + +# Exclude per type. +Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) +Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) +Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp +Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) + +Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE)) + +# Special handling of arch model. +ifeq ($(Platform_arch_model), x86_32) +Src_Files_EXCLUDE += \*x86_64\* +endif +ifeq ($(Platform_arch_model), x86_64) +Src_Files_EXCLUDE += \*x86_32\* +endif + +# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. +define findsrc + $(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) )) +endef + +Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e))) + +Obj_Files = $(addsuffix .o,$(basename $(Src_Files))) + JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS) vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) --- old/make/windows/create.bat 2010-11-16 18:01:16.000000000 +0100 +++ new/make/windows/create.bat 2010-11-16 18:01:15.000000000 +0100 @@ -1,6 +1,6 @@ @echo off REM -REM Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. +REM Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,8 @@ REM This is the interactive build setup script (as opposed to the batch REM build execution script). It creates $HotSpotBuildSpace if necessary, REM copies the appropriate files out of $HotSpotWorkSpace into it, and -REM builds and runs MakeDeps in it. This has the side-effect of creating +REM builds and runs ProjectCreator in it. This has the side-effect of creating REM the vm.vcproj file in the buildspace, which is then used in Visual C++. -REM -REM The generated project file depends upon the include databases. If -REM those are changed then MakeDeps is rerun. REM REM Since we don't have uname and we could be cross-compiling, @@ -158,13 +155,31 @@ echo Platform_arch=%Platform_arch% >> %HotSpotBuildSpace%\%%i\local.make echo Platform_arch_model=%Platform_arch_model% >> %HotSpotBuildSpace%\%%i\local.make -REM build config specific stuff - pushd %HotSpotBuildSpace%\%%i nmake /nologo popd + ) +pushd %HotSpotBuildSpace% + +echo # Generated file! > local.make +echo # Changing a variable below and then deleting %ProjectFile% will cause >> local.make +echo # %ProjectFile% to be regenerated with the new values. Changing the >> local.make +echo # version requires rerunning create.bat. >> local.make +echo. >> local.make +echo HOTSPOTWORKSPACE=%HotSpotWorkSpace% >> local.make +echo HOTSPOTBUILDSPACE=%HotSpotBuildSpace% >> local.make +echo HOTSPOTJDKDIST=%HotSpotJDKDist% >> local.make +echo ARCH=%ARCH% >> local.make +echo BUILDARCH=%BUILDARCH% >> local.make +echo Platform_arch=%Platform_arch% >> local.make +echo Platform_arch_model=%Platform_arch_model% >> local.make + +nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile %HotSpotBuildSpace%/%ProjectFile% + +popd + goto end :usage @@ -173,14 +188,11 @@ echo This is the interactive build setup script (as opposed to the batch echo build execution script). It creates HotSpotBuildSpace if necessary, echo copies the appropriate files out of HotSpotWorkSpace into it, and -echo builds and runs MakeDeps in it. This has the side-effect of creating +echo builds and runs ProjectCreator in it. This has the side-effect of creating echo the %ProjectFile% file in the build space, which is then used in Visual C++. echo The HotSpotJDKDist defines place where JVM binaries should be placed. echo Environment variable FORCE_MSC_VER allows to override MSVC version autodetection. echo. -echo The generated project file depends upon the include databases. If -echo those are changed then MakeDeps is rerun. -echo. echo NOTE that it is now NOT safe to modify any of the files in the build echo space, since they may be overwritten whenever this script is run or echo nmake is run in that directory. --- old/make/windows/makefiles/adlc.make 2010-11-16 18:01:16.000000000 +0100 +++ new/make/windows/makefiles/adlc.make 2010-11-16 18:01:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -49,24 +49,13 @@ CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE CPP_INCLUDE_DIRS=\ - /I "..\generated" \ - /I "$(WorkSpace)\src\share\vm\compiler" \ - /I "$(WorkSpace)\src\share\vm\code" \ - /I "$(WorkSpace)\src\share\vm\interpreter" \ - /I "$(WorkSpace)\src\share\vm\classfile" \ - /I "$(WorkSpace)\src\share\vm\asm" \ - /I "$(WorkSpace)\src\share\vm\memory" \ - /I "$(WorkSpace)\src\share\vm\oops" \ - /I "$(WorkSpace)\src\share\vm\prims" \ - /I "$(WorkSpace)\src\share\vm\runtime" \ - /I "$(WorkSpace)\src\share\vm\utilities" \ - /I "$(WorkSpace)\src\share\vm\libadt" \ - /I "$(WorkSpace)\src\share\vm\opto" \ - /I "$(WorkSpace)\src\os\windows\vm" \ + /I "..\generated" \ + /I "$(WorkSpace)\src\share\vm" \ + /I "$(WorkSpace)\src\os\windows\vm" \ /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" -# NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_INCL -# and MakeDepsIDEOptions in makedeps.make. +# NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR +# and ProjectCreatorIDEOptions in projectcreator.make. GENERATED_NAMES=\ ad_$(Platform_arch_model).cpp \ ad_$(Platform_arch_model).hpp \ @@ -81,18 +70,18 @@ dfa_$(Platform_arch_model).cpp # NOTE! This must be kept in sync with GENERATED_NAMES -GENERATED_NAMES_IN_INCL=\ - incls/ad_$(Platform_arch_model).cpp \ - incls/ad_$(Platform_arch_model).hpp \ - incls/ad_$(Platform_arch_model)_clone.cpp \ - incls/ad_$(Platform_arch_model)_expand.cpp \ - incls/ad_$(Platform_arch_model)_format.cpp \ - incls/ad_$(Platform_arch_model)_gen.cpp \ - incls/ad_$(Platform_arch_model)_misc.cpp \ - incls/ad_$(Platform_arch_model)_peephole.cpp \ - incls/ad_$(Platform_arch_model)_pipeline.cpp \ - incls/adGlobals_$(Platform_arch_model).hpp \ - incls/dfa_$(Platform_arch_model).cpp +GENERATED_NAMES_IN_DIR=\ + $(AdlcOutDir)\ad_$(Platform_arch_model).cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model).hpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_clone.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_expand.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_format.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_gen.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_misc.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_peephole.cpp \ + $(AdlcOutDir)\ad_$(Platform_arch_model)_pipeline.cpp \ + $(AdlcOutDir)\adGlobals_$(Platform_arch_model).hpp \ + $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp {$(WorkSpace)\src\share\vm\adlc}.cpp.obj:: $(CPP) $(CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< @@ -110,10 +99,12 @@ $(MT) /manifest $@.manifest /outputresource:$@;#1 !endif -$(GENERATED_NAMES_IN_INCL): $(Platform_arch_model).ad adlc.exe includeDB.current +$(GENERATED_NAMES_IN_DIR): $(Platform_arch_model).ad adlc.exe rm -f $(GENERATED_NAMES) + if exist $(AdlcOutDir) rmdir /s /q $(AdlcOutDir) + mkdir $(AdlcOutDir) $(ADLC) $(ADLCFLAGS) $(Platform_arch_model).ad - mv $(GENERATED_NAMES) incls/ + mv $(GENERATED_NAMES) $(AdlcOutDir)/ $(Platform_arch_model).ad: $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad rm -f $(Platform_arch_model).ad --- old/make/windows/makefiles/debug.make 2010-11-16 18:01:17.000000000 +0100 +++ new/make/windows/makefiles/debug.make 2010-11-16 18:01:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,8 +38,6 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -!include $(GENERATED)/Dependencies - HS_BUILD_ID=$(HS_BUILD_VER)-debug # Force resources to be rebuilt every time --- old/make/windows/makefiles/fastdebug.make 2010-11-16 18:01:18.000000000 +0100 +++ new/make/windows/makefiles/fastdebug.make 2010-11-16 18:01:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -38,8 +38,6 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -!include $(GENERATED)/Dependencies - HS_BUILD_ID=$(HS_BUILD_VER)-fastdebug # Force resources to be rebuilt every time @@ -57,6 +55,5 @@ $(MT) /manifest $@.manifest /outputresource:$@;#2 !endif - !include $(WorkSpace)/make/windows/makefiles/shared.make !include $(WorkSpace)/make/windows/makefiles/sa.make --- old/make/windows/makefiles/generated.make 2010-11-16 18:01:19.000000000 +0100 +++ new/make/windows/makefiles/generated.make 2010-11-16 18:01:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ # !include ../local.make -!include $(WorkSpace)/make/windows/makefiles/makedeps.make +!include $(WorkSpace)/make/windows/makefiles/projectcreator.make !include local.make # Pick up rules for building JVMTI (JSR-163) @@ -33,65 +33,21 @@ # Pick up rules for building SA !include $(WorkSpace)/make/windows/makefiles/sa.make +AdlcOutDir=adfiles + !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") -default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) +default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles !else -default:: includeDB.current Dependencies $(JvmtiGeneratedFiles) -!endif - -# core plus serial gc -IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \ - $(WorkSpace)/src/share/vm/includeDB_jvmti \ - $(WorkSpace)/src/share/vm/includeDB_gc \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial - -# parallel gc -IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1 - -IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \ - $(WorkSpace)/src/share/vm/includeDB_features - -!if "$(Variant)" == "core" -IncludeDBs=$(IncludeDBs_core) -!endif - -!if "$(Variant)" == "kernel" -IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1 -!endif - -!if "$(Variant)" == "compiler1" -IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 -!endif - - -!if "$(Variant)" == "compiler2" -IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2 -!endif - -!if "$(Variant)" == "tiered" -IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \ - $(WorkSpace)/src/share/vm/includeDB_compiler2 +default:: $(JvmtiGeneratedFiles) buildobjfiles !endif -# Note we don't generate a Visual C++ project file using MakeDeps for -# the batch build. -includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs) - cat $(IncludeDBs) > includeDB - if exist incls rmdir /s /q incls - mkdir incls - $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions) - rm -f includeDB.current - cp includeDB includeDB.current +buildobjfiles: + @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make -classes/MakeDeps.class: $(MakeDepsSources) +classes/ProjectCreator.class: $(ProjectCreatorSources) if exist classes rmdir /s /q classes mkdir classes - $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources) + $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources) !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") --- old/make/windows/makefiles/product.make 2010-11-16 18:01:20.000000000 +0100 +++ new/make/windows/makefiles/product.make 2010-11-16 18:01:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -41,8 +41,6 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -!include $(GENERATED)/Dependencies - HS_BUILD_ID=$(HS_BUILD_VER) # Force resources to be rebuilt every time --- old/make/windows/makefiles/vm.make 2010-11-16 18:01:20.000000000 +0100 +++ new/make/windows/makefiles/vm.make 2010-11-16 18:01:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,8 @@ # Resource file containing VERSIONINFO Res_Files=.\version.res +!include ..\generated\objfiles.make + !ifdef RELEASE !ifdef DEVELOP CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" @@ -77,6 +79,14 @@ # Define that so jni.h is on correct side CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" +# Used for platform dispatching +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch) +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model) +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch) +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model) +CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP + !if "$(BUILDARCH)" == "ia64" STACK_SIZE="/STACK:1048576,262144" !else @@ -111,37 +121,18 @@ /export:JVM_InitAgentProperties CPP_INCLUDE_DIRS=\ - /I "..\generated" \ - /I "..\generated\jvmtifiles" \ - /I "$(WorkSpace)\src\share\vm\c1" \ - /I "$(WorkSpace)\src\share\vm\compiler" \ - /I "$(WorkSpace)\src\share\vm\code" \ - /I "$(WorkSpace)\src\share\vm\interpreter" \ - /I "$(WorkSpace)\src\share\vm\ci" \ - /I "$(WorkSpace)\src\share\vm\classfile" \ - /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\ - /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\ - /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\ - /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\ - /I "$(WorkSpace)\src\share\vm\gc_implementation\g1"\ - /I "$(WorkSpace)\src\share\vm\gc_interface"\ - /I "$(WorkSpace)\src\share\vm\asm" \ - /I "$(WorkSpace)\src\share\vm\memory" \ - /I "$(WorkSpace)\src\share\vm\oops" \ - /I "$(WorkSpace)\src\share\vm\prims" \ - /I "$(WorkSpace)\src\share\vm\runtime" \ - /I "$(WorkSpace)\src\share\vm\services" \ - /I "$(WorkSpace)\src\share\vm\utilities" \ - /I "$(WorkSpace)\src\share\vm\libadt" \ - /I "$(WorkSpace)\src\share\vm\opto" \ - /I "$(WorkSpace)\src\os\windows\vm" \ + /I "..\generated" \ + /I "$(WorkSpace)\src\share\vm" \ + /I "$(WorkSpace)\src\share\vm\prims" \ + /I "$(WorkSpace)\src\os\windows\vm" \ /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" -CPP_USE_PCH=/Fp"vm.pch" /Yu"incls/_precompiled.incl" +CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" # Where to find the source code for the virtual machine -VM_PATH=../generated/incls +VM_PATH=../generated +VM_PATH=$(VM_PATH);../generated/adfiles VM_PATH=$(VM_PATH);../generated/jvmtifiles VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler @@ -280,11 +271,14 @@ {..\generated\incls}.cpp.obj:: $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< +{..\generated\adfiles}.cpp.obj:: + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< + {..\generated\jvmtifiles}.cpp.obj:: $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< default:: _build_pch_file.obj: - @echo #include "incls/_precompiled.incl" > ../generated/_build_pch_file.cpp - $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"incls/_precompiled.incl" /c ../generated/_build_pch_file.cpp + @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp + $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp --- old/make/windows/projectfiles/common/Makefile 2010-11-16 18:01:21.000000000 +0100 +++ new/make/windows/projectfiles/common/Makefile 2010-11-16 18:01:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,8 @@ # # +!include local.make + WorkSpace=$(HOTSPOTWORKSPACE) !ifdef ALT_BOOTDIR @@ -36,70 +38,25 @@ !endif !endif -!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/makedeps.make +!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/projectcreator.make # Pick up rules for building JVMTI (JSR-163) -JvmtiOutDir=$(HOTSPOTBUILDSPACE)\jvmtifiles +JvmtiOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\jvmtifiles !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH) -default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) - -IncludeDBs_base=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_core \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_jvmti \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_serial - -# Parallel gc files -IncludeDBs_gc=$(HOTSPOTWORKSPACE)/src/share/vm/includeDB_gc_parallel \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_shared \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parNew \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \ - $(HOTSPOTWORKSPACE)/src/share/vm/gc_implementation/includeDB_gc_g1 - - -IncludeDBs_kernel =$(IncludeDBs_base) \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 - -IncludeDBs_core =$(IncludeDBs_base) $(IncludeDBs_gc) \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_features - -IncludeDBs_compiler1=$(IncludeDBs_core) \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 - -IncludeDBs_compiler2=$(IncludeDBs_core) \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2 - -IncludeDBs_tiered=$(IncludeDBs_core) \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler1 \ - $(HOTSPOTWORKSPACE)/src/share/vm/includeDB_compiler2 - - -!if "$(Variant)" == "compiler1" -IncludeDBs = $(IncludeDBs_compiler1) -!endif - !if "$(Variant)" == "compiler2" -IncludeDBs = $(IncludeDBs_compiler2) # Pick up rules for building adlc !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make !endif !if "$(Variant)" == "tiered" -IncludeDBs = $(IncludeDBs_tiered) # Pick up rules for building adlc !include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make !endif -!if "$(Variant)" == "core" -IncludeDBs = $(IncludeDBs_core) -!endif - -!if "$(Variant)" == "kernel" -IncludeDBs = $(IncludeDBs_kernel) -!endif +default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) !include $(HOTSPOTWORKSPACE)/make/hotspot_version @@ -130,55 +87,22 @@ !endif !endif -MakeDepsIDEOptions = $(MakeDepsIDEOptions) \ - -includeDB_kernel $(HOTSPOTBUILDSPACE)\includeDB_kernel \ - -includeDB_core $(HOTSPOTBUILDSPACE)\includeDB_core \ - -includeDB_compiler1 $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \ - -includeDB_compiler2 $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \ - -includeDB_tiered $(HOTSPOTBUILDSPACE)\includeDB_tiered \ +ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) \ -platform $(Platform) \ -define HOTSPOT_RELEASE_VERSION=\\\"$(HOTSPOT_RELEASE_VERSION)\\\" \ -define JRE_RELEASE_VERSION=\\\"$(JRE_RELEASE_VERSION)\\\" \ -define HOTSPOT_VM_DISTRO=\\\"$(HOTSPOT_VM_DISTRO)\\\" -incls: - @mkdir incls - -includeDB.current $(ProjectFile) Dependencies: local.make $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class \ - $(IncludeDBs) incls - @rm -f includeDB $(HOTSPOTBUILDSPACE)\includeDB_kernel \ - $(HOTSPOTBUILDSPACE)\includeDB_core \ - $(HOTSPOTBUILDSPACE)\includeDB_compiler1 \ - $(HOTSPOTBUILDSPACE)\includeDB_compiler2 \ - $(HOTSPOTBUILDSPACE)\includeDB_tiered - @cat $(IncludeDBs_kernel) > $(HOTSPOTBUILDSPACE)\includeDB_kernel - @cat $(IncludeDBs_core) > $(HOTSPOTBUILDSPACE)\includeDB_core - @cat $(IncludeDBs_compiler1) > $(HOTSPOTBUILDSPACE)\includeDB_compiler1 - @cat $(IncludeDBs_compiler2) > $(HOTSPOTBUILDSPACE)\includeDB_compiler2 - @cat $(IncludeDBs_tiered) > $(HOTSPOTBUILDSPACE)\includeDB_tiered - @echo java.cpp jni.h > includeDB - @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps diffs WinGammaPlatform$(VcVersion) \ - $(Platform) includeDB.current $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions) - @rm -f includeDB.current - @cp includeDB includeDB.current - -lists: $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class FORCE - @if exist incls rmdir /s /q incls - @rm -f includeDB - @cat $(IncludeDBs) > includeDB - @mkdir incls - @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes MakeDeps WinGammaPlatform$(VcVersion) \ - $(Platform) includeDB $(MakeDepsOptions) $(MakeDepsIDEOptions) - @rm -f includeDB.current - @cp includeDB includeDB.current +$(HOTSPOTBUILDSPACE)/$(ProjectFile): local.make $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class + @$(RUN_JAVA) -Djava.class.path=$(HOTSPOTBUILDSPACE)/classes ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) clean: - @rm -rf incls $(HOTSPOTBUILDSPACE)/classes - @rm -f includeDB includeDB.current $(ProjectFile) Dependencies + @rm -rf $(HOTSPOTBUILDSPACE)/classes + @rm -r ../$(ProjectFile) -$(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources) +$(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class: $(ProjectCreatorSources) @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes @mkdir $(HOTSPOTBUILDSPACE)\classes - @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources) + @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\ProjectCreator -d $(HOTSPOTBUILDSPACE)/classes $(ProjectCreatorSources) FORCE: --- old/make/windows/projectfiles/compiler2/Makefile 2010-11-16 18:01:22.000000000 +0100 +++ new/make/windows/projectfiles/compiler2/Makefile 2010-11-16 18:01:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ Variant=compiler2 !include local.make -AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp +AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles +AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile --- old/make/windows/projectfiles/kernel/Makefile 2010-11-16 18:01:23.000000000 +0100 +++ new/make/windows/projectfiles/kernel/Makefile 2010-11-16 18:01:23.000000000 +0100 @@ -22,7 +22,7 @@ # # -Variant=compiler1 +Variant=kernel !include local.make !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile --- old/make/windows/projectfiles/tiered/Makefile 2010-11-16 18:01:24.000000000 +0100 +++ new/make/windows/projectfiles/tiered/Makefile 2010-11-16 18:01:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ Variant=tiered !include local.make -AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp +AdlcOutDir=$(HOTSPOTBUILDSPACE)\$(Variant)\generated\adfiles +AdditionalTargets=$(AdlcOutDir)\ad_$(Platform_arch_model).cpp $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile --- old/src/cpu/sparc/vm/assembler_sparc.cpp 2010-11-16 18:01:24.000000000 +0100 +++ new/src/cpu/sparc/vm/assembler_sparc.cpp 2010-11-16 18:01:24.000000000 +0100 @@ -22,8 +22,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/resourceArea.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#endif // Convert the raw encoding form into the form expected by the // constructor for Address. --- old/src/cpu/sparc/vm/assembler_sparc.hpp 2010-11-16 18:01:25.000000000 +0100 +++ new/src/cpu/sparc/vm/assembler_sparc.hpp 2010-11-16 18:01:25.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_HPP +#define CPU_SPARC_VM_ASSEMBLER_SPARC_HPP + class BiasedLockingCounters; // promises that the system will not use traps 16-31 @@ -2500,3 +2503,5 @@ // On RISC, there's no benefit to verifying instruction boundaries. inline bool AbstractAssembler::pd_check_instruction_mark() { return false; } #endif + +#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_HPP --- old/src/cpu/sparc/vm/assembler_sparc.inline.hpp 2010-11-16 18:01:26.000000000 +0100 +++ new/src/cpu/sparc/vm/assembler_sparc.inline.hpp 2010-11-16 18:01:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP +#define CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP + +#include "asm/assembler.inline.hpp" +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" +#include "runtime/handles.inline.hpp" + inline void MacroAssembler::pd_patch_instruction(address branch, address target) { jint& stub_inst = *(jint*) branch; stub_inst = patched_branch(target - branch, stub_inst, 0); @@ -817,3 +825,5 @@ Assembler::ldstub(SP, 0, G0); } } + +#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP --- old/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp 2010-11-16 18:01:27.000000000 +0100 +++ new/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp 2010-11-16 18:01:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,24 @@ * */ +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interp_masm_sparc.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" + // KILL THIS FILE --- old/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp 2010-11-16 18:01:28.000000000 +0100 +++ new/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp 2010-11-16 18:01:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_HPP +#define CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_HPP + // Platform specific for C++ based Interpreter #define LOTS_OF_REGS /* Lets interpreter use plenty of registers */ @@ -97,3 +100,5 @@ ((VMJavaVal64*)(addr))->d) #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \ ((VMJavaVal64*)(addr))->l) + +#endif // CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_HPP --- old/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp 2010-11-16 18:01:29.000000000 +0100 +++ new/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp 2010-11-16 18:01:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_INLINE_HPP +#define CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_INLINE_HPP + // Inline interpreter functions for sparc inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) { return op1 + op2; } @@ -331,3 +334,5 @@ } }; #endif /* ALIGN_CONVERTER */ + +#endif // CPU_SPARC_VM_BYTECODEINTERPRETER_SPARC_INLINE_HPP --- old/src/cpu/sparc/vm/bytecodes_sparc.cpp 2010-11-16 18:01:29.000000000 +0100 +++ new/src/cpu/sparc/vm/bytecodes_sparc.cpp 2010-11-16 18:01:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecodes_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecodes.hpp" void Bytecodes::pd_initialize() { --- old/src/cpu/sparc/vm/bytecodes_sparc.hpp 2010-11-16 18:01:30.000000000 +0100 +++ new/src/cpu/sparc/vm/bytecodes_sparc.hpp 2010-11-16 18:01:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_BYTECODES_SPARC_HPP +#define CPU_SPARC_VM_BYTECODES_SPARC_HPP + #ifdef SPARC #define NLOCALS_IN_REGS 6 #endif @@ -30,3 +33,5 @@ // Sparc specific bytecodes // (none) + +#endif // CPU_SPARC_VM_BYTECODES_SPARC_HPP --- old/src/cpu/sparc/vm/bytes_sparc.hpp 2010-11-16 18:01:31.000000000 +0100 +++ new/src/cpu/sparc/vm/bytes_sparc.hpp 2010-11-16 18:01:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef CPU_SPARC_VM_BYTES_SPARC_HPP +#define CPU_SPARC_VM_BYTES_SPARC_HPP + +#include "memory/allocation.hpp" + class Bytes: AllStatic { public: // Efficient reading and writing of unaligned unsigned data in platform-specific byte ordering @@ -155,3 +160,5 @@ // 1.15 98/10/05 16:30:21 bytes_i486.hpp // 1.17 99/06/22 16:37:35 bytes_i486.hpp //End + +#endif // CPU_SPARC_VM_BYTES_SPARC_HPP --- old/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp 2010-11-16 18:01:32.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp 2010-11-16 18:01:31.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_CodeStubs_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CodeStubs.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "nativeInst_sparc.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_sparc.inline.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#endif #define __ ce->masm()-> --- old/src/cpu/sparc/vm/c1_Defs_sparc.hpp 2010-11-16 18:01:32.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_Defs_sparc.hpp 2010-11-16 18:01:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_C1_DEFS_SPARC_HPP +#define CPU_SPARC_VM_C1_DEFS_SPARC_HPP + // native word offsets from memory address (big endian) enum { pd_lo_word_offset_in_bytes = BytesPerInt, @@ -65,3 +68,5 @@ enum { pd_float_saved_as_double = false }; + +#endif // CPU_SPARC_VM_C1_DEFS_SPARC_HPP --- old/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp 2010-11-16 18:01:33.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp 2010-11-16 18:01:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,10 @@ * */ +#include "precompiled.hpp" +#include "c1/c1_FpuStackSim.hpp" +#include "c1/c1_FrameMap.hpp" +#include "utilities/array.hpp" +#include "utilities/ostream.hpp" + // No FPU stack on SPARC --- old/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp 2010-11-16 18:01:34.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp 2010-11-16 18:01:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,10 @@ * */ +#ifndef CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP +#define CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP + // No FPU stack on SPARC class FpuStackSim; + +#endif // CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP --- old/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp 2010-11-16 18:01:35.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp 2010-11-16 18:01:35.000000000 +0100 @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_FrameMap_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIR.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_sparc.inline.hpp" const int FrameMap::pd_c_runtime_reserved_arg_size = 7; --- old/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp 2010-11-16 18:01:36.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp 2010-11-16 18:01:35.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP +#define CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP + public: enum { @@ -151,3 +154,5 @@ static bool is_caller_save_register (LIR_Opr reg); static bool is_caller_save_register (Register r); + +#endif // CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP --- old/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2010-11-16 18:01:36.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2010-11-16 18:01:36.000000000 +0100 @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRAssembler_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciInstance.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/barrierSet.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/objArrayKlass.hpp" +#include "runtime/sharedRuntime.hpp" #define __ _masm-> --- old/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp 2010-11-16 18:01:37.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp 2010-11-16 18:01:37.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP +#define CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP + private: ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -90,3 +93,5 @@ #endif // _LP64 exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(10*4), deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(10*4) }; + +#endif // CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP --- old/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2010-11-16 18:01:38.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2010-11-16 18:01:38.000000000 +0100 @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRGenerator_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_LIRGenerator.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_sparc.inline.hpp" #ifdef ASSERT #define __ gen()->lir(__FILE__, __LINE__)-> --- old/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp 2010-11-16 18:01:39.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp 2010-11-16 18:01:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_LinearScan_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LinearScan.hpp" +#include "utilities/bitMap.inline.hpp" void LinearScan::allocate_fpu_stack() { // No FPU stack on SPARC --- old/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp 2010-11-16 18:01:40.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp 2010-11-16 18:01:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP +#define CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP + inline bool LinearScan::is_processed_reg_num(int reg_num) { return reg_num < 26 || reg_num > 31; } @@ -71,3 +74,5 @@ } return false; } + +#endif // CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP --- old/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp 2010-11-16 18:01:41.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp 2010-11-16 18:01:40.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_MacroAssembler_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/os.hpp" +#include "runtime/stubRoutines.hpp" void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) { Label L; --- old/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp 2010-11-16 18:01:41.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp 2010-11-16 18:01:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP +#define CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP + void pd_init() { /* nothing to do */ } public: @@ -84,3 +87,5 @@ // invalidates registers in this window void invalidate_registers(bool iregisters, bool lregisters, bool oregisters, Register preserve1 = noreg, Register preserve2 = noreg); + +#endif // CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP --- old/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2010-11-16 18:01:42.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2010-11-16 18:01:42.000000000 +0100 @@ -22,8 +22,20 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Runtime1_sparc.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Defs.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "register_sparc.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/signature.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_sparc.inline.hpp" // Implementation of StubAssembler --- old/src/cpu/sparc/vm/c1_globals_sparc.hpp 2010-11-16 18:01:43.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_globals_sparc.hpp 2010-11-16 18:01:43.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP +#define CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the client compiler. // (see c1_globals.hpp) @@ -61,3 +67,5 @@ define_pd_global(bool, TwoOperandLIRForm, false); define_pd_global(intx, SafepointPollOffset, 0 ); + +#endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP --- old/src/cpu/sparc/vm/c2_globals_sparc.hpp 2010-11-16 18:01:44.000000000 +0100 +++ new/src/cpu/sparc/vm/c2_globals_sparc.hpp 2010-11-16 18:01:44.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP +#define CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the server compiler. // (see c2_globals.hpp). Alpha-sorted. @@ -88,3 +94,5 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); + +#endif // CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP --- old/src/cpu/sparc/vm/c2_init_sparc.cpp 2010-11-16 18:01:45.000000000 +0100 +++ new/src/cpu/sparc/vm/c2_init_sparc.cpp 2010-11-16 18:01:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c2_init_sparc.cpp.incl" +#include "precompiled.hpp" +#include "opto/compile.hpp" +#include "opto/node.hpp" // processor dependent initialization for sparc --- old/src/cpu/sparc/vm/codeBuffer_sparc.hpp 2010-11-16 18:01:45.000000000 +0100 +++ new/src/cpu/sparc/vm/codeBuffer_sparc.hpp 2010-11-16 18:01:45.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_CODEBUFFER_SPARC_HPP +#define CPU_SPARC_VM_CODEBUFFER_SPARC_HPP + private: void pd_initialize() {} @@ -32,3 +35,5 @@ bool is_backward_branch(Label& L) { return L.is_bound() && insts_end() <= locator_address(L.loc()); } + +#endif // CPU_SPARC_VM_CODEBUFFER_SPARC_HPP --- old/src/cpu/sparc/vm/copy_sparc.hpp 2010-11-16 18:01:46.000000000 +0100 +++ new/src/cpu/sparc/vm/copy_sparc.hpp 2010-11-16 18:01:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_COPY_SPARC_HPP +#define CPU_SPARC_VM_COPY_SPARC_HPP + // Inline functions for memory copy and fill. static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) { @@ -186,3 +189,5 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } + +#endif // CPU_SPARC_VM_COPY_SPARC_HPP --- old/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp 2010-11-16 18:01:47.000000000 +0100 +++ new/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp 2010-11-16 18:01:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_CPPINTERPRETERGENERATOR_SPARC_HPP +#define CPU_SPARC_VM_CPPINTERPRETERGENERATOR_SPARC_HPP + static address frame_manager_return; static address frame_manager_sync_return; @@ -32,3 +35,5 @@ void generate_compute_interpreter_state(const Register state, const Register prev_state, bool native); + +#endif // CPU_SPARC_VM_CPPINTERPRETERGENERATOR_SPARC_HPP --- old/src/cpu/sparc/vm/cppInterpreter_sparc.cpp 2010-11-16 18:01:48.000000000 +0100 +++ new/src/cpu/sparc/vm/cppInterpreter_sparc.cpp 2010-11-16 18:01:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_cppInterpreter_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/cppInterpreter.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef SHARK +#include "shark/shark_globals.hpp" +#endif #ifdef CC_INTERP --- old/src/cpu/sparc/vm/cppInterpreter_sparc.hpp 2010-11-16 18:01:49.000000000 +0100 +++ new/src/cpu/sparc/vm/cppInterpreter_sparc.hpp 2010-11-16 18:01:48.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_CPPINTERPRETER_SPARC_HPP +#define CPU_SPARC_VM_CPPINTERPRETER_SPARC_HPP + // Size of interpreter code. Increase if too small. Interpreter will // fail with a guarantee ("not enough space for interpreter generation"); // if too small. @@ -37,3 +40,5 @@ #else const static int InterpreterCodeSize = 180 * K; #endif + +#endif // CPU_SPARC_VM_CPPINTERPRETER_SPARC_HPP --- old/src/cpu/sparc/vm/debug_sparc.cpp 2010-11-16 18:01:49.000000000 +0100 +++ new/src/cpu/sparc/vm/debug_sparc.cpp 2010-11-16 18:01:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_debug_sparc.cpp.incl" +#include "precompiled.hpp" +#include "code/codeCache.hpp" +#include "code/nmethod.hpp" +#include "runtime/frame.hpp" +#include "runtime/init.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" +#include "utilities/top.hpp" #ifndef PRODUCT --- old/src/cpu/sparc/vm/depChecker_sparc.cpp 2010-11-16 18:01:50.000000000 +0100 +++ new/src/cpu/sparc/vm/depChecker_sparc.cpp 2010-11-16 18:01:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_depChecker_sparc.cpp.incl" +#include "precompiled.hpp" +#include "compiler/disassembler.hpp" +#include "depChecker_sparc.hpp" +#include "runtime/hpi.hpp" // Nothing to do on Sparc --- old/src/cpu/sparc/vm/depChecker_sparc.hpp 2010-11-16 18:01:51.000000000 +0100 +++ new/src/cpu/sparc/vm/depChecker_sparc.hpp 2010-11-16 18:01:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_DEPCHECKER_SPARC_HPP +#define CPU_SPARC_VM_DEPCHECKER_SPARC_HPP + // Nothing to do on Sparc + +#endif // CPU_SPARC_VM_DEPCHECKER_SPARC_HPP --- old/src/cpu/sparc/vm/disassembler_sparc.hpp 2010-11-16 18:01:52.000000000 +0100 +++ new/src/cpu/sparc/vm/disassembler_sparc.hpp 2010-11-16 18:01:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP +#define CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP + static int pd_instruction_alignment() { return sizeof(int); } @@ -30,3 +33,5 @@ return (VM_Version::v9_instructions_work()? (VM_Version::v8_instructions_work()? "" : "v9only") : "v8only"); } + +#endif // CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP --- old/src/cpu/sparc/vm/dump_sparc.cpp 2010-11-16 18:01:53.000000000 +0100 +++ new/src/cpu/sparc/vm/dump_sparc.cpp 2010-11-16 18:01:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dump_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "memory/compactingPermGenGen.hpp" +#include "memory/generation.inline.hpp" +#include "memory/space.inline.hpp" --- old/src/cpu/sparc/vm/frame_sparc.cpp 2010-11-16 18:01:53.000000000 +0100 +++ new/src/cpu/sparc/vm/frame_sparc.cpp 2010-11-16 18:01:53.000000000 +0100 @@ -22,8 +22,24 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_frame_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/resourceArea.hpp" +#include "oops/markOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/monitorChunk.hpp" +#include "runtime/signature.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_sparc.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#include "runtime/vframeArray.hpp" +#endif void RegisterMap::pd_clear() { if (_thread->has_last_Java_frame()) { --- old/src/cpu/sparc/vm/frame_sparc.hpp 2010-11-16 18:01:54.000000000 +0100 +++ new/src/cpu/sparc/vm/frame_sparc.hpp 2010-11-16 18:01:54.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_FRAME_SPARC_HPP +#define CPU_SPARC_VM_FRAME_SPARC_HPP + +#include "runtime/synchronizer.hpp" +#include "utilities/top.hpp" + // A frame represents a physical stack frame (an activation). Frames can be // C or Java frames, and the Java frames can be interpreted or compiled. // In contrast, vframes represent source-level activations, so that one physical frame @@ -309,3 +315,5 @@ return reg->is_out() || reg->is_global(); #endif } + +#endif // CPU_SPARC_VM_FRAME_SPARC_HPP --- old/src/cpu/sparc/vm/frame_sparc.inline.hpp 2010-11-16 18:01:55.000000000 +0100 +++ new/src/cpu/sparc/vm/frame_sparc.inline.hpp 2010-11-16 18:01:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP +#define CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP + // Inline functions for SPARC frames: // Constructors @@ -295,3 +298,5 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { *((oop*) map->location(O0->as_VMReg())) = obj; } + +#endif // CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP --- old/src/cpu/sparc/vm/globalDefinitions_sparc.hpp 2010-11-16 18:01:56.000000000 +0100 +++ new/src/cpu/sparc/vm/globalDefinitions_sparc.hpp 2010-11-16 18:01:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP +#define CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP + // Size of Sparc Instructions const int BytesPerInstWord = 4; const int StackAlignmentInBytes = (2*wordSize); + +#endif // CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP --- old/src/cpu/sparc/vm/globals_sparc.hpp 2010-11-16 18:01:57.000000000 +0100 +++ new/src/cpu/sparc/vm/globals_sparc.hpp 2010-11-16 18:01:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_GLOBALS_SPARC_HPP +#define CPU_SPARC_VM_GLOBALS_SPARC_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -64,3 +70,5 @@ define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, UseMembar, false); + +#endif // CPU_SPARC_VM_GLOBALS_SPARC_HPP --- old/src/cpu/sparc/vm/icBuffer_sparc.cpp 2010-11-16 18:01:57.000000000 +0100 +++ new/src/cpu/sparc/vm/icBuffer_sparc.cpp 2010-11-16 18:01:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icBuffer_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "code/icBuffer.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" int InlineCacheBuffer::ic_stub_code_size() { #ifdef _LP64 --- old/src/cpu/sparc/vm/icache_sparc.cpp 2010-11-16 18:01:58.000000000 +0100 +++ new/src/cpu/sparc/vm/icache_sparc.cpp 2010-11-16 18:01:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icache_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "runtime/icache.hpp" #define __ _masm-> --- old/src/cpu/sparc/vm/icache_sparc.hpp 2010-11-16 18:01:59.000000000 +0100 +++ new/src/cpu/sparc/vm/icache_sparc.hpp 2010-11-16 18:01:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_ICACHE_SPARC_HPP +#define CPU_SPARC_VM_ICACHE_SPARC_HPP + // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -36,3 +39,5 @@ // Use default implementation }; + +#endif // CPU_SPARC_VM_ICACHE_SPARC_HPP --- old/src/cpu/sparc/vm/interp_masm_sparc.cpp 2010-11-16 18:02:00.000000000 +0100 +++ new/src/cpu/sparc/vm/interp_masm_sparc.cpp 2010-11-16 18:02:00.000000000 +0100 @@ -22,8 +22,26 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interp_masm_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interp_masm_sparc.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif #ifndef CC_INTERP #ifndef FAST_DISPATCH --- old/src/cpu/sparc/vm/interp_masm_sparc.hpp 2010-11-16 18:02:01.000000000 +0100 +++ new/src/cpu/sparc/vm/interp_masm_sparc.hpp 2010-11-16 18:02:01.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP +#define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP + +#include "assembler_sparc.inline.hpp" +#include "interpreter/invocationCounter.hpp" + // This file specializes the assember with interpreter-specific macros REGISTER_DECLARATION( Register, Otos_i , O0); // tos for ints, etc @@ -327,3 +333,5 @@ void restore_return_value(TosState state, bool is_native_call); }; + +#endif // CPU_SPARC_VM_INTERP_MASM_SPARC_HPP --- old/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp 2010-11-16 18:02:02.000000000 +0100 +++ new/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp 2010-11-16 18:02:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_INTERPRETERGENERATOR_SPARC_HPP +#define CPU_SPARC_VM_INTERPRETERGENERATOR_SPARC_HPP + friend class AbstractInterpreterGenerator; private: @@ -39,3 +42,5 @@ void generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue); void generate_counter_overflow(Label& Lcontinue); + +#endif // CPU_SPARC_VM_INTERPRETERGENERATOR_SPARC_HPP --- old/src/cpu/sparc/vm/interpreterRT_sparc.cpp 2010-11-16 18:02:02.000000000 +0100 +++ new/src/cpu/sparc/vm/interpreterRT_sparc.cpp 2010-11-16 18:02:02.000000000 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreterRT_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/signature.hpp" #define __ _masm-> --- old/src/cpu/sparc/vm/interpreterRT_sparc.hpp 2010-11-16 18:02:03.000000000 +0100 +++ new/src/cpu/sparc/vm/interpreterRT_sparc.hpp 2010-11-16 18:02:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP +#define CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP + +#include "memory/allocation.hpp" + static int binary_search(int key, LookupswitchPair* array, int n); static address iload (JavaThread* thread); @@ -54,3 +59,5 @@ // Code generation void generate( uint64_t fingerprint ); }; + +#endif // CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP --- old/src/cpu/sparc/vm/interpreter_sparc.cpp 2010-11-16 18:02:04.000000000 +0100 +++ new/src/cpu/sparc/vm/interpreter_sparc.cpp 2010-11-16 18:02:04.000000000 +0100 @@ -22,8 +22,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreter_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif --- old/src/cpu/sparc/vm/interpreter_sparc.hpp 2010-11-16 18:02:05.000000000 +0100 +++ new/src/cpu/sparc/vm/interpreter_sparc.hpp 2010-11-16 18:02:05.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_INTERPRETER_SPARC_HPP +#define CPU_SPARC_VM_INTERPRETER_SPARC_HPP + public: static int expr_offset_in_bytes(int i) { return stackElementSize * i + wordSize; } @@ -34,3 +37,5 @@ assert(i <= 0, "local direction already negated"); return stackElementWords * i; } + +#endif // CPU_SPARC_VM_INTERPRETER_SPARC_HPP --- old/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp 2010-11-16 18:02:06.000000000 +0100 +++ new/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp 2010-11-16 18:02:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP +#define CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP + private: volatile int _flags; @@ -97,3 +100,5 @@ _flags |= flushed; OrderAccess::fence(); } + +#endif // CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP --- old/src/cpu/sparc/vm/jniFastGetField_sparc.cpp 2010-11-16 18:02:06.000000000 +0100 +++ new/src/cpu/sparc/vm/jniFastGetField_sparc.cpp 2010-11-16 18:02:06.000000000 +0100 @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_jniFastGetField_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/safepoint.hpp" // TSO ensures that loads are blocking and ordered with respect to // to earlier loads, so we don't need LoadLoad membars. --- old/src/cpu/sparc/vm/jniTypes_sparc.hpp 2010-11-16 18:02:07.000000000 +0100 +++ new/src/cpu/sparc/vm/jniTypes_sparc.hpp 2010-11-16 18:02:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef CPU_SPARC_VM_JNITYPES_SPARC_HPP +#define CPU_SPARC_VM_JNITYPES_SPARC_HPP + +#include "memory/allocation.hpp" +#include "oops/oop.hpp" +#include "prims/jni.h" + // This file holds platform-dependent routines used to write primitive jni // types to the array of arguments passed into JavaCalls::call @@ -106,3 +113,5 @@ #endif }; + +#endif // CPU_SPARC_VM_JNITYPES_SPARC_HPP --- old/src/cpu/sparc/vm/jni_sparc.h 2010-11-16 18:02:08.000000000 +0100 +++ new/src/cpu/sparc/vm/jni_sparc.h 2010-11-16 18:02:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/cpu/sparc/vm/methodHandles_sparc.cpp 2010-11-16 18:02:09.000000000 +0100 +++ new/src/cpu/sparc/vm/methodHandles_sparc.cpp 2010-11-16 18:02:09.000000000 +0100 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_methodHandles_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.inline.hpp" +#include "prims/methodHandles.hpp" #define __ _masm-> --- old/src/cpu/sparc/vm/nativeInst_sparc.cpp 2010-11-16 18:02:10.000000000 +0100 +++ new/src/cpu/sparc/vm/nativeInst_sparc.cpp 2010-11-16 18:02:09.000000000 +0100 @@ -22,8 +22,18 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_nativeInst_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/ostream.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif bool NativeInstruction::is_dtrace_trap() { --- old/src/cpu/sparc/vm/nativeInst_sparc.hpp 2010-11-16 18:02:10.000000000 +0100 +++ new/src/cpu/sparc/vm/nativeInst_sparc.hpp 2010-11-16 18:02:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef CPU_SPARC_VM_NATIVEINST_SPARC_HPP +#define CPU_SPARC_VM_NATIVEINST_SPARC_HPP + +#include "asm/assembler.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" +#include "utilities/top.hpp" + // We have interface for the following instructions: // - NativeInstruction // - - NativeCall @@ -913,3 +922,5 @@ // Insert illegal opcode as specific address static void insert(address code_pos); }; + +#endif // CPU_SPARC_VM_NATIVEINST_SPARC_HPP --- old/src/cpu/sparc/vm/registerMap_sparc.hpp 2010-11-16 18:02:11.000000000 +0100 +++ new/src/cpu/sparc/vm/registerMap_sparc.hpp 2010-11-16 18:02:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_REGISTERMAP_SPARC_HPP +#define CPU_SPARC_VM_REGISTERMAP_SPARC_HPP + // machine-dependent implemention for register maps friend class frame; @@ -51,3 +54,5 @@ void shift_individual_registers(); // When popping out of compiled frames, we make all IRegs disappear. void make_integer_regs_unsaved() { _location_valid[0] = 0; } + +#endif // CPU_SPARC_VM_REGISTERMAP_SPARC_HPP --- old/src/cpu/sparc/vm/register_definitions_sparc.cpp 2010-11-16 18:02:12.000000000 +0100 +++ new/src/cpu/sparc/vm/register_definitions_sparc.cpp 2010-11-16 18:02:12.000000000 +0100 @@ -25,8 +25,11 @@ // make sure the defines don't screw up the declarations later on in this file #define DONT_USE_REGISTER_DEFINES -#include "incls/_precompiled.incl" -#include "incls/_register_definitions_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/register.hpp" +#include "interp_masm_sparc.hpp" +#include "register_sparc.hpp" REGISTER_DEFINITION(Register, noreg); --- old/src/cpu/sparc/vm/register_sparc.cpp 2010-11-16 18:02:13.000000000 +0100 +++ new/src/cpu/sparc/vm/register_sparc.cpp 2010-11-16 18:02:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_register_sparc.cpp.incl" +#include "precompiled.hpp" +#include "register_sparc.hpp" const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers << 1; const int ConcreteRegisterImpl::max_fpr = ConcreteRegisterImpl::max_gpr + FloatRegisterImpl::number_of_registers; --- old/src/cpu/sparc/vm/register_sparc.hpp 2010-11-16 18:02:14.000000000 +0100 +++ new/src/cpu/sparc/vm/register_sparc.hpp 2010-11-16 18:02:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_REGISTER_SPARC_HPP +#define CPU_SPARC_VM_REGISTER_SPARC_HPP + +#include "asm/register.hpp" +#include "vm_version_sparc.hpp" + // forward declaration class Address; class VMRegImpl; @@ -440,3 +446,5 @@ return as_FloatRegister( ((encoding & 1) << 5) | (encoding & 0x1c) ); } }; + +#endif // CPU_SPARC_VM_REGISTER_SPARC_HPP --- old/src/cpu/sparc/vm/relocInfo_sparc.cpp 2010-11-16 18:02:14.000000000 +0100 +++ new/src/cpu/sparc/vm/relocInfo_sparc.cpp 2010-11-16 18:02:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_relocInfo_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.inline.hpp" +#include "assembler_sparc.inline.hpp" +#include "code/relocInfo.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/safepoint.hpp" void Relocation::pd_set_data_value(address x, intptr_t o) { NativeInstruction* ip = nativeInstruction_at(addr()); --- old/src/cpu/sparc/vm/relocInfo_sparc.hpp 2010-11-16 18:02:15.000000000 +0100 +++ new/src/cpu/sparc/vm/relocInfo_sparc.hpp 2010-11-16 18:02:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_RELOCINFO_SPARC_HPP +#define CPU_SPARC_VM_RELOCINFO_SPARC_HPP + // machine-dependent parts of class relocInfo private: enum { @@ -49,3 +52,5 @@ // 1.8 99/06/22 16:37:50 relocInfo_i486.hpp // 1.9 99/07/16 11:12:11 relocInfo_i486.hpp //End + +#endif // CPU_SPARC_VM_RELOCINFO_SPARC_HPP --- old/src/cpu/sparc/vm/runtime_sparc.cpp 2010-11-16 18:02:16.000000000 +0100 +++ new/src/cpu/sparc/vm/runtime_sparc.cpp 2010-11-16 18:02:16.000000000 +0100 @@ -22,8 +22,22 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_runtime_sparc.cpp.incl" +#include "precompiled.hpp" +#ifdef COMPILER2 +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/vmreg.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_sparc.hpp" +#include "opto/runtime.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/globalDefinitions.hpp" +#include "vmreg_sparc.inline.hpp" +#endif #define __ masm-> --- old/src/cpu/sparc/vm/sharedRuntime_sparc.cpp 2010-11-16 18:02:17.000000000 +0100 +++ new/src/cpu/sparc/vm/sharedRuntime_sparc.cpp 2010-11-16 18:02:17.000000000 +0100 @@ -22,8 +22,28 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_sharedRuntime_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "code/debugInfoRec.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_sparc.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif +#ifdef SHARK +#include "compiler/compileBroker.hpp" +#include "shark/sharkCompiler.hpp" +#endif #define __ masm-> --- old/src/cpu/sparc/vm/stubGenerator_sparc.cpp 2010-11-16 18:02:18.000000000 +0100 +++ new/src/cpu/sparc/vm/stubGenerator_sparc.cpp 2010-11-16 18:02:17.000000000 +0100 @@ -22,8 +22,31 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubGenerator_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_sparc.hpp" +#include "oops/instanceOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // Declaration and definition of StubGenerator (no .hpp file). // For a more detailed description of the stub routine structure --- old/src/cpu/sparc/vm/stubRoutines_sparc.cpp 2010-11-16 18:02:19.000000000 +0100 +++ new/src/cpu/sparc/vm/stubRoutines_sparc.cpp 2010-11-16 18:02:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. --- old/src/cpu/sparc/vm/stubRoutines_sparc.hpp 2010-11-16 18:02:19.000000000 +0100 +++ new/src/cpu/sparc/vm/stubRoutines_sparc.hpp 2010-11-16 18:02:19.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_STUBROUTINES_SPARC_HPP +#define CPU_SPARC_VM_STUBROUTINES_SPARC_HPP + // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to // extend it. @@ -100,3 +103,5 @@ static address partial_subtype_check() { return _partial_subtype_check; } }; + +#endif // CPU_SPARC_VM_STUBROUTINES_SPARC_HPP --- old/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp 2010-11-16 18:02:20.000000000 +0100 +++ new/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp 2010-11-16 18:02:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef CPU_SPARC_VM_TEMPLATEINTERPRETERGENERATOR_SPARC_HPP +#define CPU_SPARC_VM_TEMPLATEINTERPRETERGENERATOR_SPARC_HPP + protected: void generate_fixed_frame(bool native_call); // template interpreter only void generate_stack_overflow_check(Register Rframe_size, Register Rscratch, Register Rscratch2); + +#endif // CPU_SPARC_VM_TEMPLATEINTERPRETERGENERATOR_SPARC_HPP --- old/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2010-11-16 18:02:21.000000000 +0100 +++ new/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2010-11-16 18:02:21.000000000 +0100 @@ -22,8 +22,28 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_templateInterpreter_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" #ifndef CC_INTERP #ifndef FAST_DISPATCH --- old/src/cpu/sparc/vm/templateInterpreter_sparc.hpp 2010-11-16 18:02:22.000000000 +0100 +++ new/src/cpu/sparc/vm/templateInterpreter_sparc.hpp 2010-11-16 18:02:22.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_TEMPLATEINTERPRETER_SPARC_HPP +#define CPU_SPARC_VM_TEMPLATEINTERPRETER_SPARC_HPP + protected: @@ -38,3 +41,5 @@ #else const static int InterpreterCodeSize = 180 * K; #endif + +#endif // CPU_SPARC_VM_TEMPLATEINTERPRETER_SPARC_HPP --- old/src/cpu/sparc/vm/templateTable_sparc.cpp 2010-11-16 18:02:23.000000000 +0100 +++ new/src/cpu/sparc/vm/templateTable_sparc.cpp 2010-11-16 18:02:22.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_templateTable_sparc.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" #ifndef CC_INTERP #define __ _masm-> --- old/src/cpu/sparc/vm/templateTable_sparc.hpp 2010-11-16 18:02:23.000000000 +0100 +++ new/src/cpu/sparc/vm/templateTable_sparc.hpp 2010-11-16 18:02:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP +#define CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP + // helper function static void invokevfinal_helper(Register Rcache, Register Rret); static void invokeinterface_object_method(Register RklassOop, Register Rcall, @@ -29,3 +32,5 @@ Register Rflags); static void generate_vtable_call(Register Rrecv, Register Rindex, Register Rret); static void volatile_barrier(Assembler::Membar_mask_bits order_constraint); + +#endif // CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP --- old/src/cpu/sparc/vm/vmStructs_sparc.hpp 2010-11-16 18:02:24.000000000 +0100 +++ new/src/cpu/sparc/vm/vmStructs_sparc.hpp 2010-11-16 18:02:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP +#define CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP + // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -97,3 +100,5 @@ /* NOTE that we do not use the last_entry() macro here; it is used */ /* in vmStructs__.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */ /* be present there) */ + +#endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP --- old/src/cpu/sparc/vm/vm_version_sparc.cpp 2010-11-16 18:02:25.000000000 +0100 +++ new/src/cpu/sparc/vm/vm_version_sparc.cpp 2010-11-16 18:02:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,18 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_sparc.cpp.incl" +#include "precompiled.hpp" +#include "assembler_sparc.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/java.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "vm_version_sparc.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif int VM_Version::_features = VM_Version::unknown_m; const char* VM_Version::_features_str = ""; --- old/src/cpu/sparc/vm/vm_version_sparc.hpp 2010-11-16 18:02:26.000000000 +0100 +++ new/src/cpu/sparc/vm/vm_version_sparc.hpp 2010-11-16 18:02:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_SPARC_VM_VM_VERSION_SPARC_HPP +#define CPU_SPARC_VM_VM_VERSION_SPARC_HPP + +#include "runtime/globals_extension.hpp" +#include "runtime/vm_version.hpp" + class VM_Version: public Abstract_VM_Version { protected: enum Feature_Flag { @@ -144,3 +150,5 @@ // Calculates the number of parallel threads static unsigned int calc_parallel_worker_threads(); }; + +#endif // CPU_SPARC_VM_VM_VERSION_SPARC_HPP --- old/src/cpu/sparc/vm/vmreg_sparc.cpp 2010-11-16 18:02:27.000000000 +0100 +++ new/src/cpu/sparc/vm/vmreg_sparc.cpp 2010-11-16 18:02:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vmreg_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "code/vmreg.hpp" --- old/src/cpu/sparc/vm/vmreg_sparc.hpp 2010-11-16 18:02:28.000000000 +0100 +++ new/src/cpu/sparc/vm/vmreg_sparc.hpp 2010-11-16 18:02:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef CPU_SPARC_VM_VMREG_SPARC_HPP +#define CPU_SPARC_VM_VMREG_SPARC_HPP + bool is_Register(); Register as_Register(); bool is_FloatRegister(); FloatRegister as_FloatRegister(); + +#endif // CPU_SPARC_VM_VMREG_SPARC_HPP --- old/src/cpu/sparc/vm/vmreg_sparc.inline.hpp 2010-11-16 18:02:29.000000000 +0100 +++ new/src/cpu/sparc/vm/vmreg_sparc.inline.hpp 2010-11-16 18:02:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP +#define CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP + inline VMReg RegisterImpl::as_VMReg() { if( this==noreg ) return VMRegImpl::Bad(); return VMRegImpl::as_VMReg(encoding() << 1 ); @@ -60,3 +63,5 @@ assert(false, "what register?"); return false; } + +#endif // CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP --- old/src/cpu/sparc/vm/vtableStubs_sparc.cpp 2010-11-16 18:02:29.000000000 +0100 +++ new/src/cpu/sparc/vm/vtableStubs_sparc.cpp 2010-11-16 18:02:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vtableStubs_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "code/vtableStubs.hpp" +#include "interp_masm_sparc.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassVtable.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_sparc.inline.hpp" +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // machine-dependent part of VtableStubs: create vtableStub of correct size and // initialize its code --- old/src/cpu/x86/vm/assembler_x86.cpp 2010-11-16 18:02:31.000000000 +0100 +++ new/src/cpu/x86/vm/assembler_x86.cpp 2010-11-16 18:02:30.000000000 +0100 @@ -22,8 +22,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_x86.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/resourceArea.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#endif // Implementation of AddressLiteral --- old/src/cpu/x86/vm/assembler_x86.hpp 2010-11-16 18:02:32.000000000 +0100 +++ new/src/cpu/x86/vm/assembler_x86.hpp 2010-11-16 18:02:31.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_ASSEMBLER_X86_HPP +#define CPU_X86_VM_ASSEMBLER_X86_HPP + class BiasedLockingCounters; // Contains all the definitions needed for x86 assembly code generation. @@ -2272,3 +2275,5 @@ #ifdef ASSERT inline bool AbstractAssembler::pd_check_instruction_mark() { return true; } #endif + +#endif // CPU_X86_VM_ASSEMBLER_X86_HPP --- old/src/cpu/x86/vm/assembler_x86.inline.hpp 2010-11-16 18:02:33.000000000 +0100 +++ new/src/cpu/x86/vm/assembler_x86.inline.hpp 2010-11-16 18:02:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP +#define CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP + +#include "asm/assembler.inline.hpp" +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" +#include "runtime/handles.inline.hpp" + inline void MacroAssembler::pd_patch_instruction(address branch, address target) { unsigned char op = branch[0]; assert(op == 0xE8 /* call */ || @@ -85,3 +93,5 @@ code_section()->set_end(_code_pos); } #endif // _LP64 + +#endif // CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP --- old/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp 2010-11-16 18:02:33.000000000 +0100 +++ new/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp 2010-11-16 18:02:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,30 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecodeInterpreter_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "interp_masm_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "interp_masm_x86_64.hpp" +#endif #ifdef CC_INTERP --- old/src/cpu/x86/vm/bytecodeInterpreter_x86.hpp 2010-11-16 18:02:34.000000000 +0100 +++ new/src/cpu/x86/vm/bytecodeInterpreter_x86.hpp 2010-11-16 18:02:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_BYTECODEINTERPRETER_X86_HPP +#define CPU_X86_VM_BYTECODEINTERPRETER_X86_HPP + // Platform specific for C++ based Interpreter private: @@ -108,3 +111,5 @@ ((VMJavaVal64*)(addr))->d) #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \ ((VMJavaVal64*)(addr))->l) + +#endif // CPU_X86_VM_BYTECODEINTERPRETER_X86_HPP --- old/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2010-11-16 18:02:35.000000000 +0100 +++ new/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2010-11-16 18:02:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_BYTECODEINTERPRETER_X86_INLINE_HPP +#define CPU_X86_VM_BYTECODEINTERPRETER_X86_INLINE_HPP + // Inline interpreter functions for IA32 inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) { return op1 + op2; } @@ -278,3 +281,5 @@ inline jbyte BytecodeInterpreter::VMint2Byte(jint val) { return (jbyte) val; } + +#endif // CPU_X86_VM_BYTECODEINTERPRETER_X86_INLINE_HPP --- old/src/cpu/x86/vm/bytecodes_x86.cpp 2010-11-16 18:02:36.000000000 +0100 +++ new/src/cpu/x86/vm/bytecodes_x86.cpp 2010-11-16 18:02:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecodes_x86.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecodes.hpp" void Bytecodes::pd_initialize() { --- old/src/cpu/x86/vm/bytecodes_x86.hpp 2010-11-16 18:02:37.000000000 +0100 +++ new/src/cpu/x86/vm/bytecodes_x86.hpp 2010-11-16 18:02:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,9 @@ * */ +#ifndef CPU_X86_VM_BYTECODES_X86_HPP +#define CPU_X86_VM_BYTECODES_X86_HPP + // No i486 specific bytecodes + +#endif // CPU_X86_VM_BYTECODES_X86_HPP --- old/src/cpu/x86/vm/bytes_x86.hpp 2010-11-16 18:02:37.000000000 +0100 +++ new/src/cpu/x86/vm/bytes_x86.hpp 2010-11-16 18:02:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef CPU_X86_VM_BYTES_X86_HPP +#define CPU_X86_VM_BYTES_X86_HPP + +#include "memory/allocation.hpp" + class Bytes: AllStatic { private: #ifndef AMD64 @@ -67,4 +72,15 @@ // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base] -#include "incls/_bytes_pd.inline.hpp.incl" +#ifdef TARGET_OS_ARCH_linux_x86 +# include "bytes_linux_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_x86 +# include "bytes_solaris_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_windows_x86 +# include "bytes_windows_x86.inline.hpp" +#endif + + +#endif // CPU_X86_VM_BYTES_X86_HPP --- old/src/cpu/x86/vm/c1_CodeStubs_x86.cpp 2010-11-16 18:02:38.000000000 +0100 +++ new/src/cpu/x86/vm/c1_CodeStubs_x86.cpp 2010-11-16 18:02:38.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_CodeStubs_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CodeStubs.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "nativeInst_x86.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#endif #define __ ce->masm()-> --- old/src/cpu/x86/vm/c1_Defs_x86.hpp 2010-11-16 18:02:39.000000000 +0100 +++ new/src/cpu/x86/vm/c1_Defs_x86.hpp 2010-11-16 18:02:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_DEFS_X86_HPP +#define CPU_X86_VM_C1_DEFS_X86_HPP + // native word offsets from memory address (little endian) enum { pd_lo_word_offset_in_bytes = 0, @@ -71,3 +74,5 @@ enum { pd_float_saved_as_double = true }; + +#endif // CPU_X86_VM_C1_DEFS_X86_HPP --- old/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp 2010-11-16 18:02:40.000000000 +0100 +++ new/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp 2010-11-16 18:02:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_FpuStackSim_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_FpuStackSim.hpp" +#include "c1/c1_FrameMap.hpp" +#include "utilities/array.hpp" +#include "utilities/ostream.hpp" //-------------------------------------------------------- // FpuStackSim --- old/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp 2010-11-16 18:02:41.000000000 +0100 +++ new/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp 2010-11-16 18:02:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP +#define CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP + // Simulates the FPU stack and maintains mapping [fpu-register -> stack offset] // FPU registers are described as numbers from 0..nof_fpu_regs-1 @@ -65,3 +68,5 @@ void print() PRODUCT_RETURN; }; + +#endif // CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP --- old/src/cpu/x86/vm/c1_FrameMap_x86.cpp 2010-11-16 18:02:41.000000000 +0100 +++ new/src/cpu/x86/vm/c1_FrameMap_x86.cpp 2010-11-16 18:02:41.000000000 +0100 @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_FrameMap_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIR.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" const int FrameMap::pd_c_runtime_reserved_arg_size = 0; --- old/src/cpu/x86/vm/c1_FrameMap_x86.hpp 2010-11-16 18:02:42.000000000 +0100 +++ new/src/cpu/x86/vm/c1_FrameMap_x86.hpp 2010-11-16 18:02:42.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_FRAMEMAP_X86_HPP +#define CPU_X86_VM_C1_FRAMEMAP_X86_HPP + // On i486 the frame looks as follows: // // +-----------------------------+---------+----------------------------------------+----------------+----------- @@ -126,3 +129,5 @@ assert(i >= 0 && i < nof_caller_save_xmm_regs, "out of bounds"); return _caller_save_xmm_regs[i]; } + +#endif // CPU_X86_VM_C1_FRAMEMAP_X86_HPP --- old/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-11-16 18:02:43.000000000 +0100 +++ new/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-11-16 18:02:43.000000000 +0100 @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRAssembler_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciInstance.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/barrierSet.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "nativeInst_x86.hpp" +#include "oops/objArrayKlass.hpp" +#include "runtime/sharedRuntime.hpp" // These masks are used to provide 128-bit aligned bitmasks to the XMM --- old/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp 2010-11-16 18:02:44.000000000 +0100 +++ new/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp 2010-11-16 18:02:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP +#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP + private: Address::ScaleFactor array_element_size(BasicType type) const; @@ -56,3 +59,5 @@ exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(175), deopt_handler_size = NOT_LP64(10) LP64_ONLY(17) }; + +#endif // CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP --- old/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2010-11-16 18:02:45.000000000 +0100 +++ new/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2010-11-16 18:02:44.000000000 +0100 @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRGenerator_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_LIRGenerator.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_x86.inline.hpp" #ifdef ASSERT #define __ gen()->lir(__FILE__, __LINE__)-> --- old/src/cpu/x86/vm/c1_LinearScan_x86.cpp 2010-11-16 18:02:45.000000000 +0100 +++ new/src/cpu/x86/vm/c1_LinearScan_x86.cpp 2010-11-16 18:02:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_LinearScan_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LinearScan.hpp" +#include "utilities/bitMap.inline.hpp" //---------------------------------------------------------------------- --- old/src/cpu/x86/vm/c1_LinearScan_x86.hpp 2010-11-16 18:02:46.000000000 +0100 +++ new/src/cpu/x86/vm/c1_LinearScan_x86.hpp 2010-11-16 18:02:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_LINEARSCAN_X86_HPP +#define CPU_X86_VM_C1_LINEARSCAN_X86_HPP + inline bool LinearScan::is_processed_reg_num(int reg_num) { #ifndef _LP64 // rsp and rbp (numbers 6 ancd 7) are ignored @@ -185,3 +188,5 @@ FpuStackAllocator(Compilation* compilation, LinearScan* allocator); void allocate(); }; + +#endif // CPU_X86_VM_C1_LINEARSCAN_X86_HPP --- old/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp 2010-11-16 18:02:47.000000000 +0100 +++ new/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp 2010-11-16 18:02:47.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_MacroAssembler_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/os.hpp" +#include "runtime/stubRoutines.hpp" int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Register scratch, Label& slow_case) { const int aligned_mask = BytesPerWord -1; --- old/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp 2010-11-16 18:02:48.000000000 +0100 +++ new/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp 2010-11-16 18:02:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP +#define CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP + // C1_MacroAssembler contains high-level macros for C1 private: @@ -113,3 +116,5 @@ } void invalidate_registers(bool inv_rax, bool inv_rbx, bool inv_rcx, bool inv_rdx, bool inv_rsi, bool inv_rdi) PRODUCT_RETURN; + +#endif // CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP --- old/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2010-11-16 18:02:49.000000000 +0100 +++ new/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2010-11-16 18:02:48.000000000 +0100 @@ -22,8 +22,20 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Runtime1_x86.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Defs.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_x86.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "register_x86.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/signature.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_x86.inline.hpp" // Implementation of StubAssembler --- old/src/cpu/x86/vm/c1_globals_x86.hpp 2010-11-16 18:02:50.000000000 +0100 +++ new/src/cpu/x86/vm/c1_globals_x86.hpp 2010-11-16 18:02:49.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_C1_GLOBALS_X86_HPP +#define CPU_X86_VM_C1_GLOBALS_X86_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the client compiler. // (see c1_globals.hpp) @@ -60,3 +66,5 @@ define_pd_global(bool, TwoOperandLIRForm, true ); define_pd_global(intx, SafepointPollOffset, 256 ); + +#endif // CPU_X86_VM_C1_GLOBALS_X86_HPP --- old/src/cpu/x86/vm/c2_globals_x86.hpp 2010-11-16 18:02:50.000000000 +0100 +++ new/src/cpu/x86/vm/c2_globals_x86.hpp 2010-11-16 18:02:50.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_C2_GLOBALS_X86_HPP +#define CPU_X86_VM_C2_GLOBALS_X86_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the server compiler. // (see c2_globals.hpp). Alpha-sorted. @@ -87,3 +93,5 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); + +#endif // CPU_X86_VM_C2_GLOBALS_X86_HPP --- old/src/cpu/x86/vm/c2_init_x86.cpp 2010-11-16 18:02:51.000000000 +0100 +++ new/src/cpu/x86/vm/c2_init_x86.cpp 2010-11-16 18:02:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c2_init_x86.cpp.incl" +#include "precompiled.hpp" +#include "opto/compile.hpp" +#include "opto/node.hpp" // processor dependent initialization for i486 --- old/src/cpu/x86/vm/codeBuffer_x86.hpp 2010-11-16 18:02:52.000000000 +0100 +++ new/src/cpu/x86/vm/codeBuffer_x86.hpp 2010-11-16 18:02:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef CPU_X86_VM_CODEBUFFER_X86_HPP +#define CPU_X86_VM_CODEBUFFER_X86_HPP + private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} + +#endif // CPU_X86_VM_CODEBUFFER_X86_HPP --- old/src/cpu/x86/vm/copy_x86.hpp 2010-11-16 18:02:53.000000000 +0100 +++ new/src/cpu/x86/vm/copy_x86.hpp 2010-11-16 18:02:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,10 +22,22 @@ * */ +#ifndef CPU_X86_VM_COPY_X86_HPP +#define CPU_X86_VM_COPY_X86_HPP + // Inline functions for memory copy and fill. // Contains inline asm implementations -#include "incls/_copy_pd.inline.hpp.incl" +#ifdef TARGET_OS_ARCH_linux_x86 +# include "copy_linux_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_x86 +# include "copy_solaris_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_windows_x86 +# include "copy_windows_x86.inline.hpp" +#endif + static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) { #ifdef AMD64 @@ -58,3 +70,5 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } + +#endif // CPU_X86_VM_COPY_X86_HPP --- old/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp 2010-11-16 18:02:54.000000000 +0100 +++ new/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp 2010-11-16 18:02:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_CPPINTERPRETERGENERATOR_X86_HPP +#define CPU_X86_VM_CPPINTERPRETERGENERATOR_X86_HPP + protected: #if 0 @@ -45,3 +48,5 @@ const Register prev_state, const Register sender_sp, bool native); // C++ interpreter only + +#endif // CPU_X86_VM_CPPINTERPRETERGENERATOR_X86_HPP --- old/src/cpu/x86/vm/cppInterpreter_x86.cpp 2010-11-16 18:02:54.000000000 +0100 +++ new/src/cpu/x86/vm/cppInterpreter_x86.cpp 2010-11-16 18:02:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_cppInterpreter_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/cppInterpreter.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef SHARK +#include "shark/shark_globals.hpp" +#endif #ifdef CC_INTERP --- old/src/cpu/x86/vm/cppInterpreter_x86.hpp 2010-11-16 18:02:55.000000000 +0100 +++ new/src/cpu/x86/vm/cppInterpreter_x86.hpp 2010-11-16 18:02:55.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_CPPINTERPRETER_X86_HPP +#define CPU_X86_VM_CPPINTERPRETER_X86_HPP + protected: @@ -31,3 +34,5 @@ // Run with +PrintInterpreter to get the VM to print out the size. // Max size with JVMTI const static int InterpreterCodeSize = 168 * 1024; + +#endif // CPU_X86_VM_CPPINTERPRETER_X86_HPP --- old/src/cpu/x86/vm/debug_x86.cpp 2010-11-16 18:02:56.000000000 +0100 +++ new/src/cpu/x86/vm/debug_x86.cpp 2010-11-16 18:02:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_debug_x86.cpp.incl" +#include "precompiled.hpp" +#include "code/codeCache.hpp" +#include "code/nmethod.hpp" +#include "runtime/frame.hpp" +#include "runtime/init.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" +#include "utilities/top.hpp" void pd_ps(frame f) {} --- old/src/cpu/x86/vm/depChecker_x86.cpp 2010-11-16 18:02:57.000000000 +0100 +++ new/src/cpu/x86/vm/depChecker_x86.cpp 2010-11-16 18:02:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_depChecker_x86.cpp.incl" +#include "precompiled.hpp" +#include "compiler/disassembler.hpp" +#include "depChecker_x86.hpp" +#include "runtime/hpi.hpp" // Nothing to do on i486 --- old/src/cpu/x86/vm/depChecker_x86.hpp 2010-11-16 18:02:58.000000000 +0100 +++ new/src/cpu/x86/vm/depChecker_x86.hpp 2010-11-16 18:02:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,9 @@ * */ +#ifndef CPU_X86_VM_DEPCHECKER_X86_HPP +#define CPU_X86_VM_DEPCHECKER_X86_HPP + // Nothing to do on i486 + +#endif // CPU_X86_VM_DEPCHECKER_X86_HPP --- old/src/cpu/x86/vm/disassembler_x86.hpp 2010-11-16 18:02:59.000000000 +0100 +++ new/src/cpu/x86/vm/disassembler_x86.hpp 2010-11-16 18:02:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_DISASSEMBLER_X86_HPP +#define CPU_X86_VM_DISASSEMBLER_X86_HPP + static int pd_instruction_alignment() { return 1; } @@ -29,3 +32,5 @@ static const char* pd_cpu_opts() { return ""; } + +#endif // CPU_X86_VM_DISASSEMBLER_X86_HPP --- old/src/cpu/x86/vm/dump_x86_32.cpp 2010-11-16 18:02:59.000000000 +0100 +++ new/src/cpu/x86/vm/dump_x86_32.cpp 2010-11-16 18:02:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dump_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/compactingPermGenGen.hpp" +#include "memory/generation.inline.hpp" +#include "memory/space.inline.hpp" --- old/src/cpu/x86/vm/dump_x86_64.cpp 2010-11-16 18:03:01.000000000 +0100 +++ new/src/cpu/x86/vm/dump_x86_64.cpp 2010-11-16 18:03:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dump_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/compactingPermGenGen.hpp" +#include "memory/generation.inline.hpp" +#include "memory/space.inline.hpp" --- old/src/cpu/x86/vm/frame_x86.cpp 2010-11-16 18:03:01.000000000 +0100 +++ new/src/cpu/x86/vm/frame_x86.cpp 2010-11-16 18:03:01.000000000 +0100 @@ -22,8 +22,24 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_frame_x86.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/resourceArea.hpp" +#include "oops/markOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/monitorChunk.hpp" +#include "runtime/signature.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_x86.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#include "runtime/vframeArray.hpp" +#endif #ifdef ASSERT void RegisterMap::check_location_valid() { --- old/src/cpu/x86/vm/frame_x86.hpp 2010-11-16 18:03:02.000000000 +0100 +++ new/src/cpu/x86/vm/frame_x86.hpp 2010-11-16 18:03:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_FRAME_X86_HPP +#define CPU_X86_VM_FRAME_X86_HPP + +#include "runtime/synchronizer.hpp" +#include "utilities/top.hpp" + // A frame represents a physical stack frame (an activation). Frames can be // C or Java frames, and the Java frames can be interpreted or compiled. // In contrast, vframes represent source-level activations, so that one physical frame @@ -199,3 +205,5 @@ #ifdef CC_INTERP inline interpreterState get_interpreterState() const; #endif // CC_INTERP + +#endif // CPU_X86_VM_FRAME_X86_HPP --- old/src/cpu/x86/vm/frame_x86.inline.hpp 2010-11-16 18:03:03.000000000 +0100 +++ new/src/cpu/x86/vm/frame_x86.inline.hpp 2010-11-16 18:03:03.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_FRAME_X86_INLINE_HPP +#define CPU_X86_VM_FRAME_X86_INLINE_HPP + // Inline functions for Intel frames: // Constructors: @@ -296,3 +299,5 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { *((oop*) map->location(rax->as_VMReg())) = obj; } + +#endif // CPU_X86_VM_FRAME_X86_INLINE_HPP --- old/src/cpu/x86/vm/globalDefinitions_x86.hpp 2010-11-16 18:03:04.000000000 +0100 +++ new/src/cpu/x86/vm/globalDefinitions_x86.hpp 2010-11-16 18:03:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,9 @@ * */ +#ifndef CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP +#define CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP + const int StackAlignmentInBytes = 16; + +#endif // CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP --- old/src/cpu/x86/vm/globals_x86.hpp 2010-11-16 18:03:05.000000000 +0100 +++ new/src/cpu/x86/vm/globals_x86.hpp 2010-11-16 18:03:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_GLOBALS_X86_HPP +#define CPU_X86_VM_GLOBALS_X86_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -65,3 +71,5 @@ define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, UseMembar, false); + +#endif // CPU_X86_VM_GLOBALS_X86_HPP --- old/src/cpu/x86/vm/icBuffer_x86.cpp 2010-11-16 18:03:05.000000000 +0100 +++ new/src/cpu/x86/vm/icBuffer_x86.cpp 2010-11-16 18:03:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icBuffer_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "code/icBuffer.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_x86.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" int InlineCacheBuffer::ic_stub_code_size() { return NativeMovConstReg::instruction_size + --- old/src/cpu/x86/vm/icache_x86.cpp 2010-11-16 18:03:06.000000000 +0100 +++ new/src/cpu/x86/vm/icache_x86.cpp 2010-11-16 18:03:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icache_x86.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "runtime/icache.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/icache_x86.hpp 2010-11-16 18:03:07.000000000 +0100 +++ new/src/cpu/x86/vm/icache_x86.hpp 2010-11-16 18:03:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_ICACHE_X86_HPP +#define CPU_X86_VM_ICACHE_X86_HPP + // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -53,3 +56,5 @@ }; #endif // AMD64 }; + +#endif // CPU_X86_VM_ICACHE_X86_HPP --- old/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-11-16 18:03:08.000000000 +0100 +++ new/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-11-16 18:03:08.000000000 +0100 @@ -22,8 +22,29 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interp_masm_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "interp_masm_x86_32.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif // Implementation of InterpreterMacroAssembler --- old/src/cpu/x86/vm/interp_masm_x86_32.hpp 2010-11-16 18:03:09.000000000 +0100 +++ new/src/cpu/x86/vm/interp_masm_x86_32.hpp 2010-11-16 18:03:08.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_INTERP_MASM_X86_32_HPP +#define CPU_X86_VM_INTERP_MASM_X86_32_HPP + +#include "assembler_x86.inline.hpp" +#include "interpreter/invocationCounter.hpp" + // This file specializes the assember with interpreter-specific macros @@ -227,3 +233,5 @@ void notify_method_exit(TosState state, NotifyMethodExitMode mode); }; + +#endif // CPU_X86_VM_INTERP_MASM_X86_32_HPP --- old/src/cpu/x86/vm/interp_masm_x86_64.cpp 2010-11-16 18:03:09.000000000 +0100 +++ new/src/cpu/x86/vm/interp_masm_x86_64.cpp 2010-11-16 18:03:09.000000000 +0100 @@ -22,8 +22,29 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interp_masm_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "interp_masm_x86_64.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif // Implementation of InterpreterMacroAssembler --- old/src/cpu/x86/vm/interp_masm_x86_64.hpp 2010-11-16 18:03:10.000000000 +0100 +++ new/src/cpu/x86/vm/interp_masm_x86_64.hpp 2010-11-16 18:03:10.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_INTERP_MASM_X86_64_HPP +#define CPU_X86_VM_INTERP_MASM_X86_64_HPP + +#include "assembler_x86.inline.hpp" +#include "interpreter/invocationCounter.hpp" + // This file specializes the assember with interpreter-specific macros @@ -243,3 +249,5 @@ void notify_method_entry(); void notify_method_exit(TosState state, NotifyMethodExitMode mode); }; + +#endif // CPU_X86_VM_INTERP_MASM_X86_64_HPP --- old/src/cpu/x86/vm/interpreterGenerator_x86.hpp 2010-11-16 18:03:11.000000000 +0100 +++ new/src/cpu/x86/vm/interpreterGenerator_x86.hpp 2010-11-16 18:03:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_INTERPRETERGENERATOR_X86_HPP +#define CPU_X86_VM_INTERPRETERGENERATOR_X86_HPP + // Generation of Interpreter // @@ -41,3 +44,5 @@ void generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue); void generate_counter_overflow(Label* do_continue); + +#endif // CPU_X86_VM_INTERPRETERGENERATOR_X86_HPP --- old/src/cpu/x86/vm/interpreterRT_x86.hpp 2010-11-16 18:03:12.000000000 +0100 +++ new/src/cpu/x86/vm/interpreterRT_x86.hpp 2010-11-16 18:03:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef CPU_X86_VM_INTERPRETERRT_X86_HPP +#define CPU_X86_VM_INTERPRETERRT_X86_HPP + +#include "memory/allocation.hpp" + // native method calls class SignatureHandlerGenerator: public NativeSignatureIterator { @@ -72,3 +77,5 @@ static Register to(); static Register temp(); }; + +#endif // CPU_X86_VM_INTERPRETERRT_X86_HPP --- old/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2010-11-16 18:03:13.000000000 +0100 +++ new/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2010-11-16 18:03:12.000000000 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreterRT_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/signature.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/interpreterRT_x86_64.cpp 2010-11-16 18:03:13.000000000 +0100 +++ new/src/cpu/x86/vm/interpreterRT_x86_64.cpp 2010-11-16 18:03:13.000000000 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreterRT_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/signature.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/interpreter_x86.hpp 2010-11-16 18:03:14.000000000 +0100 +++ new/src/cpu/x86/vm/interpreter_x86.hpp 2010-11-16 18:03:14.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_INTERPRETER_X86_HPP +#define CPU_X86_VM_INTERPRETER_X86_HPP + public: // Sentinel placed in the code for interpreter returns so @@ -44,3 +47,5 @@ assert(i <= 0, "local direction already negated"); return stackElementWords * i; } + +#endif // CPU_X86_VM_INTERPRETER_X86_HPP --- old/src/cpu/x86/vm/interpreter_x86_32.cpp 2010-11-16 18:03:15.000000000 +0100 +++ new/src/cpu/x86/vm/interpreter_x86_32.cpp 2010-11-16 18:03:15.000000000 +0100 @@ -22,8 +22,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreter_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif #define __ _masm-> --- old/src/cpu/x86/vm/interpreter_x86_64.cpp 2010-11-16 18:03:16.000000000 +0100 +++ new/src/cpu/x86/vm/interpreter_x86_64.cpp 2010-11-16 18:03:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreter_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif #define __ _masm-> --- old/src/cpu/x86/vm/javaFrameAnchor_x86.hpp 2010-11-16 18:03:17.000000000 +0100 +++ new/src/cpu/x86/vm/javaFrameAnchor_x86.hpp 2010-11-16 18:03:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP +#define CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP + private: // FP value associated with _last_Java_sp: @@ -79,3 +82,5 @@ intptr_t* last_Java_fp(void) { return _last_Java_fp; } // Assert (last_Java_sp == NULL || fp == NULL) void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; } + +#endif // CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP --- old/src/cpu/x86/vm/jniFastGetField_x86_32.cpp 2010-11-16 18:03:17.000000000 +0100 +++ new/src/cpu/x86/vm/jniFastGetField_x86_32.cpp 2010-11-16 18:03:17.000000000 +0100 @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_jniFastGetField_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/safepoint.hpp" #define __ masm-> --- old/src/cpu/x86/vm/jniFastGetField_x86_64.cpp 2010-11-16 18:03:18.000000000 +0100 +++ new/src/cpu/x86/vm/jniFastGetField_x86_64.cpp 2010-11-16 18:03:18.000000000 +0100 @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_jniFastGetField_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/safepoint.hpp" #define __ masm-> --- old/src/cpu/x86/vm/jniTypes_x86.hpp 2010-11-16 18:03:19.000000000 +0100 +++ new/src/cpu/x86/vm/jniTypes_x86.hpp 2010-11-16 18:03:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef CPU_X86_VM_JNITYPES_X86_HPP +#define CPU_X86_VM_JNITYPES_X86_HPP + +#include "memory/allocation.hpp" +#include "oops/oop.hpp" +#include "prims/jni.h" + // This file holds platform-dependent routines used to write primitive jni // types to the array of arguments passed into JavaCalls::call @@ -122,3 +129,5 @@ static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + _JNI_SLOT_OFFSET); } #undef _JNI_SLOT_OFFSET }; + +#endif // CPU_X86_VM_JNITYPES_X86_HPP --- old/src/cpu/x86/vm/jni_x86.h 2010-11-16 18:03:20.000000000 +0100 +++ new/src/cpu/x86/vm/jni_x86.h 2010-11-16 18:03:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/cpu/x86/vm/methodHandles_x86.cpp 2010-11-16 18:03:21.000000000 +0100 +++ new/src/cpu/x86/vm/methodHandles_x86.cpp 2010-11-16 18:03:20.000000000 +0100 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_methodHandles_x86.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.inline.hpp" +#include "prims/methodHandles.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/nativeInst_x86.cpp 2010-11-16 18:03:22.000000000 +0100 +++ new/src/cpu/x86/vm/nativeInst_x86.cpp 2010-11-16 18:03:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,18 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_nativeInst_x86.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_x86.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/ostream.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif void NativeInstruction::wrote(int offset) { ICache::invalidate_word(addr_at(offset)); --- old/src/cpu/x86/vm/nativeInst_x86.hpp 2010-11-16 18:03:22.000000000 +0100 +++ new/src/cpu/x86/vm/nativeInst_x86.hpp 2010-11-16 18:03:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef CPU_X86_VM_NATIVEINST_X86_HPP +#define CPU_X86_VM_NATIVEINST_X86_HPP + +#include "asm/assembler.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" +#include "utilities/top.hpp" + // We have interfaces for the following instructions: // - NativeInstruction // - - NativeCall @@ -547,3 +556,5 @@ return false; #endif // AMD64 } + +#endif // CPU_X86_VM_NATIVEINST_X86_HPP --- old/src/cpu/x86/vm/registerMap_x86.hpp 2010-11-16 18:03:23.000000000 +0100 +++ new/src/cpu/x86/vm/registerMap_x86.hpp 2010-11-16 18:03:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_REGISTERMAP_X86_HPP +#define CPU_X86_VM_REGISTERMAP_X86_HPP + // machine-dependent implemention for register maps friend class frame; @@ -37,3 +40,5 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} + +#endif // CPU_X86_VM_REGISTERMAP_X86_HPP --- old/src/cpu/x86/vm/register_definitions_x86.cpp 2010-11-16 18:03:24.000000000 +0100 +++ new/src/cpu/x86/vm/register_definitions_x86.cpp 2010-11-16 18:03:24.000000000 +0100 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_register_definitions_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/register.hpp" +#include "register_x86.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "interp_masm_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "interp_masm_x86_64.hpp" +#endif REGISTER_DEFINITION(Register, noreg); REGISTER_DEFINITION(Register, rax); --- old/src/cpu/x86/vm/register_x86.cpp 2010-11-16 18:03:25.000000000 +0100 +++ new/src/cpu/x86/vm/register_x86.cpp 2010-11-16 18:03:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_register_x86.cpp.incl" +#include "precompiled.hpp" +#include "register_x86.hpp" + #ifndef AMD64 const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers; #else --- old/src/cpu/x86/vm/register_x86.hpp 2010-11-16 18:03:26.000000000 +0100 +++ new/src/cpu/x86/vm/register_x86.hpp 2010-11-16 18:03:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_REGISTER_X86_HPP +#define CPU_X86_VM_REGISTER_X86_HPP + +#include "asm/register.hpp" +#include "vm_version_x86.hpp" + class VMRegImpl; typedef VMRegImpl* VMReg; @@ -219,3 +225,5 @@ static const int max_xmm; }; + +#endif // CPU_X86_VM_REGISTER_X86_HPP --- old/src/cpu/x86/vm/relocInfo_x86.cpp 2010-11-16 18:03:26.000000000 +0100 +++ new/src/cpu/x86/vm/relocInfo_x86.cpp 2010-11-16 18:03:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_relocInfo_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.inline.hpp" +#include "assembler_x86.inline.hpp" +#include "code/relocInfo.hpp" +#include "nativeInst_x86.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/safepoint.hpp" void Relocation::pd_set_data_value(address x, intptr_t o) { --- old/src/cpu/x86/vm/relocInfo_x86.hpp 2010-11-16 18:03:27.000000000 +0100 +++ new/src/cpu/x86/vm/relocInfo_x86.hpp 2010-11-16 18:03:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_RELOCINFO_X86_HPP +#define CPU_X86_VM_RELOCINFO_X86_HPP + // machine-dependent parts of class relocInfo private: enum { @@ -36,3 +39,5 @@ format_width = 2 #endif }; + +#endif // CPU_X86_VM_RELOCINFO_X86_HPP --- old/src/cpu/x86/vm/runtime_x86_32.cpp 2010-11-16 18:03:28.000000000 +0100 +++ new/src/cpu/x86/vm/runtime_x86_32.cpp 2010-11-16 18:03:28.000000000 +0100 @@ -22,9 +22,23 @@ * */ +#include "precompiled.hpp" +#ifdef COMPILER2 +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/vmreg.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_x86.hpp" +#include "opto/runtime.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/globalDefinitions.hpp" +#include "vmreg_x86.inline.hpp" +#endif -#include "incls/_precompiled.incl" -#include "incls/_runtime_x86_32.cpp.incl" #define __ masm-> --- old/src/cpu/x86/vm/runtime_x86_64.cpp 2010-11-16 18:03:29.000000000 +0100 +++ new/src/cpu/x86/vm/runtime_x86_64.cpp 2010-11-16 18:03:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,23 @@ * */ -#include "incls/_precompiled.incl" +#include "precompiled.hpp" +#ifdef COMPILER2 +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/vmreg.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_x86.hpp" +#include "opto/runtime.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/globalDefinitions.hpp" +#include "vmreg_x86.inline.hpp" +#endif + // This file should really contain the code for generating the OptoRuntime // exception_blob. However that code uses SimpleRuntimeFrame which only --- old/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2010-11-16 18:03:30.000000000 +0100 +++ new/src/cpu/x86/vm/sharedRuntime_x86_32.cpp 2010-11-16 18:03:29.000000000 +0100 @@ -22,8 +22,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_sharedRuntime_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "code/debugInfoRec.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_x86.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif #define __ masm-> #ifdef COMPILER2 --- old/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2010-11-16 18:03:30.000000000 +0100 +++ new/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2010-11-16 18:03:30.000000000 +0100 @@ -22,8 +22,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_sharedRuntime_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "code/debugInfoRec.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_x86.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif DeoptimizationBlob *SharedRuntime::_deopt_blob; #ifdef COMPILER2 --- old/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2010-11-16 18:03:31.000000000 +0100 +++ new/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2010-11-16 18:03:31.000000000 +0100 @@ -22,8 +22,34 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubGenerator_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_x86.hpp" +#include "oops/instanceOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // Declaration and definition of StubGenerator (no .hpp file). // For a more detailed description of the stub routine structure --- old/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2010-11-16 18:03:32.000000000 +0100 +++ new/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2010-11-16 18:03:32.000000000 +0100 @@ -22,8 +22,34 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubGenerator_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_x86.hpp" +#include "oops/instanceOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // Declaration and definition of StubGenerator (no .hpp file). // For a more detailed description of the stub routine structure --- old/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2010-11-16 18:03:33.000000000 +0100 +++ new/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2010-11-16 18:03:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. --- old/src/cpu/x86/vm/stubRoutines_x86_32.hpp 2010-11-16 18:03:34.000000000 +0100 +++ new/src/cpu/x86/vm/stubRoutines_x86_32.hpp 2010-11-16 18:03:33.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_STUBROUTINES_X86_32_HPP +#define CPU_X86_VM_STUBROUTINES_X86_32_HPP + // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to // extend it. @@ -60,3 +63,5 @@ static bool returns_to_call_stub(address return_pc) { return (return_pc == _call_stub_return_address) || return_pc == x86::get_call_stub_compiled_return(); } + +#endif // CPU_X86_VM_STUBROUTINES_X86_32_HPP --- old/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2010-11-16 18:03:35.000000000 +0100 +++ new/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2010-11-16 18:03:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. --- old/src/cpu/x86/vm/stubRoutines_x86_64.hpp 2010-11-16 18:03:35.000000000 +0100 +++ new/src/cpu/x86/vm/stubRoutines_x86_64.hpp 2010-11-16 18:03:35.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_STUBROUTINES_X86_64_HPP +#define CPU_X86_VM_STUBROUTINES_X86_64_HPP + // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to // extend it. @@ -113,3 +116,5 @@ return _mxcsr_std; } }; + +#endif // CPU_X86_VM_STUBROUTINES_X86_64_HPP --- old/src/cpu/x86/vm/templateInterpreterGenerator_x86.hpp 2010-11-16 18:03:36.000000000 +0100 +++ new/src/cpu/x86/vm/templateInterpreterGenerator_x86.hpp 2010-11-16 18:03:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef CPU_X86_VM_TEMPLATEINTERPRETERGENERATOR_X86_HPP +#define CPU_X86_VM_TEMPLATEINTERPRETERGENERATOR_X86_HPP + protected: void generate_fixed_frame(bool native_call); // address generate_asm_interpreter_entry(bool synchronized); + +#endif // CPU_X86_VM_TEMPLATEINTERPRETERGENERATOR_X86_HPP --- old/src/cpu/x86/vm/templateInterpreter_x86.hpp 2010-11-16 18:03:37.000000000 +0100 +++ new/src/cpu/x86/vm/templateInterpreter_x86.hpp 2010-11-16 18:03:37.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_TEMPLATEINTERPRETER_X86_HPP +#define CPU_X86_VM_TEMPLATEINTERPRETER_X86_HPP + protected: @@ -35,3 +38,5 @@ #else const static int InterpreterCodeSize = 168 * 1024; #endif // AMD64 + +#endif // CPU_X86_VM_TEMPLATEINTERPRETER_X86_HPP --- old/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2010-11-16 18:03:38.000000000 +0100 +++ new/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2010-11-16 18:03:37.000000000 +0100 @@ -22,8 +22,28 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_templateInterpreter_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2010-11-16 18:03:39.000000000 +0100 +++ new/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2010-11-16 18:03:38.000000000 +0100 @@ -22,8 +22,28 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreter_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" #define __ _masm-> --- old/src/cpu/x86/vm/templateTable_x86_32.cpp 2010-11-16 18:03:39.000000000 +0100 +++ new/src/cpu/x86/vm/templateTable_x86_32.cpp 2010-11-16 18:03:39.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_templateTable_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" #ifndef CC_INTERP #define __ _masm-> --- old/src/cpu/x86/vm/templateTable_x86_32.hpp 2010-11-16 18:03:40.000000000 +0100 +++ new/src/cpu/x86/vm/templateTable_x86_32.hpp 2010-11-16 18:03:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_TEMPLATETABLE_X86_32_HPP +#define CPU_X86_VM_TEMPLATETABLE_X86_32_HPP + static void prepare_invoke(Register method, Register index, int byte_no); static void invokevirtual_helper(Register index, Register recv, Register flags); @@ -30,3 +33,5 @@ // Helpers static void index_check(Register array, Register index); static void index_check_without_pop(Register array, Register index); + +#endif // CPU_X86_VM_TEMPLATETABLE_X86_32_HPP --- old/src/cpu/x86/vm/templateTable_x86_64.cpp 2010-11-16 18:03:41.000000000 +0100 +++ new/src/cpu/x86/vm/templateTable_x86_64.cpp 2010-11-16 18:03:41.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_templateTable_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" #ifndef CC_INTERP --- old/src/cpu/x86/vm/templateTable_x86_64.hpp 2010-11-16 18:03:42.000000000 +0100 +++ new/src/cpu/x86/vm/templateTable_x86_64.hpp 2010-11-16 18:03:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_TEMPLATETABLE_X86_64_HPP +#define CPU_X86_VM_TEMPLATETABLE_X86_64_HPP + static void prepare_invoke(Register method, Register index, int byte_no); static void invokevirtual_helper(Register index, Register recv, Register flags); @@ -30,3 +33,5 @@ // Helpers static void index_check(Register array, Register index); static void index_check_without_pop(Register array, Register index); + +#endif // CPU_X86_VM_TEMPLATETABLE_X86_64_HPP --- old/src/cpu/x86/vm/vmStructs_x86.hpp 2010-11-16 18:03:43.000000000 +0100 +++ new/src/cpu/x86/vm/vmStructs_x86.hpp 2010-11-16 18:03:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_VMSTRUCTS_X86_HPP +#define CPU_X86_VM_VMSTRUCTS_X86_HPP + // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -60,3 +63,5 @@ /* NOTE that we do not use the last_entry() macro here; it is used */ /* in vmStructs__.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */ /* be present there) */ + +#endif // CPU_X86_VM_VMSTRUCTS_X86_HPP --- old/src/cpu/x86/vm/vm_version_x86.cpp 2010-11-16 18:03:43.000000000 +0100 +++ new/src/cpu/x86/vm/vm_version_x86.cpp 2010-11-16 18:03:43.000000000 +0100 @@ -22,8 +22,21 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_x86.cpp.incl" +#include "precompiled.hpp" +#include "assembler_x86.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/java.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "vm_version_x86.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif int VM_Version::_cpu; --- old/src/cpu/x86/vm/vm_version_x86.hpp 2010-11-16 18:03:44.000000000 +0100 +++ new/src/cpu/x86/vm/vm_version_x86.hpp 2010-11-16 18:03:44.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef CPU_X86_VM_VM_VERSION_X86_HPP +#define CPU_X86_VM_VM_VERSION_X86_HPP + +#include "runtime/globals_extension.hpp" +#include "runtime/vm_version.hpp" + class VM_Version : public Abstract_VM_Version { public: // cpuid result register layouts. These are all unions of a uint32_t @@ -516,3 +522,5 @@ return count >= 0 ? count : 1; } }; + +#endif // CPU_X86_VM_VM_VERSION_X86_HPP --- old/src/cpu/x86/vm/vmreg_x86.cpp 2010-11-16 18:03:45.000000000 +0100 +++ new/src/cpu/x86/vm/vmreg_x86.cpp 2010-11-16 18:03:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vmreg_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "code/vmreg.hpp" --- old/src/cpu/x86/vm/vmreg_x86.hpp 2010-11-16 18:03:46.000000000 +0100 +++ new/src/cpu/x86/vm/vmreg_x86.hpp 2010-11-16 18:03:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_VMREG_X86_HPP +#define CPU_X86_VM_VMREG_X86_HPP + bool is_Register(); Register as_Register(); @@ -30,3 +33,5 @@ bool is_XMMRegister(); XMMRegister as_XMMRegister(); + +#endif // CPU_X86_VM_VMREG_X86_HPP --- old/src/cpu/x86/vm/vmreg_x86.inline.hpp 2010-11-16 18:03:47.000000000 +0100 +++ new/src/cpu/x86/vm/vmreg_x86.inline.hpp 2010-11-16 18:03:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_X86_VM_VMREG_X86_INLINE_HPP +#define CPU_X86_VM_VMREG_X86_INLINE_HPP + inline VMReg RegisterImpl::as_VMReg() { if( this==noreg ) return VMRegImpl::Bad(); #ifdef AMD64 @@ -82,3 +85,5 @@ #endif // AMD64 return is_even(value()); } + +#endif // CPU_X86_VM_VMREG_X86_INLINE_HPP --- old/src/cpu/x86/vm/vtableStubs_x86_32.cpp 2010-11-16 18:03:47.000000000 +0100 +++ new/src/cpu/x86/vm/vtableStubs_x86_32.cpp 2010-11-16 18:03:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vtableStubs_x86_32.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "code/vtableStubs.hpp" +#include "interp_masm_x86_32.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassVtable.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // machine-dependent part of VtableStubs: create VtableStub of correct size and // initialize its code --- old/src/cpu/x86/vm/vtableStubs_x86_64.cpp 2010-11-16 18:03:48.000000000 +0100 +++ new/src/cpu/x86/vm/vtableStubs_x86_64.cpp 2010-11-16 18:03:48.000000000 +0100 @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vtableStubs_x86_64.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "code/vtableStubs.hpp" +#include "interp_masm_x86_64.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassVtable.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_x86.inline.hpp" +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // machine-dependent part of VtableStubs: create VtableStub of correct size and // initialize its code --- old/src/cpu/zero/vm/assembler_zero.cpp 2010-11-16 18:03:49.000000000 +0100 +++ new/src/cpu/zero/vm/assembler_zero.cpp 2010-11-16 18:03:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,24 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_zero.cpp.incl" +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/resourceArea.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#endif int AbstractAssembler::code_fill_byte() { return 0; --- old/src/cpu/zero/vm/assembler_zero.hpp 2010-11-16 18:03:50.000000000 +0100 +++ new/src/cpu/zero/vm/assembler_zero.hpp 2010-11-16 18:03:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_HPP +#define CPU_ZERO_VM_ASSEMBLER_ZERO_HPP + // In normal, CPU-specific ports of HotSpot these two classes are used // for generating assembly language. We don't do any of this in zero, // of course, but we do sneak entry points around in CodeBuffers so we @@ -62,3 +65,5 @@ address ShouldNotCallThisStub(); address ShouldNotCallThisEntry(); + +#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP --- old/src/cpu/zero/vm/assembler_zero.inline.hpp 2010-11-16 18:03:51.000000000 +0100 +++ new/src/cpu/zero/vm/assembler_zero.inline.hpp 2010-11-16 18:03:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,14 @@ * */ +#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP +#define CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP + +#include "asm/assembler.inline.hpp" +#include "asm/codeBuffer.hpp" +#include "code/codeCache.hpp" +#include "runtime/handles.inline.hpp" + // This file is intentionally empty + +#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP --- old/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp 2010-11-16 18:03:51.000000000 +0100 +++ new/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp 2010-11-16 18:03:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_cppInterpreter_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interp_masm_zero.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" #ifdef CC_INTERP --- old/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp 2010-11-16 18:03:52.000000000 +0100 +++ new/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp 2010-11-16 18:03:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP +#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP + // Platform specific for C++ based Interpreter #if defined(PPC) || defined(SPARC) || defined(IA64) @@ -146,3 +149,5 @@ ((VMJavaVal64*)(addr))->d) #define SET_LOCALS_LONG_FROM_ADDR(addr, offset) (((VMJavaVal64*)&locals[-((offset)+1)])->l = \ ((VMJavaVal64*)(addr))->l) + +#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP --- old/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp 2010-11-16 18:03:53.000000000 +0100 +++ new/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp 2010-11-16 18:03:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP +#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP + // Inline interpreter functions for zero inline jfloat BytecodeInterpreter::VMfloatAdd(jfloat op1, jfloat op2) { @@ -299,3 +302,5 @@ inline jbyte BytecodeInterpreter::VMint2Byte(jint val) { return (jbyte) val; } + +#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP --- old/src/cpu/zero/vm/bytecodes_zero.cpp 2010-11-16 18:03:54.000000000 +0100 +++ new/src/cpu/zero/vm/bytecodes_zero.cpp 2010-11-16 18:03:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecodes_zero.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecodes.hpp" void Bytecodes::pd_initialize() { // No zero specific initialization --- old/src/cpu/zero/vm/bytecodes_zero.hpp 2010-11-16 18:03:55.000000000 +0100 +++ new/src/cpu/zero/vm/bytecodes_zero.hpp 2010-11-16 18:03:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP +#define CPU_ZERO_VM_BYTECODES_ZERO_HPP + // This file is intentionally empty + +#endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP --- old/src/cpu/zero/vm/bytes_zero.hpp 2010-11-16 18:03:55.000000000 +0100 +++ new/src/cpu/zero/vm/bytes_zero.hpp 2010-11-16 18:03:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,11 @@ * */ +#ifndef CPU_ZERO_VM_BYTES_ZERO_HPP +#define CPU_ZERO_VM_BYTES_ZERO_HPP + +#include "memory/allocation.hpp" + typedef union unaligned { u4 u; u2 us; @@ -160,5 +165,10 @@ #ifdef VM_LITTLE_ENDIAN // The following header contains the implementations of swap_u2, // swap_u4, and swap_u8 -#include "incls/_bytes_pd.inline.hpp.incl" +#ifdef TARGET_OS_ARCH_linux_zero +# include "bytes_linux_zero.inline.hpp" +#endif + #endif // VM_LITTLE_ENDIAN + +#endif // CPU_ZERO_VM_BYTES_ZERO_HPP --- old/src/cpu/zero/vm/codeBuffer_zero.hpp 2010-11-16 18:03:56.000000000 +0100 +++ new/src/cpu/zero/vm/codeBuffer_zero.hpp 2010-11-16 18:03:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,5 +23,10 @@ * */ +#ifndef CPU_ZERO_VM_CODEBUFFER_ZERO_HPP +#define CPU_ZERO_VM_CODEBUFFER_ZERO_HPP + private: void pd_initialize() {} + +#endif // CPU_ZERO_VM_CODEBUFFER_ZERO_HPP --- old/src/cpu/zero/vm/copy_zero.hpp 2010-11-16 18:03:57.000000000 +0100 +++ new/src/cpu/zero/vm/copy_zero.hpp 2010-11-16 18:03:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_COPY_ZERO_HPP +#define CPU_ZERO_VM_COPY_ZERO_HPP + // Inline functions for memory copy and fill. static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) { @@ -176,3 +179,5 @@ static void pd_zero_to_bytes(void* to, size_t count) { memset(to, 0, count); } + +#endif // CPU_ZERO_VM_COPY_ZERO_HPP --- old/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp 2010-11-16 18:03:58.000000000 +0100 +++ new/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp 2010-11-16 18:03:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP +#define CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP + protected: MacroAssembler* assembler() const { return _masm; @@ -35,3 +38,5 @@ entry->set_entry_point(entry_point); return (address) entry; } + +#endif // CPU_ZERO_VM_CPPINTERPRETERGENERATOR_ZERO_HPP --- old/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-11-16 18:03:59.000000000 +0100 +++ new/src/cpu/zero/vm/cppInterpreter_zero.cpp 2010-11-16 18:03:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,33 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_cppInterpreter_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/cppInterpreter.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "stack_zero.inline.hpp" +#include "utilities/debug.hpp" +#ifdef SHARK +#include "shark/shark_globals.hpp" +#endif #ifdef CC_INTERP --- old/src/cpu/zero/vm/cppInterpreter_zero.hpp 2010-11-16 18:03:59.000000000 +0100 +++ new/src/cpu/zero/vm/cppInterpreter_zero.hpp 2010-11-16 18:03:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP +#define CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP + protected: // Size of interpreter code const static int InterpreterCodeSize = 6 * K; @@ -41,3 +44,5 @@ private: // Fast result type determination static BasicType result_type_of(methodOop method); + +#endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP --- old/src/cpu/zero/vm/debug_zero.cpp 2010-11-16 18:04:00.000000000 +0100 +++ new/src/cpu/zero/vm/debug_zero.cpp 2010-11-16 18:04:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_debug_zero.cpp.incl" +#include "precompiled.hpp" +#include "code/codeCache.hpp" +#include "code/nmethod.hpp" +#include "runtime/frame.hpp" +#include "runtime/init.hpp" +#include "runtime/os.hpp" +#include "utilities/debug.hpp" +#include "utilities/top.hpp" void pd_ps(frame f) { ShouldNotCallThis(); --- old/src/cpu/zero/vm/depChecker_zero.cpp 2010-11-16 18:04:01.000000000 +0100 +++ new/src/cpu/zero/vm/depChecker_zero.cpp 2010-11-16 18:04:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#include "precompiled.hpp" +#include "compiler/disassembler.hpp" +#include "depChecker_zero.hpp" +#include "runtime/hpi.hpp" + // This file is intentionally empty --- old/src/cpu/zero/vm/depChecker_zero.hpp 2010-11-16 18:04:02.000000000 +0100 +++ new/src/cpu/zero/vm/depChecker_zero.hpp 2010-11-16 18:04:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_DEPCHECKER_ZERO_HPP +#define CPU_ZERO_VM_DEPCHECKER_ZERO_HPP + // This file is intentionally empty + +#endif // CPU_ZERO_VM_DEPCHECKER_ZERO_HPP --- old/src/cpu/zero/vm/disassembler_zero.cpp 2010-11-16 18:04:03.000000000 +0100 +++ new/src/cpu/zero/vm/disassembler_zero.cpp 2010-11-16 18:04:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,6 @@ * */ +#include "precompiled.hpp" + // This file is intentionally empty --- old/src/cpu/zero/vm/disassembler_zero.hpp 2010-11-16 18:04:03.000000000 +0100 +++ new/src/cpu/zero/vm/disassembler_zero.hpp 2010-11-16 18:04:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP +#define CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP + static int pd_instruction_alignment() { return 1; } @@ -30,3 +33,5 @@ static const char* pd_cpu_opts() { return ""; } + +#endif // CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP --- old/src/cpu/zero/vm/dump_zero.cpp 2010-11-16 18:04:04.000000000 +0100 +++ new/src/cpu/zero/vm/dump_zero.cpp 2010-11-16 18:04:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_dump_zero.cpp.incl" +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "memory/compactingPermGenGen.hpp" +#include "memory/generation.inline.hpp" +#include "memory/space.inline.hpp" void CompactingPermGenGen::generate_vtable_methods(void** vtbl_list, void** vtable, --- old/src/cpu/zero/vm/entryFrame_zero.hpp 2010-11-16 18:04:05.000000000 +0100 +++ new/src/cpu/zero/vm/entryFrame_zero.hpp 2010-11-16 18:04:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP +#define CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP + +#include "runtime/javaCalls.hpp" +#include "stack_zero.hpp" + // | ... | // +--------------------+ ------------------ // | parameter n-1 | low addresses @@ -63,3 +69,5 @@ char* valuebuf, int buflen) const; }; + +#endif // CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP --- old/src/cpu/zero/vm/entry_zero.hpp 2010-11-16 18:04:06.000000000 +0100 +++ new/src/cpu/zero/vm/entry_zero.hpp 2010-11-16 18:04:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP +#define CPU_ZERO_VM_ENTRY_ZERO_HPP + class ZeroEntry { public: ZeroEntry() { @@ -72,3 +75,5 @@ return byte_offset_of(ZeroEntry, _entry_point); } }; + +#endif // CPU_ZERO_VM_ENTRY_ZERO_HPP --- old/src/cpu/zero/vm/fakeStubFrame_zero.hpp 2010-11-16 18:04:07.000000000 +0100 +++ new/src/cpu/zero/vm/fakeStubFrame_zero.hpp 2010-11-16 18:04:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,11 @@ * */ +#ifndef CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP +#define CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP + +#include "stack_zero.hpp" + // | ... | // +--------------------+ ------------------ // | frame_type | low addresses @@ -51,3 +56,5 @@ char* valuebuf, int buflen) const {} }; + +#endif // CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP --- old/src/cpu/zero/vm/frame_zero.cpp 2010-11-16 18:04:07.000000000 +0100 +++ new/src/cpu/zero/vm/frame_zero.cpp 2010-11-16 18:04:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,26 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_frame_zero.cpp.incl" +#include "precompiled.hpp" +#include "code/scopeDesc.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/resourceArea.hpp" +#include "oops/markOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/monitorChunk.hpp" +#include "runtime/signature.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "vmreg_zero.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#include "runtime/vframeArray.hpp" +#endif #ifdef ASSERT void RegisterMap::check_location_valid() { --- old/src/cpu/zero/vm/frame_zero.hpp 2010-11-16 18:04:08.000000000 +0100 +++ new/src/cpu/zero/vm/frame_zero.hpp 2010-11-16 18:04:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_FRAME_ZERO_HPP +#define CPU_ZERO_VM_FRAME_ZERO_HPP + +#include "runtime/synchronizer.hpp" +#include "utilities/top.hpp" + // A frame represents a physical stack frame on the Zero stack. public: @@ -72,3 +78,5 @@ outputStream* st, char* buf, int buflen) const; + +#endif // CPU_ZERO_VM_FRAME_ZERO_HPP --- old/src/cpu/zero/vm/frame_zero.inline.hpp 2010-11-16 18:04:09.000000000 +0100 +++ new/src/cpu/zero/vm/frame_zero.inline.hpp 2010-11-16 18:04:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP +#define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP + // Constructors inline frame::frame() { @@ -149,3 +152,5 @@ else return (intptr_t *) -1; } + +#endif // CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP --- old/src/cpu/zero/vm/globalDefinitions_zero.hpp 2010-11-16 18:04:10.000000000 +0100 +++ new/src/cpu/zero/vm/globalDefinitions_zero.hpp 2010-11-16 18:04:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP +#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP + #include + +#endif // CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP --- old/src/cpu/zero/vm/globals_zero.hpp 2010-11-16 18:04:11.000000000 +0100 +++ new/src/cpu/zero/vm/globals_zero.hpp 2010-11-16 18:04:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_GLOBALS_ZERO_HPP +#define CPU_ZERO_VM_GLOBALS_ZERO_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // Set the default values for platform dependent flags used by the // runtime system. See globals.hpp for details of what they do. @@ -47,3 +53,5 @@ define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, UseMembar, false); + +#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP --- old/src/cpu/zero/vm/icBuffer_zero.cpp 2010-11-16 18:04:11.000000000 +0100 +++ new/src/cpu/zero/vm/icBuffer_zero.cpp 2010-11-16 18:04:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icBuffer_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_zero.inline.hpp" +#include "code/icBuffer.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_zero.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" int InlineCacheBuffer::ic_stub_code_size() { // NB set this once the functions below are implemented --- old/src/cpu/zero/vm/icache_zero.cpp 2010-11-16 18:04:12.000000000 +0100 +++ new/src/cpu/zero/vm/icache_zero.cpp 2010-11-16 18:04:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icache_zero.cpp.incl" +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "runtime/icache.hpp" void ICacheStubGenerator::generate_icache_flush( ICache::flush_icache_stub_t* flush_icache_stub) { --- old/src/cpu/zero/vm/icache_zero.hpp 2010-11-16 18:04:13.000000000 +0100 +++ new/src/cpu/zero/vm/icache_zero.hpp 2010-11-16 18:04:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_ICACHE_ZERO_HPP +#define CPU_ZERO_VM_ICACHE_ZERO_HPP + // Interface for updating the instruction cache. Whenever the VM // modifies code, part of the processor instruction cache potentially // has to be flushed. This implementation is empty: Zero never deals @@ -34,3 +37,5 @@ static void invalidate_word(address addr) {} static void invalidate_range(address start, int nbytes) {} }; + +#endif // CPU_ZERO_VM_ICACHE_ZERO_HPP --- old/src/cpu/zero/vm/interp_masm_zero.cpp 2010-11-16 18:04:14.000000000 +0100 +++ new/src/cpu/zero/vm/interp_masm_zero.cpp 2010-11-16 18:04:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,22 @@ * */ +#include "precompiled.hpp" +#include "interp_masm_zero.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "oops/arrayOop.hpp" +#include "oops/markOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif + // This file is intentionally empty --- old/src/cpu/zero/vm/interp_masm_zero.hpp 2010-11-16 18:04:15.000000000 +0100 +++ new/src/cpu/zero/vm/interp_masm_zero.hpp 2010-11-16 18:04:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP +#define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP + +#include "assembler_zero.inline.hpp" +#include "interpreter/invocationCounter.hpp" + // This file specializes the assember with interpreter-specific macros class InterpreterMacroAssembler : public MacroAssembler { @@ -36,3 +42,5 @@ ShouldNotCallThis(); } }; + +#endif // CPU_ZERO_VM_INTERP_MASM_ZERO_HPP --- old/src/cpu/zero/vm/interpreterFrame_zero.hpp 2010-11-16 18:04:15.000000000 +0100 +++ new/src/cpu/zero/vm/interpreterFrame_zero.hpp 2010-11-16 18:04:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,14 @@ * */ +#ifndef CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP +#define CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP + +#include "interpreter/bytecodeInterpreter.hpp" +#include "oops/methodOop.hpp" +#include "runtime/thread.hpp" +#include "stack_zero.hpp" + #ifdef CC_INTERP // | ... | // +--------------------+ ------------------ @@ -71,3 +79,5 @@ int buflen) const; }; #endif // CC_INTERP + +#endif // CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP --- old/src/cpu/zero/vm/interpreterGenerator_zero.hpp 2010-11-16 18:04:16.000000000 +0100 +++ new/src/cpu/zero/vm/interpreterGenerator_zero.hpp 2010-11-16 18:04:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP +#define CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP + // Generation of Interpreter // friend class AbstractInterpreterGenerator; @@ -35,3 +38,5 @@ address generate_empty_entry(); address generate_accessor_entry(); address generate_method_handle_entry(); + +#endif // CPU_ZERO_VM_INTERPRETERGENERATOR_ZERO_HPP --- old/src/cpu/zero/vm/interpreterRT_zero.cpp 2010-11-16 18:04:17.000000000 +0100 +++ new/src/cpu/zero/vm/interpreterRT_zero.cpp 2010-11-16 18:04:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreterRT_zero.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/signature.hpp" +#include "stack_zero.inline.hpp" void InterpreterRuntime::SignatureHandlerGeneratorBase::pass_int() { push(T_INT); --- old/src/cpu/zero/vm/interpreterRT_zero.hpp 2010-11-16 18:04:18.000000000 +0100 +++ new/src/cpu/zero/vm/interpreterRT_zero.hpp 2010-11-16 18:04:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,11 @@ * */ +#ifndef CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP +#define CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP + +#include "memory/allocation.hpp" + class SignatureHandler { public: static SignatureHandler *from_handlerAddr(address handlerAddr) { @@ -125,3 +130,5 @@ return (SignatureHandler *) cif(); } }; + +#endif // CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP --- old/src/cpu/zero/vm/interpreter_zero.cpp 2010-11-16 18:04:19.000000000 +0100 +++ new/src/cpu/zero/vm/interpreter_zero.cpp 2010-11-16 18:04:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,32 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_interpreter_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif address AbstractInterpreterGenerator::generate_slow_signature_handler() { _masm->advance(1); --- old/src/cpu/zero/vm/interpreter_zero.hpp 2010-11-16 18:04:19.000000000 +0100 +++ new/src/cpu/zero/vm/interpreter_zero.hpp 2010-11-16 18:04:19.000000000 +0100 @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_INTERPRETER_ZERO_HPP +#define CPU_ZERO_VM_INTERPRETER_ZERO_HPP + public: static void invoke_method(methodOop method, address entry_point, TRAPS) { ((ZeroEntry *) entry_point)->invoke(method, THREAD); @@ -47,3 +50,5 @@ assert(i <= 0, "local direction already negated"); return stackElementWords * i; } + +#endif // CPU_ZERO_VM_INTERPRETER_ZERO_HPP --- old/src/cpu/zero/vm/javaFrameAnchor_zero.hpp 2010-11-16 18:04:20.000000000 +0100 +++ new/src/cpu/zero/vm/javaFrameAnchor_zero.hpp 2010-11-16 18:04:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP +#define CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP + private: ZeroFrame* volatile _last_Java_fp; @@ -89,3 +92,5 @@ static ByteSize last_Java_fp_offset() { return byte_offset_of(JavaFrameAnchor, _last_Java_fp); } + +#endif // CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP --- old/src/cpu/zero/vm/jniFastGetField_zero.cpp 2010-11-16 18:04:21.000000000 +0100 +++ new/src/cpu/zero/vm/jniFastGetField_zero.cpp 2010-11-16 18:04:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_jniFastGetField_zero.cpp.incl" +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/safepoint.hpp" address JNI_FastGetField::generate_fast_get_boolean_field() { return (address) -1; --- old/src/cpu/zero/vm/jniTypes_zero.hpp 2010-11-16 18:04:22.000000000 +0100 +++ new/src/cpu/zero/vm/jniTypes_zero.hpp 2010-11-16 18:04:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef CPU_ZERO_VM_JNITYPES_ZERO_HPP +#define CPU_ZERO_VM_JNITYPES_ZERO_HPP + +#include "memory/allocation.hpp" +#include "oops/oop.hpp" +#include "prims/jni.h" + // This file holds platform-dependent routines used to write primitive jni // types to the array of arguments passed into JavaCalls::call @@ -106,3 +113,5 @@ #endif }; + +#endif // CPU_ZERO_VM_JNITYPES_ZERO_HPP --- old/src/cpu/zero/vm/jni_zero.h 2010-11-16 18:04:23.000000000 +0100 +++ new/src/cpu/zero/vm/jni_zero.h 2010-11-16 18:04:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * --- old/src/cpu/zero/vm/methodHandles_zero.cpp 2010-11-16 18:04:23.000000000 +0100 +++ new/src/cpu/zero/vm/methodHandles_zero.cpp 2010-11-16 18:04:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_methodHandles_zero.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.inline.hpp" +#include "prims/methodHandles.hpp" int MethodHandles::adapter_conversion_ops_supported_mask() { ShouldNotCallThis(); --- old/src/cpu/zero/vm/nativeInst_zero.cpp 2010-11-16 18:04:24.000000000 +0100 +++ new/src/cpu/zero/vm/nativeInst_zero.cpp 2010-11-16 18:04:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_nativeInst_zero.cpp.incl" +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "memory/resourceArea.hpp" +#include "nativeInst_zero.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/ostream.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif // This method is called by nmethod::make_not_entrant_or_zombie to // insert a jump to SharedRuntime::get_handle_wrong_method_stub() --- old/src/cpu/zero/vm/nativeInst_zero.hpp 2010-11-16 18:04:25.000000000 +0100 +++ new/src/cpu/zero/vm/nativeInst_zero.hpp 2010-11-16 18:04:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,15 @@ * */ +#ifndef CPU_ZERO_VM_NATIVEINST_ZERO_HPP +#define CPU_ZERO_VM_NATIVEINST_ZERO_HPP + +#include "asm/assembler.hpp" +#include "memory/allocation.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" +#include "utilities/top.hpp" + // We have interfaces for the following instructions: // - NativeInstruction // - - NativeCall @@ -183,3 +192,5 @@ inline NativeGeneralJump* nativeGeneralJump_at(address address) { ShouldNotCallThis(); } + +#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP --- old/src/cpu/zero/vm/registerMap_zero.hpp 2010-11-16 18:04:26.000000000 +0100 +++ new/src/cpu/zero/vm/registerMap_zero.hpp 2010-11-16 18:04:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef CPU_ZERO_VM_REGISTERMAP_ZERO_HPP +#define CPU_ZERO_VM_REGISTERMAP_ZERO_HPP + // machine-dependent implemention for register maps friend class frame; @@ -37,3 +40,5 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} + +#endif // CPU_ZERO_VM_REGISTERMAP_ZERO_HPP --- old/src/cpu/zero/vm/register_definitions_zero.cpp 2010-11-16 18:04:27.000000000 +0100 +++ new/src/cpu/zero/vm/register_definitions_zero.cpp 2010-11-16 18:04:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,10 @@ * */ +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/register.hpp" +#include "interp_masm_zero.hpp" +#include "register_zero.hpp" + // This file is intentionally empty --- old/src/cpu/zero/vm/register_zero.cpp 2010-11-16 18:04:27.000000000 +0100 +++ new/src/cpu/zero/vm/register_zero.cpp 2010-11-16 18:04:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_register_zero.cpp.incl" +#include "precompiled.hpp" +#include "register_zero.hpp" const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers; const int ConcreteRegisterImpl::max_fpr = --- old/src/cpu/zero/vm/register_zero.hpp 2010-11-16 18:04:28.000000000 +0100 +++ new/src/cpu/zero/vm/register_zero.hpp 2010-11-16 18:04:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_REGISTER_ZERO_HPP +#define CPU_ZERO_VM_REGISTER_ZERO_HPP + +#include "asm/register.hpp" +#include "vm_version_zero.hpp" + class VMRegImpl; typedef VMRegImpl* VMReg; @@ -108,3 +114,5 @@ }; CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1)); + +#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP --- old/src/cpu/zero/vm/relocInfo_zero.cpp 2010-11-16 18:04:29.000000000 +0100 +++ new/src/cpu/zero/vm/relocInfo_zero.cpp 2010-11-16 18:04:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_relocInfo_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.inline.hpp" +#include "assembler_zero.inline.hpp" +#include "code/relocInfo.hpp" +#include "nativeInst_zero.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/safepoint.hpp" void Relocation::pd_set_data_value(address x, intptr_t o) { ShouldNotCallThis(); --- old/src/cpu/zero/vm/relocInfo_zero.hpp 2010-11-16 18:04:30.000000000 +0100 +++ new/src/cpu/zero/vm/relocInfo_zero.hpp 2010-11-16 18:04:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_RELOCINFO_ZERO_HPP +#define CPU_ZERO_VM_RELOCINFO_ZERO_HPP + // machine-dependent parts of class relocInfo private: enum { @@ -30,3 +33,5 @@ offset_unit = 1, format_width = 1 }; + +#endif // CPU_ZERO_VM_RELOCINFO_ZERO_HPP --- old/src/cpu/zero/vm/sharedRuntime_zero.cpp 2010-11-16 18:04:31.000000000 +0100 +++ new/src/cpu/zero/vm/sharedRuntime_zero.cpp 2010-11-16 18:04:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,28 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_sharedRuntime_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_zero.inline.hpp" +#include "code/debugInfoRec.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframeArray.hpp" +#include "vmreg_zero.inline.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif +#ifdef SHARK +#include "compiler/compileBroker.hpp" +#include "shark/sharkCompiler.hpp" +#endif DeoptimizationBlob *SharedRuntime::_deopt_blob; SafepointBlob *SharedRuntime::_polling_page_safepoint_handler_blob; --- old/src/cpu/zero/vm/sharkFrame_zero.hpp 2010-11-16 18:04:31.000000000 +0100 +++ new/src/cpu/zero/vm/sharkFrame_zero.hpp 2010-11-16 18:04:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_SHARKFRAME_ZERO_HPP +#define CPU_ZERO_VM_SHARKFRAME_ZERO_HPP + +#include "oops/methodOop.hpp" +#include "stack_zero.hpp" + // | ... | // +--------------------+ ------------------ // | stack slot n-1 | low addresses @@ -77,3 +83,5 @@ char* valuebuf, int buflen) const; }; + +#endif // CPU_ZERO_VM_SHARKFRAME_ZERO_HPP --- old/src/cpu/zero/vm/shark_globals_zero.hpp 2010-11-16 18:04:32.000000000 +0100 +++ new/src/cpu/zero/vm/shark_globals_zero.hpp 2010-11-16 18:04:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP +#define CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP + // Set the default values for platform dependent flags used by the // Shark compiler. See globals.hpp for details of what they do. @@ -60,3 +63,5 @@ define_pd_global(bool, NeverActAsServerClassMachine, true ); define_pd_global(uint64_t, MaxRAM, 1ULL*G); define_pd_global(bool, CICompileOSR, true ); + +#endif // CPU_ZERO_VM_SHARK_GLOBALS_ZERO_HPP --- old/src/cpu/zero/vm/stack_zero.cpp 2010-11-16 18:04:33.000000000 +0100 +++ new/src/cpu/zero/vm/stack_zero.cpp 2010-11-16 18:04:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stack_zero.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "stack_zero.hpp" +#include "stack_zero.inline.hpp" int ZeroStack::suggest_size(Thread *thread) const { assert(needs_setup(), "already set up"); --- old/src/cpu/zero/vm/stack_zero.hpp 2010-11-16 18:04:34.000000000 +0100 +++ new/src/cpu/zero/vm/stack_zero.hpp 2010-11-16 18:04:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,11 @@ * */ +#ifndef CPU_ZERO_VM_STACK_ZERO_HPP +#define CPU_ZERO_VM_STACK_ZERO_HPP + +#include "utilities/sizes.hpp" + class ZeroStack { private: intptr_t *_base; // the last available word @@ -217,3 +222,5 @@ char* fieldbuf, int buflen) const; }; + +#endif // CPU_ZERO_VM_STACK_ZERO_HPP --- old/src/cpu/zero/vm/stack_zero.inline.hpp 2010-11-16 18:04:35.000000000 +0100 +++ new/src/cpu/zero/vm/stack_zero.inline.hpp 2010-11-16 18:04:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef CPU_ZERO_VM_STACK_ZERO_INLINE_HPP +#define CPU_ZERO_VM_STACK_ZERO_INLINE_HPP + +#include "runtime/thread.hpp" +#include "stack_zero.hpp" + // This function should match SharkStack::CreateStackOverflowCheck inline void ZeroStack::overflow_check(int required_words, TRAPS) { // Check the Zero stack @@ -46,3 +52,5 @@ int stack_free = thread->stack_size() - stack_used; return stack_free - shadow_pages_size(); } + +#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP --- old/src/cpu/zero/vm/stubGenerator_zero.cpp 2010-11-16 18:04:35.000000000 +0100 +++ new/src/cpu/zero/vm/stubGenerator_zero.cpp 2010-11-16 18:04:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,29 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubGenerator_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_zero.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "nativeInst_zero.hpp" +#include "oops/instanceOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#include "stack_zero.inline.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // Declaration and definition of StubGenerator (no .hpp file). // For a more detailed description of the stub routine structure --- old/src/cpu/zero/vm/stubRoutines_zero.cpp 2010-11-16 18:04:36.000000000 +0100 +++ new/src/cpu/zero/vm/stubRoutines_zero.cpp 2010-11-16 18:04:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_zero.cpp.incl" +#include "precompiled.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif #ifdef IA32 address StubRoutines::x86::_call_stub_compiled_return = NULL; --- old/src/cpu/zero/vm/stubRoutines_zero.hpp 2010-11-16 18:04:37.000000000 +0100 +++ new/src/cpu/zero/vm/stubRoutines_zero.hpp 2010-11-16 18:04:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_STUBROUTINES_ZERO_HPP +#define CPU_ZERO_VM_STUBROUTINES_ZERO_HPP + // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to // extend it. @@ -53,3 +56,5 @@ static address _call_stub_compiled_return; }; #endif // IA32 + +#endif // CPU_ZERO_VM_STUBROUTINES_ZERO_HPP --- old/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp 2010-11-16 18:04:38.000000000 +0100 +++ new/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp 2010-11-16 18:04:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP +#define CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP + // This file is intentionally empty + +#endif // CPU_ZERO_VM_TEMPLATEINTERPRETERGENERATOR_ZERO_HPP --- old/src/cpu/zero/vm/templateInterpreter_zero.cpp 2010-11-16 18:04:39.000000000 +0100 +++ new/src/cpu/zero/vm/templateInterpreter_zero.cpp 2010-11-16 18:04:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,27 @@ * */ +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterGenerator.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "oops/arrayOop.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "prims/jvmtiThreadState.hpp" +#include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/timer.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/debug.hpp" + // This file is intentionally empty --- old/src/cpu/zero/vm/templateInterpreter_zero.hpp 2010-11-16 18:04:39.000000000 +0100 +++ new/src/cpu/zero/vm/templateInterpreter_zero.hpp 2010-11-16 18:04:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP +#define CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP + // This file is intentionally empty + +#endif // CPU_ZERO_VM_TEMPLATEINTERPRETER_ZERO_HPP --- old/src/cpu/zero/vm/templateTable_zero.cpp 2010-11-16 18:04:40.000000000 +0100 +++ new/src/cpu/zero/vm/templateTable_zero.cpp 2010-11-16 18:04:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,17 @@ * */ +#include "precompiled.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "interpreter/templateTable.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/synchronizer.hpp" + // This file is intentionally empty --- old/src/cpu/zero/vm/templateTable_zero.hpp 2010-11-16 18:04:41.000000000 +0100 +++ new/src/cpu/zero/vm/templateTable_zero.hpp 2010-11-16 18:04:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP +#define CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP + // This file is intentionally empty + +#endif // CPU_ZERO_VM_TEMPLATETABLE_ZERO_HPP --- old/src/cpu/zero/vm/vmStructs_zero.hpp 2010-11-16 18:04:42.000000000 +0100 +++ new/src/cpu/zero/vm/vmStructs_zero.hpp 2010-11-16 18:04:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP +#define CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP + // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -50,3 +53,5 @@ /* NOTE that we do not use the last_entry() macro here; it is used */ /* in vmStructs__.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */ /* be present there) */ + +#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP --- old/src/cpu/zero/vm/vm_version_zero.cpp 2010-11-16 18:04:43.000000000 +0100 +++ new/src/cpu/zero/vm/vm_version_zero.cpp 2010-11-16 18:04:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,14 @@ * */ +#include "precompiled.hpp" +#include "assembler_zero.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/java.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "vm_version_zero.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif + // This file is intentionally empty --- old/src/cpu/zero/vm/vm_version_zero.hpp 2010-11-16 18:04:43.000000000 +0100 +++ new/src/cpu/zero/vm/vm_version_zero.hpp 2010-11-16 18:04:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,9 +23,17 @@ * */ +#ifndef CPU_ZERO_VM_VM_VERSION_ZERO_HPP +#define CPU_ZERO_VM_VM_VERSION_ZERO_HPP + +#include "runtime/globals_extension.hpp" +#include "runtime/vm_version.hpp" + class VM_Version : public Abstract_VM_Version { public: static const char* cpu_features() { return ""; } }; + +#endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP --- old/src/cpu/zero/vm/vmreg_zero.cpp 2010-11-16 18:04:44.000000000 +0100 +++ new/src/cpu/zero/vm/vmreg_zero.cpp 2010-11-16 18:04:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vmreg_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "code/vmreg.hpp" void VMRegImpl::set_regName() { int i = 0; --- old/src/cpu/zero/vm/vmreg_zero.hpp 2010-11-16 18:04:45.000000000 +0100 +++ new/src/cpu/zero/vm/vmreg_zero.hpp 2010-11-16 18:04:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef CPU_ZERO_VM_VMREG_ZERO_HPP +#define CPU_ZERO_VM_VMREG_ZERO_HPP + bool is_Register(); Register as_Register(); bool is_FloatRegister(); FloatRegister as_FloatRegister(); + +#endif // CPU_ZERO_VM_VMREG_ZERO_HPP --- old/src/cpu/zero/vm/vmreg_zero.inline.hpp 2010-11-16 18:04:46.000000000 +0100 +++ new/src/cpu/zero/vm/vmreg_zero.inline.hpp 2010-11-16 18:04:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP +#define CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP + inline VMReg RegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding()); } @@ -30,3 +33,5 @@ inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr); } + +#endif // CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP --- old/src/cpu/zero/vm/vtableStubs_zero.cpp 2010-11-16 18:04:47.000000000 +0100 +++ new/src/cpu/zero/vm/vtableStubs_zero.cpp 2010-11-16 18:04:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vtableStubs_zero.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_zero.inline.hpp" +#include "code/vtableStubs.hpp" +#include "interp_masm_zero.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassVtable.hpp" +#include "runtime/sharedRuntime.hpp" +#include "vmreg_zero.inline.hpp" +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif VtableStub* VtableStubs::create_vtable_stub(int vtable_index) { ShouldNotCallThis(); --- old/src/os/linux/launcher/java.c 2010-11-16 18:04:47.000000000 +0100 +++ new/src/os/linux/launcher/java.c 2010-11-16 18:04:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/linux/launcher/java.h 2010-11-16 18:04:48.000000000 +0100 +++ new/src/os/linux/launcher/java.h 2010-11-16 18:04:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/linux/launcher/java_md.c 2010-11-16 18:04:49.000000000 +0100 +++ new/src/os/linux/launcher/java_md.c 2010-11-16 18:04:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/linux/launcher/java_md.h 2010-11-16 18:04:50.000000000 +0100 +++ new/src/os/linux/launcher/java_md.h 2010-11-16 18:04:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/linux/vm/attachListener_linux.cpp 2010-11-16 18:04:51.000000000 +0100 +++ new/src/os/linux/vm/attachListener_linux.cpp 2010-11-16 18:04:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_attachListener_linux.cpp.incl" +#include "precompiled.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/os.hpp" +#include "services/attachListener.hpp" +#include "services/dtraceAttacher.hpp" #include #include --- old/src/os/linux/vm/c1_globals_linux.hpp 2010-11-16 18:04:52.000000000 +0100 +++ new/src/os/linux/vm/c1_globals_linux.hpp 2010-11-16 18:04:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_LINUX_VM_C1_GLOBALS_LINUX_HPP +#define OS_LINUX_VM_C1_GLOBALS_LINUX_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // + +#endif // OS_LINUX_VM_C1_GLOBALS_LINUX_HPP --- old/src/os/linux/vm/c2_globals_linux.hpp 2010-11-16 18:04:52.000000000 +0100 +++ new/src/os/linux/vm/c2_globals_linux.hpp 2010-11-16 18:04:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_LINUX_VM_C2_GLOBALS_LINUX_HPP +#define OS_LINUX_VM_C2_GLOBALS_LINUX_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // + +#endif // OS_LINUX_VM_C2_GLOBALS_LINUX_HPP --- old/src/os/linux/vm/chaitin_linux.cpp 2010-11-16 18:04:53.000000000 +0100 +++ new/src/os/linux/vm/chaitin_linux.cpp 2010-11-16 18:04:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_chaitin_linux.cpp.incl" +#include "precompiled.hpp" +#include "opto/chaitin.hpp" +#include "opto/machnode.hpp" void PhaseRegAlloc::pd_preallocate_hook() { // no action --- old/src/os/linux/vm/dtraceJSDT_linux.cpp 2010-11-16 18:04:54.000000000 +0100 +++ new/src/os/linux/vm/dtraceJSDT_linux.cpp 2010-11-16 18:04:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_dtraceJSDT_linux.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "code/codeBlob.hpp" +#include "memory/allocation.hpp" +#include "prims/jvm.h" +#include "runtime/dtraceJSDT.hpp" +#include "runtime/jniHandles.hpp" +#include "runtime/os.hpp" +#include "runtime/signature.hpp" +#include "utilities/globalDefinitions.hpp" int DTraceJSDT::pd_activate( void* baseAddress, jstring module, --- old/src/os/linux/vm/globals_linux.hpp 2010-11-16 18:04:55.000000000 +0100 +++ new/src/os/linux/vm/globals_linux.hpp 2010-11-16 18:04:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_GLOBALS_LINUX_HPP +#define OS_LINUX_VM_GLOBALS_LINUX_HPP + // // Defines Linux specific flags. They are not available on other platforms. // @@ -42,3 +45,5 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, true) ; + +#endif // OS_LINUX_VM_GLOBALS_LINUX_HPP --- old/src/os/linux/vm/hpi_linux.cpp 2010-11-16 18:04:56.000000000 +0100 +++ new/src/os/linux/vm/hpi_linux.cpp 2010-11-16 18:04:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_hpi_linux.cpp.incl" +#include "precompiled.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/os.hpp" # include # include --- old/src/os/linux/vm/hpi_linux.hpp 2010-11-16 18:04:56.000000000 +0100 +++ new/src/os/linux/vm/hpi_linux.hpp 2010-11-16 18:04:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_HPI_LINUX_HPP +#define OS_LINUX_VM_HPI_LINUX_HPP + // // Because the interruptible IO has been dropped for HotSpot/Linux, // the following HPI interface is very different from HotSparc. @@ -222,3 +225,5 @@ // Reconciliation History // hpi_solaris.hpp 1.9 99/08/30 16:31:23 // End + +#endif // OS_LINUX_VM_HPI_LINUX_HPP --- old/src/os/linux/vm/interfaceSupport_linux.hpp 2010-11-16 18:04:57.000000000 +0100 +++ new/src/os/linux/vm/interfaceSupport_linux.hpp 2010-11-16 18:04:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef OS_LINUX_VM_INTERFACESUPPORT_LINUX_HPP +#define OS_LINUX_VM_INTERFACESUPPORT_LINUX_HPP + // Contains inlined functions for class InterfaceSupport static inline void serialize_memory(JavaThread *thread) { os::write_memory_serialize_page(thread); } + +#endif // OS_LINUX_VM_INTERFACESUPPORT_LINUX_HPP --- old/src/os/linux/vm/jsig.c 2010-11-16 18:04:58.000000000 +0100 +++ new/src/os/linux/vm/jsig.c 2010-11-16 18:04:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/linux/vm/jvm_linux.cpp 2010-11-16 18:04:59.000000000 +0100 +++ new/src/os/linux/vm/jvm_linux.cpp 2010-11-16 18:04:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_jvm_linux.cpp.incl" +#include "precompiled.hpp" +#include "prims/jvm.h" +#include "runtime/interfaceSupport.hpp" +#include "runtime/osThread.hpp" #include --- old/src/os/linux/vm/jvm_linux.h 2010-11-16 18:05:00.000000000 +0100 +++ new/src/os/linux/vm/jvm_linux.h 2010-11-16 18:04:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_JVM_LINUX_H +#define OS_LINUX_VM_JVM_LINUX_H + /* // HotSpot integration note: // @@ -95,3 +98,5 @@ // Reconciliation History // jvm_solaris.h 1.6 99/06/22 16:38:47 // End + +#endif // OS_LINUX_VM_JVM_LINUX_H --- old/src/os/linux/vm/mutex_linux.cpp 2010-11-16 18:05:00.000000000 +0100 +++ new/src/os/linux/vm/mutex_linux.cpp 2010-11-16 18:05:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_mutex_linux.cpp.incl" +#include "precompiled.hpp" +#include "mutex_linux.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/mutex.hpp" +#include "thread_linux.inline.hpp" +#include "utilities/events.hpp" // put OS-includes here # include --- old/src/os/linux/vm/mutex_linux.inline.hpp 2010-11-16 18:05:01.000000000 +0100 +++ new/src/os/linux/vm/mutex_linux.inline.hpp 2010-11-16 18:05:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,16 @@ * */ +#ifndef OS_LINUX_VM_MUTEX_LINUX_INLINE_HPP +#define OS_LINUX_VM_MUTEX_LINUX_INLINE_HPP + +#include "os_linux.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "thread_linux.inline.hpp" + // Reconciliation History // mutex_solaris.inline.hpp 1.5 99/06/22 16:38:49 // End + +#endif // OS_LINUX_VM_MUTEX_LINUX_INLINE_HPP --- old/src/os/linux/vm/osThread_linux.cpp 2010-11-16 18:05:02.000000000 +0100 +++ new/src/os/linux/vm/osThread_linux.cpp 2010-11-16 18:05:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,23 @@ * */ -// do not include precompiled header file -# include "incls/_osThread_linux.cpp.incl" +// no precompiled headers +#include "runtime/atomic.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/os.hpp" +#include "runtime/osThread.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vmThread.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +#endif void OSThread::pd_initialize() { --- old/src/os/linux/vm/osThread_linux.hpp 2010-11-16 18:05:03.000000000 +0100 +++ new/src/os/linux/vm/osThread_linux.hpp 2010-11-16 18:05:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_OSTHREAD_LINUX_HPP +#define OS_LINUX_VM_OSTHREAD_LINUX_HPP + private: int _thread_type; @@ -139,3 +142,5 @@ // Reconciliation History // osThread_solaris.hpp 1.24 99/08/27 13:11:54 // End + +#endif // OS_LINUX_VM_OSTHREAD_LINUX_HPP --- old/src/os/linux/vm/os_linux.cpp 2010-11-16 18:05:04.000000000 +0100 +++ new/src/os/linux/vm/os_linux.cpp 2010-11-16 18:05:03.000000000 +0100 @@ -24,8 +24,64 @@ # define __STDC_FORMAT_MACROS -// do not include precompiled header file -# include "incls/_os_linux.cpp.incl" +// no precompiled headers +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/compileBroker.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_linux.h" +#include "memory/allocation.inline.hpp" +#include "memory/filemap.hpp" +#include "mutex_linux.inline.hpp" +#include "oops/oop.inline.hpp" +#include "os_share_linux.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/globals.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/osThread.hpp" +#include "runtime/perfMemory.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/statSampler.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/timer.hpp" +#include "services/attachListener.hpp" +#include "services/runtimeService.hpp" +#include "thread_linux.inline.hpp" +#include "utilities/defaultStream.hpp" +#include "utilities/events.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/vmError.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +# include "nativeInst_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +# include "nativeInst_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +# include "nativeInst_zero.hpp" +#endif +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // put OS-includes here # include --- old/src/os/linux/vm/os_linux.hpp 2010-11-16 18:05:05.000000000 +0100 +++ new/src/os/linux/vm/os_linux.hpp 2010-11-16 18:05:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_OS_LINUX_HPP +#define OS_LINUX_VM_OS_LINUX_HPP + // Linux_OS defines the interface to Linux operating systems /* pthread_getattr_np comes with LinuxThreads-0.9-7 on RedHat 7.1 */ @@ -328,3 +331,5 @@ assert_status(status == 0, status, "mutex_init"); } } ; + +#endif // OS_LINUX_VM_OS_LINUX_HPP --- old/src/os/linux/vm/os_linux.inline.hpp 2010-11-16 18:05:05.000000000 +0100 +++ new/src/os/linux/vm/os_linux.inline.hpp 2010-11-16 18:05:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,24 @@ * */ +#ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP +#define OS_LINUX_VM_OS_LINUX_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_OS_ARCH_linux_x86 +# include "atomic_linux_x86.inline.hpp" +# include "orderAccess_linux_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_sparc +# include "atomic_linux_sparc.inline.hpp" +# include "orderAccess_linux_sparc.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_zero +# include "atomic_linux_zero.inline.hpp" +# include "orderAccess_linux_zero.inline.hpp" +#endif + inline void* os::thread_local_storage_at(int index) { return pthread_getspecific((pthread_key_t)index); } @@ -123,3 +141,5 @@ inline bool os::numa_has_static_binding() { return true; } inline bool os::numa_has_group_homing() { return false; } + +#endif // OS_LINUX_VM_OS_LINUX_INLINE_HPP --- old/src/os/linux/vm/os_share_linux.hpp 2010-11-16 18:05:06.000000000 +0100 +++ new/src/os/linux/vm/os_share_linux.hpp 2010-11-16 18:05:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_LINUX_VM_OS_SHARE_LINUX_HPP +#define OS_LINUX_VM_OS_SHARE_LINUX_HPP + // misc void signalHandler(int, siginfo_t*, ucontext_t*); void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc); @@ -30,3 +33,5 @@ #endif #define PROCFILE_LENGTH 128 + +#endif // OS_LINUX_VM_OS_SHARE_LINUX_HPP --- old/src/os/linux/vm/perfMemory_linux.cpp 2010-11-16 18:05:07.000000000 +0100 +++ new/src/os/linux/vm/perfMemory_linux.cpp 2010-11-16 18:05:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,15 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_perfMemory_linux.cpp.incl" +#include "precompiled.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "os_linux.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/perfMemory.hpp" +#include "utilities/exceptions.hpp" // put OS-includes here # include --- old/src/os/linux/vm/stubRoutines_linux.cpp 2010-11-16 18:05:08.000000000 +0100 +++ new/src/os/linux/vm/stubRoutines_linux.cpp 2010-11-16 18:05:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_linux.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "runtime/stubRoutines.hpp" + --- old/src/os/linux/vm/threadCritical_linux.cpp 2010-11-16 18:05:09.000000000 +0100 +++ new/src/os/linux/vm/threadCritical_linux.cpp 2010-11-16 18:05:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadCritical_linux.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadCritical.hpp" +#include "thread_linux.inline.hpp" // put OS-includes here # include --- old/src/os/linux/vm/thread_linux.inline.hpp 2010-11-16 18:05:09.000000000 +0100 +++ new/src/os/linux/vm/thread_linux.inline.hpp 2010-11-16 18:05:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,31 @@ * */ +#ifndef OS_LINUX_VM_THREAD_LINUX_INLINE_HPP +#define OS_LINUX_VM_THREAD_LINUX_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/prefetch.hpp" +#include "runtime/thread.hpp" +#include "runtime/threadLocalStorage.hpp" +#ifdef TARGET_OS_ARCH_linux_x86 +# include "atomic_linux_x86.inline.hpp" +# include "orderAccess_linux_x86.inline.hpp" +# include "prefetch_linux_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_sparc +# include "atomic_linux_sparc.inline.hpp" +# include "orderAccess_linux_sparc.inline.hpp" +# include "prefetch_linux_sparc.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_zero +# include "atomic_linux_zero.inline.hpp" +# include "orderAccess_linux_zero.inline.hpp" +# include "prefetch_linux_zero.inline.hpp" +#endif + // Contains inlined functions for class Thread and ThreadLocalStorage inline void ThreadLocalStorage::pd_invalidate_all() {} // nothing to do + +#endif // OS_LINUX_VM_THREAD_LINUX_INLINE_HPP --- old/src/os/linux/vm/vmError_linux.cpp 2010-11-16 18:05:10.000000000 +0100 +++ new/src/os/linux/vm/vmError_linux.cpp 2010-11-16 18:05:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vmError_linux.cpp.incl" +#include "precompiled.hpp" +#include "runtime/arguments.hpp" +#include "runtime/os.hpp" +#include "runtime/thread.hpp" +#include "utilities/vmError.hpp" #include #include --- old/src/os/solaris/dtrace/generateJvmOffsets.cpp 2010-11-16 18:05:11.000000000 +0100 +++ new/src/os/solaris/dtrace/generateJvmOffsets.cpp 2010-11-16 18:05:11.000000000 +0100 @@ -38,9 +38,22 @@ #define protected public #include -#include "incls/_precompiled.incl" -#include "incls/_vmStructs.cpp.incl" - +#include "code/codeBlob.hpp" +#include "code/nmethod.hpp" +#include "code/pcDesc.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/heap.hpp" +#include "memory/memRegion.hpp" +#include "memory/universe.hpp" +#include "oops/constMethodOop.hpp" +#include "oops/klass.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/virtualspace.hpp" +#include "runtime/vmStructs.hpp" +#include "utilities/accessFlags.hpp" +#include "utilities/globalDefinitions.hpp" #ifdef COMPILER1 #if defined(DEBUG) || defined(FASTDEBUG) --- old/src/os/solaris/dtrace/generateJvmOffsets.h 2010-11-16 18:05:12.000000000 +0100 +++ new/src/os/solaris/dtrace/generateJvmOffsets.h 2010-11-16 18:05:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H +#define OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H + #include #include @@ -36,3 +39,5 @@ void gen_prologue(GEN_variant gen_var); void gen_epilogue(GEN_variant gen_var); } + +#endif // OS_SOLARIS_DTRACE_GENERATEJVMOFFSETS_H --- old/src/os/solaris/dtrace/generateJvmOffsetsMain.c 2010-11-16 18:05:13.000000000 +0100 +++ new/src/os/solaris/dtrace/generateJvmOffsetsMain.c 2010-11-16 18:05:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/dtrace/jvm_dtrace.c 2010-11-16 18:05:13.000000000 +0100 +++ new/src/os/solaris/dtrace/jvm_dtrace.c 2010-11-16 18:05:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/dtrace/jvm_dtrace.h 2010-11-16 18:05:14.000000000 +0100 +++ new/src/os/solaris/dtrace/jvm_dtrace.h 2010-11-16 18:05:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/dtrace/libjvm_db.h 2010-11-16 18:05:15.000000000 +0100 +++ new/src/os/solaris/dtrace/libjvm_db.h 2010-11-16 18:05:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_DTRACE_LIBJVM_DB_H +#define OS_SOLARIS_DTRACE_LIBJVM_DB_H + #include #ifdef __cplusplus @@ -61,3 +64,5 @@ #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ + +#endif // OS_SOLARIS_DTRACE_LIBJVM_DB_H --- old/src/os/solaris/launcher/java.c 2010-11-16 18:05:16.000000000 +0100 +++ new/src/os/solaris/launcher/java.c 2010-11-16 18:05:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/launcher/java.h 2010-11-16 18:05:17.000000000 +0100 +++ new/src/os/solaris/launcher/java.h 2010-11-16 18:05:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/launcher/java_md.c 2010-11-16 18:05:18.000000000 +0100 +++ new/src/os/solaris/launcher/java_md.c 2010-11-16 18:05:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/launcher/java_md.h 2010-11-16 18:05:18.000000000 +0100 +++ new/src/os/solaris/launcher/java_md.h 2010-11-16 18:05:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/vm/attachListener_solaris.cpp 2010-11-16 18:05:19.000000000 +0100 +++ new/src/os/solaris/vm/attachListener_solaris.cpp 2010-11-16 18:05:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_attachListener_solaris.cpp.incl" +#include "precompiled.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/os.hpp" +#include "services/attachListener.hpp" +#include "services/dtraceAttacher.hpp" #include #include --- old/src/os/solaris/vm/c1_globals_solaris.hpp 2010-11-16 18:05:20.000000000 +0100 +++ new/src/os/solaris/vm/c1_globals_solaris.hpp 2010-11-16 18:05:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP +#define OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // + +#endif // OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP --- old/src/os/solaris/vm/c2_globals_solaris.hpp 2010-11-16 18:05:21.000000000 +0100 +++ new/src/os/solaris/vm/c2_globals_solaris.hpp 2010-11-16 18:05:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP +#define OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // + +#endif // OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP --- old/src/os/solaris/vm/chaitin_solaris.cpp 2010-11-16 18:05:22.000000000 +0100 +++ new/src/os/solaris/vm/chaitin_solaris.cpp 2010-11-16 18:05:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_chaitin_solaris.cpp.incl" +#include "precompiled.hpp" +#include "opto/chaitin.hpp" +#include "opto/machnode.hpp" void PhaseRegAlloc::pd_preallocate_hook() { // no action --- old/src/os/solaris/vm/dtraceJSDT_solaris.cpp 2010-11-16 18:05:22.000000000 +0100 +++ new/src/os/solaris/vm/dtraceJSDT_solaris.cpp 2010-11-16 18:05:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_dtraceJSDT_solaris.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "code/codeBlob.hpp" +#include "memory/allocation.hpp" +#include "prims/jvm.h" +#include "runtime/dtraceJSDT.hpp" +#include "runtime/jniHandles.hpp" +#include "runtime/os.hpp" +#include "runtime/signature.hpp" +#include "utilities/globalDefinitions.hpp" #ifdef HAVE_DTRACE_H --- old/src/os/solaris/vm/globals_solaris.hpp 2010-11-16 18:05:23.000000000 +0100 +++ new/src/os/solaris/vm/globals_solaris.hpp 2010-11-16 18:05:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP +#define OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP + // // Defines Solaris specific flags. They are not available on other platforms. // @@ -47,3 +50,5 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, false); + +#endif // OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP --- old/src/os/solaris/vm/hpi_solaris.cpp 2010-11-16 18:05:24.000000000 +0100 +++ new/src/os/solaris/vm/hpi_solaris.cpp 2010-11-16 18:05:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_hpi_solaris.cpp.incl" +#include "precompiled.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/os.hpp" # include # include --- old/src/os/solaris/vm/hpi_solaris.hpp 2010-11-16 18:05:25.000000000 +0100 +++ new/src/os/solaris/vm/hpi_solaris.hpp 2010-11-16 18:05:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_HPI_SOLARIS_HPP +#define OS_SOLARIS_VM_HPI_SOLARIS_HPP + // // Parts of the HPI interface for which the HotSparc does not use the // HPI (because the interruptible IO mechanims used are different). @@ -247,3 +250,5 @@ // 1.3 98/10/21 18:17:14 hpi_win32.hpp // 1.6 99/06/28 11:01:36 hpi_win32.hpp //End + +#endif // OS_SOLARIS_VM_HPI_SOLARIS_HPP --- old/src/os/solaris/vm/interfaceSupport_solaris.hpp 2010-11-16 18:05:26.000000000 +0100 +++ new/src/os/solaris/vm/interfaceSupport_solaris.hpp 2010-11-16 18:05:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef OS_SOLARIS_VM_INTERFACESUPPORT_SOLARIS_HPP +#define OS_SOLARIS_VM_INTERFACESUPPORT_SOLARIS_HPP + // Contains inlined functions for class InterfaceSupport static inline void serialize_memory(JavaThread *thread) { os::write_memory_serialize_page(thread); } + +#endif // OS_SOLARIS_VM_INTERFACESUPPORT_SOLARIS_HPP --- old/src/os/solaris/vm/jsig.c 2010-11-16 18:05:27.000000000 +0100 +++ new/src/os/solaris/vm/jsig.c 2010-11-16 18:05:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/solaris/vm/jvm_solaris.cpp 2010-11-16 18:05:27.000000000 +0100 +++ new/src/os/solaris/vm/jvm_solaris.cpp 2010-11-16 18:05:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_jvm_solaris.cpp.incl" +#include "precompiled.hpp" +#include "prims/jvm.h" +#include "runtime/interfaceSupport.hpp" +#include "runtime/osThread.hpp" #include --- old/src/os/solaris/vm/jvm_solaris.h 2010-11-16 18:05:28.000000000 +0100 +++ new/src/os/solaris/vm/jvm_solaris.h 2010-11-16 18:05:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_JVM_SOLARIS_H +#define OS_SOLARIS_VM_JVM_SOLARIS_H + /* // HotSpot integration note: // @@ -98,3 +101,5 @@ #define JSIG_VERSION_1_4_1 0x30140100 #endif /* JVM_MD_H */ + +#endif // OS_SOLARIS_VM_JVM_SOLARIS_H --- old/src/os/solaris/vm/mutex_solaris.cpp 2010-11-16 18:05:29.000000000 +0100 +++ new/src/os/solaris/vm/mutex_solaris.cpp 2010-11-16 18:05:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_mutex_solaris.cpp.incl" +#include "precompiled.hpp" +#include "mutex_solaris.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/mutex.hpp" +#include "thread_solaris.inline.hpp" +#include "utilities/events.hpp" // Solaris-specific include, therefore not in includeDB_* # include "os_share_solaris.hpp" --- old/src/os/solaris/vm/mutex_solaris.inline.hpp 2010-11-16 18:05:30.000000000 +0100 +++ new/src/os/solaris/vm/mutex_solaris.inline.hpp 2010-11-16 18:05:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,3 +21,12 @@ * questions. * */ + +#ifndef OS_SOLARIS_VM_MUTEX_SOLARIS_INLINE_HPP +#define OS_SOLARIS_VM_MUTEX_SOLARIS_INLINE_HPP + +#include "os_solaris.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "thread_solaris.inline.hpp" + +#endif // OS_SOLARIS_VM_MUTEX_SOLARIS_INLINE_HPP --- old/src/os/solaris/vm/osThread_solaris.cpp 2010-11-16 18:05:31.000000000 +0100 +++ new/src/os/solaris/vm/osThread_solaris.cpp 2010-11-16 18:05:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,21 @@ * */ -// do not include precompiled header file -# include "incls/_osThread_solaris.cpp.incl" +// no precompiled headers +#include "runtime/atomic.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/os.hpp" +#include "runtime/osThread.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vmThread.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +#endif + # include // *************************************************************** --- old/src/os/solaris/vm/osThread_solaris.hpp 2010-11-16 18:05:31.000000000 +0100 +++ new/src/os/solaris/vm/osThread_solaris.hpp 2010-11-16 18:05:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP +#define OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP + // This is embedded via include into the class OSThread private: @@ -149,3 +152,5 @@ void pd_initialize(); void pd_destroy(); + +#endif // OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP --- old/src/os/solaris/vm/os_share_solaris.hpp 2010-11-16 18:05:32.000000000 +0100 +++ new/src/os/solaris/vm/os_share_solaris.hpp 2010-11-16 18:05:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP +#define OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP + // Defines the interfaces to Solaris operating systems that vary across platforms @@ -65,3 +68,5 @@ #endif #define PROCFILE_LENGTH 128 + +#endif // OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP --- old/src/os/solaris/vm/os_solaris.cpp 2010-11-16 18:05:33.000000000 +0100 +++ new/src/os/solaris/vm/os_solaris.cpp 2010-11-16 18:05:33.000000000 +0100 @@ -22,8 +22,60 @@ * */ -// do not include precompiled header file -# include "incls/_os_solaris.cpp.incl" +// no precompiled headers +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/compileBroker.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_solaris.h" +#include "memory/allocation.inline.hpp" +#include "memory/filemap.hpp" +#include "mutex_solaris.inline.hpp" +#include "oops/oop.inline.hpp" +#include "os_share_solaris.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/globals.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/osThread.hpp" +#include "runtime/perfMemory.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/statSampler.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/timer.hpp" +#include "services/attachListener.hpp" +#include "services/runtimeService.hpp" +#include "thread_solaris.inline.hpp" +#include "utilities/defaultStream.hpp" +#include "utilities/events.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/vmError.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +# include "nativeInst_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +# include "nativeInst_sparc.hpp" +#endif +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // put OS-includes here # include --- old/src/os/solaris/vm/os_solaris.hpp 2010-11-16 18:05:34.000000000 +0100 +++ new/src/os/solaris/vm/os_solaris.hpp 2010-11-16 18:05:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_SOLARIS_VM_OS_SOLARIS_HPP +#define OS_SOLARIS_VM_OS_SOLARIS_HPP + // Solaris_OS defines the interface to Solaris operating systems class Solaris { @@ -394,3 +397,5 @@ assert_status(status == 0, status, "mutex_init"); } } ; + +#endif // OS_SOLARIS_VM_OS_SOLARIS_HPP --- old/src/os/solaris/vm/os_solaris.inline.hpp 2010-11-16 18:05:35.000000000 +0100 +++ new/src/os/solaris/vm/os_solaris.inline.hpp 2010-11-16 18:05:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP +#define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_OS_ARCH_solaris_x86 +# include "atomic_solaris_x86.inline.hpp" +# include "orderAccess_solaris_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_sparc +# include "atomic_solaris_sparc.inline.hpp" +# include "orderAccess_solaris_sparc.inline.hpp" +#endif + inline const char* os::file_separator() { return "/"; } inline const char* os::line_separator() { return "\n"; } inline const char* os::path_separator() { return ":"; } @@ -207,3 +221,5 @@ inline bool os::numa_has_static_binding() { return false; } inline bool os::numa_has_group_homing() { return true; } + +#endif // OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP --- old/src/os/solaris/vm/perfMemory_solaris.cpp 2010-11-16 18:05:36.000000000 +0100 +++ new/src/os/solaris/vm/perfMemory_solaris.cpp 2010-11-16 18:05:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,15 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_perfMemory_solaris.cpp.incl" +#include "precompiled.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "os_solaris.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/perfMemory.hpp" +#include "utilities/exceptions.hpp" // put OS-includes here # include --- old/src/os/solaris/vm/stubRoutines_solaris.cpp 2010-11-16 18:05:36.000000000 +0100 +++ new/src/os/solaris/vm/stubRoutines_solaris.cpp 2010-11-16 18:05:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_solaris.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "runtime/stubRoutines.hpp" + --- old/src/os/solaris/vm/threadCritical_solaris.cpp 2010-11-16 18:05:37.000000000 +0100 +++ new/src/os/solaris/vm/threadCritical_solaris.cpp 2010-11-16 18:05:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadCritical_solaris.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadCritical.hpp" +#include "thread_solaris.inline.hpp" // OS-includes here #include --- old/src/os/solaris/vm/thread_solaris.inline.hpp 2010-11-16 18:05:38.000000000 +0100 +++ new/src/os/solaris/vm/thread_solaris.inline.hpp 2010-11-16 18:05:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,24 @@ * */ +#ifndef OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP +#define OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/prefetch.hpp" +#include "runtime/thread.hpp" +#include "runtime/threadLocalStorage.hpp" +#ifdef TARGET_OS_ARCH_solaris_x86 +# include "atomic_solaris_x86.inline.hpp" +# include "orderAccess_solaris_x86.inline.hpp" +# include "prefetch_solaris_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_sparc +# include "atomic_solaris_sparc.inline.hpp" +# include "orderAccess_solaris_sparc.inline.hpp" +# include "prefetch_solaris_sparc.inline.hpp" +#endif + // Thread::current is "hot" it's called > 128K times in the 1st 500 msecs of // startup. // ThreadLocalStorage::thread is warm -- it's called > 16K times in the same @@ -43,3 +61,5 @@ return ThreadLocalStorage::get_thread_via_cache_slowly(raw, ix); } } + +#endif // OS_SOLARIS_VM_THREAD_SOLARIS_INLINE_HPP --- old/src/os/solaris/vm/vmError_solaris.cpp 2010-11-16 18:05:39.000000000 +0100 +++ new/src/os/solaris/vm/vmError_solaris.cpp 2010-11-16 18:05:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vmError_solaris.cpp.incl" +#include "precompiled.hpp" +#include "runtime/arguments.hpp" +#include "runtime/os.hpp" +#include "runtime/thread.hpp" +#include "utilities/vmError.hpp" #include #include --- old/src/os/windows/vm/attachListener_windows.cpp 2010-11-16 18:05:40.000000000 +0100 +++ new/src/os/windows/vm/attachListener_windows.cpp 2010-11-16 18:05:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_attachListener_windows.cpp.incl" +#include "precompiled.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/os.hpp" +#include "services/attachListener.hpp" +#include "services/dtraceAttacher.hpp" #include #include // SIGBREAK --- old/src/os/windows/vm/c1_globals_windows.hpp 2010-11-16 18:05:40.000000000 +0100 +++ new/src/os/windows/vm/c1_globals_windows.hpp 2010-11-16 18:05:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP +#define OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // + +#endif // OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP --- old/src/os/windows/vm/c2_globals_windows.hpp 2010-11-16 18:05:41.000000000 +0100 +++ new/src/os/windows/vm/c2_globals_windows.hpp 2010-11-16 18:05:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,15 @@ * */ +#ifndef OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP +#define OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP + +#include "utilities/globalDefinitions.hpp" +#include "utilities/macros.hpp" + // // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // + +#endif // OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP --- old/src/os/windows/vm/chaitin_windows.cpp 2010-11-16 18:05:42.000000000 +0100 +++ new/src/os/windows/vm/chaitin_windows.cpp 2010-11-16 18:05:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_chaitin_windows.cpp.incl" +#include "precompiled.hpp" +#include "opto/chaitin.hpp" +#include "opto/machnode.hpp" // Disallow the use of the frame pointer (EBP) for implicit null exceptions // on win95/98. If we do not do this, the OS gets confused and gives a stack --- old/src/os/windows/vm/dtraceJSDT_windows.cpp 2010-11-16 18:05:43.000000000 +0100 +++ new/src/os/windows/vm/dtraceJSDT_windows.cpp 2010-11-16 18:05:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_dtraceJSDT_windows.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "code/codeBlob.hpp" +#include "memory/allocation.hpp" +#include "prims/jvm.h" +#include "runtime/dtraceJSDT.hpp" +#include "runtime/jniHandles.hpp" +#include "runtime/os.hpp" +#include "runtime/signature.hpp" +#include "utilities/globalDefinitions.hpp" int DTraceJSDT::pd_activate( void* baseAddress, jstring module, --- old/src/os/windows/vm/globals_windows.hpp 2010-11-16 18:05:44.000000000 +0100 +++ new/src/os/windows/vm/globals_windows.hpp 2010-11-16 18:05:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP +#define OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP + // // Defines Windows specific flags. They are not available on other platforms. // @@ -40,3 +43,5 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, true); define_pd_global(bool, UseOSErrorReporting, false); // for now. define_pd_global(bool, UseThreadPriorities, true) ; + +#endif // OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP --- old/src/os/windows/vm/hpi_windows.cpp 2010-11-16 18:05:44.000000000 +0100 +++ new/src/os/windows/vm/hpi_windows.cpp 2010-11-16 18:05:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_hpi_windows.cpp.incl" +#include "precompiled.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/os.hpp" typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *); --- old/src/os/windows/vm/hpi_windows.hpp 2010-11-16 18:05:45.000000000 +0100 +++ new/src/os/windows/vm/hpi_windows.hpp 2010-11-16 18:05:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_HPI_WINDOWS_HPP +#define OS_WINDOWS_VM_HPI_WINDOWS_HPP + // Win32 delegates these to the HPI. Solaris provides its own // implementation without using the HPI (for Interrupitble I/O). @@ -168,3 +171,5 @@ ("name = %p", name), (name)); + +#endif // OS_WINDOWS_VM_HPI_WINDOWS_HPP --- old/src/os/windows/vm/interfaceSupport_windows.hpp 2010-11-16 18:05:46.000000000 +0100 +++ new/src/os/windows/vm/interfaceSupport_windows.hpp 2010-11-16 18:05:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_INTERFACESUPPORT_WINDOWS_HPP +#define OS_WINDOWS_VM_INTERFACESUPPORT_WINDOWS_HPP + // Contains inlined functions for class InterfaceSupport static inline void serialize_memory(JavaThread *thread) { @@ -39,3 +42,5 @@ serialize_fault_filter((_EXCEPTION_POINTERS*)_exception_info())) {} } + +#endif // OS_WINDOWS_VM_INTERFACESUPPORT_WINDOWS_HPP --- old/src/os/windows/vm/jvm_windows.cpp 2010-11-16 18:05:47.000000000 +0100 +++ new/src/os/windows/vm/jvm_windows.cpp 2010-11-16 18:05:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_jvm_windows.cpp.incl" +#include "precompiled.hpp" +#include "prims/jvm.h" +#include "runtime/interfaceSupport.hpp" +#include "runtime/osThread.hpp" #include --- old/src/os/windows/vm/jvm_windows.h 2010-11-16 18:05:48.000000000 +0100 +++ new/src/os/windows/vm/jvm_windows.h 2010-11-16 18:05:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/os/windows/vm/mutex_windows.cpp 2010-11-16 18:05:48.000000000 +0100 +++ new/src/os/windows/vm/mutex_windows.cpp 2010-11-16 18:05:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_mutex_windows.cpp.incl" +#include "precompiled.hpp" +#include "mutex_windows.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/mutex.hpp" +#include "thread_windows.inline.hpp" +#include "utilities/events.hpp" // put OS-includes here # include --- old/src/os/windows/vm/mutex_windows.inline.hpp 2010-11-16 18:05:49.000000000 +0100 +++ new/src/os/windows/vm/mutex_windows.inline.hpp 2010-11-16 18:05:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,3 +21,12 @@ * questions. * */ + +#ifndef OS_WINDOWS_VM_MUTEX_WINDOWS_INLINE_HPP +#define OS_WINDOWS_VM_MUTEX_WINDOWS_INLINE_HPP + +#include "os_windows.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "thread_windows.inline.hpp" + +#endif // OS_WINDOWS_VM_MUTEX_WINDOWS_INLINE_HPP --- old/src/os/windows/vm/osThread_windows.cpp 2010-11-16 18:05:50.000000000 +0100 +++ new/src/os/windows/vm/osThread_windows.cpp 2010-11-16 18:05:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,17 @@ * */ -#include "incls/_osThread_windows.cpp.incl" +// no precompiled headers +#include "runtime/atomic.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/os.hpp" +#include "runtime/osThread.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vmThread.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif void OSThread::pd_initialize() { set_thread_handle(NULL); --- old/src/os/windows/vm/osThread_windows.hpp 2010-11-16 18:05:51.000000000 +0100 +++ new/src/os/windows/vm/osThread_windows.hpp 2010-11-16 18:05:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP +#define OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP + typedef void* HANDLE; private: @@ -64,3 +67,5 @@ private: void pd_initialize(); void pd_destroy(); + +#endif // OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP --- old/src/os/windows/vm/os_share_windows.hpp 2010-11-16 18:05:52.000000000 +0100 +++ new/src/os/windows/vm/os_share_windows.hpp 2010-11-16 18:05:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,4 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP +#define OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP + // Defines the interfaces to Windows operating system that vary across platforms + +#endif // OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP --- old/src/os/windows/vm/os_windows.cpp 2010-11-16 18:05:52.000000000 +0100 +++ new/src/os/windows/vm/os_windows.cpp 2010-11-16 18:05:52.000000000 +0100 @@ -27,8 +27,56 @@ #define _WIN32_WINNT 0x500 #endif -// do not include precompiled header file -# include "incls/_os_windows.cpp.incl" +// no precompiled headers +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/compileBroker.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_windows.h" +#include "memory/allocation.inline.hpp" +#include "memory/filemap.hpp" +#include "mutex_windows.inline.hpp" +#include "oops/oop.inline.hpp" +#include "os_share_windows.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/globals.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/objectMonitor.hpp" +#include "runtime/osThread.hpp" +#include "runtime/perfMemory.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/statSampler.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/timer.hpp" +#include "services/attachListener.hpp" +#include "services/runtimeService.hpp" +#include "thread_windows.inline.hpp" +#include "utilities/defaultStream.hpp" +#include "utilities/events.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/vmError.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +# include "nativeInst_x86.hpp" +#endif +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif #ifdef _DEBUG #include --- old/src/os/windows/vm/os_windows.hpp 2010-11-16 18:05:53.000000000 +0100 +++ new/src/os/windows/vm/os_windows.hpp 2010-11-16 18:05:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_WINDOWS_VM_OS_WINDOWS_HPP +#define OS_WINDOWS_VM_OS_WINDOWS_HPP + // Win32_OS defines the interface to windows operating systems class win32 { @@ -124,3 +127,5 @@ } } ; + +#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP --- old/src/os/windows/vm/os_windows.inline.hpp 2010-11-16 18:05:54.000000000 +0100 +++ new/src/os/windows/vm/os_windows.inline.hpp 2010-11-16 18:05:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP +#define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_OS_ARCH_windows_x86 +# include "atomic_windows_x86.inline.hpp" +# include "orderAccess_windows_x86.inline.hpp" +#endif + inline const char* os::file_separator() { return "\\"; } inline const char* os::line_separator() { return "\r\n"; } inline const char* os::path_separator() { return ";"; } @@ -72,3 +82,5 @@ inline bool os::numa_has_static_binding() { return true; } inline bool os::numa_has_group_homing() { return false; } + +#endif // OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP --- old/src/os/windows/vm/perfMemory_windows.cpp 2010-11-16 18:05:55.000000000 +0100 +++ new/src/os/windows/vm/perfMemory_windows.cpp 2010-11-16 18:05:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,15 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_perfMemory_windows.cpp.incl" +#include "precompiled.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "os_windows.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/perfMemory.hpp" +#include "utilities/exceptions.hpp" #include #include --- old/src/os/windows/vm/stubRoutines_windows.cpp 2010-11-16 18:05:56.000000000 +0100 +++ new/src/os/windows/vm/stubRoutines_windows.cpp 2010-11-16 18:05:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubRoutines_windows.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "runtime/stubRoutines.hpp" + --- old/src/os/windows/vm/threadCritical_windows.cpp 2010-11-16 18:05:57.000000000 +0100 +++ new/src/os/windows/vm/threadCritical_windows.cpp 2010-11-16 18:05:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_threadCritical_windows.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadCritical.hpp" +#include "thread_windows.inline.hpp" // OS-includes here # include --- old/src/os/windows/vm/thread_windows.inline.hpp 2010-11-16 18:05:57.000000000 +0100 +++ new/src/os/windows/vm/thread_windows.inline.hpp 2010-11-16 18:05:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,21 @@ * */ +#ifndef OS_WINDOWS_VM_THREAD_WINDOWS_INLINE_HPP +#define OS_WINDOWS_VM_THREAD_WINDOWS_INLINE_HPP + +#include "runtime/atomic.hpp" +#include "runtime/prefetch.hpp" +#include "runtime/thread.hpp" +#include "runtime/threadLocalStorage.hpp" +#ifdef TARGET_OS_ARCH_windows_x86 +# include "atomic_windows_x86.inline.hpp" +# include "orderAccess_windows_x86.inline.hpp" +# include "prefetch_windows_x86.inline.hpp" +#endif + // Contains inlined functions for class Thread and ThreadLocalStorage inline void ThreadLocalStorage::pd_invalidate_all() { return; } + +#endif // OS_WINDOWS_VM_THREAD_WINDOWS_INLINE_HPP --- old/src/os/windows/vm/vmError_windows.cpp 2010-11-16 18:05:58.000000000 +0100 +++ new/src/os/windows/vm/vmError_windows.cpp 2010-11-16 18:05:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vmError_windows.cpp.incl" +#include "precompiled.hpp" +#include "runtime/arguments.hpp" +#include "runtime/os.hpp" +#include "runtime/thread.hpp" +#include "utilities/vmError.hpp" void VMError::show_message_box(char *buf, int buflen) { --- old/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2010-11-16 18:05:59.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2010-11-16 18:05:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_linux_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" #include --- old/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp 2010-11-16 18:06:00.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp 2010-11-16 18:06:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP +#define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP + +#include "orderAccess_linux_sparc.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_sparc.hpp" + // Implementation of class atomic inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; } @@ -204,3 +212,5 @@ inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value); } + +#endif // OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP --- old/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp 2010-11-16 18:06:01.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp 2010-11-16 18:06:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP +#define OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP + // // Sets the default values for platform dependent flags used by the // runtime system. (see globals.hpp) @@ -34,3 +37,5 @@ define_pd_global(uintx, HeapBaseMinAddress, 4*G); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); + +#endif // OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP --- old/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp 2010-11-16 18:06:01.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp 2010-11-16 18:06:01.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP +#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_sparc.hpp" + // Implementation of class OrderAccess. // Assume TSO. @@ -100,3 +106,5 @@ inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } + +#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_INLINE_HPP --- old/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp 2010-11-16 18:06:02.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp 2010-11-16 18:06:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,9 +22,44 @@ * */ -// do not include precompiled header file +// no precompiled headers +#include "assembler_sparc.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_linux.h" +#include "memory/allocation.inline.hpp" +#include "mutex_linux.inline.hpp" +#include "nativeInst_sparc.hpp" +#include "os_share_linux.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_linux.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif -#include "incls/_os_linux_sparc.cpp.incl" // Linux/Sparc has rather obscure naming of registers in sigcontext // different between 32 and 64 bits --- old/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2010-11-16 18:06:03.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2010-11-16 18:06:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP +#define OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP + // // NOTE: we are back in class os here, not Linux // @@ -42,3 +45,5 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } + +#endif // OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP --- old/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp 2010-11-16 18:06:04.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp 2010-11-16 18:06:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP +#define OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP + +#include "runtime/prefetch.hpp" + #if defined(COMPILER2) || defined(_LP64) inline void Prefetch::read(void *loc, intx interval) { @@ -38,3 +43,5 @@ inline void Prefetch::write(void *loc, intx interval) {} #endif + +#endif // OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP --- old/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp 2010-11-16 18:06:05.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp 2010-11-16 18:06:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadLS_linux_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_linux.inline.hpp" void ThreadLocalStorage::generate_code_for_get_thread() { } --- old/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp 2010-11-16 18:06:06.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp 2010-11-16 18:06:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,12 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_THREADLS_LINUX_SPARC_HPP +#define OS_CPU_LINUX_SPARC_VM_THREADLS_LINUX_SPARC_HPP + public: static Thread* thread() { return (Thread*) os::thread_local_storage_at(thread_index()); } + +#endif // OS_CPU_LINUX_SPARC_VM_THREADLS_LINUX_SPARC_HPP --- old/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp 2010-11-16 18:06:06.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp 2010-11-16 18:06:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_linux_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_linux.inline.hpp" // For Forte Analyzer AsyncGetCallTrace profiling support - thread is // currently interrupted by SIGPROF --- old/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp 2010-11-16 18:06:07.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp 2010-11-16 18:06:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP +#define OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP + private: void pd_initialize() { @@ -96,3 +99,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP --- old/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp 2010-11-16 18:06:08.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp 2010-11-16 18:06:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP +#define OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -67,3 +70,5 @@ \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP --- old/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-16 18:06:09.000000000 +0100 +++ new/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2010-11-16 18:06:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_linux_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_sparc.hpp" static bool detect_niagara() { char cpu[128]; --- old/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp 2010-11-16 18:06:10.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp 2010-11-16 18:06:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_linux_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" #ifndef _LP64 void MacroAssembler::int3() { --- old/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp 2010-11-16 18:06:10.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp 2010-11-16 18:06:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP +#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP + +#include "orderAccess_linux_x86.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + // Implementation of class atomic inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; } @@ -193,3 +201,5 @@ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value); } #endif // AMD64 + +#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP --- old/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp 2010-11-16 18:06:11.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp 2010-11-16 18:06:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP +#define OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP + #include // Efficient swapping of data bytes from Java byte @@ -83,3 +86,5 @@ return swap_u8_base(*(u4*)&x, *(((u4*)&x)+1)); } #endif // !AMD64 + +#endif // OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP --- old/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp 2010-11-16 18:06:12.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp 2010-11-16 18:06:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP +#define OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP + static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) { #ifdef AMD64 (void)memmove(to, from, count * HeapWordSize); @@ -302,3 +305,5 @@ pd_conjoint_oops_atomic((oop*)from, (oop*)to, count); #endif // AMD64 } + +#endif // OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP --- old/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp 2010-11-16 18:06:13.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp 2010-11-16 18:06:13.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP + // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -45,3 +48,5 @@ define_pd_global(uintx,HeapBaseMinAddress, 2*G); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); + +#endif // OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP --- old/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp 2010-11-16 18:06:14.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp 2010-11-16 18:06:13.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP +#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_x86.hpp" + // Implementation of class OrderAccess. inline void OrderAccess::loadload() { acquire(); } @@ -204,3 +210,5 @@ release_store_fence((volatile jint*)p, (jint)v); #endif // AMD64 } + +#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP --- old/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2010-11-16 18:06:14.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2010-11-16 18:06:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,43 @@ * */ -// do not include precompiled header file -# include "incls/_os_linux_x86.cpp.incl" +// no precompiled headers +#include "assembler_x86.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_linux.h" +#include "memory/allocation.inline.hpp" +#include "mutex_linux.inline.hpp" +#include "nativeInst_x86.hpp" +#include "os_share_linux.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_linux.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // put OS-includes here # include --- old/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2010-11-16 18:06:15.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2010-11-16 18:06:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP + static void setup_fpu(); static bool supports_sse(); @@ -30,3 +33,5 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } + +#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP --- old/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp 2010-11-16 18:06:16.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp 2010-11-16 18:06:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP +#define OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP + +#include "runtime/prefetch.hpp" + inline void Prefetch::read (void *loc, intx interval) { #ifdef AMD64 @@ -38,3 +43,5 @@ #endif // AMD64 } + +#endif // OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP --- old/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp 2010-11-16 18:06:17.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp 2010-11-16 18:06:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadLS_linux_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_linux.inline.hpp" // Map stack pointer (%esp) to thread pointer for faster TLS access // --- old/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2010-11-16 18:06:18.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp 2010-11-16 18:06:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP + // Processor dependent parts of ThreadLocalStorage #ifndef AMD64 @@ -47,3 +50,5 @@ return _sp_map[sp >> PAGE_SHIFT]; #endif // AMD64 } + +#endif // OS_CPU_LINUX_X86_VM_THREADLS_LINUX_X86_HPP --- old/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp 2010-11-16 18:06:18.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp 2010-11-16 18:06:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_linux_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_linux.inline.hpp" // For Forte Analyzer AsyncGetCallTrace profiling support - thread is // currently interrupted by SIGPROF --- old/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp 2010-11-16 18:06:19.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp 2010-11-16 18:06:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP + private: void pd_initialize() { _anchor.clear(); @@ -63,3 +66,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP --- old/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp 2010-11-16 18:06:20.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp 2010-11-16 18:06:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP +#define OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -58,3 +61,5 @@ \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP --- old/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp 2010-11-16 18:06:21.000000000 +0100 +++ new/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp 2010-11-16 18:06:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_linux_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + --- old/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp 2010-11-16 18:06:22.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp 2010-11-16 18:06:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,10 @@ * */ +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_zero.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" + // This file is intentionally empty --- old/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-11-16 18:06:22.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-11-16 18:06:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,14 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP +#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP + +#include "orderAccess_linux_zero.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_zero.hpp" + // Implementation of class atomic #ifdef M68K @@ -291,3 +299,5 @@ (volatile intptr_t*) dest, (intptr_t) compare_value); } + +#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP --- old/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp 2010-11-16 18:06:23.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp 2010-11-16 18:06:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP +#define OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP + // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -38,3 +41,5 @@ inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } + +#endif // OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP --- old/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2010-11-16 18:06:24.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2010-11-16 18:06:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP + // // Set the default values for platform dependent flags used by the // runtime system. See globals.hpp for details of what they do. @@ -42,3 +45,5 @@ define_pd_global(bool, UseVectoredExceptions, false); // Only used on 64 bit platforms define_pd_global(uintx, HeapBaseMinAddress, 2*G); + +#endif // OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP --- old/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp 2010-11-16 18:06:25.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp 2010-11-16 18:06:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,12 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP +#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_zero.hpp" + #ifdef ARM /* @@ -165,3 +171,5 @@ inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { release_store_ptr(p, v); fence(); } inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { release_store_ptr(p, v); fence(); } + +#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_INLINE_HPP --- old/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-11-16 18:06:26.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-11-16 18:06:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,43 @@ * */ -// do not include precompiled header file -#include "incls/_os_linux_zero.cpp.incl" +// no precompiled headers +#include "assembler_zero.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_linux.h" +#include "memory/allocation.inline.hpp" +#include "mutex_linux.inline.hpp" +#include "nativeInst_zero.hpp" +#include "os_share_linux.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_linux.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif address os::current_stack_pointer() { address dummy = (address) &dummy; --- old/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2010-11-16 18:06:26.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2010-11-16 18:06:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP + static void setup_fpu() {} static bool is_allocatable(size_t bytes); @@ -49,3 +52,5 @@ *(jlong *) dst = *(jlong *) src; #endif } + +#endif // OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP --- old/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp 2010-11-16 18:06:27.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp 2010-11-16 18:06:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,15 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP +#define OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP + +#include "runtime/prefetch.hpp" + inline void Prefetch::read(void* loc, intx interval) { } inline void Prefetch::write(void* loc, intx interval) { } + +#endif // OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP --- old/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp 2010-11-16 18:06:28.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp 2010-11-16 18:06:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadLS_linux_zero.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_linux.inline.hpp" void ThreadLocalStorage::generate_code_for_get_thread() { // nothing to do --- old/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp 2010-11-16 18:06:29.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp 2010-11-16 18:06:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,9 +22,14 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_THREADLS_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_VM_THREADLS_LINUX_ZERO_HPP + // Processor dependent parts of ThreadLocalStorage public: static Thread* thread() { return (Thread*) os::thread_local_storage_at(thread_index()); } + +#endif // OS_CPU_LINUX_ZERO_VM_THREADLS_LINUX_ZERO_HPP --- old/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp 2010-11-16 18:06:30.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp 2010-11-16 18:06:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,8 +23,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_linux_zero.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_linux.inline.hpp" void JavaThread::cache_global_variables() { // nothing to do --- old/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2010-11-16 18:06:30.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2010-11-16 18:06:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP + private: ZeroStack _zero_stack; ZeroFrame* _top_zero_frame; @@ -114,3 +117,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP --- old/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp 2010-11-16 18:06:31.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp 2010-11-16 18:06:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2007 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,6 +23,9 @@ * */ +#ifndef OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP +#define OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -43,3 +46,5 @@ #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP --- old/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp 2010-11-16 18:06:32.000000000 +0100 +++ new/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp 2010-11-16 18:06:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -23,4 +23,8 @@ * */ +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_zero.hpp" + // This file is intentionally empty --- old/src/os_cpu/solaris_sparc/vm/assembler_solaris_sparc.cpp 2010-11-16 18:06:33.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/assembler_solaris_sparc.cpp 2010-11-16 18:06:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_solaris_sparc.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_sparc.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" #include // For trap numbers #include // For V8 compatibility --- old/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp 2010-11-16 18:06:34.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp 2010-11-16 18:06:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP +#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP + +#include "orderAccess_solaris_sparc.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_sparc.hpp" + // Implementation of class atomic inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; } @@ -342,3 +350,5 @@ #endif // _LP64 || COMPILER2 #endif // _GNU_SOURCE + +#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP --- old/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp 2010-11-16 18:06:34.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp 2010-11-16 18:06:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP +#define OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP + // // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -36,3 +39,5 @@ define_pd_global(bool, UseVectoredExceptions, false); + +#endif // OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP --- old/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp 2010-11-16 18:06:35.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp 2010-11-16 18:06:35.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP +#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_sparc.hpp" + // Implementation of class OrderAccess. // Assume TSO. @@ -124,3 +130,5 @@ inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } + +#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP --- old/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp 2010-11-16 18:06:36.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp 2010-11-16 18:06:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,11 +22,46 @@ * */ -// do not include precompiled header file +// no precompiled headers +#include "assembler_sparc.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_solaris.h" +#include "memory/allocation.inline.hpp" +#include "mutex_solaris.inline.hpp" +#include "nativeInst_sparc.hpp" +#include "os_share_solaris.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_solaris.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif -# include // needed first to avoid name collision for "std" with SC 5.0 -# include "incls/_os_solaris_sparc.cpp.incl" +# include // needed first to avoid name collision for "std" with SC 5.0 // put OS-includes here # include --- old/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp 2010-11-16 18:06:37.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp 2010-11-16 18:06:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP +#define OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP + // // NOTE: we are back in class os here, not Solaris // @@ -42,3 +45,5 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } + +#endif // OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP --- old/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp 2010-11-16 18:06:38.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp 2010-11-16 18:06:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP +#define OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP + +#include "runtime/prefetch.hpp" + #if defined(COMPILER2) || defined(_LP64) // For Sun Studio inplementation is in solaris_sparc.il @@ -56,3 +61,5 @@ inline void Prefetch::write(void *loc, intx interval) {} #endif // defined(COMPILER2) || defined(_LP64) + +#endif // OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP --- old/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp 2010-11-16 18:06:39.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp 2010-11-16 18:06:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,13 +22,15 @@ * */ +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_solaris.inline.hpp" + // Provides an entry point we can link against and // a buffer we can emit code into. The buffer is // filled by ThreadLocalStorage::generate_code_for_get_thread // and called from ThreadLocalStorage::thread() -#include "incls/_precompiled.incl" -#include "incls/_threadLS_solaris_sparc.cpp.incl" #include // The portable TLS mechanism (get_thread_via_cache) is enough on SPARC. --- old/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp 2010-11-16 18:06:39.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp 2010-11-16 18:06:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_THREADLS_SOLARIS_SPARC_HPP +#define OS_CPU_SOLARIS_SPARC_VM_THREADLS_SOLARIS_SPARC_HPP + public: // Java Thread - force inlining static inline Thread* thread() ; @@ -64,3 +67,5 @@ uintptr_t ix = (int) (((raw_id >> 9) ^ (raw_id >> 20)) % _pd_cache_size); return ix; } + +#endif // OS_CPU_SOLARIS_SPARC_VM_THREADLS_SOLARIS_SPARC_HPP --- old/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp 2010-11-16 18:06:40.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp 2010-11-16 18:06:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_solaris_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_solaris.inline.hpp" // For Forte Analyzer AsyncGetCallTrace profiling support - thread is // currently interrupted by SIGPROF --- old/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp 2010-11-16 18:06:41.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp 2010-11-16 18:06:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,6 +21,9 @@ * questions. * */ + +#ifndef OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP +#define OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP private: void pd_initialize() { @@ -95,3 +98,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP --- old/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp 2010-11-16 18:06:42.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp 2010-11-16 18:06:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP +#define OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -65,3 +68,5 @@ \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP --- old/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp 2010-11-16 18:06:43.000000000 +0100 +++ new/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp 2010-11-16 18:06:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_solaris_sparc.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_sparc.hpp" # include # include --- old/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp 2010-11-16 18:06:43.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp 2010-11-16 18:06:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_solaris_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" void MacroAssembler::int3() { --- old/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp 2010-11-16 18:06:44.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp 2010-11-16 18:06:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP +#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP + +#include "orderAccess_solaris_x86.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; } inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; } inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; } @@ -245,3 +253,5 @@ #undef LOCK_IF_MP #endif // _GNU_SOURCE + +#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP --- old/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp 2010-11-16 18:06:45.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp 2010-11-16 18:06:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP +#define OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP + // For Sun Studio - implementation is in solaris_i486.il. // For gcc - implementation is just below. extern "C" u2 _raw_swap_u2(u2 x); @@ -109,3 +112,5 @@ #endif // AMD64 } #endif //_GNU_SOURCE + +#endif // OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP --- old/src/os_cpu/solaris_x86/vm/copy_solaris_x86.inline.hpp 2010-11-16 18:06:46.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/copy_solaris_x86.inline.hpp 2010-11-16 18:06:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP +#define OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP + static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) { (void)memmove(to, from, count * HeapWordSize); } @@ -136,3 +139,5 @@ _Copy_arrayof_conjoint_jints(from, to, count); #endif // AMD64 } + +#endif // OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP --- old/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp 2010-11-16 18:06:47.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp 2010-11-16 18:06:46.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP +#define OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP + // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -44,3 +47,5 @@ define_pd_global(uintx,HeapBaseMinAddress, 256*M); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); + +#endif // OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP --- old/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp 2010-11-16 18:06:47.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp 2010-11-16 18:06:47.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP +#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_x86.hpp" + // Implementation of class OrderAccess. // For Sun Studio - implementation is in solaris_i486.il. @@ -127,3 +133,5 @@ inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } + +#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP --- old/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp 2010-11-16 18:06:48.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp 2010-11-16 18:06:48.000000000 +0100 @@ -22,8 +22,43 @@ * */ -// do not include precompiled header file -# include "incls/_os_solaris_x86.cpp.incl" +// no precompiled headers +#include "assembler_x86.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_solaris.h" +#include "memory/allocation.inline.hpp" +#include "mutex_solaris.inline.hpp" +#include "nativeInst_x86.hpp" +#include "os_share_solaris.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_solaris.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // put OS-includes here # include --- old/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp 2010-11-16 18:06:49.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp 2010-11-16 18:06:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP +#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP + // // NOTE: we are back in class os here, not Solaris // @@ -48,3 +51,5 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } + +#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP --- old/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp 2010-11-16 18:06:50.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp 2010-11-16 18:06:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP +#define OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP + +#include "runtime/prefetch.hpp" + extern "C" { void _Prefetch_read (void *loc, intx interval); void _Prefetch_write(void *loc, intx interval); @@ -39,3 +44,5 @@ _Prefetch_write(loc, interval); #endif // AMD64 } + +#endif // OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP --- old/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp 2010-11-16 18:06:51.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp 2010-11-16 18:06:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_threadLS_solaris_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_solaris.inline.hpp" #ifdef AMD64 extern "C" Thread* fs_load(ptrdiff_t tlsOffset); --- old/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp 2010-11-16 18:06:51.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp 2010-11-16 18:06:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_THREADLS_SOLARIS_X86_HPP +#define OS_CPU_SOLARIS_X86_VM_THREADLS_SOLARIS_X86_HPP + // Processor dependent parts of ThreadLocalStorage private: @@ -78,3 +81,5 @@ // Java Thread static inline Thread* thread(); + +#endif // OS_CPU_SOLARIS_X86_VM_THREADLS_SOLARIS_X86_HPP --- old/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp 2010-11-16 18:06:52.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp 2010-11-16 18:06:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_solaris_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_solaris.inline.hpp" // For Forte Analyzer AsyncGetCallTrace profiling support - thread is // currently interrupted by SIGPROF --- old/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp 2010-11-16 18:06:53.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp 2010-11-16 18:06:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP +#define OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP + private: void pd_initialize() { _anchor.clear(); } @@ -57,3 +60,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP --- old/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp 2010-11-16 18:06:54.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp 2010-11-16 18:06:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP +#define OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -57,3 +60,5 @@ \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP --- old/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp 2010-11-16 18:06:55.000000000 +0100 +++ new/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp 2010-11-16 18:06:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_solaris_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + --- old/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp 2010-11-16 18:06:55.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp 2010-11-16 18:06:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler_windows_x86.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "assembler_x86.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/threadLocalStorage.hpp" void MacroAssembler::int3() { --- old/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp 2010-11-16 18:06:56.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp 2010-11-16 18:06:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP +#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP + +#include "orderAccess_windows_x86.inline.hpp" +#include "runtime/atomic.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + // The following alternative implementations are needed because // Windows 95 doesn't support (some of) the corresponding Windows NT // calls. Furthermore, these versions allow inlining in the caller. @@ -249,3 +257,5 @@ #endif // AMD64 #pragma warning(default: 4035) // Enables warnings reporting missing return statement + +#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP --- old/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp 2010-11-16 18:06:57.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp 2010-11-16 18:06:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP +#define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP + #pragma warning(disable: 4035) // Disable warning 4035: no return value // Efficient swapping of data bytes from Java byte @@ -80,3 +83,5 @@ #endif // AMD64 #pragma warning(default: 4035) // Enable warning 4035: no return value + +#endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP --- old/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp 2010-11-16 18:06:58.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp 2010-11-16 18:06:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP +#define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP + static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) { (void)memmove(to, from, count * HeapWordSize); } @@ -164,3 +167,5 @@ static void pd_arrayof_conjoint_oops(HeapWord* from, HeapWord* to, size_t count) { pd_conjoint_oops_atomic((oop*)from, (oop*)to, count); } + +#endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP --- old/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp 2010-11-16 18:06:59.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp 2010-11-16 18:06:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP + // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -46,3 +49,5 @@ define_pd_global(uintx, HeapBaseMinAddress, 2*G); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); + +#endif // OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp 2010-11-16 18:06:59.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp 2010-11-16 18:06:59.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP +#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP + +#include "runtime/orderAccess.hpp" +#include "vm_version_x86.hpp" + #pragma warning(disable: 4035) // Disables warnings reporting missing return statement // Implementation of class OrderAccess. @@ -208,3 +214,5 @@ } #pragma warning(default: 4035) // Enables warnings reporting missing return statement + +#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP --- old/src/os_cpu/windows_x86/vm/os_windows_x86.cpp 2010-11-16 18:07:00.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/os_windows_x86.cpp 2010-11-16 18:07:00.000000000 +0100 @@ -22,8 +22,44 @@ * */ -// do not include precompiled header file -# include "incls/_os_windows_x86.cpp.incl" +// no precompiled headers +#include "assembler_x86.inline.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/icBuffer.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "jvm_windows.h" +#include "memory/allocation.inline.hpp" +#include "mutex_windows.inline.hpp" +#include "nativeInst_x86.hpp" +#include "os_share_windows.hpp" +#include "prims/jniFastGetField.hpp" +#include "prims/jvm.h" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/extendedPC.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/osThread.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "runtime/timer.hpp" +#include "thread_windows.inline.hpp" +#include "utilities/events.hpp" +#include "utilities/vmError.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif + # include "unwind_windows_x86.hpp" #undef REG_SP #undef REG_FP --- old/src/os_cpu/windows_x86/vm/os_windows_x86.hpp 2010-11-16 18:07:01.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/os_windows_x86.hpp 2010-11-16 18:07:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP + // // NOTE: we are back in class os here, not win32 // @@ -56,3 +59,5 @@ static bool supports_sse() { return true; } static bool register_code_area(char *low, char *high); + +#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp 2010-11-16 18:07:02.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp 2010-11-16 18:07:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,12 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP +#define OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP + +#include "runtime/prefetch.hpp" + inline void Prefetch::read (void *loc, intx interval) {} inline void Prefetch::write(void *loc, intx interval) {} + +#endif // OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP --- old/src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp 2010-11-16 18:07:03.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp 2010-11-16 18:07:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,14 +22,15 @@ * */ +#include "precompiled.hpp" +#include "runtime/threadLocalStorage.hpp" +#include "thread_windows.inline.hpp" + // Provides an entry point we can link against and // a buffer we can emit code into. The buffer is // filled by ThreadLocalStorage::generate_code_for_get_thread // and called from ThreadLocalStorage::thread() -#include "incls/_precompiled.incl" -#include "incls/_threadLS_windows_x86.cpp.incl" - int ThreadLocalStorage::_thread_ptr_offset = 0; static void call_wrapper_dummy() {} --- old/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp 2010-11-16 18:07:04.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp 2010-11-16 18:07:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_THREADLS_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_THREADLS_WINDOWS_X86_HPP + // Processor dependent parts of ThreadLocalStorage protected: @@ -42,3 +45,5 @@ static inline void set_thread_ptr_offset( int offset ) { _thread_ptr_offset = offset; } static inline int get_thread_ptr_offset() { return _thread_ptr_offset; } + +#endif // OS_CPU_WINDOWS_X86_VM_THREADLS_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp 2010-11-16 18:07:04.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp 2010-11-16 18:07:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_thread_windows_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/frame.inline.hpp" +#include "thread_windows.inline.hpp" // For Forte Analyzer AsyncGetCallTrace profiling support - thread is // currently interrupted by SIGPROF --- old/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp 2010-11-16 18:07:05.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp 2010-11-16 18:07:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP + private: void pd_initialize() { _anchor.clear(); @@ -60,3 +63,5 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} + +#endif // OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp 2010-11-16 18:07:06.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp 2010-11-16 18:07:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP + #ifdef AMD64 typedef unsigned char UBYTE; @@ -81,3 +84,5 @@ #endif #endif // AMD64 + +#endif // OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp 2010-11-16 18:07:07.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp 2010-11-16 18:07:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP +#define OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP + // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is // referenced by vmStructs.cpp. @@ -52,3 +55,5 @@ \ /* This must be the last entry, and must be present */ \ last_entry() + +#endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP --- old/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp 2010-11-16 18:07:08.000000000 +0100 +++ new/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp 2010-11-16 18:07:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,7 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vm_version_windows_x86.cpp.incl" +#include "precompiled.hpp" +#include "runtime/os.hpp" +#include "vm_version_x86.hpp" + --- old/src/share/tools/hsdis/hsdis-demo.c 2010-11-16 18:07:08.000000000 +0100 +++ new/src/share/tools/hsdis/hsdis-demo.c 2010-11-16 18:07:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,8 @@ * */ +#include "precompiled.hpp" + /* hsdis-demo.c -- dump a range of addresses as native instructions This demonstrates the protocol required by the HotSpot PrintAssembly option. */ --- old/src/share/tools/hsdis/hsdis.c 2010-11-16 18:07:09.000000000 +0100 +++ new/src/share/tools/hsdis/hsdis.c 2010-11-16 18:07:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,8 @@ * */ +#include "precompiled.hpp" + /* hsdis.c -- dump a range of addresses as native instructions This implements the plugin protocol required by the HotSpot PrintAssembly option. --- old/src/share/tools/hsdis/hsdis.h 2010-11-16 18:07:10.000000000 +0100 +++ new/src/share/tools/hsdis/hsdis.h 2010-11-16 18:07:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/adlc.hpp 2010-11-16 18:07:11.000000000 +0100 +++ new/src/share/vm/adlc/adlc.hpp 2010-11-16 18:07:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_ADLC_HPP +#define SHARE_VM_ADLC_ADLC_HPP + // // Standard include file for ADLC parser // @@ -77,18 +80,19 @@ #define uint32 unsigned int #define uint unsigned int +// VM components +#include "opto/opcodes.hpp" + // Macros // Debugging note: Put a breakpoint on "abort". #undef assert #define assert(cond, msg) { if (!(cond)) { fprintf(stderr, "assert fails %s %d: %s\n", __FILE__, __LINE__, msg); abort(); }} +#undef max #define max(a, b) (((a)>(b)) ? (a) : (b)) -// VM components -#include "opcodes.hpp" - // ADLC components #include "arena.hpp" -#include "adlcVMDeps.hpp" +#include "opto/adlcVMDeps.hpp" #include "filebuff.hpp" #include "dict2.hpp" #include "forms.hpp" @@ -101,3 +105,5 @@ // could have a backpointer to the AD but it's too complicated to pass // it everywhere it needs to be available. extern ArchDesc* globalAD; + +#endif // SHARE_VM_ADLC_ADLC_HPP --- old/src/share/vm/adlc/adlparse.cpp 2010-11-16 18:07:12.000000000 +0100 +++ new/src/share/vm/adlc/adlparse.cpp 2010-11-16 18:07:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/adlparse.hpp 2010-11-16 18:07:13.000000000 +0100 +++ new/src/share/vm/adlc/adlparse.hpp 2010-11-16 18:07:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_ADLPARSE_HPP +#define SHARE_VM_ADLC_ADLPARSE_HPP + // ADLPARSE.HPP - Definitions for Architecture Description Language Parser // Authors: Chris Vick and Mike Paleczny @@ -277,3 +280,5 @@ static bool equivalent_expressions(const char* str1, const char* str2); static void trim(char* &token); // trim leading & trailing spaces }; + +#endif // SHARE_VM_ADLC_ADLPARSE_HPP --- old/src/share/vm/adlc/archDesc.cpp 2010-11-16 18:07:13.000000000 +0100 +++ new/src/share/vm/adlc/archDesc.cpp 2010-11-16 18:07:13.000000000 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -1038,22 +1038,38 @@ fprintf(fp,"\n"); } -//---------------------------machineDependentIncludes-------------------------- -// output #include declarations for machine specific files -void ArchDesc::machineDependentIncludes(ADLFILE &adlfile) { - const char *basename = adlfile._name; - const char *cp; - for (cp = basename; *cp; cp++) - if (*cp == '/') basename = cp+1; +//---------------------------addIncludeGuardStart-------------------------- +// output the start of an include guard. +void ArchDesc::addIncludeGuardStart(ADLFILE &adlfile, const char* guardString) { // Build #include lines fprintf(adlfile._fp, "\n"); - fprintf(adlfile._fp, "#include \"incls/_precompiled.incl\"\n"); - fprintf(adlfile._fp, "#include \"incls/_%s.incl\"\n",basename); + fprintf(adlfile._fp, "#ifndef %s\n", guardString); + fprintf(adlfile._fp, "#define %s\n", guardString); fprintf(adlfile._fp, "\n"); } +//---------------------------addIncludeGuardEnd-------------------------- +// output the end of an include guard. +void ArchDesc::addIncludeGuardEnd(ADLFILE &adlfile, const char* guardString) { + // Build #include lines + fprintf(adlfile._fp, "\n"); + fprintf(adlfile._fp, "#endif // %s\n", guardString); + +} + +//---------------------------addInclude-------------------------- +// output the #include line for this file. +void ArchDesc::addInclude(ADLFILE &adlfile, const char* fileName) { + fprintf(adlfile._fp, "#include \"%s\"\n", fileName); + +} + +void ArchDesc::addInclude(ADLFILE &adlfile, const char* includeDir, const char* fileName) { + fprintf(adlfile._fp, "#include \"%s/%s\"\n", includeDir, fileName); + +} //---------------------------addPreprocessorChecks----------------------------- // Output C preprocessor code to verify the backend compilation environment. --- old/src/share/vm/adlc/archDesc.hpp 2010-11-16 18:07:14.000000000 +0100 +++ new/src/share/vm/adlc/archDesc.hpp 2010-11-16 18:07:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_ARCHDESC_HPP +#define SHARE_VM_ADLC_ARCHDESC_HPP + // Definitions for Error Flags #define WARN 0 #define SYNERR 1 @@ -274,8 +277,13 @@ // output SUN copyright info void addSunCopyright(char* legal, int size, FILE *fp); - // output #include declarations for machine specific files - void machineDependentIncludes(ADLFILE &adlfile); + // output the start of an include guard. + void addIncludeGuardStart(ADLFILE &adlfile, const char* guardString); + // output the end of an include guard. + void addIncludeGuardEnd(ADLFILE &adlfile, const char* guardString); + // output the #include line for this file. + void addInclude(ADLFILE &adlfile, const char* fileName); + void addInclude(ADLFILE &adlfile, const char* includeDir, const char* fileName); // Output C preprocessor code to verify the backend compilation environment. void addPreprocessorChecks(FILE *fp); // Output C source and header (source_hpp) blocks. @@ -387,3 +395,5 @@ // Allow derived class to output name and position specific info virtual void record_position(OutputMap::position place, int index) {} }; + +#endif // SHARE_VM_ADLC_ARCHDESC_HPP --- old/src/share/vm/adlc/arena.cpp 2010-11-16 18:07:15.000000000 +0100 +++ new/src/share/vm/adlc/arena.cpp 2010-11-16 18:07:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/arena.hpp 2010-11-16 18:07:16.000000000 +0100 +++ new/src/share/vm/adlc/arena.hpp 2010-11-16 18:07:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_ARENA_HPP +#define SHARE_VM_ADLC_ARENA_HPP + // All classes in the virtual machine must be subclassed // by one of the following allocation classes: // @@ -155,3 +158,5 @@ size_t size_in_bytes() const { return _size_in_bytes; } void set_size_in_bytes(size_t size) { _size_in_bytes = size; } }; + +#endif // SHARE_VM_ADLC_ARENA_HPP --- old/src/share/vm/adlc/dfa.cpp 2010-11-16 18:07:17.000000000 +0100 +++ new/src/share/vm/adlc/dfa.cpp 2010-11-16 18:07:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/dict2.cpp 2010-11-16 18:07:18.000000000 +0100 +++ new/src/share/vm/adlc/dict2.cpp 2010-11-16 18:07:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/dict2.hpp 2010-11-16 18:07:19.000000000 +0100 +++ new/src/share/vm/adlc/dict2.hpp 2010-11-16 18:07:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#ifndef _DICT_ -#define _DICT_ +#ifndef SHARE_VM_ADLC_DICT2_HPP +#define SHARE_VM_ADLC_DICT2_HPP + // Dictionaries - An Abstract Data Type @@ -117,4 +118,4 @@ int test(void) { return _i<_d->_size;} // Test for end of iteration }; -#endif // _DICT_ +#endif // SHARE_VM_ADLC_DICT2_HPP --- old/src/share/vm/adlc/filebuff.cpp 2010-11-16 18:07:19.000000000 +0100 +++ new/src/share/vm/adlc/filebuff.cpp 2010-11-16 18:07:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/filebuff.hpp 2010-11-16 18:07:20.000000000 +0100 +++ new/src/share/vm/adlc/filebuff.hpp 2010-11-16 18:07:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_FILEBUFF_HPP +#define SHARE_VM_ADLC_FILEBUFF_HPP + // FILEBUFF.HPP - Definitions for parser file buffering routines #include @@ -99,3 +102,5 @@ void print(ostream&); friend ostream& operator<< (ostream&, FileBuffRegion&); }; + +#endif // SHARE_VM_ADLC_FILEBUFF_HPP --- old/src/share/vm/adlc/forms.cpp 2010-11-16 18:07:21.000000000 +0100 +++ new/src/share/vm/adlc/forms.cpp 2010-11-16 18:07:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/forms.hpp 2010-11-16 18:07:22.000000000 +0100 +++ new/src/share/vm/adlc/forms.hpp 2010-11-16 18:07:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_FORMS_HPP +#define SHARE_VM_ADLC_FORMS_HPP + // FORMS.HPP - ADL Parser Generic and Utility Forms Classes #define TRUE 1 @@ -588,3 +591,5 @@ void print_asserts(FILE *fp); void dump(); }; + +#endif // SHARE_VM_ADLC_FORMS_HPP --- old/src/share/vm/adlc/formsopt.cpp 2010-11-16 18:07:23.000000000 +0100 +++ new/src/share/vm/adlc/formsopt.cpp 2010-11-16 18:07:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it --- old/src/share/vm/adlc/formsopt.hpp 2010-11-16 18:07:24.000000000 +0100 +++ new/src/share/vm/adlc/formsopt.hpp 2010-11-16 18:07:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_FORMSOPT_HPP +#define SHARE_VM_ADLC_FORMSOPT_HPP + // FORMSOPT.HPP - ADL Parser Target Specific Optimization Forms Classes // Class List @@ -546,3 +549,5 @@ void dump(); void output(FILE *fp); }; + +#endif // SHARE_VM_ADLC_FORMSOPT_HPP --- old/src/share/vm/adlc/formssel.hpp 2010-11-16 18:07:25.000000000 +0100 +++ new/src/share/vm/adlc/formssel.hpp 2010-11-16 18:07:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_ADLC_FORMSSEL_HPP +#define SHARE_VM_ADLC_FORMSSEL_HPP + // FORMSSEL.HPP - ADL Parser Instruction Selection Forms Classes // Class List @@ -1062,3 +1065,5 @@ void dump(); void output(FILE *fp); }; + +#endif // SHARE_VM_ADLC_FORMSSEL_HPP --- old/src/share/vm/adlc/main.cpp 2010-11-16 18:07:25.000000000 +0100 +++ new/src/share/vm/adlc/main.cpp 2010-11-16 18:07:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,17 @@ ArchDesc* globalAD = NULL; // global reference to Architecture Description object +const char* get_basename(const char* filename) { + const char *basename = filename; + const char *cp; + for (cp = basename; *cp; cp++) { + if (*cp == '/') { + basename = cp+1; + } + } + return basename; +} + //------------------------------main------------------------------------------- int main(int argc, char *argv[]) { @@ -193,16 +204,69 @@ AD.addSunCopyright(legal_text, legal_sz, AD._CPP_PIPELINE_file._fp); // .cpp AD.addSunCopyright(legal_text, legal_sz, AD._VM_file._fp); // .hpp AD.addSunCopyright(legal_text, legal_sz, AD._DFA_file._fp); // .cpp + // Add include guards for all .hpp files + AD.addIncludeGuardStart(AD._HPP_file, "GENERATED_ADFILES_AD_HPP"); // .hpp + AD.addIncludeGuardStart(AD._VM_file, "GENERATED_ADFILES_ADGLOBALS_HPP"); // .hpp + // Add includes + AD.addInclude(AD._CPP_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._VM_file._name)); + AD.addInclude(AD._CPP_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_file, "memory/allocation.inline.hpp"); + AD.addInclude(AD._CPP_file, "asm/assembler.hpp"); + AD.addInclude(AD._CPP_file, "code/vmreg.hpp"); + AD.addInclude(AD._CPP_file, "gc_interface/collectedHeap.inline.hpp"); + AD.addInclude(AD._CPP_file, "oops/compiledICHolderOop.hpp"); + AD.addInclude(AD._CPP_file, "oops/markOop.hpp"); + AD.addInclude(AD._CPP_file, "oops/methodOop.hpp"); + AD.addInclude(AD._CPP_file, "oops/oop.inline.hpp"); + AD.addInclude(AD._CPP_file, "oops/oop.inline2.hpp"); + AD.addInclude(AD._CPP_file, "opto/cfgnode.hpp"); + AD.addInclude(AD._CPP_file, "opto/locknode.hpp"); + AD.addInclude(AD._CPP_file, "opto/opcodes.hpp"); + AD.addInclude(AD._CPP_file, "opto/regalloc.hpp"); + AD.addInclude(AD._CPP_file, "opto/regmask.hpp"); + AD.addInclude(AD._CPP_file, "opto/runtime.hpp"); + AD.addInclude(AD._CPP_file, "runtime/biasedLocking.hpp"); + AD.addInclude(AD._CPP_file, "runtime/sharedRuntime.hpp"); + AD.addInclude(AD._CPP_file, "runtime/stubRoutines.hpp"); + AD.addInclude(AD._CPP_file, "utilities/growableArray.hpp"); +#ifdef TARGET_ARCH_x86 + AD.addInclude(AD._CPP_file, "assembler_x86.inline.hpp"); + AD.addInclude(AD._CPP_file, "nativeInst_x86.hpp"); + AD.addInclude(AD._CPP_file, "vmreg_x86.inline.hpp"); +#endif +#ifdef TARGET_ARCH_sparc + AD.addInclude(AD._CPP_file, "assembler_sparc.inline.hpp"); + AD.addInclude(AD._CPP_file, "nativeInst_sparc.hpp"); + AD.addInclude(AD._CPP_file, "vmreg_sparc.inline.hpp"); +#endif + AD.addInclude(AD._HPP_file, "memory/allocation.hpp"); + AD.addInclude(AD._HPP_file, "opto/machnode.hpp"); + AD.addInclude(AD._HPP_file, "opto/node.hpp"); + AD.addInclude(AD._HPP_file, "opto/regalloc.hpp"); + AD.addInclude(AD._HPP_file, "opto/subnode.hpp"); + AD.addInclude(AD._CPP_CLONE_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_CLONE_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_EXPAND_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_EXPAND_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_FORMAT_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_FORMAT_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_GEN_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_GEN_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_GEN_file, "opto/cfgnode.hpp"); + AD.addInclude(AD._CPP_GEN_file, "opto/locknode.hpp"); + AD.addInclude(AD._CPP_MISC_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_MISC_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_PEEPHOLE_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_PEEPHOLE_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._CPP_PIPELINE_file, "precompiled.hpp"); + AD.addInclude(AD._CPP_PIPELINE_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._DFA_file, "precompiled.hpp"); + AD.addInclude(AD._DFA_file, "adfiles", get_basename(AD._HPP_file._name)); + AD.addInclude(AD._DFA_file, "opto/matcher.hpp"); + AD.addInclude(AD._DFA_file, "opto/opcodes.hpp"); // Make sure each .cpp file starts with include lines: // files declaring and defining generators for Mach* Objects (hpp,cpp) - AD.machineDependentIncludes(AD._CPP_file); // .cpp - AD.machineDependentIncludes(AD._CPP_CLONE_file); // .cpp - AD.machineDependentIncludes(AD._CPP_EXPAND_file); // .cpp - AD.machineDependentIncludes(AD._CPP_FORMAT_file); // .cpp - AD.machineDependentIncludes(AD._CPP_GEN_file); // .cpp - AD.machineDependentIncludes(AD._CPP_MISC_file); // .cpp - AD.machineDependentIncludes(AD._CPP_PEEPHOLE_file); // .cpp - AD.machineDependentIncludes(AD._CPP_PIPELINE_file); // .cpp // Generate the result files: // enumerations, class definitions, object generators, and the DFA // file containing enumeration of machine operands & instructions (hpp) @@ -244,8 +308,10 @@ AD.addPreprocessorChecks(AD._CPP_PIPELINE_file._fp); // .cpp // define the finite automata that selects lowest cost production - AD.machineDependentIncludes(AD._DFA_file); // .cpp AD.buildDFA(AD._DFA_file._fp); + // Add include guards for all .hpp files + AD.addIncludeGuardEnd(AD._HPP_file, "GENERATED_ADFILES_AD_HPP"); // .hpp + AD.addIncludeGuardEnd(AD._VM_file, "GENERATED_ADFILES_ADGLOBALS_HPP"); // .hpp AD.close_files(0); // Close all input/output files --- old/src/share/vm/asm/assembler.cpp 2010-11-16 18:07:26.000000000 +0100 +++ new/src/share/vm/asm/assembler.cpp 2010-11-16 18:07:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_assembler.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "asm/assembler.inline.hpp" +#include "asm/codeBuffer.hpp" +#include "runtime/icache.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +#endif // Implementation of AbstractAssembler --- old/src/share/vm/asm/assembler.hpp 2010-11-16 18:07:27.000000000 +0100 +++ new/src/share/vm/asm/assembler.hpp 2010-11-16 18:07:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,28 @@ * */ +#ifndef SHARE_VM_ASM_ASSEMBLER_HPP +#define SHARE_VM_ASM_ASSEMBLER_HPP + +#include "code/oopRecorder.hpp" +#include "code/relocInfo.hpp" +#include "memory/allocation.hpp" +#include "utilities/debug.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_ARCH_x86 +# include "register_x86.hpp" +# include "vm_version_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "register_sparc.hpp" +# include "vm_version_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "register_zero.hpp" +# include "vm_version_zero.hpp" +#endif + // This file contains platform-independent assembler declarations. class CodeBuffer; @@ -348,4 +370,15 @@ #endif // PRODUCT }; -#include "incls/_assembler_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.hpp" +#endif + + +#endif // SHARE_VM_ASM_ASSEMBLER_HPP --- old/src/share/vm/asm/assembler.inline.hpp 2010-11-16 18:07:28.000000000 +0100 +++ new/src/share/vm/asm/assembler.inline.hpp 2010-11-16 18:07:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_ASM_ASSEMBLER_INLINE_HPP +#define SHARE_VM_ASM_ASSEMBLER_INLINE_HPP + +#include "asm/assembler.hpp" +#include "asm/codeBuffer.hpp" +#include "compiler/disassembler.hpp" +#include "runtime/threadLocalStorage.hpp" + inline void AbstractAssembler::sync() { CodeSection* cs = code_section(); guarantee(cs->start() == _code_begin, "must not shift code buffer"); @@ -133,3 +141,5 @@ } return ptr; } + +#endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP --- old/src/share/vm/asm/codeBuffer.cpp 2010-11-16 18:07:29.000000000 +0100 +++ new/src/share/vm/asm/codeBuffer.cpp 2010-11-16 18:07:29.000000000 +0100 @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_codeBuffer.cpp.incl" +#include "precompiled.hpp" +#include "asm/codeBuffer.hpp" +#include "compiler/disassembler.hpp" +#include "utilities/copy.hpp" // The structure of a CodeSection: // --- old/src/share/vm/asm/codeBuffer.hpp 2010-11-16 18:07:30.000000000 +0100 +++ new/src/share/vm/asm/codeBuffer.hpp 2010-11-16 18:07:30.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_ASM_CODEBUFFER_HPP +#define SHARE_VM_ASM_CODEBUFFER_HPP + +#include "asm/assembler.hpp" +#include "code/oopRecorder.hpp" +#include "code/relocInfo.hpp" + class CodeComments; class AbstractAssembler; class MacroAssembler; @@ -550,7 +557,16 @@ // The following header contains architecture-specific implementations - #include "incls/_codeBuffer_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "codeBuffer_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "codeBuffer_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "codeBuffer_zero.hpp" +#endif + }; @@ -562,3 +578,5 @@ if (remaining() < amount) { _outer->expand(this, amount); return true; } return false; } + +#endif // SHARE_VM_ASM_CODEBUFFER_HPP --- old/src/share/vm/asm/register.cpp 2010-11-16 18:07:31.000000000 +0100 +++ new/src/share/vm/asm/register.cpp 2010-11-16 18:07:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_register.cpp.incl" +#include "precompiled.hpp" +#include "asm/register.hpp" // Intentionally left blank --- old/src/share/vm/asm/register.hpp 2010-11-16 18:07:32.000000000 +0100 +++ new/src/share/vm/asm/register.hpp 2010-11-16 18:07:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_ASM_REGISTER_HPP +#define SHARE_VM_ASM_REGISTER_HPP + +#include "utilities/top.hpp" + // Use AbstractRegister as shortcut class AbstractRegisterImpl; typedef AbstractRegisterImpl* AbstractRegister; @@ -209,3 +214,5 @@ "registers must be different" ); } + +#endif // SHARE_VM_ASM_REGISTER_HPP --- old/src/share/vm/c1/c1_CFGPrinter.cpp 2010-11-16 18:07:32.000000000 +0100 +++ new/src/share/vm/c1/c1_CFGPrinter.cpp 2010-11-16 18:07:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_CFGPrinter.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CFGPrinter.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_LIR.hpp" +#include "c1/c1_LinearScan.hpp" +#include "c1/c1_ValueStack.hpp" #ifndef PRODUCT --- old/src/share/vm/c1/c1_CFGPrinter.hpp 2010-11-16 18:07:33.000000000 +0100 +++ new/src/share/vm/c1/c1_CFGPrinter.hpp 2010-11-16 18:07:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_C1_C1_CFGPRINTER_HPP +#define SHARE_VM_C1_C1_CFGPRINTER_HPP + +#include "c1/c1_Compilation.hpp" +#include "c1/c1_Instruction.hpp" + #ifndef PRODUCT // This is a utility class used for recording the results of a @@ -44,3 +50,5 @@ }; #endif + +#endif // SHARE_VM_C1_C1_CFGPRINTER_HPP --- old/src/share/vm/c1/c1_Canonicalizer.cpp 2010-11-16 18:07:34.000000000 +0100 +++ new/src/share/vm/c1/c1_Canonicalizer.cpp 2010-11-16 18:07:34.000000000 +0100 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Canonicalizer.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Canonicalizer.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArray.hpp" +#include "runtime/sharedRuntime.hpp" class PrintValueVisitor: public ValueVisitor { --- old/src/share/vm/c1/c1_Canonicalizer.hpp 2010-11-16 18:07:35.000000000 +0100 +++ new/src/share/vm/c1/c1_Canonicalizer.hpp 2010-11-16 18:07:35.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_C1_C1_CANONICALIZER_HPP +#define SHARE_VM_C1_C1_CANONICALIZER_HPP + +#include "c1/c1_Instruction.hpp" + class Canonicalizer: InstructionVisitor { private: Compilation *_compilation; @@ -98,3 +103,5 @@ virtual void do_ProfileCall (ProfileCall* x); virtual void do_ProfileInvoke (ProfileInvoke* x); }; + +#endif // SHARE_VM_C1_C1_CANONICALIZER_HPP --- old/src/share/vm/c1/c1_CodeStubs.hpp 2010-11-16 18:07:36.000000000 +0100 +++ new/src/share/vm/c1/c1_CodeStubs.hpp 2010-11-16 18:07:36.000000000 +0100 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_C1_C1_CODESTUBS_HPP +#define SHARE_VM_C1_C1_CODESTUBS_HPP + +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIR.hpp" +#include "c1/c1_Runtime1.hpp" +#include "utilities/array.hpp" + class CodeEmitInfo; class LIR_Assembler; class LIR_OpVisitState; @@ -586,3 +596,5 @@ #endif // SERIALGC ////////////////////////////////////////////////////////////////////////////////////////// + +#endif // SHARE_VM_C1_C1_CODESTUBS_HPP --- old/src/share/vm/c1/c1_Compilation.cpp 2010-11-16 18:07:37.000000000 +0100 +++ new/src/share/vm/c1/c1_Compilation.cpp 2010-11-16 18:07:37.000000000 +0100 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Compilation.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CFGPrinter.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_LinearScan.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_ValueMap.hpp" +#include "c1/c1_ValueStack.hpp" +#include "code/debugInfoRec.hpp" typedef enum { --- old/src/share/vm/c1/c1_Compilation.hpp 2010-11-16 18:07:38.000000000 +0100 +++ new/src/share/vm/c1/c1_Compilation.hpp 2010-11-16 18:07:37.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_C1_C1_COMPILATION_HPP +#define SHARE_VM_C1_C1_COMPILATION_HPP + +#include "ci/ciEnv.hpp" +#include "code/exceptionHandlerTable.hpp" +#include "memory/resourceArea.hpp" + class CompilationResourceObj; class XHandlers; class ExceptionInfo; @@ -289,3 +296,5 @@ int pco() { return _pco; } XHandlers* exception_handlers() { return _exception_handlers; } }; + +#endif // SHARE_VM_C1_C1_COMPILATION_HPP --- old/src/share/vm/c1/c1_Compiler.cpp 2010-11-16 18:07:39.000000000 +0100 +++ new/src/share/vm/c1/c1_Compiler.cpp 2010-11-16 18:07:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Compiler.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_Compiler.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_GraphBuilder.hpp" +#include "c1/c1_LinearScan.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "c1/c1_ValueType.hpp" +#include "compiler/compileBroker.hpp" +#include "compiler/compilerOracle.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "prims/nativeLookup.hpp" +#include "runtime/arguments.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" volatile int Compiler::_runtimes = uninitialized; --- old/src/share/vm/c1/c1_Compiler.hpp 2010-11-16 18:07:39.000000000 +0100 +++ new/src/share/vm/c1/c1_Compiler.hpp 2010-11-16 18:07:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_C1_C1_COMPILER_HPP +#define SHARE_VM_C1_C1_COMPILER_HPP + +#include "compiler/abstractCompiler.hpp" + // There is one instance of the Compiler per CompilerThread. class Compiler: public AbstractCompiler { @@ -61,3 +66,5 @@ // Print compilation timers and statistics virtual void print_timers(); }; + +#endif // SHARE_VM_C1_C1_COMPILER_HPP --- old/src/share/vm/c1/c1_Defs.cpp 2010-11-16 18:07:40.000000000 +0100 +++ new/src/share/vm/c1/c1_Defs.cpp 2010-11-16 18:07:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,6 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Defs.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Defs.hpp" + --- old/src/share/vm/c1/c1_Defs.hpp 2010-11-16 18:07:41.000000000 +0100 +++ new/src/share/vm/c1/c1_Defs.hpp 2010-11-16 18:07:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_C1_C1_DEFS_HPP +#define SHARE_VM_C1_C1_DEFS_HPP + +#include "utilities/globalDefinitions.hpp" +#ifdef TARGET_ARCH_x86 +# include "register_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "register_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "register_zero.hpp" +#endif + // set frame size and return address offset to these values in blobs // (if the compiled frame uses ebp as link pointer on IA; otherwise, // the frame size must be fixed) @@ -30,7 +44,13 @@ }; -# include "incls/_c1_Defs_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "c1_Defs_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_Defs_sparc.hpp" +#endif + // native word offsets from memory address enum { @@ -49,3 +69,5 @@ enum { float_saved_as_double = pd_float_saved_as_double }; + +#endif // SHARE_VM_C1_C1_DEFS_HPP --- old/src/share/vm/c1/c1_FpuStackSim.hpp 2010-11-16 18:07:42.000000000 +0100 +++ new/src/share/vm/c1/c1_FpuStackSim.hpp 2010-11-16 18:07:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,22 @@ * */ +#ifndef SHARE_VM_C1_C1_FPUSTACKSIM_HPP +#define SHARE_VM_C1_C1_FPUSTACKSIM_HPP + +#include "c1/c1_FrameMap.hpp" +#include "memory/allocation.hpp" + // Provides location for forward declaration of this class, which is // only implemented on Intel class FpuStackSim; -# include "incls/_c1_FpuStackSim_pd.hpp.incl" // platform dependent declarations +#ifdef TARGET_ARCH_x86 +# include "c1_FpuStackSim_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_FpuStackSim_sparc.hpp" +#endif + + +#endif // SHARE_VM_C1_C1_FPUSTACKSIM_HPP --- old/src/share/vm/c1/c1_FrameMap.cpp 2010-11-16 18:07:43.000000000 +0100 +++ new/src/share/vm/c1/c1_FrameMap.cpp 2010-11-16 18:07:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_FrameMap.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIR.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef TARGET_ARCH_x86 +# include "vmreg_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "vmreg_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "vmreg_zero.inline.hpp" +#endif --- old/src/share/vm/c1/c1_FrameMap.hpp 2010-11-16 18:07:44.000000000 +0100 +++ new/src/share/vm/c1/c1_FrameMap.hpp 2010-11-16 18:07:43.000000000 +0100 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_C1_C1_FRAMEMAP_HPP +#define SHARE_VM_C1_C1_FRAMEMAP_HPP + +#include "asm/assembler.hpp" +#include "c1/c1_Defs.hpp" +#include "c1/c1_LIR.hpp" +#include "code/vmreg.hpp" +#include "memory/allocation.hpp" +#include "runtime/frame.hpp" +#include "runtime/synchronizer.hpp" +#include "utilities/globalDefinitions.hpp" + class ciMethod; class CallingConvention; class BasicTypeArray; @@ -70,7 +82,13 @@ spill_slot_size_in_bytes = 4 }; -# include "incls/_c1_FrameMap_pd.hpp.incl" // platform dependent declarations +#ifdef TARGET_ARCH_x86 +# include "c1_FrameMap_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_FrameMap_sparc.hpp" +#endif + friend class LIR_OprDesc; @@ -266,3 +284,5 @@ } #endif // PRODUCT }; + +#endif // SHARE_VM_C1_C1_FRAMEMAP_HPP --- old/src/share/vm/c1/c1_GraphBuilder.cpp 2010-11-16 18:07:45.000000000 +0100 +++ new/src/share/vm/c1/c1_GraphBuilder.cpp 2010-11-16 18:07:44.000000000 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_GraphBuilder.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CFGPrinter.hpp" +#include "c1/c1_Canonicalizer.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_GraphBuilder.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "ci/ciField.hpp" +#include "ci/ciKlass.hpp" +#include "interpreter/bytecode.hpp" +#include "runtime/sharedRuntime.hpp" +#include "utilities/bitMap.inline.hpp" class BlockListBuilder VALUE_OBJ_CLASS_SPEC { private: --- old/src/share/vm/c1/c1_GraphBuilder.hpp 2010-11-16 18:07:46.000000000 +0100 +++ new/src/share/vm/c1/c1_GraphBuilder.hpp 2010-11-16 18:07:45.000000000 +0100 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_C1_C1_GRAPHBUILDER_HPP +#define SHARE_VM_C1_C1_GRAPHBUILDER_HPP + +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_ValueMap.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciMethodData.hpp" +#include "ci/ciStreams.hpp" + class MemoryBuffer; class GraphBuilder VALUE_OBJ_CLASS_SPEC { @@ -378,3 +388,5 @@ BlockBegin* start() const { return _start; } }; + +#endif // SHARE_VM_C1_C1_GRAPHBUILDER_HPP --- old/src/share/vm/c1/c1_IR.cpp 2010-11-16 18:07:46.000000000 +0100 +++ new/src/share/vm/c1/c1_IR.cpp 2010-11-16 18:07:46.000000000 +0100 @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_IR.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_GraphBuilder.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_Optimizer.hpp" +#include "utilities/bitMap.inline.hpp" // Implementation of XHandlers --- old/src/share/vm/c1/c1_IR.hpp 2010-11-16 18:07:47.000000000 +0100 +++ new/src/share/vm/c1/c1_IR.hpp 2010-11-16 18:07:47.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_C1_C1_IR_HPP +#define SHARE_VM_C1_C1_IR_HPP + +#include "c1/c1_Instruction.hpp" +#include "ci/ciExceptionHandler.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciStreams.hpp" +#include "memory/allocation.hpp" + // An XHandler is a C1 internal description for an exception handler class XHandler: public CompilationResourceObj { @@ -337,3 +346,5 @@ virtual void block_do(BlockBegin* block); }; + +#endif // SHARE_VM_C1_C1_IR_HPP --- old/src/share/vm/c1/c1_Instruction.cpp 2010-11-16 18:07:48.000000000 +0100 +++ new/src/share/vm/c1/c1_Instruction.cpp 2010-11-16 18:07:48.000000000 +0100 @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Instruction.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciTypeArrayKlass.hpp" // Implementation of Instruction --- old/src/share/vm/c1/c1_Instruction.hpp 2010-11-16 18:07:49.000000000 +0100 +++ new/src/share/vm/c1/c1_Instruction.hpp 2010-11-16 18:07:49.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_C1_C1_INSTRUCTION_HPP +#define SHARE_VM_C1_C1_INSTRUCTION_HPP + +#include "c1/c1_Compilation.hpp" +#include "c1/c1_LIR.hpp" +#include "c1/c1_ValueType.hpp" +#include "ci/ciField.hpp" + // Predefined classes class ciField; class ValueStack; @@ -2287,3 +2295,5 @@ inline void BlockBegin::add_successor(BlockBegin* sux) { assert(_end == NULL, "Would create mismatch with successors of BlockEnd"); _successors.append(sux); } #undef ASSERT_VALUES + +#endif // SHARE_VM_C1_C1_INSTRUCTION_HPP --- old/src/share/vm/c1/c1_InstructionPrinter.cpp 2010-11-16 18:07:50.000000000 +0100 +++ new/src/share/vm/c1/c1_InstructionPrinter.cpp 2010-11-16 18:07:50.000000000 +0100 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_InstructionPrinter.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciObject.hpp" #ifndef PRODUCT --- old/src/share/vm/c1/c1_InstructionPrinter.hpp 2010-11-16 18:07:51.000000000 +0100 +++ new/src/share/vm/c1/c1_InstructionPrinter.hpp 2010-11-16 18:07:51.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP +#define SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP + +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_Runtime1.hpp" + #ifndef PRODUCT class InstructionPrinter: public InstructionVisitor { private: @@ -126,3 +133,5 @@ virtual void do_ProfileInvoke (ProfileInvoke* x); }; #endif // PRODUCT + +#endif // SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP --- old/src/share/vm/c1/c1_LIR.cpp 2010-11-16 18:07:52.000000000 +0100 +++ new/src/share/vm/c1/c1_LIR.cpp 2010-11-16 18:07:51.000000000 +0100 @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIR.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_LIR.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciInstance.hpp" +#include "runtime/sharedRuntime.hpp" Register LIR_OprDesc::as_register() const { return FrameMap::cpu_rnr2reg(cpu_regnr()); --- old/src/share/vm/c1/c1_LIR.hpp 2010-11-16 18:07:53.000000000 +0100 +++ new/src/share/vm/c1/c1_LIR.hpp 2010-11-16 18:07:52.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_C1_C1_LIR_HPP +#define SHARE_VM_C1_C1_LIR_HPP + +#include "c1/c1_ValueType.hpp" + class BlockBegin; class BlockList; class LIR_Assembler; @@ -2282,3 +2287,5 @@ inline LIR_Opr LIR_OprDesc::illegalOpr() { return LIR_OprFact::illegalOpr; }; + +#endif // SHARE_VM_C1_C1_LIR_HPP --- old/src/share/vm/c1/c1_LIRAssembler.cpp 2010-11-16 18:07:53.000000000 +0100 +++ new/src/share/vm/c1/c1_LIRAssembler.cpp 2010-11-16 18:07:53.000000000 +0100 @@ -22,8 +22,26 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRAssembler.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciInstance.hpp" +#ifdef TARGET_ARCH_x86 +# include "nativeInst_x86.hpp" +# include "vmreg_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "nativeInst_sparc.hpp" +# include "vmreg_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "nativeInst_zero.hpp" +# include "vmreg_zero.inline.hpp" +#endif void LIR_Assembler::patching_epilog(PatchingStub* patch, LIR_PatchCode patch_code, Register obj, CodeEmitInfo* info) { --- old/src/share/vm/c1/c1_LIRAssembler.hpp 2010-11-16 18:07:54.000000000 +0100 +++ new/src/share/vm/c1/c1_LIRAssembler.hpp 2010-11-16 18:07:54.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_C1_C1_LIRASSEMBLER_HPP +#define SHARE_VM_C1_C1_LIRASSEMBLER_HPP + +#include "c1/c1_CodeStubs.hpp" +#include "ci/ciMethodData.hpp" +#include "oops/methodDataOop.hpp" +#include "utilities/top.hpp" + class Compilation; class ScopeValue; class BarrierSet; @@ -236,5 +244,13 @@ void verify_oop_map(CodeEmitInfo* info); - #include "incls/_c1_LIRAssembler_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "c1_LIRAssembler_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_LIRAssembler_sparc.hpp" +#endif + }; + +#endif // SHARE_VM_C1_C1_LIRASSEMBLER_HPP --- old/src/share/vm/c1/c1_LIRGenerator.cpp 2010-11-16 18:07:56.000000000 +0100 +++ new/src/share/vm/c1/c1_LIRGenerator.cpp 2010-11-16 18:07:56.000000000 +0100 @@ -22,8 +22,22 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_LIRGenerator.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_LIRGenerator.hpp" +#include "c1/c1_ValueStack.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciInstance.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/bitMap.inline.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/heapRegion.hpp" +#endif #ifdef ASSERT #define __ gen()->lir(__FILE__, __LINE__)-> --- old/src/share/vm/c1/c1_LIRGenerator.hpp 2010-11-16 18:07:57.000000000 +0100 +++ new/src/share/vm/c1/c1_LIRGenerator.hpp 2010-11-16 18:07:57.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_C1_C1_LIRGENERATOR_HPP +#define SHARE_VM_C1_C1_LIRGENERATOR_HPP + +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIR.hpp" +#include "ci/ciMethodData.hpp" +#include "utilities/sizes.hpp" + // The classes responsible for code emission and register allocation @@ -596,3 +604,5 @@ jdouble get_jdouble_constant() const; jint get_address_constant() const; }; + +#endif // SHARE_VM_C1_C1_LIRGENERATOR_HPP --- old/src/share/vm/c1/c1_LinearScan.cpp 2010-11-16 18:07:58.000000000 +0100 +++ new/src/share/vm/c1/c1_LinearScan.cpp 2010-11-16 18:07:58.000000000 +0100 @@ -22,8 +22,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_LinearScan.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_CFGPrinter.hpp" +#include "c1/c1_CodeStubs.hpp" +#include "c1/c1_Compilation.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_LIRGenerator.hpp" +#include "c1/c1_LinearScan.hpp" +#include "c1/c1_ValueStack.hpp" +#include "utilities/bitMap.inline.hpp" +#ifdef TARGET_ARCH_x86 +# include "vmreg_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "vmreg_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "vmreg_zero.inline.hpp" +#endif #ifndef PRODUCT --- old/src/share/vm/c1/c1_LinearScan.hpp 2010-11-16 18:07:59.000000000 +0100 +++ new/src/share/vm/c1/c1_LinearScan.hpp 2010-11-16 18:07:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_C1_C1_LINEARSCAN_HPP +#define SHARE_VM_C1_C1_LINEARSCAN_HPP + +#include "c1/c1_FpuStackSim.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "c1/c1_LIR.hpp" +#include "c1/c1_LIRGenerator.hpp" + class DebugInfoCache; class FpuStackAllocator; class IRScopeDebugInfo; @@ -955,4 +965,12 @@ // Pick up platform-dependent implementation details -# include "incls/_c1_LinearScan_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "c1_LinearScan_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_LinearScan_sparc.hpp" +#endif + + +#endif // SHARE_VM_C1_C1_LINEARSCAN_HPP --- old/src/share/vm/c1/c1_MacroAssembler.hpp 2010-11-16 18:08:00.000000000 +0100 +++ new/src/share/vm/c1/c1_MacroAssembler.hpp 2010-11-16 18:07:59.000000000 +0100 @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP +#define SHARE_VM_C1_C1_MACROASSEMBLER_HPP + +#include "asm/assembler.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +#endif + class CodeEmitInfo; class C1_MacroAssembler: public MacroAssembler { @@ -41,7 +55,13 @@ void verify_stack_oop(int offset) PRODUCT_RETURN; void verify_not_null_oop(Register r) PRODUCT_RETURN; -#include "incls/_c1_MacroAssembler_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "c1_MacroAssembler_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_MacroAssembler_sparc.hpp" +#endif + }; @@ -80,3 +100,5 @@ int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2); int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2, Register arg3); }; + +#endif // SHARE_VM_C1_C1_MACROASSEMBLER_HPP --- old/src/share/vm/c1/c1_Optimizer.cpp 2010-11-16 18:08:01.000000000 +0100 +++ new/src/share/vm/c1/c1_Optimizer.cpp 2010-11-16 18:08:00.000000000 +0100 @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Optimizer.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Canonicalizer.hpp" +#include "c1/c1_Optimizer.hpp" +#include "c1/c1_ValueMap.hpp" +#include "c1/c1_ValueSet.hpp" +#include "c1/c1_ValueStack.hpp" +#include "utilities/bitMap.inline.hpp" define_array(ValueSetArray, ValueSet*); define_stack(ValueSetList, ValueSetArray); --- old/src/share/vm/c1/c1_Optimizer.hpp 2010-11-16 18:08:01.000000000 +0100 +++ new/src/share/vm/c1/c1_Optimizer.hpp 2010-11-16 18:08:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_C1_C1_OPTIMIZER_HPP +#define SHARE_VM_C1_C1_OPTIMIZER_HPP + +#include "c1/c1_IR.hpp" +#include "c1/c1_Instruction.hpp" +#include "memory/allocation.hpp" + class Optimizer VALUE_OBJ_CLASS_SPEC { private: IR* _ir; @@ -35,3 +42,5 @@ void eliminate_blocks(); void eliminate_null_checks(); }; + +#endif // SHARE_VM_C1_C1_OPTIMIZER_HPP --- old/src/share/vm/c1/c1_Runtime1.cpp 2010-11-16 18:08:02.000000000 +0100 +++ new/src/share/vm/c1/c1_Runtime1.cpp 2010-11-16 18:08:02.000000000 +0100 @@ -22,8 +22,41 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_Runtime1.cpp.incl" +#include "precompiled.hpp" +#include "asm/codeBuffer.hpp" +#include "c1/c1_CodeStubs.hpp" +#include "c1/c1_Defs.hpp" +#include "c1/c1_FrameMap.hpp" +#include "c1/c1_LIRAssembler.hpp" +#include "c1/c1_MacroAssembler.hpp" +#include "c1/c1_Runtime1.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/codeBlob.hpp" +#include "code/compiledIC.hpp" +#include "code/pcDesc.hpp" +#include "code/scopeDesc.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/disassembler.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/barrierSet.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/compilationPolicy.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/vframe.hpp" +#include "runtime/vframeArray.hpp" +#include "utilities/copy.hpp" +#include "utilities/events.hpp" // Implementation of StubAssembler --- old/src/share/vm/c1/c1_Runtime1.hpp 2010-11-16 18:08:03.000000000 +0100 +++ new/src/share/vm/c1/c1_Runtime1.hpp 2010-11-16 18:08:03.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_C1_C1_RUNTIME1_HPP +#define SHARE_VM_C1_C1_RUNTIME1_HPP + +#include "c1/c1_FrameMap.hpp" +#include "code/stubs.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/allocation.hpp" +#include "runtime/deoptimization.hpp" + class StubAssembler; // The Runtime1 holds all assembly stubs and VM @@ -174,3 +183,5 @@ static void print_statistics() PRODUCT_RETURN; }; + +#endif // SHARE_VM_C1_C1_RUNTIME1_HPP --- old/src/share/vm/c1/c1_ValueMap.cpp 2010-11-16 18:08:04.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueMap.cpp 2010-11-16 18:08:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_ValueMap.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_Canonicalizer.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_ValueMap.hpp" +#include "utilities/bitMap.inline.hpp" #ifndef PRODUCT --- old/src/share/vm/c1/c1_ValueMap.hpp 2010-11-16 18:08:05.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueMap.hpp 2010-11-16 18:08:05.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_C1_C1_VALUEMAP_HPP +#define SHARE_VM_C1_C1_VALUEMAP_HPP + +#include "c1/c1_Instruction.hpp" +#include "c1/c1_ValueSet.hpp" +#include "memory/allocation.hpp" + class ValueMapEntry: public CompilationResourceObj { private: intx _hash; @@ -226,3 +233,5 @@ // main entry point that performs global value numbering GlobalValueNumbering(IR* ir); }; + +#endif // SHARE_VM_C1_C1_VALUEMAP_HPP --- old/src/share/vm/c1/c1_ValueSet.cpp 2010-11-16 18:08:06.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueSet.cpp 2010-11-16 18:08:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,6 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_ValueSet.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_ValueSet.hpp" + --- old/src/share/vm/c1/c1_ValueSet.hpp 2010-11-16 18:08:07.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueSet.hpp 2010-11-16 18:08:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_C1_C1_VALUESET_HPP +#define SHARE_VM_C1_C1_VALUESET_HPP + +#include "c1/c1_Instruction.hpp" +#include "memory/allocation.hpp" +#include "utilities/bitMap.inline.hpp" + // A ValueSet is a simple abstraction on top of a BitMap representing // a set of Instructions. Currently it assumes that the number of // instructions is fixed during its lifetime; should make it @@ -93,3 +100,5 @@ inline bool ValueSet::equals(ValueSet* other) { return _map.is_same(other->_map); } + +#endif // SHARE_VM_C1_C1_VALUESET_HPP --- old/src/share/vm/c1/c1_ValueStack.cpp 2010-11-16 18:08:07.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueStack.cpp 2010-11-16 18:08:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_c1_ValueStack.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_IR.hpp" +#include "c1/c1_InstructionPrinter.hpp" +#include "c1/c1_ValueStack.hpp" // Implementation of ValueStack --- old/src/share/vm/c1/c1_ValueStack.hpp 2010-11-16 18:08:08.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueStack.hpp 2010-11-16 18:08:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_C1_C1_VALUESTACK_HPP +#define SHARE_VM_C1_C1_VALUESTACK_HPP + +#include "c1/c1_Instruction.hpp" + class ValueStack: public CompilationResourceObj { public: enum Kind { @@ -322,3 +327,5 @@ } \ } \ } + +#endif // SHARE_VM_C1_C1_VALUESTACK_HPP --- old/src/share/vm/c1/c1_ValueType.cpp 2010-11-16 18:08:09.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueType.cpp 2010-11-16 18:08:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_ValueType.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_ValueType.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciNullObject.hpp" // predefined types --- old/src/share/vm/c1/c1_ValueType.hpp 2010-11-16 18:08:10.000000000 +0100 +++ new/src/share/vm/c1/c1_ValueType.hpp 2010-11-16 18:08:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_C1_C1_VALUETYPE_HPP +#define SHARE_VM_C1_C1_VALUETYPE_HPP + +#include "c1/c1_Compilation.hpp" +#include "ci/ciConstant.hpp" + // type hierarchy class ValueType; class VoidType; @@ -419,3 +425,5 @@ BasicType as_BasicType(ValueType* type); inline ValueType* as_ValueType(ciType* type) { return as_ValueType(type->basic_type()); } + +#endif // SHARE_VM_C1_C1_VALUETYPE_HPP --- old/src/share/vm/c1/c1_globals.cpp 2010-11-16 18:08:11.000000000 +0100 +++ new/src/share/vm/c1/c1_globals.cpp 2010-11-16 18:08:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_c1_globals.cpp.incl" +#include "precompiled.hpp" +#include "c1/c1_globals.hpp" C1_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, MATERIALIZE_NOTPRODUCT_FLAG) --- old/src/share/vm/c1/c1_globals.hpp 2010-11-16 18:08:12.000000000 +0100 +++ new/src/share/vm/c1/c1_globals.hpp 2010-11-16 18:08:12.000000000 +0100 @@ -22,6 +22,26 @@ * */ +#ifndef SHARE_VM_C1_C1_GLOBALS_HPP +#define SHARE_VM_C1_C1_GLOBALS_HPP + +#include "runtime/globals.hpp" +#ifdef TARGET_ARCH_x86 +# include "c1_globals_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "c1_globals_sparc.hpp" +#endif +#ifdef TARGET_OS_FAMILY_linux +# include "c1_globals_linux.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "c1_globals_solaris.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "c1_globals_windows.hpp" +#endif + // // Defines all global flags used by the client compiler. // @@ -300,6 +320,7 @@ // Read default values for c1 globals -// #include "incls/_c1_globals_pd.hpp.incl" C1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_NOTPRODUCT_FLAG) + +#endif // SHARE_VM_C1_C1_GLOBALS_HPP --- old/src/share/vm/ci/bcEscapeAnalyzer.cpp 2010-11-16 18:08:13.000000000 +0100 +++ new/src/share/vm/ci/bcEscapeAnalyzer.cpp 2010-11-16 18:08:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,9 +22,15 @@ * */ +#include "precompiled.hpp" +#include "ci/bcEscapeAnalyzer.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciField.hpp" +#include "ci/ciMethodBlocks.hpp" +#include "ci/ciStreams.hpp" +#include "interpreter/bytecode.hpp" +#include "utilities/bitMap.inline.hpp" -#include "incls/_precompiled.incl" -#include "incls/_bcEscapeAnalyzer.cpp.incl" #ifndef PRODUCT --- old/src/share/vm/ci/bcEscapeAnalyzer.hpp 2010-11-16 18:08:14.000000000 +0100 +++ new/src/share/vm/ci/bcEscapeAnalyzer.hpp 2010-11-16 18:08:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_CI_BCESCAPEANALYZER_HPP +#define SHARE_VM_CI_BCESCAPEANALYZER_HPP + +#ifdef COMPILER2 +#include "ci/ciMethod.hpp" +#include "ci/ciMethodData.hpp" +#include "code/dependencies.hpp" +#include "libadt/vectset.hpp" +#include "memory/allocation.hpp" +#include "utilities/growableArray.hpp" +#endif + // This class implements a fast, conservative analysis of effect of methods // on the escape state of their arguments. The analysis is at the bytecode // level. @@ -147,3 +159,5 @@ void dump(); #endif }; + +#endif // SHARE_VM_CI_BCESCAPEANALYZER_HPP --- old/src/share/vm/ci/ciArray.cpp 2010-11-16 18:08:14.000000000 +0100 +++ new/src/share/vm/ci/ciArray.cpp 2010-11-16 18:08:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciArray.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciArray.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciUtilities.hpp" // ciArray // --- old/src/share/vm/ci/ciArray.hpp 2010-11-16 18:08:15.000000000 +0100 +++ new/src/share/vm/ci/ciArray.hpp 2010-11-16 18:08:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CIARRAY_HPP +#define SHARE_VM_CI_CIARRAY_HPP + +#include "ci/ciObject.hpp" +#include "oops/arrayOop.hpp" +#include "oops/objArrayOop.hpp" +#include "oops/typeArrayOop.hpp" + // ciArray // // This class represents an arrayOop in the HotSpot virtual @@ -50,3 +58,5 @@ bool is_array() { return true; } bool is_java_object() { return true; } }; + +#endif // SHARE_VM_CI_CIARRAY_HPP --- old/src/share/vm/ci/ciArrayKlass.cpp 2010-11-16 18:08:16.000000000 +0100 +++ new/src/share/vm/ci/ciArrayKlass.cpp 2010-11-16 18:08:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciArrayKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "ci/ciUtilities.hpp" // ciArrayKlass // --- old/src/share/vm/ci/ciArrayKlass.hpp 2010-11-16 18:08:17.000000000 +0100 +++ new/src/share/vm/ci/ciArrayKlass.hpp 2010-11-16 18:08:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIARRAYKLASS_HPP +#define SHARE_VM_CI_CIARRAYKLASS_HPP + +#include "ci/ciKlass.hpp" + // ciArrayKlass // // This class, and its subclasses represent klassOops in the @@ -57,3 +62,5 @@ static ciArrayKlass* make(ciType* element_type); }; + +#endif // SHARE_VM_CI_CIARRAYKLASS_HPP --- old/src/share/vm/ci/ciArrayKlassKlass.hpp 2010-11-16 18:08:18.000000000 +0100 +++ new/src/share/vm/ci/ciArrayKlassKlass.hpp 2010-11-16 18:08:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIARRAYKLASSKLASS_HPP +#define SHARE_VM_CI_CIARRAYKLASSKLASS_HPP + +#include "ci/ciKlassKlass.hpp" + // ciArrayKlassKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -41,3 +46,5 @@ // What kind of ciObject is this? bool is_array_klass_klass() { return true; } }; + +#endif // SHARE_VM_CI_CIARRAYKLASSKLASS_HPP --- old/src/share/vm/ci/ciCPCache.cpp 2010-11-16 18:08:19.000000000 +0100 +++ new/src/share/vm/ci/ciCPCache.cpp 2010-11-16 18:08:18.000000000 +0100 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciCPCache.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciUtilities.hpp" +#include "oops/cpCacheOop.hpp" // ciCPCache --- old/src/share/vm/ci/ciCPCache.hpp 2010-11-16 18:08:20.000000000 +0100 +++ new/src/share/vm/ci/ciCPCache.hpp 2010-11-16 18:08:19.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CICPCACHE_HPP +#define SHARE_VM_CI_CICPCACHE_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciObject.hpp" +#include "oops/cpCacheOop.hpp" + // ciCPCache // // This class represents a constant pool cache. @@ -57,3 +64,5 @@ void print(); }; + +#endif // SHARE_VM_CI_CICPCACHE_HPP --- old/src/share/vm/ci/ciCallProfile.hpp 2010-11-16 18:08:20.000000000 +0100 +++ new/src/share/vm/ci/ciCallProfile.hpp 2010-11-16 18:08:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CICALLPROFILE_HPP +#define SHARE_VM_CI_CICALLPROFILE_HPP + +#include "ci/ciClassList.hpp" + // ciCallProfile // // This class is used to determine the frequently called method @@ -73,3 +78,5 @@ return _receiver[i]; } }; + +#endif // SHARE_VM_CI_CICALLPROFILE_HPP --- old/src/share/vm/ci/ciCallSite.cpp 2010-11-16 18:08:21.000000000 +0100 +++ new/src/share/vm/ci/ciCallSite.cpp 2010-11-16 18:08:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciCallSite.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCallSite.hpp" +#include "ci/ciUtilities.hpp" // ciCallSite --- old/src/share/vm/ci/ciCallSite.hpp 2010-11-16 18:08:22.000000000 +0100 +++ new/src/share/vm/ci/ciCallSite.hpp 2010-11-16 18:08:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CICALLSITE_HPP +#define SHARE_VM_CI_CICALLSITE_HPP + +#include "ci/ciInstance.hpp" + // ciCallSite // // The class represents a java.dyn.CallSite object. @@ -37,3 +42,5 @@ void print(); }; + +#endif // SHARE_VM_CI_CICALLSITE_HPP --- old/src/share/vm/ci/ciClassList.hpp 2010-11-16 18:08:23.000000000 +0100 +++ new/src/share/vm/ci/ciClassList.hpp 2010-11-16 18:08:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_CI_CICLASSLIST_HPP +#define SHARE_VM_CI_CICLASSLIST_HPP + class ciEnv; class ciObjectFactory; class ciConstantPoolCache; @@ -118,3 +121,5 @@ friend class ciArrayKlassKlass; \ friend class ciObjArrayKlassKlass; \ friend class ciTypeArrayKlassKlass; + +#endif // SHARE_VM_CI_CICLASSLIST_HPP --- old/src/share/vm/ci/ciConstant.cpp 2010-11-16 18:08:24.000000000 +0100 +++ new/src/share/vm/ci/ciConstant.cpp 2010-11-16 18:08:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciConstant.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciUtilities.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" // ciConstant // --- old/src/share/vm/ci/ciConstant.hpp 2010-11-16 18:08:25.000000000 +0100 +++ new/src/share/vm/ci/ciConstant.hpp 2010-11-16 18:08:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CICONSTANT_HPP +#define SHARE_VM_CI_CICONSTANT_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciNullObject.hpp" + // ciConstant // // This class represents a constant value. @@ -110,3 +116,5 @@ // Debugging output void print(); }; + +#endif // SHARE_VM_CI_CICONSTANT_HPP --- old/src/share/vm/ci/ciConstantPoolCache.cpp 2010-11-16 18:08:26.000000000 +0100 +++ new/src/share/vm/ci/ciConstantPoolCache.cpp 2010-11-16 18:08:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciConstantPoolCache.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciConstantPoolCache.hpp" +#include "ci/ciUtilities.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" // ciConstantPoolCache // --- old/src/share/vm/ci/ciConstantPoolCache.hpp 2010-11-16 18:08:26.000000000 +0100 +++ new/src/share/vm/ci/ciConstantPoolCache.hpp 2010-11-16 18:08:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP +#define SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP + +#include "memory/resourceArea.hpp" +#include "utilities/growableArray.hpp" + // ciConstantPoolCache // // The class caches indexed constant pool lookups. @@ -45,3 +51,5 @@ void print(); }; + +#endif // SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP --- old/src/share/vm/ci/ciEnv.cpp 2010-11-16 18:08:27.000000000 +0100 +++ new/src/share/vm/ci/ciEnv.cpp 2010-11-16 18:08:27.000000000 +0100 @@ -22,8 +22,44 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciEnv.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciEnv.hpp" +#include "ci/ciField.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciInstanceKlassKlass.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciNullObject.hpp" +#include "ci/ciObjArrayKlassKlass.hpp" +#include "ci/ciTypeArrayKlassKlass.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/scopeDesc.hpp" +#include "compiler/compileBroker.hpp" +#include "compiler/compileLog.hpp" +#include "compiler/compilerOracle.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/oopFactory.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/init.hpp" +#include "runtime/reflection.hpp" +#include "runtime/sharedRuntime.hpp" +#include "utilities/dtrace.hpp" +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif +#ifdef COMPILER2 +#include "opto/runtime.hpp" +#endif // ciEnv // --- old/src/share/vm/ci/ciEnv.hpp 2010-11-16 18:08:28.000000000 +0100 +++ new/src/share/vm/ci/ciEnv.hpp 2010-11-16 18:08:28.000000000 +0100 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_CI_CIENV_HPP +#define SHARE_VM_CI_CIENV_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciObjectFactory.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/debugInfoRec.hpp" +#include "code/dependencies.hpp" +#include "code/exceptionHandlerTable.hpp" +#include "compiler/oopMap.hpp" +#include "runtime/thread.hpp" + class CompileTask; // ciEnv @@ -384,3 +396,5 @@ void record_method_not_compilable(const char* reason, bool all_tiers = true); void record_out_of_memory_failure(); }; + +#endif // SHARE_VM_CI_CIENV_HPP --- old/src/share/vm/ci/ciExceptionHandler.cpp 2010-11-16 18:08:29.000000000 +0100 +++ new/src/share/vm/ci/ciExceptionHandler.cpp 2010-11-16 18:08:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciExceptionHandler.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciExceptionHandler.hpp" +#include "ci/ciUtilities.hpp" // ciExceptionHandler // --- old/src/share/vm/ci/ciExceptionHandler.hpp 2010-11-16 18:08:30.000000000 +0100 +++ new/src/share/vm/ci/ciExceptionHandler.hpp 2010-11-16 18:08:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP +#define SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciInstanceKlass.hpp" + // ciExceptionHandler // // This class represents an exception handler for a method. @@ -73,3 +79,5 @@ void print(); }; + +#endif // SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP --- old/src/share/vm/ci/ciField.cpp 2010-11-16 18:08:31.000000000 +0100 +++ new/src/share/vm/ci/ciField.cpp 2010-11-16 18:08:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciField.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciField.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/universe.inline.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "runtime/fieldDescriptor.hpp" // ciField // --- old/src/share/vm/ci/ciField.hpp 2010-11-16 18:08:32.000000000 +0100 +++ new/src/share/vm/ci/ciField.hpp 2010-11-16 18:08:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CIFIELD_HPP +#define SHARE_VM_CI_CIFIELD_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciFlags.hpp" +#include "ci/ciInstance.hpp" + // ciField // // This class represents the result of a field lookup in the VM. @@ -174,3 +182,5 @@ void print(); void print_name_on(outputStream* st); }; + +#endif // SHARE_VM_CI_CIFIELD_HPP --- old/src/share/vm/ci/ciFlags.cpp 2010-11-16 18:08:33.000000000 +0100 +++ new/src/share/vm/ci/ciFlags.cpp 2010-11-16 18:08:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciFlags.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciFlags.hpp" // ciFlags // --- old/src/share/vm/ci/ciFlags.hpp 2010-11-16 18:08:33.000000000 +0100 +++ new/src/share/vm/ci/ciFlags.hpp 2010-11-16 18:08:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CIFLAGS_HPP +#define SHARE_VM_CI_CIFLAGS_HPP + +#include "ci/ciClassList.hpp" +#include "memory/allocation.hpp" +#include "prims/jvm.h" +#include "utilities/accessFlags.hpp" + // ciFlags // // This class represents klass or method flags. @@ -59,3 +67,5 @@ void print_member_flags(outputStream* st = tty); void print(outputStream* st = tty); }; + +#endif // SHARE_VM_CI_CIFLAGS_HPP --- old/src/share/vm/ci/ciInstance.cpp 2010-11-16 18:08:34.000000000 +0100 +++ new/src/share/vm/ci/ciInstance.cpp 2010-11-16 18:08:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciInstance.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciField.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "oops/oop.inline.hpp" // ciInstance // --- old/src/share/vm/ci/ciInstance.hpp 2010-11-16 18:08:35.000000000 +0100 +++ new/src/share/vm/ci/ciInstance.hpp 2010-11-16 18:08:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIINSTANCE_HPP +#define SHARE_VM_CI_CIINSTANCE_HPP + +#include "ci/ciObject.hpp" +#include "oops/instanceOop.hpp" + // ciInstance // // This class represents an instanceOop in the HotSpot virtual @@ -59,3 +65,5 @@ // Constant value of a field at the specified offset. ciConstant field_value_by_offset(int field_offset); }; + +#endif // SHARE_VM_CI_CIINSTANCE_HPP --- old/src/share/vm/ci/ciInstanceKlass.cpp 2010-11-16 18:08:36.000000000 +0100 +++ new/src/share/vm/ci/ciInstanceKlass.cpp 2010-11-16 18:08:36.000000000 +0100 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciInstanceKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciField.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/fieldDescriptor.hpp" // ciInstanceKlass // --- old/src/share/vm/ci/ciInstanceKlass.hpp 2010-11-16 18:08:37.000000000 +0100 +++ new/src/share/vm/ci/ciInstanceKlass.hpp 2010-11-16 18:08:37.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_CI_CIINSTANCEKLASS_HPP +#define SHARE_VM_CI_CIINSTANCEKLASS_HPP + +#include "ci/ciConstantPoolCache.hpp" +#include "ci/ciFlags.hpp" +#include "ci/ciInstanceKlassKlass.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciSymbol.hpp" + // ciInstanceKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -215,3 +224,5 @@ bool is_instance_klass() { return true; } bool is_java_klass() { return true; } }; + +#endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP --- old/src/share/vm/ci/ciInstanceKlassKlass.cpp 2010-11-16 18:08:38.000000000 +0100 +++ new/src/share/vm/ci/ciInstanceKlassKlass.cpp 2010-11-16 18:08:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciInstanceKlassKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciInstanceKlassKlass.hpp" +#include "ci/ciUtilities.hpp" // ciInstanceKlassKlass // --- old/src/share/vm/ci/ciInstanceKlassKlass.hpp 2010-11-16 18:08:39.000000000 +0100 +++ new/src/share/vm/ci/ciInstanceKlassKlass.hpp 2010-11-16 18:08:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIINSTANCEKLASSKLASS_HPP +#define SHARE_VM_CI_CIINSTANCEKLASSKLASS_HPP + +#include "ci/ciKlassKlass.hpp" + // ciInstanceKlassKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -48,3 +53,5 @@ // Return the distinguished ciInstanceKlassKlass instance. static ciInstanceKlassKlass* make(); }; + +#endif // SHARE_VM_CI_CIINSTANCEKLASSKLASS_HPP --- old/src/share/vm/ci/ciKlass.cpp 2010-11-16 18:08:39.000000000 +0100 +++ new/src/share/vm/ci/ciKlass.cpp 2010-11-16 18:08:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciUtilities.hpp" +#include "oops/oop.inline.hpp" // ciKlass // --- old/src/share/vm/ci/ciKlass.hpp 2010-11-16 18:08:40.000000000 +0100 +++ new/src/share/vm/ci/ciKlass.hpp 2010-11-16 18:08:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIKLASS_HPP +#define SHARE_VM_CI_CIKLASS_HPP + +#include "ci/ciType.hpp" +#include "oops/klassOop.hpp" + // ciKlass // // This class and its subclasses represent klassOops in the @@ -117,3 +123,5 @@ void print_name_on(outputStream* st); }; + +#endif // SHARE_VM_CI_CIKLASS_HPP --- old/src/share/vm/ci/ciKlassKlass.cpp 2010-11-16 18:08:41.000000000 +0100 +++ new/src/share/vm/ci/ciKlassKlass.cpp 2010-11-16 18:08:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciKlassKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciKlassKlass.hpp" +#include "ci/ciUtilities.hpp" // ciKlassKlass // --- old/src/share/vm/ci/ciKlassKlass.hpp 2010-11-16 18:08:42.000000000 +0100 +++ new/src/share/vm/ci/ciKlassKlass.hpp 2010-11-16 18:08:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIKLASSKLASS_HPP +#define SHARE_VM_CI_CIKLASSKLASS_HPP + +#include "ci/ciKlass.hpp" +#include "ci/ciSymbol.hpp" + // ciKlassKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -49,3 +55,5 @@ // Return the distinguished ciKlassKlass instance. static ciKlassKlass* make(); }; + +#endif // SHARE_VM_CI_CIKLASSKLASS_HPP --- old/src/share/vm/ci/ciMethod.cpp 2010-11-16 18:08:43.000000000 +0100 +++ new/src/share/vm/ci/ciMethod.cpp 2010-11-16 18:08:43.000000000 +0100 @@ -22,8 +22,41 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciMethod.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCallProfile.hpp" +#include "ci/ciExceptionHandler.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciMethodBlocks.hpp" +#include "ci/ciMethodData.hpp" +#include "ci/ciMethodKlass.hpp" +#include "ci/ciStreams.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "compiler/abstractCompiler.hpp" +#include "compiler/compilerOracle.hpp" +#include "compiler/methodLiveness.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/linkResolver.hpp" +#include "interpreter/oopMapCache.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "oops/generateOopMap.hpp" +#include "oops/oop.inline.hpp" +#include "prims/nativeLookup.hpp" +#include "runtime/deoptimization.hpp" +#include "utilities/bitMap.inline.hpp" +#include "utilities/xmlstream.hpp" +#ifdef COMPILER2 +#include "ci/bcEscapeAnalyzer.hpp" +#include "ci/ciTypeFlow.hpp" +#include "oops/methodOop.hpp" +#endif +#ifdef SHARK +#include "ci/ciTypeFlow.hpp" +#include "oops/methodOop.hpp" +#endif // ciMethod // --- old/src/share/vm/ci/ciMethod.hpp 2010-11-16 18:08:44.000000000 +0100 +++ new/src/share/vm/ci/ciMethod.hpp 2010-11-16 18:08:44.000000000 +0100 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_CI_CIMETHOD_HPP +#define SHARE_VM_CI_CIMETHOD_HPP + +#include "ci/ciFlags.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciObject.hpp" +#include "ci/ciSignature.hpp" +#include "compiler/methodLiveness.hpp" +#include "prims/methodHandles.hpp" +#include "utilities/bitMap.hpp" + class ciMethodBlocks; class MethodLiveness; class BitMap; @@ -269,3 +280,5 @@ return MethodHandles::decode_method(get_oop(), receiver_limit_oop, flags); } }; + +#endif // SHARE_VM_CI_CIMETHOD_HPP --- old/src/share/vm/ci/ciMethodBlocks.cpp 2010-11-16 18:08:45.000000000 +0100 +++ new/src/share/vm/ci/ciMethodBlocks.cpp 2010-11-16 18:08:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciMethodBlocks.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethodBlocks.hpp" +#include "ci/ciStreams.hpp" +#include "interpreter/bytecode.hpp" +#include "utilities/copy.hpp" // ciMethodBlocks --- old/src/share/vm/ci/ciMethodBlocks.hpp 2010-11-16 18:08:46.000000000 +0100 +++ new/src/share/vm/ci/ciMethodBlocks.hpp 2010-11-16 18:08:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CIMETHODBLOCKS_HPP +#define SHARE_VM_CI_CIMETHODBLOCKS_HPP + +#include "ci/ciMethod.hpp" +#include "memory/resourceArea.hpp" +#include "utilities/growableArray.hpp" + class ciBlock; @@ -121,3 +128,5 @@ void print_on(outputStream* st) const PRODUCT_RETURN; #endif }; + +#endif // SHARE_VM_CI_CIMETHODBLOCKS_HPP --- old/src/share/vm/ci/ciMethodData.cpp 2010-11-16 18:08:46.000000000 +0100 +++ new/src/share/vm/ci/ciMethodData.cpp 2010-11-16 18:08:46.000000000 +0100 @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciMethodData.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethodData.hpp" +#include "ci/ciUtilities.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/deoptimization.hpp" +#include "utilities/copy.hpp" // ciMethodData --- old/src/share/vm/ci/ciMethodData.hpp 2010-11-16 18:08:47.000000000 +0100 +++ new/src/share/vm/ci/ciMethodData.hpp 2010-11-16 18:08:47.000000000 +0100 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_CI_CIMETHODDATA_HPP +#define SHARE_VM_CI_CIMETHODDATA_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciObject.hpp" +#include "ci/ciUtilities.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/oop.inline.hpp" + class ciBitData; class ciCounterData; class ciJumpData; @@ -311,3 +321,5 @@ void print_data_on(outputStream* st); #endif }; + +#endif // SHARE_VM_CI_CIMETHODDATA_HPP --- old/src/share/vm/ci/ciMethodHandle.cpp 2010-11-16 18:08:48.000000000 +0100 +++ new/src/share/vm/ci/ciMethodHandle.cpp 2010-11-16 18:08:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciMethodHandle.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciClassList.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciMethodHandle.hpp" +#include "ci/ciUtilities.hpp" +#include "prims/methodHandleWalk.hpp" +#include "prims/methodHandles.hpp" // ciMethodHandle --- old/src/share/vm/ci/ciMethodHandle.hpp 2010-11-16 18:08:49.000000000 +0100 +++ new/src/share/vm/ci/ciMethodHandle.hpp 2010-11-16 18:08:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIMETHODHANDLE_HPP +#define SHARE_VM_CI_CIMETHODHANDLE_HPP + +#include "prims/methodHandles.hpp" + // ciMethodHandle // // The class represents a java.dyn.MethodHandle object. @@ -54,3 +59,5 @@ return get_adapter(true); } }; + +#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP --- old/src/share/vm/ci/ciMethodKlass.cpp 2010-11-16 18:08:50.000000000 +0100 +++ new/src/share/vm/ci/ciMethodKlass.cpp 2010-11-16 18:08:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciMethodKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethodKlass.hpp" +#include "ci/ciUtilities.hpp" // ciMethodKlass // --- old/src/share/vm/ci/ciMethodKlass.hpp 2010-11-16 18:08:51.000000000 +0100 +++ new/src/share/vm/ci/ciMethodKlass.hpp 2010-11-16 18:08:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIMETHODKLASS_HPP +#define SHARE_VM_CI_CIMETHODKLASS_HPP + +#include "ci/ciKlass.hpp" +#include "ci/ciSymbol.hpp" + // ciMethodKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -46,3 +52,5 @@ // Return the distinguished ciMethodKlass instance. static ciMethodKlass* make(); }; + +#endif // SHARE_VM_CI_CIMETHODKLASS_HPP --- old/src/share/vm/ci/ciNullObject.cpp 2010-11-16 18:08:52.000000000 +0100 +++ new/src/share/vm/ci/ciNullObject.cpp 2010-11-16 18:08:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciNullObject.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciNullObject.hpp" // ciNullObject // --- old/src/share/vm/ci/ciNullObject.hpp 2010-11-16 18:08:52.000000000 +0100 +++ new/src/share/vm/ci/ciNullObject.hpp 2010-11-16 18:08:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CINULLOBJECT_HPP +#define SHARE_VM_CI_CINULLOBJECT_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciObject.hpp" +#include "ci/ciUtilities.hpp" + // ciNullObject // // This class represents a null reference in the VM. @@ -47,3 +54,5 @@ // Get the distinguished instance of this klass. static ciNullObject* make(); }; + +#endif // SHARE_VM_CI_CINULLOBJECT_HPP --- old/src/share/vm/ci/ciObjArray.cpp 2010-11-16 18:08:53.000000000 +0100 +++ new/src/share/vm/ci/ciObjArray.cpp 2010-11-16 18:08:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciObjArray.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciNullObject.hpp" +#include "ci/ciObjArray.hpp" +#include "ci/ciUtilities.hpp" +#include "oops/objArrayOop.hpp" // ciObjArray // --- old/src/share/vm/ci/ciObjArray.hpp 2010-11-16 18:08:54.000000000 +0100 +++ new/src/share/vm/ci/ciObjArray.hpp 2010-11-16 18:08:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CIOBJARRAY_HPP +#define SHARE_VM_CI_CIOBJARRAY_HPP + +#include "ci/ciArray.hpp" +#include "ci/ciClassList.hpp" +#include "oops/objArrayOop.hpp" + // ciObjArray // // This class represents a ObjArrayOop in the HotSpot virtual @@ -46,3 +53,5 @@ ciObject* obj_at(int index); }; + +#endif // SHARE_VM_CI_CIOBJARRAY_HPP --- old/src/share/vm/ci/ciObjArrayKlass.cpp 2010-11-16 18:08:55.000000000 +0100 +++ new/src/share/vm/ci/ciObjArrayKlass.cpp 2010-11-16 18:08:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciObjArrayKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciObjArrayKlassKlass.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciUtilities.hpp" +#include "oops/objArrayKlass.hpp" // ciObjArrayKlass // --- old/src/share/vm/ci/ciObjArrayKlass.hpp 2010-11-16 18:08:56.000000000 +0100 +++ new/src/share/vm/ci/ciObjArrayKlass.hpp 2010-11-16 18:08:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIOBJARRAYKLASS_HPP +#define SHARE_VM_CI_CIOBJARRAYKLASS_HPP + +#include "ci/ciArrayKlass.hpp" + // ciObjArrayKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -69,3 +74,5 @@ static ciObjArrayKlass* make(ciKlass* element_klass); }; + +#endif // SHARE_VM_CI_CIOBJARRAYKLASS_HPP --- old/src/share/vm/ci/ciObjArrayKlassKlass.cpp 2010-11-16 18:08:57.000000000 +0100 +++ new/src/share/vm/ci/ciObjArrayKlassKlass.cpp 2010-11-16 18:08:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciObjArrayKlassKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciObjArrayKlassKlass.hpp" +#include "ci/ciUtilities.hpp" // ciObjArrayKlassKlass // --- old/src/share/vm/ci/ciObjArrayKlassKlass.hpp 2010-11-16 18:08:58.000000000 +0100 +++ new/src/share/vm/ci/ciObjArrayKlassKlass.hpp 2010-11-16 18:08:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CIOBJARRAYKLASSKLASS_HPP +#define SHARE_VM_CI_CIOBJARRAYKLASSKLASS_HPP + +#include "ci/ciArrayKlassKlass.hpp" + // ciObjArrayKlassKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -48,3 +53,5 @@ // Return the distinguished ciObjArrayKlassKlass instance. static ciObjArrayKlassKlass* make(); }; + +#endif // SHARE_VM_CI_CIOBJARRAYKLASSKLASS_HPP --- old/src/share/vm/ci/ciObject.cpp 2010-11-16 18:08:58.000000000 +0100 +++ new/src/share/vm/ci/ciObject.cpp 2010-11-16 18:08:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciObject.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciObject.hpp" +#include "ci/ciUtilities.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "oops/oop.inline2.hpp" // ciObject // --- old/src/share/vm/ci/ciObject.hpp 2010-11-16 18:08:59.000000000 +0100 +++ new/src/share/vm/ci/ciObject.hpp 2010-11-16 18:08:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CIOBJECT_HPP +#define SHARE_VM_CI_CIOBJECT_HPP + +#include "ci/ciClassList.hpp" +#include "memory/allocation.hpp" +#include "runtime/handles.hpp" +#include "runtime/jniHandles.hpp" + // ciObject // // This class represents an oop in the HotSpot virtual machine. @@ -291,3 +299,5 @@ // Print debugging output about the oop this ciObject represents. void print_oop(outputStream* st = tty); }; + +#endif // SHARE_VM_CI_CIOBJECT_HPP --- old/src/share/vm/ci/ciObjectFactory.cpp 2010-11-16 18:09:00.000000000 +0100 +++ new/src/share/vm/ci/ciObjectFactory.cpp 2010-11-16 18:09:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,33 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciObjectFactory.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciCallSite.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciInstanceKlassKlass.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciMethodData.hpp" +#include "ci/ciMethodHandle.hpp" +#include "ci/ciMethodKlass.hpp" +#include "ci/ciNullObject.hpp" +#include "ci/ciObjArray.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciObjArrayKlassKlass.hpp" +#include "ci/ciObjectFactory.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciSymbolKlass.hpp" +#include "ci/ciTypeArray.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "ci/ciTypeArrayKlassKlass.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "runtime/fieldType.hpp" // ciObjectFactory // --- old/src/share/vm/ci/ciObjectFactory.hpp 2010-11-16 18:09:01.000000000 +0100 +++ new/src/share/vm/ci/ciObjectFactory.hpp 2010-11-16 18:09:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CIOBJECTFACTORY_HPP +#define SHARE_VM_CI_CIOBJECTFACTORY_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciObject.hpp" +#include "utilities/growableArray.hpp" + // ciObjectFactory // // This class handles requests for the creation of new instances @@ -123,3 +130,5 @@ void print_contents(); void print(); }; + +#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP --- old/src/share/vm/ci/ciSignature.cpp 2010-11-16 18:09:02.000000000 +0100 +++ new/src/share/vm/ci/ciSignature.cpp 2010-11-16 18:09:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciSignature.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciSignature.hpp" +#include "ci/ciUtilities.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/signature.hpp" // ciSignature // --- old/src/share/vm/ci/ciSignature.hpp 2010-11-16 18:09:03.000000000 +0100 +++ new/src/share/vm/ci/ciSignature.hpp 2010-11-16 18:09:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CISIGNATURE_HPP +#define SHARE_VM_CI_CISIGNATURE_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciSymbol.hpp" +#include "utilities/globalDefinitions.hpp" +#include "utilities/growableArray.hpp" + // ciSignature // // This class represents the signature of a method. @@ -54,3 +62,5 @@ void print_signature(); void print(); }; + +#endif // SHARE_VM_CI_CISIGNATURE_HPP --- old/src/share/vm/ci/ciStreams.cpp 2010-11-16 18:09:04.000000000 +0100 +++ new/src/share/vm/ci/ciStreams.cpp 2010-11-16 18:09:03.000000000 +0100 @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciStreams.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciCPCache.hpp" +#include "ci/ciCallSite.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciField.hpp" +#include "ci/ciStreams.hpp" +#include "ci/ciUtilities.hpp" // ciExceptionHandlerStream // --- old/src/share/vm/ci/ciStreams.hpp 2010-11-16 18:09:05.000000000 +0100 +++ new/src/share/vm/ci/ciStreams.hpp 2010-11-16 18:09:04.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_CI_CISTREAMS_HPP +#define SHARE_VM_CI_CISTREAMS_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciExceptionHandler.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciMethod.hpp" +#include "interpreter/bytecode.hpp" + // ciBytecodeStream // // The class is used to iterate over the bytecodes of a method. @@ -397,3 +406,5 @@ return _method->_exception_handlers[_pos]; } }; + +#endif // SHARE_VM_CI_CISTREAMS_HPP --- old/src/share/vm/ci/ciSymbol.cpp 2010-11-16 18:09:05.000000000 +0100 +++ new/src/share/vm/ci/ciSymbol.cpp 2010-11-16 18:09:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciSymbol.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciUtilities.hpp" +#include "memory/oopFactory.hpp" // ------------------------------------------------------------------ // ciSymbol::ciSymbol --- old/src/share/vm/ci/ciSymbol.hpp 2010-11-16 18:09:06.000000000 +0100 +++ new/src/share/vm/ci/ciSymbol.hpp 2010-11-16 18:09:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CI_CISYMBOL_HPP +#define SHARE_VM_CI_CISYMBOL_HPP + +#include "ci/ciObject.hpp" +#include "ci/ciObjectFactory.hpp" +#include "classfile/vmSymbols.hpp" +#include "oops/symbolOop.hpp" + // ciSymbol // // This class represents a symbolOop in the HotSpot virtual @@ -89,3 +97,5 @@ VM_SYMBOLS_DO(CI_SYMBOL_DECLARE, CI_SYMBOL_DECLARE) #undef CI_SYMBOL_DECLARE }; + +#endif // SHARE_VM_CI_CISYMBOL_HPP --- old/src/share/vm/ci/ciSymbolKlass.cpp 2010-11-16 18:09:07.000000000 +0100 +++ new/src/share/vm/ci/ciSymbolKlass.cpp 2010-11-16 18:09:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciSymbolKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciSymbolKlass.hpp" +#include "ci/ciUtilities.hpp" // ciSymbolKlass // --- old/src/share/vm/ci/ciSymbolKlass.hpp 2010-11-16 18:09:08.000000000 +0100 +++ new/src/share/vm/ci/ciSymbolKlass.hpp 2010-11-16 18:09:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CISYMBOLKLASS_HPP +#define SHARE_VM_CI_CISYMBOLKLASS_HPP + +#include "ci/ciKlass.hpp" +#include "ci/ciSymbol.hpp" + // ciSymbolKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -50,3 +56,5 @@ // Return the distinguished ciSymbolKlass instance. static ciSymbolKlass* make(); }; + +#endif // SHARE_VM_CI_CISYMBOLKLASS_HPP --- old/src/share/vm/ci/ciType.cpp 2010-11-16 18:09:09.000000000 +0100 +++ new/src/share/vm/ci/ciType.cpp 2010-11-16 18:09:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciType.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciType.hpp" +#include "ci/ciUtilities.hpp" +#include "classfile/systemDictionary.hpp" +#include "oops/oop.inline.hpp" ciType* ciType::_basic_types[T_CONFLICT+1]; --- old/src/share/vm/ci/ciType.hpp 2010-11-16 18:09:10.000000000 +0100 +++ new/src/share/vm/ci/ciType.hpp 2010-11-16 18:09:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CITYPE_HPP +#define SHARE_VM_CI_CITYPE_HPP + +#include "ci/ciObject.hpp" +#include "oops/klassOop.hpp" + // ciType // // This class represents either a class (T_OBJECT), array (T_ARRAY), @@ -106,3 +112,5 @@ static ciReturnAddress* make(int bci); }; + +#endif // SHARE_VM_CI_CITYPE_HPP --- old/src/share/vm/ci/ciTypeArray.cpp 2010-11-16 18:09:11.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArray.cpp 2010-11-16 18:09:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciTypeArray.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciTypeArray.hpp" +#include "ci/ciUtilities.hpp" // ciTypeArray // --- old/src/share/vm/ci/ciTypeArray.hpp 2010-11-16 18:09:11.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArray.hpp 2010-11-16 18:09:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CI_CITYPEARRAY_HPP +#define SHARE_VM_CI_CITYPEARRAY_HPP + +#include "ci/ciArray.hpp" +#include "ci/ciClassList.hpp" +#include "oops/typeArrayOop.hpp" + // ciTypeArray // // This class represents a typeArrayOop in the HotSpot virtual @@ -50,3 +57,5 @@ jchar char_at(int index); }; + +#endif // SHARE_VM_CI_CITYPEARRAY_HPP --- old/src/share/vm/ci/ciTypeArrayKlass.cpp 2010-11-16 18:09:12.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArrayKlass.cpp 2010-11-16 18:09:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciTypeArrayKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "ci/ciUtilities.hpp" // ciTypeArrayKlass // --- old/src/share/vm/ci/ciTypeArrayKlass.hpp 2010-11-16 18:09:13.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArrayKlass.hpp 2010-11-16 18:09:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CITYPEARRAYKLASS_HPP +#define SHARE_VM_CI_CITYPEARRAYKLASS_HPP + +#include "ci/ciArrayKlass.hpp" + // ciTypeArrayKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -53,3 +58,5 @@ // Make an array klass corresponding to the specified primitive type. static ciTypeArrayKlass* make(BasicType type); }; + +#endif // SHARE_VM_CI_CITYPEARRAYKLASS_HPP --- old/src/share/vm/ci/ciTypeArrayKlassKlass.cpp 2010-11-16 18:09:14.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArrayKlassKlass.cpp 2010-11-16 18:09:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciTypeArrayKlassKlass.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciTypeArrayKlassKlass.hpp" +#include "ci/ciUtilities.hpp" // ciTypeArrayKlassKlass // --- old/src/share/vm/ci/ciTypeArrayKlassKlass.hpp 2010-11-16 18:09:15.000000000 +0100 +++ new/src/share/vm/ci/ciTypeArrayKlassKlass.hpp 2010-11-16 18:09:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CI_CITYPEARRAYKLASSKLASS_HPP +#define SHARE_VM_CI_CITYPEARRAYKLASSKLASS_HPP + +#include "ci/ciArrayKlassKlass.hpp" + // ciTypeArrayKlassKlass // // This class represents a klassOop in the HotSpot virtual machine @@ -49,3 +54,5 @@ // Return the distinguished ciTypeArrayKlassKlass instance. static ciTypeArrayKlassKlass* make(); }; + +#endif // SHARE_VM_CI_CITYPEARRAYKLASSKLASS_HPP --- old/src/share/vm/ci/ciTypeFlow.cpp 2010-11-16 18:09:16.000000000 +0100 +++ new/src/share/vm/ci/ciTypeFlow.cpp 2010-11-16 18:09:15.000000000 +0100 @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciTypeFlow.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciField.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciMethodData.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciStreams.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "ci/ciTypeFlow.hpp" +#include "compiler/compileLog.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/allocation.inline.hpp" +#include "runtime/deoptimization.hpp" +#include "utilities/growableArray.hpp" // ciTypeFlow::JsrSet // --- old/src/share/vm/ci/ciTypeFlow.hpp 2010-11-16 18:09:17.000000000 +0100 +++ new/src/share/vm/ci/ciTypeFlow.hpp 2010-11-16 18:09:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_CI_CITYPEFLOW_HPP +#define SHARE_VM_CI_CITYPEFLOW_HPP + +#ifdef COMPILER2 +#include "ci/ciEnv.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciMethodBlocks.hpp" +#endif +#ifdef SHARK +#include "ci/ciEnv.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciMethodBlocks.hpp" +#endif + class ciTypeFlow : public ResourceObj { private: @@ -924,3 +938,5 @@ void rpo_print_on(outputStream* st) const PRODUCT_RETURN; }; + +#endif // SHARE_VM_CI_CITYPEFLOW_HPP --- old/src/share/vm/ci/ciUtilities.cpp 2010-11-16 18:09:18.000000000 +0100 +++ new/src/share/vm/ci/ciUtilities.cpp 2010-11-16 18:09:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_ciUtilities.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciUtilities.hpp" // ciUtilities // --- old/src/share/vm/ci/ciUtilities.hpp 2010-11-16 18:09:18.000000000 +0100 +++ new/src/share/vm/ci/ciUtilities.hpp 2010-11-16 18:09:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CI_CIUTILITIES_HPP +#define SHARE_VM_CI_CIUTILITIES_HPP + +#include "ci/ciEnv.hpp" +#include "runtime/interfaceSupport.hpp" + // The following routines and definitions are used internally in the // compiler interface. @@ -104,3 +110,5 @@ const char* basictype_to_str(BasicType t); const char basictype_to_char(BasicType t); + +#endif // SHARE_VM_CI_CIUTILITIES_HPP --- old/src/share/vm/ci/compilerInterface.hpp 2010-11-16 18:09:19.000000000 +0100 +++ new/src/share/vm/ci/compilerInterface.hpp 2010-11-16 18:09:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,5 +22,39 @@ * */ +#ifndef SHARE_VM_CI_COMPILERINTERFACE_HPP +#define SHARE_VM_CI_COMPILERINTERFACE_HPP + +#include "ci/ciArray.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciArrayKlassKlass.hpp" +#include "ci/ciCallProfile.hpp" +#include "ci/ciConstant.hpp" +#include "ci/ciEnv.hpp" +#include "ci/ciExceptionHandler.hpp" +#include "ci/ciField.hpp" +#include "ci/ciFlags.hpp" +#include "ci/ciInstance.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciInstanceKlassKlass.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciKlassKlass.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciMethodKlass.hpp" +#include "ci/ciNullObject.hpp" +#include "ci/ciObjArray.hpp" +#include "ci/ciObjArrayKlass.hpp" +#include "ci/ciObjArrayKlassKlass.hpp" +#include "ci/ciObject.hpp" +#include "ci/ciSignature.hpp" +#include "ci/ciStreams.hpp" +#include "ci/ciSymbol.hpp" +#include "ci/ciSymbolKlass.hpp" +#include "ci/ciTypeArray.hpp" +#include "ci/ciTypeArrayKlass.hpp" +#include "ci/ciTypeArrayKlassKlass.hpp" + // This is a dummy file used for including the complete // compiler interface. + +#endif // SHARE_VM_CI_COMPILERINTERFACE_HPP --- old/src/share/vm/classfile/classFileError.cpp 2010-11-16 18:09:20.000000000 +0100 +++ new/src/share/vm/classfile/classFileError.cpp 2010-11-16 18:09:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_classFileError.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classFileParser.hpp" +#include "classfile/stackMapTable.hpp" +#include "classfile/verifier.hpp" // Keep these in a separate file to prevent inlining --- old/src/share/vm/classfile/classFileParser.cpp 2010-11-16 18:09:21.000000000 +0100 +++ new/src/share/vm/classfile/classFileParser.cpp 2010-11-16 18:09:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,34 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_classFileParser.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classFileParser.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/verificationType.hpp" +#include "classfile/verifier.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/allocation.hpp" +#include "memory/gcLocker.hpp" +#include "memory/oopFactory.hpp" +#include "memory/universe.inline.hpp" +#include "oops/constantPoolOop.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klass.inline.hpp" +#include "oops/klassOop.hpp" +#include "oops/klassVtable.hpp" +#include "oops/methodOop.hpp" +#include "oops/symbolOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/perfData.hpp" +#include "runtime/reflection.hpp" +#include "runtime/signature.hpp" +#include "runtime/timer.hpp" +#include "services/classLoadingService.hpp" +#include "services/threadService.hpp" // We generally try to create the oops directly when parsing, rather than // allocating temporary data structures and copying the bytes twice. A --- old/src/share/vm/classfile/classFileParser.hpp 2010-11-16 18:09:22.000000000 +0100 +++ new/src/share/vm/classfile/classFileParser.hpp 2010-11-16 18:09:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP +#define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP + +#include "classfile/classFileStream.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "oops/typeArrayOop.hpp" +#include "runtime/handles.inline.hpp" +#include "utilities/accessFlags.hpp" + // Parser for for .class files // // The bytes describing the class file structure is read from a Stream object @@ -283,3 +293,5 @@ static void check_final_method_override(instanceKlassHandle this_klass, TRAPS); static void check_illegal_static_method(instanceKlassHandle this_klass, TRAPS); }; + +#endif // SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP --- old/src/share/vm/classfile/classFileStream.cpp 2010-11-16 18:09:23.000000000 +0100 +++ new/src/share/vm/classfile/classFileStream.cpp 2010-11-16 18:09:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_classFileStream.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classFileStream.hpp" +#include "classfile/vmSymbols.hpp" void ClassFileStream::truncated_file_error(TRAPS) { THROW_MSG(vmSymbols::java_lang_ClassFormatError(), "Truncated class file"); --- old/src/share/vm/classfile/classFileStream.hpp 2010-11-16 18:09:24.000000000 +0100 +++ new/src/share/vm/classfile/classFileStream.hpp 2010-11-16 18:09:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP +#define SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP + +#include "utilities/top.hpp" +#ifdef TARGET_ARCH_x86 +# include "bytes_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytes_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytes_zero.hpp" +#endif + // Input stream for reading .class file // // The entire input stream is present in a buffer allocated by the caller. @@ -116,3 +130,5 @@ // Tells whether eos is reached bool at_eos() const { return _current == _buffer_end; } }; + +#endif // SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP --- old/src/share/vm/classfile/classLoader.cpp 2010-11-16 18:09:25.000000000 +0100 +++ new/src/share/vm/classfile/classLoader.cpp 2010-11-16 18:09:24.000000000 +0100 @@ -22,8 +22,56 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_classLoader.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classFileParser.hpp" +#include "classfile/classFileStream.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "compiler/compileBroker.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/bytecodeStream.hpp" +#include "interpreter/oopMapCache.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/generation.hpp" +#include "memory/oopFactory.hpp" +#include "memory/universe.inline.hpp" +#include "oops/constantPoolKlass.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/instanceRefKlass.hpp" +#include "oops/oop.inline.hpp" +#include "oops/symbolOop.hpp" +#include "prims/jvm_misc.hpp" +#include "runtime/arguments.hpp" +#include "runtime/compilationPolicy.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/handles.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/init.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/timer.hpp" +#include "services/management.hpp" +#include "services/threadService.hpp" +#include "utilities/events.hpp" +#include "utilities/hashtable.hpp" +#include "utilities/hashtable.inline.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "hpi_linux.hpp" +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "hpi_solaris.hpp" +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "hpi_windows.hpp" +# include "os_windows.inline.hpp" +#endif // Entry points in zip.dll for loading zip/jar file entries --- old/src/share/vm/classfile/classLoader.hpp 2010-11-16 18:09:25.000000000 +0100 +++ new/src/share/vm/classfile/classLoader.hpp 2010-11-16 18:09:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_HPP +#define SHARE_VM_CLASSFILE_CLASSLOADER_HPP + +#include "classfile/classFileParser.hpp" +#include "runtime/perfData.hpp" + // The VM class loader. #include @@ -456,3 +462,5 @@ } }; + +#endif // SHARE_VM_CLASSFILE_CLASSLOADER_HPP --- old/src/share/vm/classfile/dictionary.cpp 2010-11-16 18:09:26.000000000 +0100 +++ new/src/share/vm/classfile/dictionary.cpp 2010-11-16 18:09:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dictionary.cpp.incl" +#include "precompiled.hpp" +#include "classfile/dictionary.hpp" +#include "classfile/systemDictionary.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "services/classLoadingService.hpp" +#include "utilities/hashtable.inline.hpp" DictionaryEntry* Dictionary::_current_class_entry = NULL; --- old/src/share/vm/classfile/dictionary.hpp 2010-11-16 18:09:27.000000000 +0100 +++ new/src/share/vm/classfile/dictionary.hpp 2010-11-16 18:09:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CLASSFILE_DICTIONARY_HPP +#define SHARE_VM_CLASSFILE_DICTIONARY_HPP + +#include "classfile/systemDictionary.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/oop.hpp" +#include "utilities/hashtable.hpp" + class DictionaryEntry; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -336,3 +344,5 @@ void verify(); }; + +#endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP --- old/src/share/vm/classfile/javaAssertions.cpp 2010-11-16 18:09:28.000000000 +0100 +++ new/src/share/vm/classfile/javaAssertions.cpp 2010-11-16 18:09:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_javaAssertions.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaAssertions.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/oopFactory.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" bool JavaAssertions::_userDefault = false; bool JavaAssertions::_sysDefault = false; --- old/src/share/vm/classfile/javaAssertions.hpp 2010-11-16 18:09:29.000000000 +0100 +++ new/src/share/vm/classfile/javaAssertions.hpp 2010-11-16 18:09:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP +#define SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP + +#include "oops/objArrayOop.hpp" +#include "oops/typeArrayOop.hpp" +#include "utilities/exceptions.hpp" +#include "utilities/ostream.hpp" + class JavaAssertions: AllStatic { public: static inline bool userClassDefault(); @@ -95,3 +103,5 @@ tty->print_cr("JavaAssertions::setSystemClassDefault(%d)", enabled); _sysDefault = enabled; } + +#endif // SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP --- old/src/share/vm/classfile/javaClasses.cpp 2010-11-16 18:09:30.000000000 +0100 +++ new/src/share/vm/classfile/javaClasses.cpp 2010-11-16 18:09:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,39 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_javaClasses.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/debugInfo.hpp" +#include "code/pcDesc.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "memory/universe.inline.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klass.hpp" +#include "oops/klassOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/symbolOop.hpp" +#include "oops/typeArrayOop.hpp" +#include "runtime/fieldDescriptor.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vframe.hpp" +#include "utilities/preserveException.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif static bool find_field(instanceKlass* ik, symbolOop name_symbol, symbolOop signature_symbol, --- old/src/share/vm/classfile/javaClasses.hpp 2010-11-16 18:09:31.000000000 +0100 +++ new/src/share/vm/classfile/javaClasses.hpp 2010-11-16 18:09:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_HPP +#define SHARE_VM_CLASSFILE_JAVACLASSES_HPP + +#include "classfile/systemDictionary.hpp" +#include "jvmtifiles/jvmti.h" +#include "oops/oop.hpp" +#include "runtime/os.hpp" +#include "utilities/utf8.hpp" + // Interface for manipulating the basic Java classes. // // All dependencies on layout of actual Java classes should be kept here. @@ -1271,3 +1280,5 @@ static void compute_offsets(); static void check_offsets() PRODUCT_RETURN; }; + +#endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP --- old/src/share/vm/classfile/loaderConstraints.cpp 2010-11-16 18:09:32.000000000 +0100 +++ new/src/share/vm/classfile/loaderConstraints.cpp 2010-11-16 18:09:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_loaderConstraints.cpp.incl" +#include "precompiled.hpp" +#include "classfile/loaderConstraints.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/safepoint.hpp" +#include "utilities/hashtable.inline.hpp" LoaderConstraintTable::LoaderConstraintTable(int nof_buckets) : Hashtable(nof_buckets, sizeof(LoaderConstraintEntry)) {}; --- old/src/share/vm/classfile/loaderConstraints.hpp 2010-11-16 18:09:32.000000000 +0100 +++ new/src/share/vm/classfile/loaderConstraints.hpp 2010-11-16 18:09:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP +#define SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP + +#include "classfile/dictionary.hpp" +#include "classfile/placeholders.hpp" +#include "utilities/hashtable.hpp" + class LoaderConstraintEntry; class LoaderConstraintTable : public Hashtable { @@ -130,3 +137,5 @@ void set_loader(int i, oop p) { _loaders[i] = p; } }; + +#endif // SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP --- old/src/share/vm/classfile/placeholders.cpp 2010-11-16 18:09:33.000000000 +0100 +++ new/src/share/vm/classfile/placeholders.cpp 2010-11-16 18:09:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_placeholders.cpp.incl" +#include "precompiled.hpp" +#include "classfile/placeholders.hpp" +#include "classfile/systemDictionary.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/fieldType.hpp" +#include "utilities/hashtable.inline.hpp" // Placeholder methods --- old/src/share/vm/classfile/placeholders.hpp 2010-11-16 18:09:34.000000000 +0100 +++ new/src/share/vm/classfile/placeholders.hpp 2010-11-16 18:09:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP +#define SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP + +#include "utilities/hashtable.hpp" + class PlaceholderEntry; // Placeholder objects. These represent classes currently @@ -329,3 +334,5 @@ void print() const PRODUCT_RETURN; void verify() const; }; + +#endif // SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP --- old/src/share/vm/classfile/resolutionErrors.cpp 2010-11-16 18:09:35.000000000 +0100 +++ new/src/share/vm/classfile/resolutionErrors.cpp 2010-11-16 18:09:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_resolutionErrors.cpp.incl" +#include "precompiled.hpp" +#include "classfile/resolutionErrors.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/safepoint.hpp" +#include "utilities/hashtable.inline.hpp" // add new entry to the table void ResolutionErrorTable::add_entry(int index, unsigned int hash, --- old/src/share/vm/classfile/resolutionErrors.hpp 2010-11-16 18:09:36.000000000 +0100 +++ new/src/share/vm/classfile/resolutionErrors.hpp 2010-11-16 18:09:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP +#define SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP + +#include "oops/constantPoolOop.hpp" +#include "utilities/hashtable.hpp" + class ResolutionErrorEntry; // ResolutionError objects are used to record errors encountered during @@ -97,3 +103,5 @@ // GC support void oops_do(OopClosure* blk); }; + +#endif // SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP --- old/src/share/vm/classfile/stackMapFrame.cpp 2010-11-16 18:09:37.000000000 +0100 +++ new/src/share/vm/classfile/stackMapFrame.cpp 2010-11-16 18:09:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_stackMapFrame.cpp.incl" +#include "precompiled.hpp" +#include "classfile/stackMapFrame.hpp" +#include "classfile/verifier.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/handles.inline.hpp" +#include "utilities/globalDefinitions.hpp" StackMapFrame::StackMapFrame(u2 max_locals, u2 max_stack, ClassVerifier* v) : _offset(0), _locals_size(0), _stack_size(0), _flags(0), --- old/src/share/vm/classfile/stackMapFrame.hpp 2010-11-16 18:09:38.000000000 +0100 +++ new/src/share/vm/classfile/stackMapFrame.hpp 2010-11-16 18:09:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP +#define SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP + +#include "classfile/verificationType.hpp" +#include "classfile/verifier.hpp" +#include "oops/methodOop.hpp" +#include "runtime/handles.hpp" +#include "runtime/signature.hpp" +#include "utilities/exceptions.hpp" + // A StackMapFrame represents one frame in the stack map attribute. enum { @@ -224,3 +234,5 @@ // Debugging void print() const PRODUCT_RETURN; }; + +#endif // SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP --- old/src/share/vm/classfile/stackMapTable.cpp 2010-11-16 18:09:38.000000000 +0100 +++ new/src/share/vm/classfile/stackMapTable.cpp 2010-11-16 18:09:38.000000000 +0100 @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_stackMapTable.cpp.incl" +#include "precompiled.hpp" +#include "classfile/stackMapTable.hpp" +#include "classfile/verifier.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/fieldType.hpp" +#include "runtime/handles.inline.hpp" StackMapTable::StackMapTable(StackMapReader* reader, StackMapFrame* init_frame, u2 max_locals, u2 max_stack, --- old/src/share/vm/classfile/stackMapTable.hpp 2010-11-16 18:09:39.000000000 +0100 +++ new/src/share/vm/classfile/stackMapTable.hpp 2010-11-16 18:09:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,24 @@ * */ +#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP +#define SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP + +#include "classfile/stackMapFrame.hpp" +#include "memory/allocation.hpp" +#include "oops/constantPoolOop.hpp" +#include "oops/methodOop.hpp" +#include "utilities/globalDefinitions.hpp" +#ifdef TARGET_ARCH_x86 +# include "bytes_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytes_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytes_zero.hpp" +#endif + class StackMapReader; // StackMapTable class is the StackMap table used by type checker @@ -159,3 +177,5 @@ } } }; + +#endif // SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP --- old/src/share/vm/classfile/stackMapTableFormat.hpp 2010-11-16 18:09:40.000000000 +0100 +++ new/src/share/vm/classfile/stackMapTableFormat.hpp 2010-11-16 18:09:40.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP +#define SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP + +#include "classfile/verificationType.hpp" + // These classes represent the stack-map substructures described in the JVMS // (hence the non-conforming naming scheme). @@ -914,3 +919,5 @@ Bytes::put_Java_u2(number_of_entries_addr(), num); } }; + +#endif // SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP --- old/src/share/vm/classfile/symbolTable.cpp 2010-11-16 18:09:41.000000000 +0100 +++ new/src/share/vm/classfile/symbolTable.cpp 2010-11-16 18:09:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,18 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_symbolTable.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "memory/filemap.hpp" +#include "memory/gcLocker.inline.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "oops/symbolKlass.hpp" +#include "runtime/mutexLocker.hpp" +#include "utilities/hashtable.inline.hpp" // -------------------------------------------------------------------------- --- old/src/share/vm/classfile/symbolTable.hpp 2010-11-16 18:09:42.000000000 +0100 +++ new/src/share/vm/classfile/symbolTable.hpp 2010-11-16 18:09:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP +#define SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP + +#include "memory/allocation.inline.hpp" +#include "oops/symbolOop.hpp" +#include "utilities/hashtable.hpp" + // The symbol table holds all symbolOops and corresponding interned strings. // symbolOops and literal strings should be canonicalized. // @@ -222,3 +229,5 @@ ((BasicHashtable*)the_table())->reverse(); } }; + +#endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP --- old/src/share/vm/classfile/systemDictionary.cpp 2010-11-16 18:09:43.000000000 +0100 +++ new/src/share/vm/classfile/systemDictionary.cpp 2010-11-16 18:09:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,37 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_systemDictionary.cpp.incl" +#include "precompiled.hpp" +#include "classfile/dictionary.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/loaderConstraints.hpp" +#include "classfile/placeholders.hpp" +#include "classfile/resolutionErrors.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "interpreter/bytecodeStream.hpp" +#include "interpreter/interpreter.hpp" +#include "memory/gcLocker.hpp" +#include "memory/oopFactory.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/instanceRefKlass.hpp" +#include "oops/klass.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "oops/typeArrayKlass.hpp" +#include "prims/jvmtiEnvBase.hpp" +#include "prims/methodHandles.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/fieldType.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/signature.hpp" +#include "services/classLoadingService.hpp" +#include "services/threadService.hpp" Dictionary* SystemDictionary::_dictionary = NULL; --- old/src/share/vm/classfile/systemDictionary.hpp 2010-11-16 18:09:44.000000000 +0100 +++ new/src/share/vm/classfile/systemDictionary.hpp 2010-11-16 18:09:43.000000000 +0100 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP +#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP + +#include "classfile/classFileStream.hpp" +#include "classfile/classLoader.hpp" +#include "oops/objArrayOop.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/java.hpp" +#include "runtime/reflectionUtils.hpp" +#include "utilities/hashtable.hpp" + // The system dictionary stores all loaded classes and maps: // // [class name,class loader] -> class i.e. [symbolOop,oop] -> klassOop @@ -671,3 +682,5 @@ static KlassHandle box_klass(BasicType t); }; + +#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP --- old/src/share/vm/classfile/verificationType.cpp 2010-11-16 18:09:45.000000000 +0100 +++ new/src/share/vm/classfile/verificationType.cpp 2010-11-16 18:09:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_verificationType.cpp.incl" +#include "precompiled.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/verificationType.hpp" VerificationType VerificationType::from_tag(u1 tag) { switch (tag) { --- old/src/share/vm/classfile/verificationType.hpp 2010-11-16 18:09:45.000000000 +0100 +++ new/src/share/vm/classfile/verificationType.hpp 2010-11-16 18:09:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP +#define SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP + +#include "classfile/systemDictionary.hpp" +#include "memory/allocation.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/oop.inline.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/handles.hpp" +#include "runtime/signature.hpp" + enum { // As specifed in the JVM spec ITEM_Top = 0, @@ -303,3 +314,5 @@ bool is_reference_assignable_from( const VerificationType&, instanceKlassHandle, TRAPS) const; }; + +#endif // SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP --- old/src/share/vm/classfile/verifier.cpp 2010-11-16 18:09:46.000000000 +0100 +++ new/src/share/vm/classfile/verifier.cpp 2010-11-16 18:09:46.000000000 +0100 @@ -22,8 +22,36 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_verifier.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classFileStream.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/stackMapTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/verifier.hpp" +#include "classfile/vmSymbols.hpp" +#include "interpreter/bytecodeStream.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/oop.inline.hpp" +#include "oops/typeArrayOop.hpp" +#include "prims/jvm.h" +#include "runtime/fieldDescriptor.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/orderAccess.hpp" +#include "runtime/os.hpp" +#ifdef TARGET_ARCH_x86 +# include "bytes_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytes_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytes_zero.hpp" +#endif #define NOFAILOVER_MAJOR_VERSION 51 --- old/src/share/vm/classfile/verifier.hpp 2010-11-16 18:09:47.000000000 +0100 +++ new/src/share/vm/classfile/verifier.hpp 2010-11-16 18:09:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_CLASSFILE_VERIFIER_HPP +#define SHARE_VM_CLASSFILE_VERIFIER_HPP + +#include "classfile/verificationType.hpp" +#include "memory/gcLocker.hpp" +#include "oops/klass.hpp" +#include "oops/methodOop.hpp" +#include "runtime/handles.hpp" +#include "utilities/exceptions.hpp" + // The verifier class class Verifier : AllStatic { public: @@ -254,3 +264,5 @@ return 1; } } + +#endif // SHARE_VM_CLASSFILE_VERIFIER_HPP --- old/src/share/vm/classfile/vmSymbols.cpp 2010-11-16 18:09:48.000000000 +0100 +++ new/src/share/vm/classfile/vmSymbols.cpp 2010-11-16 18:09:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vmSymbols.cpp.incl" +#include "precompiled.hpp" +#include "classfile/vmSymbols.hpp" +#include "memory/oopFactory.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "utilities/xmlstream.hpp" symbolOop vmSymbols::_symbols[vmSymbols::SID_LIMIT]; --- old/src/share/vm/classfile/vmSymbols.hpp 2010-11-16 18:09:49.000000000 +0100 +++ new/src/share/vm/classfile/vmSymbols.hpp 2010-11-16 18:09:49.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP +#define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP + +#include "oops/symbolOop.hpp" + // The classes vmSymbols and vmSymbolHandles are a name spaces for fast lookup of // symbols commonly used in the VM. The first class return a symbolOop, while the // second class returns a SymbolHandle. The underlying data structure is shared @@ -1112,3 +1117,5 @@ // Raw conversion: static ID for_raw_conversion(BasicType src, BasicType dest); }; + +#endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP --- old/src/share/vm/code/codeBlob.cpp 2010-11-16 18:09:50.000000000 +0100 +++ new/src/share/vm/code/codeBlob.cpp 2010-11-16 18:09:50.000000000 +0100 @@ -22,8 +22,35 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_codeBlob.cpp.incl" +#include "precompiled.hpp" +#include "code/codeBlob.hpp" +#include "code/codeCache.hpp" +#include "code/relocInfo.hpp" +#include "compiler/disassembler.hpp" +#include "interpreter/bytecode.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/heap.hpp" +#include "oops/oop.inline.hpp" +#include "prims/forte.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/vframe.hpp" +#include "services/memoryService.hpp" +#ifdef TARGET_ARCH_x86 +# include "nativeInst_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "nativeInst_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "nativeInst_zero.hpp" +#endif +#ifdef COMPILER1 +#include "c1/c1_Runtime1.hpp" +#endif unsigned int align_code_offset(int offset) { // align the size to CodeEntryAlignment --- old/src/share/vm/code/codeBlob.hpp 2010-11-16 18:09:51.000000000 +0100 +++ new/src/share/vm/code/codeBlob.hpp 2010-11-16 18:09:50.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CODE_CODEBLOB_HPP +#define SHARE_VM_CODE_CODEBLOB_HPP + +#include "asm/codeBuffer.hpp" +#include "compiler/oopMap.hpp" +#include "runtime/frame.hpp" +#include "runtime/handles.hpp" + // CodeBlob - superclass for all entries in the CodeCache. // // Suptypes are: @@ -499,3 +507,5 @@ // Typing bool is_safepoint_stub() const { return true; } }; + +#endif // SHARE_VM_CODE_CODEBLOB_HPP --- old/src/share/vm/code/codeCache.cpp 2010-11-16 18:09:52.000000000 +0100 +++ new/src/share/vm/code/codeCache.cpp 2010-11-16 18:09:51.000000000 +0100 @@ -22,8 +22,26 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_codeCache.cpp.incl" +#include "precompiled.hpp" +#include "code/codeBlob.hpp" +#include "code/codeCache.hpp" +#include "code/dependencies.hpp" +#include "code/nmethod.hpp" +#include "code/pcDesc.hpp" +#include "gc_implementation/shared/markSweep.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/gcLocker.hpp" +#include "memory/iterator.hpp" +#include "memory/resourceArea.hpp" +#include "oops/methodOop.hpp" +#include "oops/objArrayOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/icache.hpp" +#include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" +#include "services/memoryService.hpp" +#include "utilities/xmlstream.hpp" // Helper class for printing in CodeCache --- old/src/share/vm/code/codeCache.hpp 2010-11-16 18:09:52.000000000 +0100 +++ new/src/share/vm/code/codeCache.hpp 2010-11-16 18:09:52.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_CODE_CODECACHE_HPP +#define SHARE_VM_CODE_CODECACHE_HPP + +#include "code/codeBlob.hpp" +#include "memory/allocation.hpp" +#include "memory/heap.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/oopsHierarchy.hpp" + // The CodeCache implements the code cache for various pieces of generated // code, e.g., compiled java methods, runtime stubs, transition frames, etc. // The entries in the CodeCache are all CodeBlob's. @@ -172,3 +181,5 @@ // tells how many nmethods have dependencies static int number_of_nmethods_with_dependencies(); }; + +#endif // SHARE_VM_CODE_CODECACHE_HPP --- old/src/share/vm/code/compiledIC.cpp 2010-11-16 18:09:53.000000000 +0100 +++ new/src/share/vm/code/compiledIC.cpp 2010-11-16 18:09:53.000000000 +0100 @@ -22,8 +22,23 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compiledIC.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "code/compiledIC.hpp" +#include "code/icBuffer.hpp" +#include "code/nmethod.hpp" +#include "code/vtableStubs.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/oopFactory.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/icache.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/stubRoutines.hpp" +#include "utilities/events.hpp" // Every time a compiled IC is changed or its type is being accessed, --- old/src/share/vm/code/compiledIC.hpp 2010-11-16 18:09:54.000000000 +0100 +++ new/src/share/vm/code/compiledIC.hpp 2010-11-16 18:09:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,23 @@ * */ +#ifndef SHARE_VM_CODE_COMPILEDIC_HPP +#define SHARE_VM_CODE_COMPILEDIC_HPP + +#include "interpreter/linkResolver.hpp" +#include "oops/compiledICHolderKlass.hpp" +#include "oops/compiledICHolderOop.hpp" +#include "oops/klassOop.hpp" +#ifdef TARGET_ARCH_x86 +# include "nativeInst_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "nativeInst_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "nativeInst_zero.hpp" +#endif + //----------------------------------------------------------------------------- // The CompiledIC represents a compiled inline cache. // @@ -239,3 +256,5 @@ inline CompiledStaticCall* compiledStaticCall_at(Relocation* call_site) { return compiledStaticCall_at(call_site->addr()); } + +#endif // SHARE_VM_CODE_COMPILEDIC_HPP --- old/src/share/vm/code/compressedStream.cpp 2010-11-16 18:09:55.000000000 +0100 +++ new/src/share/vm/code/compressedStream.cpp 2010-11-16 18:09:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compressedStream.cpp.incl" +#include "precompiled.hpp" +#include "code/compressedStream.hpp" +#include "utilities/ostream.hpp" // 32-bit one-to-one sign encoding taken from Pack200 // converts leading sign bits into leading zeroes with trailing sign bit --- old/src/share/vm/code/compressedStream.hpp 2010-11-16 18:09:56.000000000 +0100 +++ new/src/share/vm/code/compressedStream.hpp 2010-11-16 18:09:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CODE_COMPRESSEDSTREAM_HPP +#define SHARE_VM_CODE_COMPRESSEDSTREAM_HPP + +#include "memory/allocation.hpp" + // Simple interface for filing out and filing in basic types // Used for writing out and reading in debugging information. @@ -118,3 +123,5 @@ void write_double(jdouble value); // write_int(reverse_int()) void write_long(jlong value); // write_signed_int() }; + +#endif // SHARE_VM_CODE_COMPRESSEDSTREAM_HPP --- old/src/share/vm/code/debugInfo.cpp 2010-11-16 18:09:57.000000000 +0100 +++ new/src/share/vm/code/debugInfo.cpp 2010-11-16 18:09:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_debugInfo.cpp.incl" +#include "precompiled.hpp" +#include "code/debugInfo.hpp" +#include "code/debugInfoRec.hpp" +#include "code/nmethod.hpp" +#include "runtime/handles.inline.hpp" // Comstructors --- old/src/share/vm/code/debugInfo.hpp 2010-11-16 18:09:58.000000000 +0100 +++ new/src/share/vm/code/debugInfo.hpp 2010-11-16 18:09:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_CODE_DEBUGINFO_HPP +#define SHARE_VM_CODE_DEBUGINFO_HPP + +#include "code/compressedStream.hpp" +#include "code/location.hpp" +#include "code/nmethod.hpp" +#include "code/oopRecorder.hpp" +#include "runtime/stackValue.hpp" +#include "utilities/growableArray.hpp" + // Classes used for serializing debugging information. // These abstractions are introducted to provide symmetric // read and write operations. @@ -270,3 +280,5 @@ void write_handle(jobject h); void write_bci(int bci) { write_int(bci - InvocationEntryBci); } }; + +#endif // SHARE_VM_CODE_DEBUGINFO_HPP --- old/src/share/vm/code/debugInfoRec.cpp 2010-11-16 18:09:59.000000000 +0100 +++ new/src/share/vm/code/debugInfoRec.cpp 2010-11-16 18:09:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_debugInfoRec.cpp.incl" +#include "precompiled.hpp" +#include "code/debugInfoRec.hpp" +#include "code/scopeDesc.hpp" +#include "prims/jvmtiExport.hpp" // Private definition. // There is one DIR_Chunk for each scope and values array. --- old/src/share/vm/code/debugInfoRec.hpp 2010-11-16 18:09:59.000000000 +0100 +++ new/src/share/vm/code/debugInfoRec.hpp 2010-11-16 18:09:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,19 @@ * */ +#ifndef SHARE_VM_CODE_DEBUGINFOREC_HPP +#define SHARE_VM_CODE_DEBUGINFOREC_HPP + +#include "ci/ciClassList.hpp" +#include "ci/ciInstanceKlass.hpp" +#include "ci/ciMethod.hpp" +#include "code/debugInfo.hpp" +#include "code/location.hpp" +#include "code/pcDesc.hpp" +#include "compiler/oopMap.hpp" +#include "oops/oop.hpp" +#include "utilities/growableArray.hpp" + //** The DebugInformationRecorder collects debugging information // for a compiled method. // Debugging information is used for: @@ -183,3 +196,5 @@ public: enum { serialized_null = 0 }; }; + +#endif // SHARE_VM_CODE_DEBUGINFOREC_HPP --- old/src/share/vm/code/dependencies.cpp 2010-11-16 18:10:00.000000000 +0100 +++ new/src/share/vm/code/dependencies.cpp 2010-11-16 18:10:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dependencies.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciArrayKlass.hpp" +#include "ci/ciEnv.hpp" +#include "ci/ciKlass.hpp" +#include "ci/ciMethod.hpp" +#include "code/dependencies.hpp" +#include "compiler/compileLog.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "utilities/copy.hpp" #ifdef ASSERT --- old/src/share/vm/code/dependencies.hpp 2010-11-16 18:10:01.000000000 +0100 +++ new/src/share/vm/code/dependencies.hpp 2010-11-16 18:10:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CODE_DEPENDENCIES_HPP +#define SHARE_VM_CODE_DEPENDENCIES_HPP + +#include "ci/ciKlass.hpp" +#include "code/compressedStream.hpp" +#include "code/nmethod.hpp" +#include "utilities/growableArray.hpp" + //** Dependencies represent assertions (approximate invariants) within // the class hierarchy. An example is an assertion that a given // method is not overridden; another example is that a type has only @@ -550,3 +558,5 @@ void print(); }; + +#endif // SHARE_VM_CODE_DEPENDENCIES_HPP --- old/src/share/vm/code/exceptionHandlerTable.cpp 2010-11-16 18:10:02.000000000 +0100 +++ new/src/share/vm/code/exceptionHandlerTable.cpp 2010-11-16 18:10:02.000000000 +0100 @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_exceptionHandlerTable.cpp.incl" +#include "precompiled.hpp" +#include "code/exceptionHandlerTable.hpp" +#include "code/nmethod.hpp" +#include "memory/allocation.inline.hpp" void ExceptionHandlerTable::add_entry(HandlerTableEntry entry) { _nesting.check(); --- old/src/share/vm/code/exceptionHandlerTable.hpp 2010-11-16 18:10:03.000000000 +0100 +++ new/src/share/vm/code/exceptionHandlerTable.hpp 2010-11-16 18:10:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP +#define SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP + +#include "memory/allocation.hpp" +#include "oops/methodOop.hpp" + // A HandlerTableEntry describes an individual entry of a subtable // of ExceptionHandlerTable. An entry consists of a pair(bci, pco), // where bci is the exception handler bci, and pco is the pc offset @@ -154,3 +160,5 @@ void print(address base) const; void verify(nmethod *nm) const; }; + +#endif // SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP --- old/src/share/vm/code/icBuffer.cpp 2010-11-16 18:10:04.000000000 +0100 +++ new/src/share/vm/code/icBuffer.cpp 2010-11-16 18:10:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,30 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_icBuffer.cpp.incl" +#include "precompiled.hpp" +#include "code/compiledIC.hpp" +#include "code/icBuffer.hpp" +#include "code/nmethod.hpp" +#include "code/scopeDesc.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/resourceArea.hpp" +#include "memory/universe.inline.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.inline2.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +#endif DEF_STUB_INTERFACE(ICStub); --- old/src/share/vm/code/icBuffer.hpp 2010-11-16 18:10:05.000000000 +0100 +++ new/src/share/vm/code/icBuffer.hpp 2010-11-16 18:10:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CODE_ICBUFFER_HPP +#define SHARE_VM_CODE_ICBUFFER_HPP + +#include "code/stubs.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/allocation.hpp" + // // For CompiledIC's: // @@ -126,3 +133,5 @@ static address ic_destination_for(CompiledIC *ic); static oop cached_oop_for(CompiledIC *ic); }; + +#endif // SHARE_VM_CODE_ICBUFFER_HPP --- old/src/share/vm/code/location.cpp 2010-11-16 18:10:05.000000000 +0100 +++ new/src/share/vm/code/location.cpp 2010-11-16 18:10:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_location.cpp.incl" +#include "precompiled.hpp" +#include "code/debugInfo.hpp" +#include "code/location.hpp" void Location::print_on(outputStream* st) const { if(type() == invalid) { --- old/src/share/vm/code/location.hpp 2010-11-16 18:10:06.000000000 +0100 +++ new/src/share/vm/code/location.hpp 2010-11-16 18:10:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_CODE_LOCATION_HPP +#define SHARE_VM_CODE_LOCATION_HPP + +#include "asm/assembler.hpp" +#include "code/vmreg.hpp" +#include "memory/allocation.hpp" + // A Location describes a concrete machine variable location // (such as integer or floating point register or a stack-held // variable). Used when generating debug-information for nmethods. @@ -113,3 +120,5 @@ // check static bool legal_offset_in_bytes(int offset_in_bytes); }; + +#endif // SHARE_VM_CODE_LOCATION_HPP --- old/src/share/vm/code/nmethod.cpp 2010-11-16 18:10:07.000000000 +0100 +++ new/src/share/vm/code/nmethod.cpp 2010-11-16 18:10:07.000000000 +0100 @@ -22,8 +22,26 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_nmethod.cpp.incl" +#include "precompiled.hpp" +#include "code/codeCache.hpp" +#include "code/compiledIC.hpp" +#include "code/nmethod.hpp" +#include "code/scopeDesc.hpp" +#include "compiler/abstractCompiler.hpp" +#include "compiler/compileLog.hpp" +#include "compiler/compilerOracle.hpp" +#include "compiler/disassembler.hpp" +#include "interpreter/bytecode.hpp" +#include "oops/methodDataOop.hpp" +#include "prims/jvmtiRedefineClassesTrace.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/sweeper.hpp" +#include "utilities/dtrace.hpp" +#include "utilities/events.hpp" +#include "utilities/xmlstream.hpp" +#ifdef SHARK +#include "shark/sharkCompiler.hpp" +#endif #ifdef DTRACE_ENABLED --- old/src/share/vm/code/nmethod.hpp 2010-11-16 18:10:08.000000000 +0100 +++ new/src/share/vm/code/nmethod.hpp 2010-11-16 18:10:08.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CODE_NMETHOD_HPP +#define SHARE_VM_CODE_NMETHOD_HPP + +#include "code/codeBlob.hpp" +#include "code/pcDesc.hpp" + // This class is used internally by nmethods, to cache // exception/pc/handler information. @@ -704,3 +710,5 @@ lock_nmethod(_nm); } }; + +#endif // SHARE_VM_CODE_NMETHOD_HPP --- old/src/share/vm/code/oopRecorder.cpp 2010-11-16 18:10:09.000000000 +0100 +++ new/src/share/vm/code/oopRecorder.cpp 2010-11-16 18:10:09.000000000 +0100 @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_oopRecorder.cpp.incl" +#include "precompiled.hpp" +#include "code/oopRecorder.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/oop.inline.hpp" #ifdef ASSERT int OopRecorder::_find_index_calls = 0; --- old/src/share/vm/code/oopRecorder.hpp 2010-11-16 18:10:10.000000000 +0100 +++ new/src/share/vm/code/oopRecorder.hpp 2010-11-16 18:10:10.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CODE_OOPRECORDER_HPP +#define SHARE_VM_CODE_OOPRECORDER_HPP + +#include "runtime/handles.hpp" +#include "utilities/growableArray.hpp" + // Recording and retrieval of oop relocations in compiled code. class CodeBlob; @@ -134,3 +140,5 @@ static int _find_index_calls, _hit_indexes, _missed_indexes; #endif }; + +#endif // SHARE_VM_CODE_OOPRECORDER_HPP --- old/src/share/vm/code/pcDesc.cpp 2010-11-16 18:10:11.000000000 +0100 +++ new/src/share/vm/code/pcDesc.cpp 2010-11-16 18:10:10.000000000 +0100 @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_pcDesc.cpp.incl" +#include "precompiled.hpp" +#include "code/debugInfoRec.hpp" +#include "code/nmethod.hpp" +#include "code/pcDesc.hpp" +#include "code/scopeDesc.hpp" +#include "memory/resourceArea.hpp" PcDesc::PcDesc(int pc_offset, int scope_decode_offset, int obj_decode_offset) { assert(sizeof(PcDescFlags) <= 4, "occupies more than a word"); --- old/src/share/vm/code/pcDesc.hpp 2010-11-16 18:10:12.000000000 +0100 +++ new/src/share/vm/code/pcDesc.hpp 2010-11-16 18:10:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CODE_PCDESC_HPP +#define SHARE_VM_CODE_PCDESC_HPP + +#include "memory/allocation.hpp" + // PcDescs map a physical PC (given as offset from start of nmethod) to // the corresponding source scope and byte code index. @@ -86,3 +91,5 @@ void print(nmethod* code); bool verify(nmethod* code); }; + +#endif // SHARE_VM_CODE_PCDESC_HPP --- old/src/share/vm/code/relocInfo.cpp 2010-11-16 18:10:12.000000000 +0100 +++ new/src/share/vm/code/relocInfo.cpp 2010-11-16 18:10:12.000000000 +0100 @@ -22,8 +22,25 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_relocInfo.cpp.incl" +#include "precompiled.hpp" +#include "code/compiledIC.hpp" +#include "code/nmethod.hpp" +#include "code/relocInfo.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "utilities/copy.hpp" +#ifdef TARGET_ARCH_x86 +# include "assembler_x86.inline.hpp" +# include "nativeInst_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "assembler_sparc.inline.hpp" +# include "nativeInst_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "assembler_zero.inline.hpp" +# include "nativeInst_zero.hpp" +#endif const RelocationHolder RelocationHolder::none; // its type is relocInfo::none --- old/src/share/vm/code/relocInfo.hpp 2010-11-16 18:10:13.000000000 +0100 +++ new/src/share/vm/code/relocInfo.hpp 2010-11-16 18:10:13.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_CODE_RELOCINFO_HPP +#define SHARE_VM_CODE_RELOCINFO_HPP + +#include "memory/allocation.hpp" +#include "utilities/top.hpp" + // Types in this file: // relocInfo // One element of an array of halfwords encoding compressed relocations. @@ -415,7 +421,16 @@ static void remove_reloc_info_for_address(RelocIterator *itr, address pc, relocType old_type); // Machine dependent stuff - #include "incls/_relocInfo_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "relocInfo_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "relocInfo_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "relocInfo_zero.hpp" +#endif + protected: // Derived constant, based on format_width which is PD: @@ -1325,3 +1340,5 @@ ~PatchingRelocIterator() { postpass(); } }; + +#endif // SHARE_VM_CODE_RELOCINFO_HPP --- old/src/share/vm/code/scopeDesc.cpp 2010-11-16 18:10:14.000000000 +0100 +++ new/src/share/vm/code/scopeDesc.cpp 2010-11-16 18:10:14.000000000 +0100 @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_scopeDesc.cpp.incl" +#include "precompiled.hpp" +#include "code/debugInfoRec.hpp" +#include "code/pcDesc.hpp" +#include "code/scopeDesc.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop) { --- old/src/share/vm/code/scopeDesc.hpp 2010-11-16 18:10:15.000000000 +0100 +++ new/src/share/vm/code/scopeDesc.hpp 2010-11-16 18:10:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_CODE_SCOPEDESC_HPP +#define SHARE_VM_CODE_SCOPEDESC_HPP + +#include "code/debugInfo.hpp" +#include "code/pcDesc.hpp" +#include "oops/methodOop.hpp" +#include "utilities/growableArray.hpp" + // SimpleScopeDesc is used when all you need to extract from // a given pc,nmethod pair is a methodOop and a bci. This is // quite a bit faster than allocating a full ScopeDesc, but @@ -125,3 +133,5 @@ void print_value_on(outputStream* st) const; #endif }; + +#endif // SHARE_VM_CODE_SCOPEDESC_HPP --- old/src/share/vm/code/stubs.cpp 2010-11-16 18:10:16.000000000 +0100 +++ new/src/share/vm/code/stubs.cpp 2010-11-16 18:10:16.000000000 +0100 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_stubs.cpp.incl" +#include "precompiled.hpp" +#include "code/codeBlob.hpp" +#include "code/stubs.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/mutexLocker.hpp" // Implementation of StubQueue --- old/src/share/vm/code/stubs.hpp 2010-11-16 18:10:17.000000000 +0100 +++ new/src/share/vm/code/stubs.hpp 2010-11-16 18:10:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_CODE_STUBS_HPP +#define SHARE_VM_CODE_STUBS_HPP + +#include "memory/allocation.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif + // The classes in this file provide a simple framework for the // management of little pieces of machine code - or stubs - // created on the fly and frequently discarded. In this frame- @@ -206,3 +220,5 @@ void verify(); // verifies the stub queue void print(); // prints information about the stub queue }; + +#endif // SHARE_VM_CODE_STUBS_HPP --- old/src/share/vm/code/vmreg.cpp 2010-11-16 18:10:18.000000000 +0100 +++ new/src/share/vm/code/vmreg.cpp 2010-11-16 18:10:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vmreg.cpp.incl" +#include "precompiled.hpp" +#include "asm/assembler.hpp" +#include "code/vmreg.hpp" // First VMReg value that could refer to a stack slot VMReg VMRegImpl::stack0 = (VMReg)(intptr_t)((ConcreteRegisterImpl::number_of_registers + 1) & ~1); --- old/src/share/vm/code/vmreg.hpp 2010-11-16 18:10:19.000000000 +0100 +++ new/src/share/vm/code/vmreg.hpp 2010-11-16 18:10:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,37 @@ * */ +#ifndef SHARE_VM_CODE_VMREG_HPP +#define SHARE_VM_CODE_VMREG_HPP + +#include "memory/allocation.hpp" +#include "utilities/globalDefinitions.hpp" +#ifdef TARGET_ARCH_x86 +# include "register_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "register_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "register_zero.hpp" +#endif +#ifdef COMPILER2 +#include "opto/adlcVMDeps.hpp" +#include "utilities/ostream.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "adfiles/adGlobals_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "adfiles/adGlobals_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "adfiles/adGlobals_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "adfiles/adGlobals_zero.hpp" +#endif +#endif + //------------------------------VMReg------------------------------------------ // The VM uses 'unwarped' stack slots; the compiler uses 'warped' stack slots. // Register numbers below VMRegImpl::stack0 are the same for both. Register @@ -124,7 +155,16 @@ static void set_regName(); -#include "incls/_vmreg_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "vmreg_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "vmreg_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "vmreg_zero.hpp" +#endif + }; @@ -181,3 +221,5 @@ VMRegPair(VMReg f) { _second = VMRegImpl::Bad(); _first = f; } VMRegPair() { _second = VMRegImpl::Bad(); _first = VMRegImpl::Bad(); } }; + +#endif // SHARE_VM_CODE_VMREG_HPP --- old/src/share/vm/code/vtableStubs.cpp 2010-11-16 18:10:20.000000000 +0100 +++ new/src/share/vm/code/vtableStubs.cpp 2010-11-16 18:10:19.000000000 +0100 @@ -22,8 +22,22 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vtableStubs.cpp.incl" +#include "precompiled.hpp" +#include "code/vtableStubs.hpp" +#include "compiler/disassembler.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/klassVtable.hpp" +#include "oops/oop.inline.hpp" +#include "prims/forte.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/sharedRuntime.hpp" +#ifdef COMPILER2 +#include "opto/matcher.hpp" +#endif // ----------------------------------------------------------------------------------------- // Implementation of VtableStub --- old/src/share/vm/code/vtableStubs.hpp 2010-11-16 18:10:20.000000000 +0100 +++ new/src/share/vm/code/vtableStubs.hpp 2010-11-16 18:10:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_CODE_VTABLESTUBS_HPP +#define SHARE_VM_CODE_VTABLESTUBS_HPP + +#include "memory/allocation.hpp" + // A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables // There's a one-to-one relationship between a VtableStub and such a pair. @@ -121,3 +126,5 @@ static int number_of_vtable_stubs() { return _number_of_vtable_stubs; } static void initialize(); }; + +#endif // SHARE_VM_CODE_VTABLESTUBS_HPP --- old/src/share/vm/compiler/abstractCompiler.cpp 2010-11-16 18:10:21.000000000 +0100 +++ new/src/share/vm/compiler/abstractCompiler.cpp 2010-11-16 18:10:21.000000000 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -21,9 +21,10 @@ // questions. // -#include "incls/_precompiled.incl" -#include "incls/_abstractCompiler.cpp.incl" +#include "precompiled.hpp" +#include "compiler/abstractCompiler.hpp" +#include "runtime/mutexLocker.hpp" void AbstractCompiler::initialize_runtimes(initializer f, volatile int* state) { if (*state != initialized) { --- old/src/share/vm/compiler/abstractCompiler.hpp 2010-11-16 18:10:22.000000000 +0100 +++ new/src/share/vm/compiler/abstractCompiler.hpp 2010-11-16 18:10:22.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP +#define SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP + +#include "ci/compilerInterface.hpp" + typedef void (*initializer)(void); class AbstractCompiler : public CHeapObj { @@ -88,3 +93,5 @@ ShouldNotReachHere(); } }; + +#endif // SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP --- old/src/share/vm/compiler/compileBroker.cpp 2010-11-16 18:10:23.000000000 +0100 +++ new/src/share/vm/compiler/compileBroker.cpp 2010-11-16 18:10:23.000000000 +0100 @@ -22,8 +22,37 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compileBroker.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/codeCache.hpp" +#include "compiler/compileBroker.hpp" +#include "compiler/compileLog.hpp" +#include "compiler/compilerOracle.hpp" +#include "interpreter/linkResolver.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "prims/nativeLookup.hpp" +#include "runtime/arguments.hpp" +#include "runtime/compilationPolicy.hpp" +#include "runtime/init.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/os.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/sweeper.hpp" +#include "utilities/dtrace.hpp" +#ifdef COMPILER1 +#include "c1/c1_Compiler.hpp" +#endif +#ifdef COMPILER2 +#include "opto/c2compiler.hpp" +#endif +#ifdef SHARK +#include "shark/sharkCompiler.hpp" +#endif #ifdef DTRACE_ENABLED --- old/src/share/vm/compiler/compileBroker.hpp 2010-11-16 18:10:24.000000000 +0100 +++ new/src/share/vm/compiler/compileBroker.hpp 2010-11-16 18:10:24.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_COMPILER_COMPILEBROKER_HPP +#define SHARE_VM_COMPILER_COMPILEBROKER_HPP + +#include "ci/compilerInterface.hpp" +#include "compiler/abstractCompiler.hpp" +#include "runtime/perfData.hpp" + class nmethod; class nmethodLocker; @@ -380,3 +387,5 @@ static void print_compiler_threads_on(outputStream* st); }; + +#endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP --- old/src/share/vm/compiler/compileLog.cpp 2010-11-16 18:10:25.000000000 +0100 +++ new/src/share/vm/compiler/compileLog.cpp 2010-11-16 18:10:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compileLog.cpp.incl" +#include "precompiled.hpp" +#include "ci/ciMethod.hpp" +#include "compiler/compileLog.hpp" +#include "memory/allocation.inline.hpp" +#include "oops/methodOop.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/os.hpp" CompileLog* CompileLog::_first = NULL; --- old/src/share/vm/compiler/compileLog.hpp 2010-11-16 18:10:26.000000000 +0100 +++ new/src/share/vm/compiler/compileLog.hpp 2010-11-16 18:10:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_COMPILER_COMPILELOG_HPP +#define SHARE_VM_COMPILER_COMPILELOG_HPP + +#include "utilities/xmlstream.hpp" + class ciObject; class ciSymbol; @@ -75,3 +80,5 @@ static void finish_log(outputStream* out); static void finish_log_on_error(outputStream* out, char *buf, int buflen); }; + +#endif // SHARE_VM_COMPILER_COMPILELOG_HPP --- old/src/share/vm/compiler/compilerOracle.cpp 2010-11-16 18:10:27.000000000 +0100 +++ new/src/share/vm/compiler/compilerOracle.cpp 2010-11-16 18:10:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_compilerOracle.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compilerOracle.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/oopFactory.hpp" +#include "memory/resourceArea.hpp" +#include "oops/klass.hpp" +#include "oops/methodOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/symbolOop.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/jniHandles.hpp" class MethodMatcher : public CHeapObj { public: --- old/src/share/vm/compiler/compilerOracle.hpp 2010-11-16 18:10:27.000000000 +0100 +++ new/src/share/vm/compiler/compilerOracle.hpp 2010-11-16 18:10:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_COMPILER_COMPILERORACLE_HPP +#define SHARE_VM_COMPILER_COMPILERORACLE_HPP + +#include "memory/allocation.hpp" +#include "oops/oopsHierarchy.hpp" + // CompilerOracle is an interface for turning on and off compilation // for some methods @@ -66,3 +72,5 @@ static void append_comment_to_file(const char* message); static void append_exclude_to_file(methodHandle method); }; + +#endif // SHARE_VM_COMPILER_COMPILERORACLE_HPP --- old/src/share/vm/compiler/disassembler.cpp 2010-11-16 18:10:28.000000000 +0100 +++ new/src/share/vm/compiler/disassembler.cpp 2010-11-16 18:10:28.000000000 +0100 @@ -22,8 +22,29 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_disassembler.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "code/codeCache.hpp" +#include "compiler/disassembler.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/hpi.hpp" +#include "runtime/stubCodeGenerator.hpp" +#include "runtime/stubRoutines.hpp" +#ifdef TARGET_ARCH_x86 +# include "depChecker_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "depChecker_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "depChecker_zero.hpp" +#endif +#ifdef SHARK +#include "shark/sharkEntry.hpp" +#endif void* Disassembler::_library = NULL; bool Disassembler::_tried_to_load_library = false; --- old/src/share/vm/compiler/disassembler.hpp 2010-11-16 18:10:29.000000000 +0100 +++ new/src/share/vm/compiler/disassembler.hpp 2010-11-16 18:10:29.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,20 @@ * */ +#ifndef SHARE_VM_COMPILER_DISASSEMBLER_HPP +#define SHARE_VM_COMPILER_DISASSEMBLER_HPP + +#include "runtime/globals.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif + class decode_env; // The disassembler prints out assembly code annotated @@ -47,7 +61,16 @@ static bool load_library(); // Machine dependent stuff - #include "incls/_disassembler_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "disassembler_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "disassembler_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "disassembler_zero.hpp" +#endif + public: static bool can_decode() { @@ -57,3 +80,5 @@ static void decode(nmethod* nm, outputStream* st = NULL); static void decode(address begin, address end, outputStream* st = NULL); }; + +#endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP --- old/src/share/vm/compiler/methodLiveness.cpp 2010-11-16 18:10:30.000000000 +0100 +++ new/src/share/vm/compiler/methodLiveness.cpp 2010-11-16 18:10:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#include "precompiled.hpp" +#include "ci/ciMethod.hpp" +#include "ci/ciMethodBlocks.hpp" +#include "ci/ciStreams.hpp" +#include "compiler/methodLiveness.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/bytecodes.hpp" +#include "memory/allocation.inline.hpp" +#include "utilities/bitMap.inline.hpp" + // The MethodLiveness class performs a simple liveness analysis on a method // in order to decide which locals are live (that is, will be used again) at // a particular bytecode index (bci). @@ -60,9 +70,6 @@ // analysis. -# include "incls/_precompiled.incl" -# include "incls/_methodLiveness.cpp.incl" - //-------------------------------------------------------------------------- // The BitCounter class is used for counting the number of bits set in // some BitMap. It is only used when collecting liveness statistics. --- old/src/share/vm/compiler/methodLiveness.hpp 2010-11-16 18:10:31.000000000 +0100 +++ new/src/share/vm/compiler/methodLiveness.hpp 2010-11-16 18:10:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_COMPILER_METHODLIVENESS_HPP +#define SHARE_VM_COMPILER_METHODLIVENESS_HPP + +#include "utilities/bitMap.hpp" +#include "utilities/growableArray.hpp" + class ciMethod; class MethodLivenessResult : public BitMap { @@ -269,3 +275,5 @@ static void print_times() PRODUCT_RETURN; }; + +#endif // SHARE_VM_COMPILER_METHODLIVENESS_HPP --- old/src/share/vm/compiler/oopMap.cpp 2010-11-16 18:10:32.000000000 +0100 +++ new/src/share/vm/compiler/oopMap.cpp 2010-11-16 18:10:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_oopMap.cpp.incl" +#include "precompiled.hpp" +#include "code/codeBlob.hpp" +#include "code/codeCache.hpp" +#include "code/nmethod.hpp" +#include "code/scopeDesc.hpp" +#include "compiler/oopMap.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/signature.hpp" +#ifdef COMPILER1 +#include "c1/c1_Defs.hpp" +#endif // OopMapStream --- old/src/share/vm/compiler/oopMap.hpp 2010-11-16 18:10:33.000000000 +0100 +++ new/src/share/vm/compiler/oopMap.hpp 2010-11-16 18:10:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_COMPILER_OOPMAP_HPP +#define SHARE_VM_COMPILER_OOPMAP_HPP + +#include "code/compressedStream.hpp" +#include "code/vmreg.hpp" +#include "memory/allocation.hpp" +#include "utilities/growableArray.hpp" + // Interface for generating the frame map for compiled code. A frame map // describes for a specific pc whether each register and frame stack slot is: // Oop - A GC root for current frame @@ -315,3 +323,5 @@ } }; #endif // COMPILER2 + +#endif // SHARE_VM_COMPILER_OOPMAP_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp 2010-11-16 18:10:33.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp 2010-11-16 18:10:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_binaryTreeDictionary.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp" +#include "gc_implementation/shared/allocationStats.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/space.inline.hpp" +#include "runtime/globals.hpp" +#include "utilities/ostream.hpp" //////////////////////////////////////////////////////////////////////////////// // A binary tree based search structure for free blocks. --- old/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp 2010-11-16 18:10:34.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp 2010-11-16 18:10:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_BINARYTREEDICTIONARY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_BINARYTREEDICTIONARY_HPP + +#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp" +#include "gc_implementation/concurrentMarkSweep/freeList.hpp" + /* * A binary tree based search structure for free blocks. * This is currently used in the Concurrent Mark&Sweep implementation. @@ -286,3 +292,5 @@ void verify() const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_BINARYTREEDICTIONARY_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2010-11-16 18:10:35.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2010-11-16 18:10:35.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,9 +21,22 @@ * questions. * */ -#include "incls/_precompiled.incl" -#include "incls/_cmsAdaptiveSizePolicy.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" +#include "gc_implementation/shared/gcStats.hpp" +#include "memory/defNewGeneration.hpp" +#include "memory/genCollectedHeap.hpp" +#include "runtime/thread.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer; elapsedTimer CMSAdaptiveSizePolicy::_STW_timer; --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2010-11-16 18:10:36.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2010-11-16 18:10:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSADAPTIVESIZEPOLICY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSADAPTIVESIZEPOLICY_HPP + +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" +#include "runtime/timer.hpp" + // This class keeps statistical information and computes the // size of the heap for the concurrent mark sweep collector. // @@ -467,3 +473,5 @@ // Printing support virtual bool print_adaptive_size_policy_on(outputStream* st) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSADAPTIVESIZEPOLICY_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2010-11-16 18:10:37.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2010-11-16 18:10:37.000000000 +0100 @@ -22,8 +22,34 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_cmsCollectorPolicy.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp" +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "gc_implementation/shared/vmGCOperations.hpp" +#include "memory/cardTableRS.hpp" +#include "memory/collectorPolicy.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/generationSpec.hpp" +#include "memory/space.hpp" +#include "memory/universe.hpp" +#include "runtime/arguments.hpp" +#include "runtime/globals_extension.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" +#include "runtime/vmThread.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif // // ConcurrentMarkSweepPolicy methods --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp 2010-11-16 18:10:38.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp 2010-11-16 18:10:38.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP + +#include "memory/collectorPolicy.hpp" + class ConcurrentMarkSweepPolicy : public TwoGenerationCollectorPolicy { protected: void initialize_generations(); @@ -55,3 +60,5 @@ return CollectorPolicy::ASConcurrentMarkSweepPolicyKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSCOLLECTORPOLICY_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp 2010-11-16 18:10:39.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp 2010-11-16 18:10:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_cmsGCAdaptivePolicyCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp" +#include "memory/resourceArea.hpp" CMSGCAdaptivePolicyCounters::CMSGCAdaptivePolicyCounters(const char* name_arg, int collectors, --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp 2010-11-16 18:10:40.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp 2010-11-16 18:10:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSGCADAPTIVEPOLICYCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSGCADAPTIVEPOLICYCOUNTERS_HPP + +#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" +#include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp" +#include "gc_implementation/shared/gcStats.hpp" +#include "runtime/perfData.hpp" + // CMSGCAdaptivePolicyCounters is a holder class for performance counters // that track the data and decisions for the ergonomics policy for the // concurrent mark sweep collector @@ -298,3 +306,5 @@ return GCPolicyCounters::CMSGCAdaptivePolicyCountersKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSGCADAPTIVEPOLICYCOUNTERS_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp 2010-11-16 18:10:40.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp 2010-11-16 18:10:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_cmsLockVerifier.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "runtime/vmThread.hpp" ///////////// Locking verification specific to CMS ////////////// // Much like "assert_lock_strong()", except that it relaxes the --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp 2010-11-16 18:10:41.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp 2010-11-16 18:10:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP + +#include "runtime/mutex.hpp" + ///////////// Locking verification specific to CMS ////////////// // Much like "assert_lock_strong()", except // that it relaxes the assertion somewhat for the parallel GC case, where @@ -38,3 +43,5 @@ assert_locked(lock, NULL); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSLOCKVERIFIER_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2010-11-16 18:10:42.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2010-11-16 18:10:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP + +#include "memory/genOopClosures.hpp" + ///////////////////////////////////////////////////////////////// // Closures used by ConcurrentMarkSweepGeneration's collector ///////////////////////////////////////////////////////////////// @@ -427,3 +432,5 @@ inline void do_oop_nv(oop* p) { CMSParKeepAliveClosure::do_oop_work(p); } inline void do_oop_nv(narrowOop* p) { CMSParKeepAliveClosure::do_oop_work(p); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp 2010-11-16 18:10:43.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp 2010-11-16 18:10:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP + +#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" + // Trim our work_queue so its length is below max at return inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) { while (_work_queue->size() > max) { @@ -74,3 +80,5 @@ inline void Par_PushOrMarkClosure::do_yield_check() { _parent->do_yield_check(); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSOOPCLOSURES_INLINE_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp 2010-11-16 18:10:44.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp 2010-11-16 18:10:44.000000000 +0100 @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_cmsPermGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp" +#include "gc_implementation/shared/cSpaceCounters.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "memory/blockOffsetTable.inline.hpp" +#include "memory/compactPermGen.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/generation.inline.hpp" +#include "memory/permGen.hpp" +#include "memory/universe.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" CMSPermGen::CMSPermGen(ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct, --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp 2010-11-16 18:10:45.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp 2010-11-16 18:10:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSPERMGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSPERMGEN_HPP + +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "memory/permGen.hpp" + class CardTableRS; // fwd decl class ConcurrentMarkSweepGeneration; @@ -75,3 +81,5 @@ bool must_be_youngest() const { return false; } bool must_be_oldest() const { return false; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CMSPERMGEN_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2010-11-16 18:10:46.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp 2010-11-16 18:10:45.000000000 +0100 @@ -22,8 +22,25 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_compactibleFreeListSpace.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp" +#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "gc_implementation/shared/liveRange.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/blockOffsetTable.inline.hpp" +#include "memory/resourceArea.hpp" +#include "memory/universe.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/globals.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/init.hpp" +#include "runtime/java.hpp" +#include "runtime/vmThread.hpp" +#include "utilities/copy.hpp" ///////////////////////////////////////////////////////////////////////// //// CompactibleFreeListSpace --- old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp 2010-11-16 18:10:47.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp 2010-11-16 18:10:46.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP + +#include "gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp" +#include "gc_implementation/concurrentMarkSweep/freeList.hpp" +#include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp" +#include "memory/blockOffsetTable.inline.hpp" +#include "memory/space.hpp" + // Classes in support of keeping track of promotions into a non-Contiguous // space, in this case a CompactibleFreeListSpace. @@ -646,3 +655,5 @@ * CMSSpoolBlockSize); return CompactibleFreeListSpace::adjustObjectSize(sz); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_COMPACTIBLEFREELISTSPACE_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2010-11-16 18:10:47.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2010-11-16 18:10:47.000000000 +0100 @@ -22,8 +22,39 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_concurrentMarkSweepGeneration.cpp.incl" +#include "precompiled.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp" +#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp" +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/shared/collectorCounters.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "memory/cardTableRS.hpp" +#include "memory/collectorPolicy.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/genMarkSweep.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/iterator.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/globals_extension.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" +#include "runtime/vmThread.hpp" +#include "services/memoryService.hpp" +#include "services/runtimeService.hpp" // statics CMSCollector* ConcurrentMarkSweepGeneration::_collector = NULL; --- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2010-11-16 18:10:48.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2010-11-16 18:10:48.000000000 +0100 @@ -22,6 +22,22 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP + +#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp" +#include "gc_implementation/shared/gSpaceCounters.hpp" +#include "gc_implementation/shared/gcStats.hpp" +#include "gc_implementation/shared/generationCounters.hpp" +#include "memory/generation.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/virtualspace.hpp" +#include "services/memoryService.hpp" +#include "utilities/bitMap.inline.hpp" +#include "utilities/stack.inline.hpp" +#include "utilities/taskqueue.hpp" +#include "utilities/yieldingWorkgroup.hpp" + // ConcurrentMarkSweepGeneration is in support of a concurrent // mark-sweep old generation in the Detlefs-Printezis--Boehm-Demers-Schenker // style. We assume, for now, that this generation is always the @@ -1883,3 +1899,5 @@ TraceCMSMemoryManagerStats(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp 2010-11-16 18:10:49.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp 2010-11-16 18:10:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP + +#include "gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp" +#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "gc_implementation/shared/gcUtil.hpp" +#include "memory/defNewGeneration.hpp" + inline void CMSBitMap::clear_all() { assert_locked(); // CMS bitmaps are usually cover large memory regions @@ -505,3 +515,5 @@ CardTableModRefBS::card_size /* bytes */)); _t->par_mark_range(mr2); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp 2010-11-16 18:10:50.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp 2010-11-16 18:10:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_concurrentMarkSweepThread.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "memory/genCollectedHeap.hpp" +#include "oops/instanceRefKlass.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/init.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/os.hpp" +#include "runtime/vmThread.hpp" // ======= Concurrent Mark Sweep Thread ======== --- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2010-11-16 18:10:51.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2010-11-16 18:10:51.000000000 +0100 @@ -22,6 +22,21 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP + +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "gc_implementation/shared/concurrentGCThread.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif + class ConcurrentMarkSweepGeneration; class CMSCollector; @@ -249,3 +264,5 @@ } } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPTHREAD_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2010-11-16 18:10:52.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2010-11-16 18:10:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,17 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_freeBlockDictionary.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif #ifndef PRODUCT Mutex* FreeBlockDictionary::par_lock() const { --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp 2010-11-16 18:10:53.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp 2010-11-16 18:10:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREEBLOCKDICTIONARY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREEBLOCKDICTIONARY_HPP + +#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" +#include "memory/allocation.hpp" +#include "memory/memRegion.hpp" +#include "runtime/mutex.hpp" +#include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" +#include "utilities/ostream.hpp" + // A FreeBlockDictionary is an abstract superclass that will allow // a number of alternative implementations in the future. class FreeBlockDictionary: public CHeapObj { @@ -88,3 +99,5 @@ void set_par_lock(Mutex* lock) PRODUCT_RETURN; void verify_par_locked() const PRODUCT_RETURN; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREEBLOCKDICTIONARY_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp 2010-11-16 18:10:54.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp 2010-11-16 18:10:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_freeChunk.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp" +#include "utilities/copy.hpp" #ifndef PRODUCT --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp 2010-11-16 18:10:55.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp 2010-11-16 18:10:54.000000000 +0100 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP + +#include "memory/allocation.hpp" +#include "memory/memRegion.hpp" +#include "oops/markOop.hpp" +#include "runtime/mutex.hpp" +#include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" +#include "utilities/ostream.hpp" + // // Free block maintenance for Concurrent Mark Sweep Generation // @@ -141,3 +152,5 @@ extern size_t MinChunkSize; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREECHUNK_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp 2010-11-16 18:10:55.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp 2010-11-16 18:10:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_freeList.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp" +#include "gc_implementation/concurrentMarkSweep/freeList.hpp" +#include "memory/sharedHeap.hpp" +#include "runtime/globals.hpp" +#include "runtime/mutex.hpp" +#include "runtime/vmThread.hpp" // Free list. A FreeList is used to access a linked list of chunks // of space in the heap. The head and tail are maintained so that --- old/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp 2010-11-16 18:10:56.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp 2010-11-16 18:10:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREELIST_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREELIST_HPP + +#include "gc_implementation/shared/allocationStats.hpp" + class CompactibleFreeListSpace; // A class for maintaining a free list of FreeChunk's. The FreeList @@ -326,3 +331,5 @@ static void print_labels_on(outputStream* st, const char* c); void print_on(outputStream* st, const char* c = NULL) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_FREELIST_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp 2010-11-16 18:10:57.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp 2010-11-16 18:10:57.000000000 +0100 @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_promotionInfo.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp" +#include "gc_implementation/concurrentMarkSweep/promotionInfo.hpp" +#include "oops/markOop.inline.hpp" +#include "oops/oop.inline.hpp" ///////////////////////////////////////////////////////////////////////// //// PromotionInfo --- old/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp 2010-11-16 18:10:58.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp 2010-11-16 18:10:58.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP + +#include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" +#include "memory/allocation.hpp" + // Forward declarations class CompactibleFreeListSpace; @@ -204,3 +210,5 @@ void print_statistics(uint worker_id) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_PROMOTIONINFO_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2010-11-16 18:10:59.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2010-11-16 18:10:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,9 +21,15 @@ * questions. * */ -# include "incls/_precompiled.incl" -# include "incls/_vmCMSOperations.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" +#include "gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "memory/gcLocker.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "utilities/dtrace.hpp" HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin); HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end); --- old/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp 2010-11-16 18:11:00.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp 2010-11-16 18:10:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP + +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "gc_implementation/shared/vmGCOperations.hpp" +#include "gc_interface/gcCause.hpp" +#include "runtime/vm_operations.hpp" + // The VM_CMS_Operation is slightly different from // a VM_GC_Operation -- and would not have subclassed easily // to VM_GC_Operation without several changes to VM_GC_Operation. @@ -136,3 +144,5 @@ virtual bool is_cheap_allocated() const { return false; } virtual bool evaluate_at_safepoint() const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMCMSOPERATIONS_HPP --- old/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp 2010-11-16 18:11:01.000000000 +0100 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp 2010-11-16 18:11:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP + #define VM_STRUCTS_CMS(nonstatic_field, \ volatile_nonstatic_field, \ static_field) \ @@ -78,3 +81,5 @@ #define VM_INT_CONSTANTS_CMS(declare_constant) \ declare_constant(Generation::ConcurrentMarkSweep) \ declare_constant(PermGen::ConcurrentMarkSweep) + +#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP --- old/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp 2010-11-16 18:11:01.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp 2010-11-16 18:11:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP + +#include "memory/genOopClosures.hpp" +#include "memory/generation.hpp" +#include "runtime/os.hpp" +#include "utilities/taskqueue.hpp" + // A BufferingOops closure tries to separate out the cost of finding roots // from the cost of applying closures to them. It maintains an array of // ref-containing locations. Until the array is full, applying the closure @@ -201,3 +209,5 @@ _hr_curr(_hr_buffer), _closure_app_seconds(0.0) { } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_BUFFERINGOOPCLOSURE_HPP --- old/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp 2010-11-16 18:11:02.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp 2010-11-16 18:11:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_collectionSetChooser.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/collectionSetChooser.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "memory/space.inline.hpp" CSetChooserCache::CSetChooserCache() { for (int i = 0; i < CacheLength; ++i) --- old/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2010-11-16 18:11:03.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2010-11-16 18:11:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP + +#include "gc_implementation/g1/heapRegion.hpp" +#include "utilities/growableArray.hpp" + // We need to sort heap regions by collection desirability. class CSetChooserCache VALUE_OBJ_CLASS_SPEC { @@ -136,3 +142,5 @@ #endif }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_COLLECTIONSETCHOOSER_HPP --- old/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2010-11-16 18:11:04.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2010-11-16 18:11:04.000000000 +0100 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_concurrentG1Refine.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/concurrentG1RefineThread.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/g1RemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/space.inline.hpp" +#include "runtime/atomic.hpp" +#include "utilities/copy.hpp" // Possible sizes for the card counts cache: odd primes that roughly double in size. // (See jvmtiTagMap.cpp). --- old/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2010-11-16 18:11:05.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2010-11-16 18:11:05.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP + +#include "memory/allocation.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "runtime/thread.hpp" +#include "utilities/globalDefinitions.hpp" + // Forward decl class ConcurrentG1RefineThread; class G1RemSet; @@ -223,3 +231,5 @@ int thread_threshold_step() const { return _thread_threshold_step; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINE_HPP --- old/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp 2010-11-16 18:11:06.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp 2010-11-16 18:11:06.000000000 +0100 @@ -22,8 +22,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_concurrentG1RefineThread.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/concurrentG1RefineThread.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/mutexLocker.hpp" ConcurrentG1RefineThread:: ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *next, --- old/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp 2010-11-16 18:11:07.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp 2010-11-16 18:11:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP + +#include "gc_implementation/shared/concurrentGCThread.hpp" + // Forward Decl. class ConcurrentG1Refine; @@ -84,3 +89,5 @@ // shutdown void stop(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTG1REFINETHREAD_HPP --- old/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2010-11-16 18:11:08.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2010-11-16 18:11:07.000000000 +0100 @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_concurrentMark.cpp.incl" +#include "precompiled.hpp" +#include "classfile/symbolTable.hpp" +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/concurrentMarkThread.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/g1RemSet.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" // // CMS Bit Map Wrapper --- old/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2010-11-16 18:11:08.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2010-11-16 18:11:08.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP + +#include "gc_implementation/g1/heapRegion.hpp" +#include "utilities/taskqueue.hpp" + class G1CollectedHeap; class CMTask; typedef GenericTaskQueue CMTaskQueue; @@ -1120,3 +1126,5 @@ void increase_objs_found_on_bitmap() { ++_objs_found_on_bitmap; } #endif // _MARKING_STATS_ }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP --- old/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp 2010-11-16 18:11:09.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp 2010-11-16 18:11:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_concurrentMarkThread.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentMarkThread.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/g1MMUTracker.hpp" +#include "gc_implementation/g1/vm_operations_g1.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/vmThread.hpp" // ======= Concurrent Mark Thread ======== --- old/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp 2010-11-16 18:11:10.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp 2010-11-16 18:11:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP + +#include "gc_implementation/shared/concurrentGCThread.hpp" + // The Concurrent Mark GC Thread (could be several in the future). // This is copied from the Concurrent Mark Sweep GC Thread // Still under construction. @@ -93,3 +98,5 @@ // shutdown void stop(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_HPP --- old/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp 2010-11-16 18:11:11.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp 2010-11-16 18:11:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP + +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/concurrentMarkThread.hpp" + // Total virtual time so far. inline double ConcurrentMarkThread::vtime_accum() { return _vtime_accum + _cm->all_task_accum_vtime(); @@ -31,3 +37,5 @@ inline double ConcurrentMarkThread::vtime_mark_accum() { return _vtime_mark_accum + _cm->all_task_accum_vtime(); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARKTHREAD_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp 2010-11-16 18:11:12.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp 2010-11-16 18:11:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_concurrentZFThread.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentZFThread.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "memory/space.inline.hpp" +#include "runtime/mutexLocker.hpp" +#include "utilities/copy.hpp" // ======= Concurrent Zero-Fill Thread ======== --- old/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp 2010-11-16 18:11:13.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp 2010-11-16 18:11:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTZFTHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTZFTHREAD_HPP + +#include "gc_implementation/shared/concurrentGCThread.hpp" + // The Concurrent ZF Thread. Performs concurrent zero-filling. class ConcurrentZFThread: public ConcurrentGCThread { @@ -82,3 +87,5 @@ static void print_summary_info(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTZFTHREAD_HPP --- old/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2010-11-16 18:11:14.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2010-11-16 18:11:13.000000000 +0100 @@ -22,8 +22,23 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_dirtyCardQueue.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/dirtyCardQueue.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "runtime/atomic.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/thread.hpp" +#include "utilities/workgroup.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl, bool consume, --- old/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp 2010-11-16 18:11:15.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp 2010-11-16 18:11:14.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP + +#include "gc_implementation/g1/ptrQueue.hpp" +#include "memory/allocation.hpp" + class FreeIdSet; // A closure class for processing card table entries. Note that we don't @@ -168,3 +174,5 @@ } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_DIRTYCARDQUEUE_HPP --- old/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2010-11-16 18:11:15.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2010-11-16 18:11:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1BlockOffsetTable.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "memory/space.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" ////////////////////////////////////////////////////////////////////// // G1BlockOffsetSharedArray --- old/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp 2010-11-16 18:11:16.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp 2010-11-16 18:11:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP + +#include "memory/memRegion.hpp" +#include "runtime/virtualspace.hpp" +#include "utilities/globalDefinitions.hpp" + // The CollectedHeap type requires subtypes to implement a method // "block_start". For some subtypes, notably generational // systems using card-table-based write barriers, the efficiency of this @@ -485,3 +492,5 @@ HeapWord* block_start_unsafe(const void* addr); HeapWord* block_start_unsafe_const(const void* addr) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP --- old/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2010-11-16 18:11:17.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2010-11-16 18:11:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP + +#include "gc_implementation/g1/g1BlockOffsetTable.hpp" +#include "memory/space.hpp" + inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) { if (addr >= _bottom && addr < _end) { return block_start_unsafe(addr); @@ -151,3 +157,5 @@ inline void G1BlockOffsetArray::freed(HeapWord* blk, size_t size) { freed(blk, blk + size); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2010-11-16 18:11:18.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2010-11-16 18:11:18.000000000 +0100 @@ -22,8 +22,29 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1CollectedHeap.cpp.incl" +#include "precompiled.hpp" +#include "code/icBuffer.hpp" +#include "gc_implementation/g1/bufferingOopClosure.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/concurrentG1RefineThread.hpp" +#include "gc_implementation/g1/concurrentMarkThread.inline.hpp" +#include "gc_implementation/g1/concurrentZFThread.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/g1MarkSweep.hpp" +#include "gc_implementation/g1/g1OopClosures.inline.hpp" +#include "gc_implementation/g1/g1RemSet.inline.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "gc_implementation/g1/vm_operations_g1.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/generationSpec.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" +#include "runtime/aprofiler.hpp" +#include "runtime/vmThread.hpp" size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0; --- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2010-11-16 18:11:19.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2010-11-16 18:11:19.000000000 +0100 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP + +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/g1RemSet.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_implementation/parNew/parGCAllocBuffer.hpp" +#include "memory/barrierSet.hpp" +#include "memory/memRegion.hpp" +#include "memory/sharedHeap.hpp" + // A "G1CollectedHeap" is an implementation of a java heap for HotSpot. // It uses the "Garbage First" heap organization and algorithm, which // may combine concurrent marking with parallel, incremental compaction of @@ -1798,3 +1809,5 @@ public: void trim_queue(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_HPP --- old/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2010-11-16 18:11:20.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2010-11-16 18:11:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP + +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/g1CollectedHeap.hpp" +#include "gc_implementation/g1/heapRegionSeq.hpp" +#include "utilities/taskqueue.hpp" + // Inline functions for G1CollectedHeap inline HeapRegion* @@ -94,3 +102,5 @@ inline bool G1CollectedHeap::isMarkedNext(oop obj) const { return _cm->nextMarkBitMap()->isMarked((HeapWord *)obj); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTEDHEAP_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2010-11-16 18:11:21.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2010-11-16 18:11:20.000000000 +0100 @@ -22,8 +22,18 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1CollectorPolicy.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/concurrentMarkThread.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "runtime/arguments.hpp" +#include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" +#include "utilities/debug.hpp" #define PREDICTIONS_VERBOSE 0 --- old/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp 2010-11-16 18:11:22.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp 2010-11-16 18:11:21.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP + +#include "gc_implementation/g1/collectionSetChooser.hpp" +#include "gc_implementation/g1/g1MMUTracker.hpp" +#include "memory/collectorPolicy.hpp" + // A G1CollectorPolicy makes policy decisions that determine the // characteristics of the collector. Examples include: // * choice of collection set. @@ -1287,3 +1294,5 @@ // Local Variables: *** // c-indentation-style: gnu *** // End: *** + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP --- old/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp 2010-11-16 18:11:23.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp 2010-11-16 18:11:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1MMUTracker.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1MMUTracker.hpp" +#include "runtime/mutexLocker.hpp" +#include "utilities/ostream.hpp" #define _DISABLE_MMU 0 --- old/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp 2010-11-16 18:11:23.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp 2010-11-16 18:11:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP + +#include "memory/allocation.hpp" +#include "utilities/debug.hpp" + // Keeps track of the GC work and decides when it is OK to do GC work // and for how long so that the MMU invariants are maintained. @@ -127,3 +133,5 @@ virtual double longest_pause(double current_time); virtual double when_sec(double current_time, double pause_time); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MMUTRACKER_HPP --- old/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2010-11-16 18:11:24.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2010-11-16 18:11:24.000000000 +0100 @@ -22,8 +22,30 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1MarkSweep.cpp.incl" +#include "precompiled.hpp" +#include "classfile/javaClasses.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "classfile/vmSymbols.hpp" +#include "code/codeCache.hpp" +#include "code/icBuffer.hpp" +#include "gc_implementation/g1/g1MarkSweep.hpp" +#include "memory/gcLocker.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/modRefBarrierSet.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/space.hpp" +#include "oops/instanceRefKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/aprofiler.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/thread.hpp" +#include "runtime/vmThread.hpp" +#include "utilities/copy.hpp" +#include "utilities/events.hpp" class HeapRegion; --- old/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp 2010-11-16 18:11:25.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp 2010-11-16 18:11:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,19 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP + +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "memory/genMarkSweep.hpp" +#include "memory/generation.hpp" +#include "memory/universe.hpp" +#include "oops/markOop.hpp" +#include "oops/oop.hpp" +#include "runtime/timer.hpp" +#include "utilities/growableArray.hpp" + class ReferenceProcessor; // G1MarkSweep takes care of global mark-compact garbage collection for a @@ -55,3 +68,5 @@ static void allocate_stacks(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1MARKSWEEP_HPP --- old/src/share/vm/gc_implementation/g1/g1OopClosures.hpp 2010-11-16 18:11:26.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1OopClosures.hpp 2010-11-16 18:11:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP + class HeapRegion; class G1CollectedHeap; class G1RemSet; @@ -210,3 +213,5 @@ bool do_header() { return false; } int out_of_region() { return _out_of_region; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP --- old/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2010-11-16 18:11:27.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2010-11-16 18:11:27.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP + +#include "gc_implementation/g1/concurrentMark.hpp" +#include "gc_implementation/g1/g1CollectedHeap.hpp" +#include "gc_implementation/g1/g1OopClosures.hpp" +#include "gc_implementation/g1/g1RemSet.hpp" + /* * This really ought to be an inline function, but apparently the C++ * compiler sometimes sees fit to ignore inline declarations. Sigh. @@ -121,3 +129,5 @@ } } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2010-11-16 18:11:28.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2010-11-16 18:11:28.000000000 +0100 @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1RemSet.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/bufferingOopClosure.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/concurrentG1RefineThread.hpp" +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/g1OopClosures.inline.hpp" +#include "gc_implementation/g1/g1RemSet.inline.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/iterator.hpp" +#include "oops/oop.inline.hpp" +#include "utilities/intHisto.hpp" #define CARD_REPEAT_HISTO 0 --- old/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2010-11-16 18:11:29.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2010-11-16 18:11:28.000000000 +0100 @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP + // A G1RemSet provides ways of iterating over pointers into a selected // collection set. @@ -215,3 +218,5 @@ virtual void do_oop(narrowOop* p) { do_oop_work(p); } virtual void do_oop( oop* p) { do_oop_work(p); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP --- old/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp 2010-11-16 18:11:30.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp 2010-11-16 18:11:29.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP + +#include "gc_implementation/g1/g1RemSet.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "oops/oop.inline.hpp" + inline size_t G1RemSet::n_workers() { if (_g1->workers() != NULL) { return _g1->workers()->total_workers(); @@ -108,3 +115,5 @@ } } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2010-11-16 18:11:30.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2010-11-16 18:11:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,21 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1SATBCardTableModRefBS.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_implementation/g1/satbQueue.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/thread.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap, int max_covered_regions) : --- old/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2010-11-16 18:11:31.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2010-11-16 18:11:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP + +#include "memory/cardTableModRefBS.hpp" +#include "memory/memRegion.hpp" +#include "oops/oop.inline.hpp" + #ifndef SERIALGC class DirtyCardQueueSet; @@ -115,3 +122,5 @@ #endif // SERIALGC + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP --- old/src/share/vm/gc_implementation/g1/g1_globals.cpp 2010-11-16 18:11:32.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1_globals.cpp 2010-11-16 18:11:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_g1_globals.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1_globals.hpp" G1_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \ MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \ --- old/src/share/vm/gc_implementation/g1/g1_globals.hpp 2010-11-16 18:11:33.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1_globals.hpp 2010-11-16 18:11:33.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP + +#include "runtime/globals.hpp" + // // Defines all globals flags used by the garbage-first compiler. // @@ -282,3 +287,5 @@ " controls whether G1 allows the RICM optimization") G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG) + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1_GLOBALS_HPP --- old/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp 2010-11-16 18:11:34.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp 2010-11-16 18:11:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP + // The following OopClosure types get specialized versions of // "oop_oop_iterate" that invoke the closures' do_oop methods // non-virtually, using a mechanism defined in this file. Extend these @@ -63,3 +66,5 @@ #endif #define FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(f) + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1_SPECIALIZED_OOP_CLOSURES_HPP --- old/src/share/vm/gc_implementation/g1/heapRegion.cpp 2010-11-16 18:11:35.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegion.cpp 2010-11-16 18:11:35.000000000 +0100 @@ -22,8 +22,17 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_heapRegion.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentZFThread.hpp" +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1OopClosures.inline.hpp" +#include "gc_implementation/g1/heapRegion.inline.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/iterator.hpp" +#include "oops/oop.inline.hpp" int HeapRegion::LogOfHRGrainBytes = 0; int HeapRegion::LogOfHRGrainWords = 0; --- old/src/share/vm/gc_implementation/g1/heapRegion.hpp 2010-11-16 18:11:36.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegion.hpp 2010-11-16 18:11:35.000000000 +0100 @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP + +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "gc_implementation/g1/g1_specialized_oop_closures.hpp" +#include "gc_implementation/g1/survRateGroup.hpp" +#include "gc_implementation/shared/ageTable.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/space.inline.hpp" +#include "memory/watermark.hpp" + #ifndef SERIALGC // A HeapRegion is the smallest piece of a G1CollectedHeap that @@ -954,3 +965,5 @@ // End: *** #endif // SERIALGC + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_HPP --- old/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2010-11-16 18:11:37.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2010-11-16 18:11:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP + inline HeapWord* G1OffsetTableContigSpace::allocate(size_t size) { HeapWord* res = ContiguousSpace::allocate(size); if (res != NULL) { @@ -58,3 +61,5 @@ G1OffsetTableContigSpace::block_start_const(const void* p) const { return _offsets.block_start_const(p); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGION_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2010-11-16 18:11:37.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2010-11-16 18:11:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_heapRegionRemSet.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/concurrentG1Refine.hpp" +#include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/heapRegionSeq.inline.hpp" +#include "memory/allocation.hpp" +#include "memory/space.inline.hpp" +#include "utilities/bitMap.inline.hpp" +#include "utilities/globalDefinitions.hpp" #define HRRS_VERBOSE 0 --- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2010-11-16 18:11:38.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2010-11-16 18:11:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP + +#include "gc_implementation/g1/sparsePRT.hpp" + // Remembered set for a heap region. Represent a set of "cards" that // contain pointers into the owner heap region. Cards are defined somewhat // abstractly, in terms of what the "BlockOffsetTable" in use can parse. @@ -426,3 +431,5 @@ }; #endif + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP --- old/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp 2010-11-16 18:11:39.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp 2010-11-16 18:11:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_heapRegionSeq.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/heapRegionSeq.hpp" +#include "memory/allocation.hpp" // Local to this file. --- old/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp 2010-11-16 18:11:40.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp 2010-11-16 18:11:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_HPP + +#include "gc_implementation/g1/heapRegion.hpp" +#include "utilities/growableArray.hpp" + class HeapRegion; class HeapRegionClosure; @@ -108,3 +114,5 @@ void print_empty_runs(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_HPP --- old/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp 2010-11-16 18:11:41.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp 2010-11-16 18:11:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP + +#include "gc_implementation/g1/heapRegionSeq.hpp" + inline HeapRegion* HeapRegionSeq::addr_to_region(const void* addr) { assert(_seq_bottom != NULL, "bad _seq_bottom in addr_to_region"); if ((char*) addr >= _seq_bottom) { @@ -38,3 +43,5 @@ } return NULL; } + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONSEQ_INLINE_HPP --- old/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2010-11-16 18:11:42.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2010-11-16 18:11:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,21 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_ptrQueue.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/ptrQueue.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" +#include "runtime/mutex.hpp" +#include "runtime/mutexLocker.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif PtrQueue::PtrQueue(PtrQueueSet* qset_, bool perm, bool active) : _qset(qset_), _buf(NULL), _index(0), _active(active), --- old/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2010-11-16 18:11:43.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2010-11-16 18:11:42.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP + +#include "memory/allocation.hpp" +#include "utilities/sizes.hpp" + // There are various techniques that require threads to be able to log // addresses. For example, a generational write barrier might log // the addresses of modified old-generation objects. This type supports @@ -293,3 +299,5 @@ // Notify the consumer if the number of buffers crossed the threshold void notify_if_necessary(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_PTRQUEUE_HPP --- old/src/share/vm/gc_implementation/g1/satbQueue.cpp 2010-11-16 18:11:43.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/satbQueue.cpp 2010-11-16 18:11:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_satbQueue.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/satbQueue.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/sharedHeap.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/thread.hpp" void ObjPtrQueue::apply_closure(ObjectClosure* cl) { if (_buf != NULL) { --- old/src/share/vm/gc_implementation/g1/satbQueue.hpp 2010-11-16 18:11:44.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/satbQueue.hpp 2010-11-16 18:11:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP + +#include "gc_implementation/g1/ptrQueue.hpp" + class ObjectClosure; class JavaThread; @@ -113,3 +118,5 @@ void abandon_partial_marking(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SATBQUEUE_HPP --- old/src/share/vm/gc_implementation/g1/sparsePRT.cpp 2010-11-16 18:11:45.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/sparsePRT.cpp 2010-11-16 18:11:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_sparsePRT.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_implementation/g1/heapRegionRemSet.hpp" +#include "gc_implementation/g1/sparsePRT.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/space.inline.hpp" +#include "runtime/mutexLocker.hpp" #define SPARSE_PRT_VERBOSE 0 --- old/src/share/vm/gc_implementation/g1/sparsePRT.hpp 2010-11-16 18:11:46.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/sparsePRT.hpp 2010-11-16 18:11:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP + +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "memory/allocation.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "runtime/mutex.hpp" +#include "utilities/globalDefinitions.hpp" + // Sparse remembered set for a heap region (the "owning" region). Maps // indices of other regions to short sequences of cards in the other region // that might contain pointers into the owner region. @@ -301,3 +311,5 @@ return RSHashTableIter::has_next(card_index); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SPARSEPRT_HPP --- old/src/share/vm/gc_implementation/g1/survRateGroup.cpp 2010-11-16 18:11:47.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/survRateGroup.cpp 2010-11-16 18:11:47.000000000 +0100 @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_survRateGroup.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/heapRegion.hpp" +#include "gc_implementation/g1/survRateGroup.hpp" +#include "memory/allocation.hpp" SurvRateGroup::SurvRateGroup(G1CollectorPolicy* g1p, const char* name, --- old/src/share/vm/gc_implementation/g1/survRateGroup.hpp 2010-11-16 18:11:48.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/survRateGroup.hpp 2010-11-16 18:11:48.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP + +#include "utilities/numberSeq.hpp" + class G1CollectorPolicy; class SurvRateGroup : public CHeapObj { @@ -92,3 +97,5 @@ void print_surv_rate_summary(); #endif // PRODUCT }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_SURVRATEGROUP_HPP --- old/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp 2010-11-16 18:11:49.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp 2010-11-16 18:11:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_vm_operations_g1.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#include "gc_implementation/g1/g1CollectorPolicy.hpp" +#include "gc_implementation/g1/vm_operations_g1.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "runtime/interfaceSupport.hpp" void VM_G1CollectForAllocation::doit() { JvmtiGCForAllocationMarker jgcm; --- old/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp 2010-11-16 18:11:50.000000000 +0100 +++ new/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp 2010-11-16 18:11:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP +#define SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP + +#include "gc_implementation/shared/vmGCOperations.hpp" + // VM_operations for the G1 collector. // VM_GC_Operation: // - VM_CGC_Operation @@ -114,3 +119,5 @@ return "concurrent gc"; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_VM_OPERATIONS_G1_HPP --- old/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2010-11-16 18:11:50.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2010-11-16 18:11:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,17 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_asParNewGeneration.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" +#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp" +#include "gc_implementation/parNew/asParNewGeneration.hpp" +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/shared/markSweep.inline.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/defNewGeneration.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "oops/markOop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" ASParNewGeneration::ASParNewGeneration(ReservedSpace rs, size_t initial_byte_size, --- old/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp 2010-11-16 18:11:51.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp 2010-11-16 18:11:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_ASPARNEWGENERATION_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_ASPARNEWGENERATION_HPP + +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" + // A Generation that does parallel young-gen collection extended // for adaptive size policy. @@ -88,3 +94,5 @@ // Space boundary invariant checker void space_invariants() PRODUCT_RETURN; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_ASPARNEWGENERATION_HPP --- old/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp 2010-11-16 18:11:52.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp 2010-11-16 18:11:52.000000000 +0100 @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_parCardTableModRefBS.cpp.incl" +#include "precompiled.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/cardTableRS.hpp" +#include "memory/sharedHeap.hpp" +#include "memory/space.inline.hpp" +#include "memory/universe.hpp" +#include "runtime/java.hpp" +#include "runtime/mutexLocker.hpp" +#include "runtime/virtualspace.hpp" void CardTableModRefBS::par_non_clean_card_iterate_work(Space* sp, MemRegion mr, DirtyCardToOopClosure* dcto_cl, --- old/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp 2010-11-16 18:11:53.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp 2010-11-16 18:11:53.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_parGCAllocBuffer.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parNew/parGCAllocBuffer.hpp" +#include "memory/sharedHeap.hpp" +#include "oops/arrayOop.hpp" +#include "oops/oop.inline.hpp" ParGCAllocBuffer::ParGCAllocBuffer(size_t desired_plab_sz_) : _word_sz(desired_plab_sz_), _bottom(NULL), _top(NULL), --- old/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp 2010-11-16 18:11:54.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp 2010-11-16 18:11:54.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP + +#include "memory/allocation.hpp" +#include "memory/threadLocalAllocBuffer.hpp" +#include "utilities/globalDefinitions.hpp" + // Forward decl. class PLABStats; @@ -237,3 +244,5 @@ return MemRegion(_top, _true_end); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP --- old/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2010-11-16 18:11:55.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2010-11-16 18:11:55.000000000 +0100 @@ -22,8 +22,33 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_parNewGeneration.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" +#include "gc_implementation/parNew/parGCAllocBuffer.hpp" +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/parNew/parOopClosures.inline.hpp" +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" +#include "gc_implementation/shared/ageTable.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/defNewGeneration.inline.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/genOopClosures.inline.hpp" +#include "memory/generation.hpp" +#include "memory/generation.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/resourceArea.hpp" +#include "memory/sharedHeap.hpp" +#include "memory/space.hpp" +#include "oops/objArrayOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" +#include "runtime/handles.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" +#include "runtime/thread.hpp" +#include "utilities/copy.hpp" +#include "utilities/globalDefinitions.hpp" +#include "utilities/workgroup.hpp" #ifdef _MSC_VER #pragma warning( push ) --- old/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp 2010-11-16 18:11:56.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp 2010-11-16 18:11:55.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP + +#include "gc_implementation/parNew/parGCAllocBuffer.hpp" +#include "memory/defNewGeneration.hpp" +#include "utilities/taskqueue.hpp" + class ChunkArray; class ParScanWithoutBarrierClosure; class ParScanWithBarrierClosure; @@ -422,3 +429,5 @@ DEBUG_ONLY(static bool is_legal_forward_ptr(oop p);) }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARNEWGENERATION_HPP --- old/src/share/vm/gc_implementation/parNew/parOopClosures.hpp 2010-11-16 18:11:57.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parOopClosures.hpp 2010-11-16 18:11:56.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP + +#include "memory/genOopClosures.hpp" + // Closures for ParNewGeneration class ParScanThreadState; @@ -141,3 +146,5 @@ ParallelTaskTerminator* terminator_); virtual void do_void(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_HPP --- old/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp 2010-11-16 18:11:57.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp 2010-11-16 18:11:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP + +#include "gc_implementation/parNew/parNewGeneration.hpp" +#include "gc_implementation/parNew/parOopClosures.hpp" +#include "memory/cardTableRS.hpp" + template inline void ParScanWeakRefClosure::do_oop_work(T* p) { assert (!oopDesc::is_null(*p), "null weak reference?"); oop obj = oopDesc::load_decode_heap_oop_not_null(p); @@ -107,3 +114,5 @@ inline void ParScanWithoutBarrierClosure::do_oop_nv(oop* p) { ParScanClosure::do_oop_work(p, false, false); } inline void ParScanWithoutBarrierClosure::do_oop_nv(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_PAROOPCLOSURES_INLINE_HPP --- old/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp 2010-11-16 18:11:58.000000000 +0100 +++ new/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp 2010-11-16 18:11:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP + #define VM_TYPES_PARNEW(declare_type) \ declare_type(ParNewGeneration, DefNewGeneration) #define VM_INT_CONSTANTS_PARNEW(declare_constant) \ declare_constant(Generation::ParNew) + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARNEW_VMSTRUCTS_PARNEW_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp 2010-11-16 18:11:59.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp 2010-11-16 18:11:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_adjoiningGenerations.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/adjoiningGenerations.hpp" +#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" // If boundary moving is being used, create the young gen and old // gen with ASPSYoungGen and ASPSOldGen, respectively. Revert to --- old/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp 2010-11-16 18:12:00.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp 2010-11-16 18:12:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP + +#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp" +#include "gc_implementation/parallelScavenge/asPSOldGen.hpp" +#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" + // Contains two generations that both use an AdjoiningVirtualSpaces. // The two generations are adjacent in the reserved space for the @@ -75,3 +83,5 @@ // for the adjoining generations. size_t reserved_byte_size(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGGENERATIONS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp 2010-11-16 18:12:01.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp 2010-11-16 18:12:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_adjoiningVirtualSpaces.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp" +#include "runtime/java.hpp" AdjoiningVirtualSpaces::AdjoiningVirtualSpaces(ReservedSpace rs, size_t min_low_byte_size, --- old/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp 2010-11-16 18:12:02.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp 2010-11-16 18:12:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP + +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" + // Contains two virtual spaces that each can individually span // most of the reserved region but committed parts of which @@ -106,3 +111,5 @@ size_t init_low_byte_size, size_t init_high_byte_size); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ADJOININGVIRTUALSPACES_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp 2010-11-16 18:12:03.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp 2010-11-16 18:12:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_asPSOldGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/asPSOldGen.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" // Whereas PSOldGen takes the maximum size of the generation // (which doesn't change in the case of PSOldGen) as a parameter, --- old/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp 2010-11-16 18:12:03.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp 2010-11-16 18:12:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/shared/generationCounters.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "gc_implementation/shared/spaceCounters.hpp" + class ASPSOldGen : public PSOldGen { friend class VMStructs; size_t _gen_size_limit; // Largest size the generation's reserved size @@ -55,3 +65,5 @@ // Debugging support virtual const char* short_name() const { return "ASPSOldGen"; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSOLDGEN_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp 2010-11-16 18:12:04.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp 2010-11-16 18:12:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_asPSYoungGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/asPSYoungGen.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" ASPSYoungGen::ASPSYoungGen(size_t init_byte_size, size_t minimum_byte_size, --- old/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp 2010-11-16 18:12:06.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp 2010-11-16 18:12:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,17 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/generationCounters.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "gc_implementation/shared/spaceCounters.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" + class ASPSYoungGen : public PSYoungGen { friend class VMStructs; private: @@ -62,3 +73,5 @@ // Printing support virtual const char* short_name() const { return "ASPSYoungGen"; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp 2010-11-16 18:12:06.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp 2010-11-16 18:12:06.000000000 +0100 @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_cardTableExtension.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psTasks.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.psgc.inline.hpp" // Checks an individual oop for missing precise marks. Mark // may be either dirty or newgen. --- old/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp 2010-11-16 18:12:07.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp 2010-11-16 18:12:07.000000000 +0100 @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP + +#include "memory/cardTableModRefBS.hpp" + class MutableSpace; class ObjectStartArray; class PSPromotionManager; @@ -108,3 +113,5 @@ #endif // ASSERT }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_CARDTABLEEXTENSION_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp 2010-11-16 18:12:08.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp 2010-11-16 18:12:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_gcTaskManager.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/gcTaskThread.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" +#include "runtime/mutex.hpp" +#include "runtime/mutexLocker.hpp" // // GCTask --- old/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp 2010-11-16 18:12:09.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp 2010-11-16 18:12:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP + +#include "runtime/mutex.hpp" +#include "utilities/growableArray.hpp" + // // The GCTaskManager is a queue of GCTasks, and accessors // to allow the queue to be accessed from many threads. @@ -636,3 +642,5 @@ return _freelist; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKMANAGER_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp 2010-11-16 18:12:10.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp 2010-11-16 18:12:10.000000000 +0100 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_gcTaskThread.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/gcTaskThread.hpp" +#include "memory/allocation.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/handles.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/os.hpp" +#include "runtime/thread.hpp" GCTaskThread::GCTaskThread(GCTaskManager* manager, uint which, --- old/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp 2010-11-16 18:12:11.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp 2010-11-16 18:12:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP + +#include "runtime/thread.hpp" + // Forward declarations of classes defined here. class GCTaskThread; class GCTaskTimeStamp; @@ -97,3 +102,5 @@ void set_exit_time(jlong time) { _exit_time = time; } void set_name(char* name) { _name = name; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp 2010-11-16 18:12:12.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp 2010-11-16 18:12:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP + +#include "memory/collectorPolicy.hpp" + // There is a nice batch of tested generation sizing code in // TwoGenerationCollectorPolicy. Lets reuse it! @@ -67,3 +72,5 @@ size_t perm_gen_size() { return PermSize; } size_t max_perm_gen_size() { return MaxPermSize; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GENERATIONSIZER_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp 2010-11-16 18:12:13.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp 2010-11-16 18:12:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_objectStartArray.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "memory/allocation.inline.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" void ObjectStartArray::initialize(MemRegion reserved_region) { // We're based on the assumption that we use the same --- old/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp 2010-11-16 18:12:14.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp 2010-11-16 18:12:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP + +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "memory/allocation.hpp" +#include "memory/memRegion.hpp" +#include "oops/oop.hpp" + // // This class can be used to locate the beginning of an object in the // covered region. @@ -160,3 +168,5 @@ // "start", the method will return true. bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_OBJECTSTARTARRAY_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2010-11-16 18:12:14.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2010-11-16 18:12:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,22 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_parMarkBitMap.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp" +#include "gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/os.hpp" +#include "utilities/bitMap.inline.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif bool ParMarkBitMap::initialize(MemRegion covered_region) --- old/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp 2010-11-16 18:12:15.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp 2010-11-16 18:12:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP + +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "utilities/bitMap.inline.hpp" + class oopDesc; class ParMarkBitMapClosure; @@ -426,3 +432,5 @@ assert(addr <= region_start() + region_size(), "addr too big"); } #endif // #ifdef ASSERT + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp 2010-11-16 18:12:16.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp 2010-11-16 18:12:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_INLINE_HPP + inline bool ParMarkBitMap::mark_obj(oop obj) { return mark_obj(obj, obj->size()); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_INLINE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2010-11-16 18:12:17.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2010-11-16 18:12:17.000000000 +0100 @@ -22,8 +22,24 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_parallelScavengeHeap.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/adjoiningGenerations.hpp" +#include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp" +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/generationSizer.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/vmPSOperations.hpp" +#include "memory/gcLocker.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/java.hpp" +#include "runtime/vmThread.hpp" PSYoungGen* ParallelScavengeHeap::_young_gen = NULL; PSOldGen* ParallelScavengeHeap::_old_gen = NULL; --- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp 2010-11-16 18:12:18.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp 2010-11-16 18:12:18.000000000 +0100 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "utilities/ostream.hpp" + class AdjoiningGenerations; class GCTaskManager; class PSAdaptiveSizePolicy; @@ -263,3 +275,5 @@ var = round_to(val, intra_heap_alignment()); return var; } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp 2010-11-16 18:12:19.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp 2010-11-16 18:12:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP + +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" + inline size_t ParallelScavengeHeap::total_invocations() { return UseParallelOldGC ? PSParallelCompact::total_invocations() : @@ -49,3 +57,5 @@ inline bool ParallelScavengeHeap::is_in_old_or_perm(oop p) { return old_gen()->is_in_reserved(p) || perm_gen()->is_in_reserved(p); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp 2010-11-16 18:12:20.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp 2010-11-16 18:12:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,22 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_pcTasks.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "gc_implementation/parallelScavenge/pcTasks.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "memory/universe.hpp" +#include "oops/objArrayKlass.inline.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/jniHandles.hpp" +#include "runtime/thread.hpp" +#include "runtime/vmThread.hpp" +#include "services/management.hpp" // // ThreadRootsMarkingTask --- old/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp 2010-11-16 18:12:21.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp 2010-11-16 18:12:20.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP + +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psTasks.hpp" + // Tasks for parallel compaction of the old generation // @@ -250,3 +257,5 @@ char* name() { return (char *)"drain-region-task"; } virtual void do_it(GCTaskManager* manager, uint which); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PCTASKS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2010-11-16 18:12:21.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2010-11-16 18:12:21.000000000 +0100 @@ -22,8 +22,16 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psAdaptiveSizePolicy.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/generationSizer.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/collectorPolicy.hpp" +#include "runtime/timer.hpp" +#include "utilities/top.hpp" #include --- old/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2010-11-16 18:12:22.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2010-11-16 18:12:22.000000000 +0100 @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP + +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" +#include "gc_implementation/shared/gcStats.hpp" +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_interface/gcCause.hpp" + // This class keeps statistical information and computes the // optimal free space for both the young and old generation // based on current application characteristics (based on gc cost @@ -384,3 +392,5 @@ // Printing support virtual bool print_adaptive_size_policy_on(outputStream* st) const; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSADAPTIVESIZEPOLICY_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp 2010-11-16 18:12:23.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp 2010-11-16 18:12:23.000000000 +0100 @@ -22,8 +22,20 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psCompactionManager.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psCompactionManager.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "oops/objArrayKlass.inline.hpp" +#include "oops/oop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" +#include "utilities/stack.inline.hpp" PSOldGen* ParCompactionManager::_old_gen = NULL; ParCompactionManager** ParCompactionManager::_manager_array = NULL; --- old/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp 2010-11-16 18:12:24.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp 2010-11-16 18:12:24.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP + +#include "memory/allocation.hpp" +#include "utilities/stack.hpp" +#include "utilities/taskqueue.hpp" + // Move to some global location #define HAS_BEEN_MOVED 0x1501d01d // End move to some global location @@ -167,3 +174,5 @@ bool ParCompactionManager::marking_stacks_empty() const { return _marking_stack.is_empty() && _objarray_stack.is_empty(); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp 2010-11-16 18:12:25.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp 2010-11-16 18:12:25.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP + +#include "gc_implementation/parallelScavenge/psCompactionManager.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" + void ParCompactionManager::push_objarray(oop obj, size_t index) { ObjArrayTask task(obj, index); @@ -39,3 +45,5 @@ #endif region_stack()->push(index); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSCOMPACTIONMANAGER_INLINE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp 2010-11-16 18:12:26.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp 2010-11-16 18:12:26.000000000 +0100 @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psGCAdaptivePolicyCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/arguments.hpp" --- old/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2010-11-16 18:12:27.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2010-11-16 18:12:26.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP + +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" + // PSGCAdaptivePolicyCounters is a holder class for performance counters // that track the data and decisions for the ergonomics policy for the // parallel scavenge collector. @@ -200,3 +207,5 @@ return GCPolicyCounters::PSGCAdaptivePolicyCountersKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGCADAPTIVEPOLICYCOUNTERS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp 2010-11-16 18:12:28.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp 2010-11-16 18:12:27.000000000 +0100 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psGenerationCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp" +#include "memory/resourceArea.hpp" PSGenerationCounters::PSGenerationCounters(const char* name, --- old/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp 2010-11-16 18:12:28.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp 2010-11-16 18:12:28.000000000 +0100 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP + +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/shared/generationCounters.hpp" +#include "runtime/perfData.hpp" + // A PSGenerationCounter is a holder class for performance counters // that track a generation @@ -41,3 +48,5 @@ _current_size->set_value(_ps_virtual_space->committed_size()); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSGENERATIONCOUNTERS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2010-11-16 18:12:29.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2010-11-16 18:12:29.000000000 +0100 @@ -22,8 +22,34 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psMarkSweep.cpp.incl" +#include "precompiled.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "gc_implementation/parallelScavenge/generationSizer.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/referenceProcessor.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vmThread.hpp" +#include "services/management.hpp" +#include "services/memoryService.hpp" +#include "utilities/events.hpp" +#include "utilities/stack.inline.hpp" elapsedTimer PSMarkSweep::_accumulated_time; unsigned int PSMarkSweep::_total_invocations = 0; --- old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp 2010-11-16 18:12:30.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp 2010-11-16 18:12:30.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP + +#include "gc_implementation/shared/collectorCounters.hpp" +#include "gc_implementation/shared/markSweep.inline.hpp" +#include "utilities/stack.hpp" + class PSAdaptiveSizePolicy; class PSYoungGen; class PSOldGen; @@ -83,3 +90,5 @@ // Time since last full gc (in milliseconds) static jlong millis_since_last_gc(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEP_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp 2010-11-16 18:12:31.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp 2010-11-16 18:12:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psMarkSweepDecorator.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/shared/liveRange.hpp" +#include "gc_implementation/shared/markSweep.inline.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "oops/oop.inline.hpp" PSMarkSweepDecorator* PSMarkSweepDecorator::_destination_decorator = NULL; --- old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp 2010-11-16 18:12:32.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp 2010-11-16 18:12:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP + +#include "gc_implementation/shared/mutableSpace.hpp" + // // A PSMarkSweepDecorator is used to add "ParallelScavenge" style mark sweep operations // to a MutableSpace. @@ -73,3 +78,5 @@ void precompact(); void compact(bool mangle_free_space); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSMARKSWEEPDECORATOR_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp 2010-11-16 18:12:33.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp 2010-11-16 18:12:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psOldGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/gcLocker.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" inline const char* PSOldGen::select_name() { return UseParallelOldGC ? "ParOldGen" : "PSOldGen"; --- old/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp 2010-11-16 18:12:34.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp 2010-11-16 18:12:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "gc_implementation/shared/spaceCounters.hpp" +#include "runtime/safepoint.hpp" + class PSMarkSweepDecorator; class PSOldGen : public CHeapObj { @@ -190,3 +200,5 @@ // Save the tops of all spaces for later use during mangling. void record_spaces_top() PRODUCT_RETURN; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSOLDGEN_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2010-11-16 18:12:34.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2010-11-16 18:12:34.000000000 +0100 @@ -22,8 +22,39 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psParallelCompact.cpp.incl" +#include "precompiled.hpp" +#include "classfile/symbolTable.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/generationSizer.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" +#include "gc_implementation/parallelScavenge/pcTasks.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psCompactionManager.inline.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/referenceProcessor.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.pcgc.inline.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/vmThread.hpp" +#include "services/management.hpp" +#include "services/memoryService.hpp" +#include "utilities/events.hpp" +#include "utilities/stack.inline.hpp" #include --- old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp 2010-11-16 18:12:35.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp 2010-11-16 18:12:35.000000000 +0100 @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/parMarkBitMap.hpp" +#include "gc_implementation/parallelScavenge/psCompactionManager.hpp" +#include "gc_implementation/shared/collectorCounters.hpp" +#include "gc_implementation/shared/markSweep.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "memory/sharedHeap.hpp" +#include "oops/oop.hpp" + class ParallelScavengeHeap; class PSAdaptiveSizePolicy; class PSYoungGen; @@ -1514,3 +1526,5 @@ private: ObjectStartArray* const _start_array; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPARALLELCOMPACT_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2010-11-16 18:12:36.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2010-11-16 18:12:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psPermGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psPermGen.hpp" +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_implementation/shared/markSweep.inline.hpp" +#include "oops/markOop.inline.hpp" PSPermGen::PSPermGen(ReservedSpace rs, size_t alignment, size_t initial_size, size_t min_size, size_t max_size, --- old/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp 2010-11-16 18:12:37.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp 2010-11-16 18:12:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPERMGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPERMGEN_HPP + +#include "gc_implementation/parallelScavenge/psOldGen.hpp" + class AdaptivePaddedAverage; class PSPermGen : public PSOldGen { @@ -51,3 +56,5 @@ virtual const char* name() const { return "PSPermGen"; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPERMGEN_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp 2010-11-16 18:12:38.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp 2010-11-16 18:12:38.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psPromotionLAB.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "oops/oop.inline.hpp" size_t PSPromotionLAB::filler_header_size; --- old/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp 2010-11-16 18:12:39.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp 2010-11-16 18:12:39.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "memory/allocation.hpp" + // // PSPromotionLAB is a parallel scavenge promotion lab. This class acts very // much like a MutableSpace. We couldn't embed a MutableSpace, though, as @@ -140,3 +146,5 @@ debug_only(virtual bool lab_is_valid(MemRegion lab)); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONLAB_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp 2010-11-16 18:12:40.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp 2010-11-16 18:12:40.000000000 +0100 @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psPromotionManager.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psOldGen.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "memory/memRegion.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.psgc.inline.hpp" PSPromotionManager** PSPromotionManager::_manager_array = NULL; OopStarTaskQueueSet* PSPromotionManager::_stack_array_depth = NULL; --- old/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp 2010-11-16 18:12:41.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp 2010-11-16 18:12:41.000000000 +0100 @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP + +#include "gc_implementation/parallelScavenge/psPromotionLAB.hpp" +#include "memory/allocation.hpp" +#include "utilities/taskqueue.hpp" + // // psPromotionManager is used by a single thread to manage object survival // during a scavenge. The promotion manager contains thread local data only. @@ -191,3 +198,5 @@ TASKQUEUE_STATS_ONLY(inline void record_steal(StarTask& p);) }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp 2010-11-16 18:12:42.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp 2010-11-16 18:12:41.000000000 +0100 @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + +#include "gc_implementation/parallelScavenge/psPromotionManager.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" + inline PSPromotionManager* PSPromotionManager::manager_array(int index) { assert(_manager_array != NULL, "access of NULL manager_array"); assert(index >= 0 && index <= (int)ParallelGCThreads, "out of range manager_array access"); @@ -77,3 +83,5 @@ } } #endif // TASKQUEUE_STATS + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2010-11-16 18:12:43.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2010-11-16 18:12:42.000000000 +0100 @@ -22,9 +22,35 @@ * */ +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/generationSizer.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" +#include "gc_implementation/parallelScavenge/psTasks.hpp" +#include "gc_implementation/shared/isGCActiveMark.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/collectorPolicy.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/referencePolicy.hpp" +#include "memory/referenceProcessor.hpp" +#include "memory/resourceArea.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.psgc.inline.hpp" +#include "runtime/biasedLocking.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/threadCritical.hpp" +#include "runtime/vmThread.hpp" +#include "runtime/vm_operations.hpp" +#include "services/memoryService.hpp" +#include "utilities/stack.inline.hpp" -# include "incls/_precompiled.incl" -# include "incls/_psScavenge.cpp.incl" HeapWord* PSScavenge::_to_space_top_before_gc = NULL; int PSScavenge::_consecutive_skipped_scavenges = 0; --- old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp 2010-11-16 18:12:44.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp 2010-11-16 18:12:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP + +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/shared/collectorCounters.hpp" +#include "memory/allocation.hpp" +#include "oops/oop.hpp" +#include "utilities/stack.hpp" + class GCTaskManager; class GCTaskQueue; class OopStack; @@ -135,3 +145,5 @@ return result; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp 2010-11-16 18:12:45.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp 2010-11-16 18:12:44.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP + +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" + inline void PSScavenge::save_to_space_top_before_gc() { ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap(); _to_space_top_before_gc = heap->young_gen()->to_space()->top(); @@ -77,3 +85,5 @@ } } } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp 2010-11-16 18:12:46.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp 2010-11-16 18:12:45.000000000 +0100 @@ -22,8 +22,25 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psTasks.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "code/codeCache.hpp" +#include "gc_implementation/parallelScavenge/cardTableExtension.hpp" +#include "gc_implementation/parallelScavenge/gcTaskManager.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.hpp" +#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psTasks.hpp" +#include "memory/iterator.hpp" +#include "memory/universe.hpp" +#include "oops/oop.inline.hpp" +#include "oops/oop.psgc.inline.hpp" +#include "runtime/fprofiler.hpp" +#include "runtime/thread.hpp" +#include "runtime/vmThread.hpp" +#include "services/management.hpp" +#include "utilities/taskqueue.hpp" // // ScavengeRootsTask --- old/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp 2010-11-16 18:12:47.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp 2010-11-16 18:12:46.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP + +#include "memory/allocation.hpp" +#include "utilities/growableArray.hpp" + // // psTasks.hpp is a collection of GCTasks used by the // parallelScavenge collector. @@ -144,3 +150,5 @@ virtual void do_it(GCTaskManager* manager, uint which); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSTASKS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2010-11-16 18:12:47.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2010-11-16 18:12:47.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,19 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_psVirtualspace.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "runtime/os.hpp" +#include "runtime/virtualspace.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "os_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "os_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "os_windows.inline.hpp" +#endif // PSVirtualSpace --- old/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp 2010-11-16 18:12:48.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp 2010-11-16 18:12:48.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP + +#include "runtime/virtualspace.hpp" + // VirtualSpace for the parallel scavenge collector. // // VirtualSpace is data structure for committing a previously reserved address @@ -173,3 +178,5 @@ _committed_low_addr = low_addr; _committed_high_addr = high_addr; } + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSVIRTUALSPACE_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp 2010-11-16 18:12:49.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp 2010-11-16 18:12:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,16 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_psYoungGen.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psYoungGen.hpp" +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_implementation/shared/mutableNUMASpace.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/java.hpp" PSYoungGen::PSYoungGen(size_t initial_size, size_t min_size, --- old/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp 2010-11-16 18:12:50.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp 2010-11-16 18:12:50.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP + +#include "gc_implementation/parallelScavenge/objectStartArray.hpp" +#include "gc_implementation/parallelScavenge/psGenerationCounters.hpp" +#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "gc_implementation/shared/spaceCounters.hpp" + class PSMarkSweepDecorator; class PSYoungGen : public CHeapObj { @@ -188,3 +197,5 @@ void record_spaces_top() PRODUCT_RETURN; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSYOUNGGEN_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp 2010-11-16 18:12:51.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp 2010-11-16 18:12:51.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_vmPSOperations.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp" +#include "gc_implementation/parallelScavenge/psMarkSweep.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.hpp" +#include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" +#include "gc_implementation/parallelScavenge/vmPSOperations.hpp" +#include "memory/gcLocker.inline.hpp" +#include "utilities/dtrace.hpp" // The following methods are used by the parallel scavenge collector VM_ParallelGCFailedAllocation::VM_ParallelGCFailedAllocation(size_t size, --- old/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp 2010-11-16 18:12:52.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp 2010-11-16 18:12:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP + +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#include "gc_implementation/shared/vmGCOperations.hpp" +#include "gc_interface/gcCause.hpp" + class VM_ParallelGCFailedAllocation: public VM_GC_Operation { private: size_t _size; @@ -63,3 +70,5 @@ virtual VMOp_Type type() const { return VMOp_ParallelGCSystemGC; } virtual void doit(); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMPSOPERATIONS_HPP --- old/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp 2010-11-16 18:12:53.000000000 +0100 +++ new/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp 2010-11-16 18:12:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,9 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP +#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP + #define VM_STRUCTS_PARALLELGC(nonstatic_field, \ static_field) \ \ @@ -93,3 +96,5 @@ declare_toplevel_type(ASPSOldGen*) \ declare_toplevel_type(PSPermGen*) \ declare_toplevel_type(ParallelScavengeHeap*) + +#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_VMSTRUCTS_PARALLELGC_HPP --- old/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2010-11-16 18:12:54.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2010-11-16 18:12:53.000000000 +0100 @@ -21,9 +21,13 @@ * questions. * */ -#include "incls/_precompiled.incl" -#include "incls/_adaptiveSizePolicy.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/collectorPolicy.hpp" +#include "runtime/timer.hpp" +#include "utilities/ostream.hpp" elapsedTimer AdaptiveSizePolicy::_minor_timer; elapsedTimer AdaptiveSizePolicy::_major_timer; --- old/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2010-11-16 18:12:54.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2010-11-16 18:12:54.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP + +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "gc_interface/gcCause.hpp" +#include "memory/allocation.hpp" +#include "memory/universe.hpp" + // This class keeps statistical information and computes the // size of the heap. @@ -503,3 +512,5 @@ } } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ADAPTIVESIZEPOLICY_HPP --- old/src/share/vm/gc_implementation/shared/ageTable.cpp 2010-11-16 18:12:55.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/ageTable.cpp 2010-11-16 18:12:55.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,12 +22,17 @@ * */ +#include "precompiled.hpp" +#include "gc_implementation/shared/ageTable.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "memory/collectorPolicy.hpp" +#include "memory/resourceArea.hpp" +#include "memory/sharedHeap.hpp" +#include "utilities/copy.hpp" + /* Copyright (c) 1992-2009 Oracle and/or its affiliates, and Stanford University. See the LICENSE file for license information. */ -# include "incls/_precompiled.incl" -# include "incls/_ageTable.cpp.incl" - ageTable::ageTable(bool global) { clear(); --- old/src/share/vm/gc_implementation/shared/ageTable.hpp 2010-11-16 18:12:56.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/ageTable.hpp 2010-11-16 18:12:56.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP + +#include "oops/markOop.hpp" +#include "oops/oop.hpp" +#include "runtime/perfData.hpp" + /* Copyright (c) 1992-2009 Oracle and/or its affiliates, and Stanford University. See the LICENSE file for license information. */ @@ -64,3 +71,5 @@ private: PerfVariable* _perf_sizes[table_size]; }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_AGETABLE_HPP --- old/src/share/vm/gc_implementation/shared/allocationStats.cpp 2010-11-16 18:12:57.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/allocationStats.cpp 2010-11-16 18:12:57.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_allocationStats.cpp.incl" +#include "precompiled.hpp" +#ifndef SERIALGC +#include "gc_implementation/shared/allocationStats.hpp" +#include "utilities/ostream.hpp" +#endif // Technically this should be derived from machine speed, and // ideally it would be dynamically adjusted. --- old/src/share/vm/gc_implementation/shared/allocationStats.hpp 2010-11-16 18:12:58.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/allocationStats.hpp 2010-11-16 18:12:58.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP + +#ifndef SERIALGC +#include "gc_implementation/shared/gcUtil.hpp" +#include "memory/allocation.hpp" +#include "utilities/globalDefinitions.hpp" +#endif + class AllocationStats VALUE_OBJ_CLASS_SPEC { // A duration threshold (in ms) used to filter // possibly unreliable samples. @@ -157,3 +166,5 @@ void set_returnedBytes(size_t v) { _returnedBytes = v; } ) }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP --- old/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp 2010-11-16 18:12:59.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp 2010-11-16 18:12:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_cSpaceCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/cSpaceCounters.hpp" +#include "memory/resourceArea.hpp" CSpaceCounters::CSpaceCounters(const char* name, int ordinal, size_t max_size, ContiguousSpace* s, GenerationCounters* gc) : --- old/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp 2010-11-16 18:13:00.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp 2010-11-16 18:12:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP + +#include "gc_implementation/shared/generationCounters.hpp" +#include "memory/space.inline.hpp" +#include "runtime/perfData.hpp" + // A CSpaceCounters is a holder class for performance counters // that track a space; @@ -75,3 +82,5 @@ return _space->used(); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_CSPACECOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/collectorCounters.cpp 2010-11-16 18:13:01.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/collectorCounters.cpp 2010-11-16 18:13:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_collectorCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/collectorCounters.hpp" +#include "memory/resourceArea.hpp" CollectorCounters::CollectorCounters(const char* name, int ordinal) { --- old/src/share/vm/gc_implementation/shared/collectorCounters.hpp 2010-11-16 18:13:01.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/collectorCounters.hpp 2010-11-16 18:13:01.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP + +#include "runtime/perfData.hpp" + // CollectorCounters is a holder class for performance counters // that track a collector @@ -78,3 +83,5 @@ if (UsePerfData) _c->last_exit_counter()->set_value(os::elapsed_counter()); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_COLLECTORCOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp 2010-11-16 18:13:02.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp 2010-11-16 18:13:02.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,10 +22,17 @@ * */ -// CopyrightVersion 1.2 +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_implementation/shared/concurrentGCThread.hpp" +#include "oops/instanceRefKlass.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/init.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/java.hpp" +#include "runtime/javaCalls.hpp" -# include "incls/_precompiled.incl" -# include "incls/_concurrentGCThread.cpp.incl" +// CopyrightVersion 1.2 int ConcurrentGCThread::_CGC_flag = CGC_nil; --- old/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp 2010-11-16 18:13:03.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp 2010-11-16 18:13:03.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP + +#ifndef SERIALGC +#include "runtime/thread.hpp" +#endif + class VoidClosure; // A SuspendibleThreadSet is (obviously) a set of threads that can be @@ -165,3 +172,5 @@ void manipulatePLL(SLT_msg_type msg); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_CONCURRENTGCTHREAD_HPP --- old/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp 2010-11-16 18:13:04.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp 2010-11-16 18:13:04.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_gSpaceCounters.cpp.incl" +#include "precompiled.hpp" +#ifndef SERIALGC +#include "gc_implementation/shared/gSpaceCounters.hpp" +#include "memory/generation.hpp" +#include "memory/resourceArea.hpp" +#endif GSpaceCounters::GSpaceCounters(const char* name, int ordinal, size_t max_size, Generation* g, GenerationCounters* gc, --- old/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp 2010-11-16 18:13:05.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp 2010-11-16 18:13:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP + +#ifndef SERIALGC +#include "gc_implementation/shared/generationCounters.hpp" +#include "memory/generation.hpp" +#include "runtime/perfData.hpp" +#endif + // A GSpaceCounter is a holder class for performance counters // that track a space; @@ -100,3 +109,5 @@ return _gen->used(); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GSPACECOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp 2010-11-16 18:13:06.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp 2010-11-16 18:13:05.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_gcAdaptivePolicyCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp" +#include "memory/resourceArea.hpp" // This class keeps statistical information and computes the // size of the heap. --- old/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp 2010-11-16 18:13:07.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp 2010-11-16 18:13:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP + +#ifndef SERIALGC +#include "gc_implementation/shared/adaptiveSizePolicy.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#endif + // This class keeps statistical information and computes the // size of the heap. @@ -222,3 +230,5 @@ return GCPolicyCounters::GCAdaptivePolicyCountersKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCADAPTIVEPOLICYCOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp 2010-11-16 18:13:07.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp 2010-11-16 18:13:07.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_gcPolicyCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/gcPolicyCounters.hpp" +#include "memory/resourceArea.hpp" GCPolicyCounters::GCPolicyCounters(const char* name, int collectors, int generations) { --- old/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp 2010-11-16 18:13:08.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp 2010-11-16 18:13:08.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP + +#include "runtime/perfData.hpp" + // GCPolicyCounters is a holder class for performance counters // that track a generation @@ -69,3 +74,5 @@ return GCPolicyCounters::GCPolicyCountersKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCPOLICYCOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/gcStats.cpp 2010-11-16 18:13:09.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcStats.cpp 2010-11-16 18:13:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_gcStats.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/gcStats.hpp" +#include "gc_implementation/shared/gcUtil.hpp" GCStats::GCStats() { _avg_promoted = new AdaptivePaddedNoZeroDevAverage( --- old/src/share/vm/gc_implementation/shared/gcStats.hpp 2010-11-16 18:13:10.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcStats.hpp 2010-11-16 18:13:10.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP + +#include "gc_implementation/shared/gcUtil.hpp" + class GCStats : public CHeapObj { protected: // Avg amount promoted; used for avoiding promotion undo @@ -61,3 +66,5 @@ return CMSGCStatsKind; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCSTATS_HPP --- old/src/share/vm/gc_implementation/shared/gcUtil.cpp 2010-11-16 18:13:11.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcUtil.cpp 2010-11-16 18:13:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_gcUtil.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/gcUtil.hpp" // Catch-all file for utility classes --- old/src/share/vm/gc_implementation/shared/gcUtil.hpp 2010-11-16 18:13:12.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/gcUtil.hpp 2010-11-16 18:13:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP + +#include "memory/allocation.hpp" +#include "runtime/timer.hpp" +#include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" +#include "utilities/ostream.hpp" + // Catch-all file for utility classes // A weighted average maintains a running, weighted average @@ -206,3 +215,5 @@ _timer->start(); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCUTIL_HPP --- old/src/share/vm/gc_implementation/shared/generationCounters.cpp 2010-11-16 18:13:13.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/generationCounters.cpp 2010-11-16 18:13:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,9 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_generationCounters.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/generationCounters.hpp" +#include "memory/resourceArea.hpp" GenerationCounters::GenerationCounters(const char* name, --- old/src/share/vm/gc_implementation/shared/generationCounters.hpp 2010-11-16 18:13:14.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/generationCounters.hpp 2010-11-16 18:13:13.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP + +#include "runtime/perfData.hpp" +#include "runtime/virtualspace.hpp" + // A GenerationCounter is a holder class for performance counters // that track a generation @@ -60,3 +66,5 @@ const char* name_space() const { return _name_space; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GENERATIONCOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/immutableSpace.cpp 2010-11-16 18:13:14.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/immutableSpace.cpp 2010-11-16 18:13:14.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,12 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_immutableSpace.cpp.incl" +#include "precompiled.hpp" +#ifndef SERIALGC +#include "gc_implementation/shared/immutableSpace.hpp" +#include "memory/universe.hpp" +#include "oops/oop.inline.hpp" +#endif void ImmutableSpace::initialize(MemRegion mr) { HeapWord* bottom = mr.start(); --- old/src/share/vm/gc_implementation/shared/immutableSpace.hpp 2010-11-16 18:13:15.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/immutableSpace.hpp 2010-11-16 18:13:15.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP + +#include "memory/iterator.hpp" + // An ImmutableSpace is a viewport into a contiguous range // (or subrange) of previously allocated objects. @@ -62,3 +67,5 @@ virtual void print_short() const PRODUCT_RETURN; virtual void verify(bool allow_dirty); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_IMMUTABLESPACE_HPP --- old/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp 2010-11-16 18:13:16.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp 2010-11-16 18:13:16.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP + +#ifndef SERIALGC +#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" +#endif + // This class provides a method for block structured setting of the // _is_gc_active state without requiring accessors in CollectedHeap @@ -39,3 +46,5 @@ heap->_is_gc_active = false; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP --- old/src/share/vm/gc_implementation/shared/liveRange.hpp 2010-11-16 18:13:17.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/liveRange.hpp 2010-11-16 18:13:17.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP + +#include "memory/memRegion.hpp" +#include "utilities/copy.hpp" + // This is a shared helper class used during phase 3 and 4 to move all the objects // Dead regions in a Space are linked together to keep track of the live regions // so that the live data can be traversed quickly without having to look at each @@ -46,3 +52,5 @@ Copy::aligned_conjoint_words(start(), destination, word_size()); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_LIVERANGE_HPP --- old/src/share/vm/gc_implementation/shared/markSweep.cpp 2010-11-16 18:13:18.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/markSweep.cpp 2010-11-16 18:13:18.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,13 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_markSweep.cpp.incl" +#include "precompiled.hpp" +#include "compiler/compileBroker.hpp" +#include "gc_implementation/shared/markSweep.inline.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/objArrayKlass.inline.hpp" +#include "oops/oop.inline.hpp" Stack MarkSweep::_marking_stack; Stack MarkSweep::_revisit_mdo_stack; --- old/src/share/vm/gc_implementation/shared/markSweep.hpp 2010-11-16 18:13:19.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/markSweep.hpp 2010-11-16 18:13:19.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,18 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP + +#include "gc_interface/collectedHeap.hpp" +#include "memory/universe.hpp" +#include "oops/markOop.hpp" +#include "oops/oop.hpp" +#include "runtime/timer.hpp" +#include "utilities/growableArray.hpp" +#include "utilities/stack.hpp" +#include "utilities/taskqueue.hpp" + class ReferenceProcessor; class DataLayout; @@ -248,3 +260,5 @@ _obj->set_mark(_mark); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_HPP --- old/src/share/vm/gc_implementation/shared/markSweep.inline.hpp 2010-11-16 18:13:20.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/markSweep.inline.hpp 2010-11-16 18:13:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP + +#include "gc_implementation/shared/markSweep.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "utilities/stack.inline.hpp" +#ifndef SERIALGC +#include "gc_implementation/parallelScavenge/psParallelCompact.hpp" +#endif + inline void MarkSweep::mark_object(oop obj) { // some marks may contain information we need to preserve so we store them away // and overwrite the mark. We'll restore it at the end of markSweep. @@ -115,3 +125,5 @@ #endif mark_and_push(p); } + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MARKSWEEP_INLINE_HPP --- old/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2010-11-16 18:13:21.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2010-11-16 18:13:21.000000000 +0100 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,8 +23,20 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_mutableNUMASpace.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/mutableNUMASpace.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/sharedHeap.hpp" +#include "oops/oop.inline.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) { --- old/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp 2010-11-16 18:13:22.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp 2010-11-16 18:13:21.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,14 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP + +#ifndef SERIALGC +#include "gc_implementation/shared/gcUtil.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#endif + /* * The NUMA-aware allocator (MutableNUMASpace) is basically a modification * of MutableSpace which preserves interfaces but implements different @@ -221,3 +229,5 @@ virtual void set_top(HeapWord* value); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLENUMASPACE_HPP --- old/src/share/vm/gc_implementation/shared/mutableSpace.cpp 2010-11-16 18:13:23.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/mutableSpace.cpp 2010-11-16 18:13:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,14 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_mutableSpace.cpp.incl" +#include "precompiled.hpp" +#ifndef SERIALGC +#include "gc_implementation/shared/mutableSpace.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/thread.hpp" +#endif MutableSpace::MutableSpace(size_t alignment): ImmutableSpace(), _top(NULL), _alignment(alignment) { assert(MutableSpace::alignment() >= 0 && --- old/src/share/vm/gc_implementation/shared/mutableSpace.hpp 2010-11-16 18:13:23.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/mutableSpace.hpp 2010-11-16 18:13:23.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP + +#include "gc_implementation/shared/immutableSpace.hpp" +#include "memory/memRegion.hpp" +#include "utilities/copy.hpp" + // A MutableSpace is a subtype of ImmutableSpace that supports the // concept of allocation. This includes the concepts that a space may // be only partially full, and the querry methods that go with such @@ -136,3 +143,5 @@ virtual void print_short_on(outputStream* st) const; virtual void verify(bool allow_dirty); }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_MUTABLESPACE_HPP --- old/src/share/vm/gc_implementation/shared/spaceCounters.cpp 2010-11-16 18:13:24.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/spaceCounters.cpp 2010-11-16 18:13:24.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_spaceCounters.cpp.incl" +#include "precompiled.hpp" +#ifndef SERIALGC +#include "gc_implementation/shared/spaceCounters.hpp" +#include "memory/resourceArea.hpp" +#endif SpaceCounters::SpaceCounters(const char* name, int ordinal, size_t max_size, MutableSpace* m, GenerationCounters* gc) : --- old/src/share/vm/gc_implementation/shared/spaceCounters.hpp 2010-11-16 18:13:25.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/spaceCounters.hpp 2010-11-16 18:13:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP + +#ifndef SERIALGC +#include "gc_implementation/shared/generationCounters.hpp" +#include "gc_implementation/shared/immutableSpace.hpp" +#include "gc_implementation/shared/mutableSpace.hpp" +#include "runtime/perfData.hpp" +#endif + // A SpaceCounter is a holder class for performance counters // that track a space; @@ -75,3 +85,5 @@ return _m->used_in_bytes(); } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACECOUNTERS_HPP --- old/src/share/vm/gc_implementation/shared/spaceDecorator.cpp 2010-11-16 18:13:26.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/spaceDecorator.cpp 2010-11-16 18:13:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,10 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_spaceDecorator.cpp.incl" +#include "precompiled.hpp" +#include "gc_implementation/shared/spaceDecorator.hpp" +#include "memory/space.inline.hpp" +#include "utilities/copy.hpp" // Catch-all file for utility classes --- old/src/share/vm/gc_implementation/shared/spaceDecorator.hpp 2010-11-16 18:13:27.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/spaceDecorator.hpp 2010-11-16 18:13:27.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,13 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP + +#include "gc_implementation/shared/mutableSpace.hpp" +#include "memory/space.hpp" +#include "utilities/globalDefinitions.hpp" + class SpaceDecorator: public AllStatic { public: // Initialization flags. @@ -139,3 +146,5 @@ public: MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {} }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_SPACEDECORATOR_HPP --- old/src/share/vm/gc_implementation/shared/vmGCOperations.cpp 2010-11-16 18:13:28.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/vmGCOperations.cpp 2010-11-16 18:13:28.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,9 +21,25 @@ * questions. * */ -# include "incls/_precompiled.incl" -# include "incls/_vmGCOperations.cpp.incl" +#include "precompiled.hpp" +#include "classfile/classLoader.hpp" +#include "classfile/javaClasses.hpp" +#include "gc_implementation/shared/vmGCOperations.hpp" +#include "memory/gcLocker.inline.hpp" +#include "memory/genCollectedHeap.hpp" +#include "memory/oopFactory.hpp" +#include "oops/instanceKlass.hpp" +#include "oops/instanceRefKlass.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/init.hpp" +#include "runtime/interfaceSupport.hpp" +#include "utilities/dtrace.hpp" +#include "utilities/preserveException.hpp" +#ifndef SERIALGC +#include "gc_implementation/g1/g1CollectedHeap.inline.hpp" +#endif HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool); HS_DTRACE_PROBE_DECL(hotspot, gc__end); --- old/src/share/vm/gc_implementation/shared/vmGCOperations.hpp 2010-11-16 18:13:29.000000000 +0100 +++ new/src/share/vm/gc_implementation/shared/vmGCOperations.hpp 2010-11-16 18:13:28.000000000 +0100 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP +#define SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP + +#include "memory/heapInspection.hpp" +#include "runtime/handles.hpp" +#include "runtime/jniHandles.hpp" +#include "runtime/synchronizer.hpp" +#include "runtime/vm_operations.hpp" + // The following class hierarchy represents // a set of operations (VM_Operation) related to GC. // @@ -199,3 +208,5 @@ virtual void doit(); HeapWord* result() const { return _res; } }; + +#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_VMGCOPERATIONS_HPP --- old/src/share/vm/gc_interface/collectedHeap.cpp 2010-11-16 18:13:30.000000000 +0100 +++ new/src/share/vm/gc_interface/collectedHeap.cpp 2010-11-16 18:13:29.000000000 +0100 @@ -22,8 +22,23 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_collectedHeap.cpp.incl" +#include "precompiled.hpp" +#include "classfile/systemDictionary.hpp" +#include "gc_implementation/shared/vmGCOperations.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "gc_interface/collectedHeap.inline.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/init.hpp" +#include "services/heapDumper.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif #ifdef ASSERT --- old/src/share/vm/gc_interface/collectedHeap.hpp 2010-11-16 18:13:30.000000000 +0100 +++ new/src/share/vm/gc_interface/collectedHeap.hpp 2010-11-16 18:13:30.000000000 +0100 @@ -22,6 +22,16 @@ * */ +#ifndef SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP +#define SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP + +#include "gc_interface/gcCause.hpp" +#include "memory/allocation.hpp" +#include "memory/barrierSet.hpp" +#include "runtime/handles.hpp" +#include "runtime/perfData.hpp" +#include "runtime/safepoint.hpp" + // A "CollectedHeap" is an implementation of a java heap for HotSpot. This // is an abstract class: there may be many different kinds of heaps. This // class defines the functions that a heap must implement, and contains @@ -644,3 +654,5 @@ _heap->set_gc_cause(_previous_cause); } }; + +#endif // SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_HPP --- old/src/share/vm/gc_interface/collectedHeap.inline.hpp 2010-11-16 18:13:31.000000000 +0100 +++ new/src/share/vm/gc_interface/collectedHeap.inline.hpp 2010-11-16 18:13:31.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,28 @@ * */ +#ifndef SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP +#define SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP + +#include "gc_interface/collectedHeap.hpp" +#include "memory/threadLocalAllocBuffer.inline.hpp" +#include "memory/universe.hpp" +#include "oops/arrayOop.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/thread.hpp" +#include "services/lowMemoryDetector.hpp" +#include "utilities/copy.hpp" +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif + // Inline allocation implementations. void CollectedHeap::post_allocation_setup_common(KlassHandle klass, @@ -368,3 +390,5 @@ reset_promotion_should_fail(&_promotion_failure_alot_count); } #endif // #ifndef PRODUCT + +#endif // SHARE_VM_GC_INTERFACE_COLLECTEDHEAP_INLINE_HPP --- old/src/share/vm/gc_interface/gcCause.cpp 2010-11-16 18:13:32.000000000 +0100 +++ new/src/share/vm/gc_interface/gcCause.cpp 2010-11-16 18:13:32.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,8 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_gcCause.cpp.incl" +#include "precompiled.hpp" +#include "gc_interface/gcCause.hpp" const char* GCCause::to_string(GCCause::Cause cause) { switch (cause) { --- old/src/share/vm/gc_interface/gcCause.hpp 2010-11-16 18:13:33.000000000 +0100 +++ new/src/share/vm/gc_interface/gcCause.hpp 2010-11-16 18:13:33.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_GC_INTERFACE_GCCAUSE_HPP +#define SHARE_VM_GC_INTERFACE_GCCAUSE_HPP + +#include "memory/allocation.hpp" + // // This class exposes implementation details of the various // collector(s), and we need to be very careful with it. If @@ -83,3 +88,5 @@ // Return true if the GCCause is for a full collection. static bool is_for_full_collection(GCCause::Cause cause) PRODUCT_RETURN0; }; + +#endif // SHARE_VM_GC_INTERFACE_GCCAUSE_HPP --- old/src/share/vm/interpreter/abstractInterpreter.hpp 2010-11-16 18:13:34.000000000 +0100 +++ new/src/share/vm/interpreter/abstractInterpreter.hpp 2010-11-16 18:13:34.000000000 +0100 @@ -22,6 +22,35 @@ * */ +#ifndef SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP +#define SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP + +#include "code/stubs.hpp" +#include "interpreter/bytecodes.hpp" +#include "runtime/vmThread.hpp" +#include "utilities/top.hpp" +#ifdef TARGET_ARCH_MODEL_x86_32 +# include "interp_masm_x86_32.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_x86_64 +# include "interp_masm_x86_64.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_sparc +# include "interp_masm_sparc.hpp" +#endif +#ifdef TARGET_ARCH_MODEL_zero +# include "interp_masm_zero.hpp" +#endif +#ifdef TARGET_OS_FAMILY_linux +# include "thread_linux.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_solaris +# include "thread_solaris.inline.hpp" +#endif +#ifdef TARGET_OS_FAMILY_windows +# include "thread_windows.inline.hpp" +#endif + // This file contains the platform-independent parts // of the abstract interpreter and the abstract interpreter generator. @@ -256,3 +285,5 @@ public: AbstractInterpreterGenerator(StubQueue* _code); }; + +#endif // SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP --- old/src/share/vm/interpreter/bytecode.cpp 2010-11-16 18:13:35.000000000 +0100 +++ new/src/share/vm/interpreter/bytecode.cpp 2010-11-16 18:13:35.000000000 +0100 @@ -22,8 +22,15 @@ * */ -#include "incls/_precompiled.incl" -#include "incls/_bytecode.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecode.hpp" +#include "interpreter/linkResolver.hpp" +#include "oops/constantPoolOop.hpp" +#include "oops/oop.inline.hpp" +#include "runtime/fieldType.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/safepoint.hpp" +#include "runtime/signature.hpp" // Implementation of Bytecode --- old/src/share/vm/interpreter/bytecode.hpp 2010-11-16 18:13:36.000000000 +0100 +++ new/src/share/vm/interpreter/bytecode.hpp 2010-11-16 18:13:35.000000000 +0100 @@ -22,6 +22,22 @@ * */ +#ifndef SHARE_VM_INTERPRETER_BYTECODE_HPP +#define SHARE_VM_INTERPRETER_BYTECODE_HPP + +#include "interpreter/bytecodes.hpp" +#include "memory/allocation.hpp" +#include "oops/methodOop.hpp" +#ifdef TARGET_ARCH_x86 +# include "bytes_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytes_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytes_zero.hpp" +#endif + // Base class for different kinds of abstractions working // relative to an objects 'this' pointer. @@ -431,3 +447,5 @@ DEBUG_ONLY(b->verify()); return b; } + +#endif // SHARE_VM_INTERPRETER_BYTECODE_HPP --- old/src/share/vm/interpreter/bytecodeHistogram.cpp 2010-11-16 18:13:37.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeHistogram.cpp 2010-11-16 18:13:36.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,8 +22,11 @@ * */ -# include "incls/_precompiled.incl" -# include "incls/_bytecodeHistogram.cpp.incl" +#include "precompiled.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "memory/resourceArea.hpp" +#include "runtime/os.hpp" +#include "utilities/growableArray.hpp" // ------------------------------------------------------------------------------------------------ // Non-product code --- old/src/share/vm/interpreter/bytecodeHistogram.hpp 2010-11-16 18:13:37.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeHistogram.hpp 2010-11-16 18:13:37.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP +#define SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP + +#include "interpreter/bytecodes.hpp" +#include "memory/allocation.hpp" + // BytecodeCounter counts the number of bytecodes executed class BytecodeCounter: AllStatic { @@ -90,3 +96,5 @@ // Profile printing static void print(float cutoff = 0.01F) PRODUCT_RETURN; // cutoff in percent }; + +#endif // SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP --- old/src/share/vm/interpreter/bytecodeInterpreter.cpp 2010-11-16 18:13:38.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeInterpreter.cpp 2010-11-16 18:13:38.000000000 +0100 @@ -22,10 +22,46 @@ * */ - // no precompiled headers -#include "incls/_bytecodeInterpreter.cpp.incl" +#include "classfile/vmSymbols.hpp" +#include "gc_interface/collectedHeap.hpp" +#include "interpreter/bytecodeHistogram.hpp" +#include "interpreter/bytecodeInterpreter.hpp" +#include "interpreter/bytecodeInterpreter.inline.hpp" +#include "interpreter/interpreter.hpp" +#include "interpreter/interpreterRuntime.hpp" +#include "memory/cardTableModRefBS.hpp" +#include "memory/resourceArea.hpp" +#include "oops/objArrayKlass.hpp" +#include "oops/oop.inline.hpp" +#include "prims/jvmtiExport.hpp" +#include "runtime/frame.inline.hpp" +#include "runtime/handles.inline.hpp" +#include "runtime/interfaceSupport.hpp" +#include "runtime/sharedRuntime.hpp" +#include "runtime/threadCritical.hpp" +#include "utilities/exceptions.hpp" +#ifdef TARGET_OS_ARCH_linux_x86 +# include "orderAccess_linux_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_sparc +# include "orderAccess_linux_sparc.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_linux_zero +# include "orderAccess_linux_zero.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_x86 +# include "orderAccess_solaris_x86.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_solaris_sparc +# include "orderAccess_solaris_sparc.inline.hpp" +#endif +#ifdef TARGET_OS_ARCH_windows_x86 +# include "orderAccess_windows_x86.inline.hpp" +#endif + +// no precompiled headers #ifdef CC_INTERP /* --- old/src/share/vm/interpreter/bytecodeInterpreter.hpp 2010-11-16 18:13:39.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeInterpreter.hpp 2010-11-16 18:13:39.000000000 +0100 @@ -22,6 +22,26 @@ * */ +#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP +#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP + +#include "memory/allocation.hpp" +#include "oops/methodDataOop.hpp" +#include "oops/methodOop.hpp" +#include "runtime/basicLock.hpp" +#include "runtime/frame.hpp" +#include "runtime/globals.hpp" +#include "utilities/globalDefinitions.hpp" +#ifdef TARGET_ARCH_x86 +# include "bytes_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytes_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytes_zero.hpp" +#endif + #ifdef CC_INTERP // CVM definitions find hotspot equivalents... @@ -558,8 +578,19 @@ #endif // PRODUCT // Platform fields/methods -# include "incls/_bytecodeInterpreter_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "bytecodeInterpreter_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytecodeInterpreter_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytecodeInterpreter_zero.hpp" +#endif + }; // BytecodeInterpreter #endif // CC_INTERP + +#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP --- old/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp 2010-11-16 18:13:40.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp 2010-11-16 18:13:40.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,12 @@ * */ +#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP +#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP + +#include "interpreter/bytecodeInterpreter.hpp" +#include "runtime/stubRoutines.hpp" + // This file holds platform-independent bodies of inline functions for the C++ based interpreter #ifdef CC_INTERP @@ -37,5 +43,16 @@ #endif // Platform dependent data manipulation -# include "incls/_bytecodeInterpreter_pd.inline.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "bytecodeInterpreter_x86.inline.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "bytecodeInterpreter_sparc.inline.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "bytecodeInterpreter_zero.inline.hpp" +#endif + #endif // CC_INTERP + +#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP --- old/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2010-11-16 18:13:41.000000000 +0100 +++ new/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl 2010-11-16 18:13:41.000000000 +0100 @@ -1,6 +1,6 @@