/hg/openjdk6-mips: 3 new changesets
liuqi at icedtea.classpath.org
liuqi at icedtea.classpath.org
Mon Nov 1 06:11:58 PDT 2010
changeset 142b74086f40 in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=142b74086f40
author: Ao Qi <aoqi at loongson.cn>
date: Fri Oct 29 09:44:58 2010 +0800
Removed unimplemented parts in Makefile, so a relatively complete
JRE can be built.
changeset 7a9f890eafef in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=7a9f890eafef
author: YANG Yongqiang <yangyongqiang at loongson.cn>
date: Mon Nov 01 17:41:18 2010 +0800
Fix 2 bugs which are related to patching.
NativeGeneralJump represents both long and short jump instructions,
so they must be dealed respectively in patching. Otherwise patching
produces wrong results.
changeset d0a60cd6d61c in /hg/openjdk6-mips
details: http://icedtea.classpath.org/hg/openjdk6-mips?cmd=changeset;node=d0a60cd6d61c
author: LIN Chuanwen <linchuanwen at loongson.cn>
date: Mon Nov 01 17:45:37 2010 +0800
Fix a bug caused by the MIPS ABI.
When passing arguments, the stack adjusting is not according to the
MIPS ABI. Fixed it.
diffstat:
31 files changed, 202 insertions(+), 268 deletions(-)
corba/make/common/Defs-linux.gmk | 4
env_debug.sh | 18 -
env_product.sh | 7
hotspot/agent/make/saenv.sh | 4
hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | 46 +++
hotspot/agent/src/os/linux/Makefile | 6
hotspot/agent/src/os/linux/libproc.h | 11
hotspot/make/Makefile | 7
hotspot/make/defs.make | 6
hotspot/make/linux/makefiles/buildtree.make | 2
hotspot/make/linux/makefiles/debug.make | 2
hotspot/make/linux/makefiles/defs.make | 20 +
hotspot/make/linux/makefiles/gcc.make | 2
hotspot/make/linux/makefiles/launcher.make | 7
hotspot/make/linux/makefiles/sa.make | 3
hotspot/make/linux/makefiles/vm.make | 2
hotspot/src/cpu/mips/vm/c1_CodeStubs_mips.cpp | 9
hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp | 8
hotspot/src/cpu/mips/vm/nativeInst_mips.cpp | 210 +-----------------
hotspot/src/cpu/mips/vm/templateInterpreter_mips.cpp | 5
hotspot/src/share/vm/c1/c1_Runtime1.cpp | 1
hotspot/src/share/vm/runtime/reflection.cpp | 1
jdk/make/common/Defs-linux.gmk | 9
jdk/make/common/Program.gmk | 3
jdk/make/common/shared/Compiler-gcc.gmk | 8
jdk/make/common/shared/Platform.gmk | 5
jdk/make/java/instrument/Makefile | 3
jdk/make/java/redist/Makefile | 54 ++--
jdk/make/javax/sound/SoundDefs.gmk | 4
jdk/src/share/native/com/sun/media/sound/SoundDefs.h | 1
make/hotspot-rules.gmk | 2
diffs (truncated from 996 to 500 lines):
diff -r d2a6a000ff33 -r d0a60cd6d61c corba/make/common/Defs-linux.gmk
--- a/corba/make/common/Defs-linux.gmk Sat Oct 30 17:47:17 2010 +0800
+++ b/corba/make/common/Defs-linux.gmk Mon Nov 01 17:45:37 2010 +0800
@@ -197,6 +197,10 @@ EXTRA_LIBS += -lc
EXTRA_LIBS += -lc
LDFLAGS_DEFS_OPTION = -z defs
+ifeq ($(ARCH), mips64)
+# MIPS do not know this defs option
+ LDFLAGS_DEFS_OPTION =
+endif
LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
#
diff -r d2a6a000ff33 -r d0a60cd6d61c env_debug.sh
--- a/env_debug.sh Sat Oct 30 17:47:17 2010 +0800
+++ b/env_debug.sh Mon Nov 01 17:45:37 2010 +0800
@@ -1,27 +1,27 @@ export LANG=C
export LANG=C
export LC_ALL=C
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-6-openjdk
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-6-openjdk/bin
export ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk
#export ALT_BOOTDIR=/home/loongson/java/j2sdk-gs2
export ALT_BINARY_PLUGS_PATH=/opt/java/openjdk-binary-plugs
-export ALT_JDK_IMPORT_PATH=/usr/lib/jvm/java-6-openjdk
-#export ALT_SLASH_JAVA=/yangyongqiang
+#export ALT_JDK_IMPORT_PATH=/usr/lib/jvm/java-6-openjdk
export ARCH_DATA_MODEL=32
+#The default hotspot-build is all_product. Setting DEBUG_NAME would change the target.
export DEBUG_NAME=debug
-#The default hotspot-build is all_product. Setting DEBUG_NAME would change the target.
-export BUILD_LANGTOOLS=fasle
+# If want to build entire JDK, set all envs below true.
+export BUILD_LANGTOOLS=false
export BUILD_CORBA=false
export BUILD_JAXP=false
export BUILD_JAXWS=false
+# When building jaxp, it seems a bug that jdk6-jaxp-2009_10_13.zip cannot be downloaded.
+# The workaround is to download it by "wget ", and set ALT_DROPS_DIR to the dir where the zip is.
+#export ALT_DROPS_DIR=~/zip_dir
+
export BUILD_MOTIF=false
export BUILD_JDK=false
export BUILD_DEPLOY=false
-export CLIENT_ONLY=true
-
-
unset CLASSPATH
unset JAVA_HOME
-
diff -r d2a6a000ff33 -r d0a60cd6d61c env_product.sh
--- a/env_product.sh Sat Oct 30 17:47:17 2010 +0800
+++ b/env_product.sh Mon Nov 01 17:45:37 2010 +0800
@@ -1,15 +1,20 @@ export LC_ALL=C
export LC_ALL=C
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-6-openjdk
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-6-openjdk/bin
export ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk
export ALT_BINARY_PLUGS_PATH=/opt/java/openjdk-binary-plugs
export ARCH_DATA_MODEL=32
#The default hotspot-build is all_product. Setting DEBUG_NAME would change the target.
+# If want to build entire JDK, set all envs below true.
export BUILD_LANGTOOLS=false
export BUILD_CORBA=false
export BUILD_JAXP=false
export BUILD_JAXWS=false
+# When building jaxp, it seems a bug that jdk6-jaxp-2009_10_13.zip cannot be downloaded.
+# The workaround is to download it by "wget ", and set ALT_DROPS_DIR to the dir where the zip is.
+#export ALT_DROPS_DIR=~/zip_dir
+
export BUILD_MOTIF=false
export BUILD_JDK=false
export BUILD_DEPLOY=false
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/agent/make/saenv.sh
--- a/hotspot/agent/make/saenv.sh Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/agent/make/saenv.sh Mon Nov 01 17:45:37 2010 +0800
@@ -42,6 +42,10 @@ if [ "$OS" = "Linux" ]; then
SA_LIBPATH=$STARTDIR/../src/os/linux/amd64:$STARTDIR/linux/amd64
OPTIONS="-Dsa.library.path=$SA_LIBPATH"
CPU=amd64
+ elif [ "$ARCH" = "mips64" ] ; then
+ SA_LIBPATH=$STARTDIR/../src/os/linux/mips:$STARTDIR/linux/mips
+ OPTIONS="-Dsa.library.path=$SA_LIBPATH"
+ CPU=mips
else
SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386
OPTIONS="-Dsa.library.path=$SA_LIBPATH"
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/agent/src/os/linux/LinuxDebuggerLocal.c
--- a/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c Mon Nov 01 17:45:37 2010 +0800
@@ -39,6 +39,10 @@
#if defined(sparc) || defined(sparcv9)
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
+#endif
+
+#if defined(mipsel) || defined(mips)
+#include "sun_jvm_hotspot_debugger_mips_MIPSThreadContext.h"
#endif
static jfieldID p_ps_prochandle_ID = 0;
@@ -307,6 +311,9 @@ JNIEXPORT jlongArray JNICALL Java_sun_jv
#if defined(sparc) || defined(sparcv9)
#define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG
#endif
+#if defined(mips) || defined(mipsel)
+#define NPRGREG sun_jvm_hotspot_debugger_mips_MIPSThreadContext_NPRGREG
+#endif
array = (*env)->NewLongArray(env, NPRGREG);
CHECK_EXCEPTION_(0);
@@ -406,6 +413,45 @@ JNIEXPORT jlongArray JNICALL Java_sun_jv
regs[REG_INDEX(R_O7)] = gregs.u_regs[14];
#endif /* sparc */
+#if defined(mips) || defined(mipsel)
+
+#define REG_INDEX(reg) sun_jvm_hotspot_debugger_mips_MIPSThreadContext_##reg
+
+ regs[REG_INDEX(ZERO)] = gregs.regs[0];
+ regs[REG_INDEX(AT)] = gregs.regs[1];
+ regs[REG_INDEX(V0)] = gregs.regs[2];
+ regs[REG_INDEX(V1)] = gregs.regs[3];
+ regs[REG_INDEX(A0)] = gregs.regs[4];
+ regs[REG_INDEX(A1)] = gregs.regs[5];
+ regs[REG_INDEX(A2)] = gregs.regs[6];
+ regs[REG_INDEX(A3)] = gregs.regs[7];
+ regs[REG_INDEX(T0)] = gregs.regs[8];
+ regs[REG_INDEX(T1)] = gregs.regs[9];
+ regs[REG_INDEX(T2)] = gregs.regs[10];
+ regs[REG_INDEX(T3)] = gregs.regs[11];
+ regs[REG_INDEX(T4)] = gregs.regs[12];
+ regs[REG_INDEX(T5)] = gregs.regs[13];
+ regs[REG_INDEX(T6)] = gregs.regs[14];
+ regs[REG_INDEX(T7)] = gregs.regs[15];
+ regs[REG_INDEX(S0)] = gregs.regs[16];
+ regs[REG_INDEX(S1)] = gregs.regs[17];
+ regs[REG_INDEX(S2)] = gregs.regs[18];
+ regs[REG_INDEX(S3)] = gregs.regs[19];
+ regs[REG_INDEX(S4)] = gregs.regs[20];
+ regs[REG_INDEX(S5)] = gregs.regs[21];
+ regs[REG_INDEX(S6)] = gregs.regs[22];
+ regs[REG_INDEX(S7)] = gregs.regs[23];
+ regs[REG_INDEX(T8)] = gregs.regs[24];
+ regs[REG_INDEX(T9)] = gregs.regs[25];
+ regs[REG_INDEX(K0)] = gregs.regs[26];
+ regs[REG_INDEX(K1)] = gregs.regs[27];
+ regs[REG_INDEX(GP)] = gregs.regs[28];
+ regs[REG_INDEX(SP)] = gregs.regs[29];
+ regs[REG_INDEX(FP)] = gregs.regs[30];
+ regs[REG_INDEX(S8)] = gregs.regs[30];
+ regs[REG_INDEX(RA)] = gregs.regs[31];
+#endif /* mips */
+
(*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
return array;
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/agent/src/os/linux/Makefile
--- a/hotspot/agent/src/os/linux/Makefile Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/agent/src/os/linux/Makefile Mon Nov 01 17:45:37 2010 +0800
@@ -22,7 +22,11 @@
#
#
-ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; \
+ elif ([ `uname -m` = "x86_64" ]) ; then echo amd64 ; \
+ elif ([ `uname -m` = "sparc64" ]) ; then echo sparc ; \
+ elif ([ `uname -m` = "mips64" ]) ; then echo mips ; \
+ else echo i386 ; fi )
GCC = gcc
JAVAH = ${JAVA_HOME}/bin/javah
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/agent/src/os/linux/libproc.h
--- a/hotspot/agent/src/os/linux/libproc.h Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/agent/src/os/linux/libproc.h Mon Nov 01 17:45:37 2010 +0800
@@ -43,6 +43,11 @@
#endif //sparc or sparcv9
+#if defined(mips) || defined(mipsel) || defined(mips64) || defined(mips64el)
+#include <asm/ptrace.h>
+void abc();
+#endif
+
/************************************************************************************
0. This is very minimal subset of Solaris libproc just enough for current application.
@@ -83,7 +88,11 @@ unsigned long regs[IA64_REG_COUNT];
};
#endif
-#if defined(sparc) || defined(sparcv9)
+#if defined(sparc) || defined(sparcv9)
+#define user_regs_struct pt_regs
+#endif
+
+#if defined(mips) || defined(mipsel) || defined(mips64) || defined(mips64el)
#define user_regs_struct pt_regs
#endif
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/Makefile
--- a/hotspot/make/Makefile Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/Makefile Mon Nov 01 17:45:37 2010 +0800
@@ -89,7 +89,8 @@ JDK_DIRS=bin include jre lib demo
JDK_DIRS=bin include jre lib demo
all: all_product all_fastdebug
-all_product: product product1 productkernel docs export_product
+all_product: product1 productkernel docs export_product
+#all_product: product product1 productkernel docs export_product
all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
all_debug: jvmg1 jvmgkernel docs export_debug
#all_debug: jvmg jvmg1 jvmgkernel docs export_debug
@@ -303,7 +304,9 @@ endif
$(install-file)
# Xusage file
-$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
+# FIXME: EXPORT_SERVER_DIR is null now. aoqi
+#$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
+$(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
$(prep-target)
$(RM) $@.temp
$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/defs.make
--- a/hotspot/make/defs.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/defs.make Mon Nov 01 17:45:37 2010 +0800
@@ -218,6 +218,8 @@ ifneq ($(OSNAME),windows)
endif
endif
ifeq ($(BUILDARCH), mips)
+ # FIXME: Simply set BUILDARCH mipsel, because loongson is mipsel. aoqi
+ BUILDARCH = mipsel
ifdef LP64
BUILDARCH = mips64
endif
@@ -232,8 +234,10 @@ ifneq ($(OSNAME),windows)
LIBARCH/ia64 = ia64
LIBARCH/mips = mips
LIBARCH/mips64 = mips64
+ LIBARCH/mipsel = mipsel
+ LIBARCH/mips64el= mips64el
- LP64_ARCH = sparcv9 amd64 ia64 mips64
+ LP64_ARCH = sparcv9 amd64 ia64 mips64 mips64el
endif
# Required make macro settings for all platforms
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/buildtree.make
--- a/hotspot/make/linux/makefiles/buildtree.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/buildtree.make Mon Nov 01 17:45:37 2010 +0800
@@ -114,7 +114,7 @@ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_F
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
- env.sh env.csh .dbxrc #test_gamma
+ env.sh env.csh .dbxrc test_gamma
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/debug.make
--- a/hotspot/make/linux/makefiles/debug.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/debug.make Mon Nov 01 17:45:37 2010 +0800
@@ -40,5 +40,5 @@ _JUNK_ := $(shell echo -e >&2 ""\
G_SUFFIX =
VERSION = debug
-SYSDEFS += -DASSERT -DDEBUG -DLOONGSONDEBUG
+SYSDEFS += -DASSERT -DDEBUG
PICFLAGS = DEFAULT
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/defs.make
--- a/hotspot/make/linux/makefiles/defs.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/defs.make Mon Nov 01 17:45:37 2010 +0800
@@ -87,22 +87,32 @@ ifeq ($(ARCH), i686)
HS_ARCH = x86
endif
+# mips
+ifeq ($(ARCH), mips64)
+ ARCH_DATA_MODEL = 32
+ PLATFORM = linux-mipsel
+ VM_PLATFORM = linux_mipsel
+ HS_ARCH = mips
+endif
+
JDK_INCLUDE_SUBDIR=linux
# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
VM_DEBUG=jvmg
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
-EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+#server cannot work now. FIXME aoqi
+#EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+#EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+#EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+#EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
ifeq ($(ARCH_DATA_MODEL), 32)
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+#libsaproc.so is not generated yet, its build is in saproc.make. FIXME aoqi
+# EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
else
ifeq ($(ARCH),ia64)
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/gcc.make
--- a/hotspot/make/linux/makefiles/gcc.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/gcc.make Mon Nov 01 17:45:37 2010 +0800
@@ -83,7 +83,7 @@ endif
endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS =
+WARNINGS_ARE_ERRORS =
# Except for a few acceptable ones
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/launcher.make
--- a/hotspot/make/linux/makefiles/launcher.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/launcher.make Mon Nov 01 17:45:37 2010 +0800
@@ -31,10 +31,15 @@ LAUNCHERFLAGS = $(ARCHFLAG) \
LAUNCHERFLAGS = $(ARCHFLAG) \
-I$(LAUNCHERDIR) -I$(GAMMADIR)/src/share/vm/prims \
-DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
- -DARCH=\"$(LIBARCH)\" \
-DGAMMA \
-DLAUNCHER_TYPE=\"gamma\" \
-DLINK_INTO_$(LINK_INTO)
+
+ifeq ($(LIBARCH),mips)
+ LAUNCHERFLAGS += -DARCH=\"mipsel\"
+else
+ LAUNCHERFLAGS += -DARCH=\"$(LIBARCH)\"
+endif
ifeq ($(LINK_INTO),AOUT)
LAUNCHER.o = launcher.o $(JVM_OBJ_FILES)
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/sa.make
--- a/hotspot/make/linux/makefiles/sa.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/sa.make Mon Nov 01 17:45:37 2010 +0800
@@ -42,6 +42,7 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/too
# gnumake 3.78.1 does not accept the *s that
# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
+# see sa.files
AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
@@ -91,6 +92,8 @@ all:
$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
+#*.java of MIPS in hotspot/agent/src/share/classes/sun has not been implemented yet. FIXME aoqi
+#$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.mips.MIPSThreadContext
clean:
rm -rf $(SA_CLASSDIR)
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/make/linux/makefiles/vm.make
--- a/hotspot/make/linux/makefiles/vm.make Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/make/linux/makefiles/vm.make Mon Nov 01 17:45:37 2010 +0800
@@ -221,7 +221,7 @@ include $(MAKEFILES_DIR)/saproc.make
#----------------------------------------------------------------------
-#TODO aoqi
+#FIXME aoqi, libsaproc[_g].so(serviceability agent) of mips has not been implemented yet.
#build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) checkAndBuildSA
build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB)
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/src/cpu/mips/vm/c1_CodeStubs_mips.cpp
--- a/hotspot/src/cpu/mips/vm/c1_CodeStubs_mips.cpp Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/c1_CodeStubs_mips.cpp Mon Nov 01 17:45:37 2010 +0800
@@ -373,14 +373,11 @@ void PatchingStub::emit_code(LIR_Assembl
}
if (CommentedAssembly) {
- __ block_comment("patch data encoded as movl");
+ __ block_comment("patch data");
}
// Now emit the patch record telling the runtime how to find the
- // pieces of the patch. We only need 3 bytes but for readability of
- // the disassembly we make the data look like a movl reg, imm32,
- // which requires 5 bytes
- //int sizeof_patch_record = 5;
- //for mips, I use a move instruction instead @jerome, 12/29, 06
+ // pieces of the patch. We only need 3 bytes but for alignment, we
+ // need 4 bytes
int sizeof_patch_record = 4;
bytes_to_skip += sizeof_patch_record;
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp
--- a/hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp Mon Nov 01 17:45:37 2010 +0800
@@ -2479,13 +2479,14 @@ void LIR_Assembler::emit_opTypeCheck(LIR
jobject2reg(k->encoding(),k_RInfo);
}
assert(obj != k_RInfo, "must be different");
+ int the_pc;
if (op->profiled_method() != NULL) {
ciMethod* method = op->profiled_method();
int bci = op->profiled_bci();
Label profile_done;
// __ jcc(Assembler::notEqual, profile_done);
- __ bne(obj, ZERO, done);
+ __ bne(obj, ZERO, profile_done);
__ delayed()->nop();
// Object is null; update methodDataOop
@@ -2498,15 +2499,11 @@ void LIR_Assembler::emit_opTypeCheck(LIR
assert(data != NULL, "need data for checkcast");
assert(data->is_BitData(), "need BitData for checkcast");
Register mdo = klass_RInfo;
- // __ movl(mdo, md->encoding());
- //__ move(mdo, md->encoding());
int oop_index = __ oop_recorder()->find_index(md->encoding());
RelocationHolder rspec = oop_Relocation::spec(oop_index);
__ relocate(rspec);
__ lui(mdo, Assembler::split_high((int)md->encoding()));
__ addiu(mdo, mdo, Assembler::split_low((int)md->encoding()));
-
-
Address data_addr(mdo, md->byte_offset_of_slot(data, DataLayout::header_offset()));
//FIXME, it very ineffictive to replace orl with 3 mips instruction @jerome, 12/27,06
@@ -2521,7 +2518,6 @@ void LIR_Assembler::emit_opTypeCheck(LIR
} else {
__ beq(obj, ZERO, done);
__ delayed()->nop();
-
}
__ verify_oop(obj);
diff -r d2a6a000ff33 -r d0a60cd6d61c hotspot/src/cpu/mips/vm/nativeInst_mips.cpp
--- a/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp Sat Oct 30 17:47:17 2010 +0800
+++ b/hotspot/src/cpu/mips/vm/nativeInst_mips.cpp Mon Nov 01 17:45:37 2010 +0800
@@ -37,15 +37,6 @@ void NativeInstruction::set_long_at(int
}
void NativeCall::verify() {
-/*
- // Make sure code pattern is actually a call imm32 instruction.
- int inst = ubyte_at(0);
- if (inst != instruction_code) {
- tty->print_cr("Addr: " INTPTR_FORMAT " Code: 0x%x", instruction_address(),
- inst);
- fatal("not a call disp32");
- }
-*/
// make sure code pattern is actually a call instruction
if ( !is_op(Assembler::lui_op) ||
!is_op(long_at(4), Assembler::addiu_op) ||
@@ -145,136 +136,9 @@ void NativeCall::insert(address code_pos
// selfs (spinlock). Then patches the last byte, and then atomicly replaces
// the jmp's with the first 4 byte of the new instruction.
void NativeCall::replace_mt_safe(address instr_addr, address code_buffer) {
-/*
- assert(Patching_lock->is_locked() ||
- SafepointSynchronize::is_at_safepoint(), "concurrent code patching");
- assert (instr_addr != NULL, "illegal address for code patching");
-
- NativeCall* n_call = nativeCall_at (instr_addr); // checking that it is a call
- if (os::is_MP()) {
- guarantee((intptr_t)instr_addr % BytesPerWord == 0, "must be aligned");
- }
-
- // First patch dummy jmp in place
- unsigned char patch[4];
- assert(sizeof(patch)==sizeof(jint), "sanity check");
- patch[0] = 0xEB; // jmp rel8
- patch[1] = 0xFE; // jmp to self
- patch[2] = 0xEB;
- patch[3] = 0xFE;
-
- // First patch dummy jmp in place
- *(jint*)instr_addr = *(jint *)patch;
-
- // Invalidate. Opteron requires a flush after every write.
- n_call->wrote(0);
-
- // Patch 4th byte
- instr_addr[4] = code_buffer[4];
-
- n_call->wrote(4);
-
- // Patch bytes 0-3
- *(jint*)instr_addr = *(jint *)code_buffer;
More information about the distro-pkg-dev
mailing list