archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Vladimir Kozlov 2011-08-25 18:56:52 -07:00
commit fa7cc07ca0
2 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/cpu/x86/vm/assembler_x86.cpp
View file

@ -2307,7 +2307,7 @@ void Assembler::prefetch_prefix(Address src) {
}
void Assembler::prefetchnta(Address src) {
NOT_LP64(assert(VM_Version::supports_sse2(), "must support"));
NOT_LP64(assert(VM_Version::supports_sse(), "must support"));
InstructionMark im(this);
prefetch_prefix(src);
emit_byte(0x18);

41
hotspot/test/compiler/5091921/Test7005594.sh
View file

@ -43,6 +43,45 @@ fi
echo "TESTCLASSES=${TESTCLASSES}"
echo "CLASSPATH=${CLASSPATH}"
# Amount of physical memory in megabytes
MEM=0
if [ -f "/proc/meminfo" ]; then
# Linux, Windows/Cygwin
MEM=`cat /proc/meminfo |grep ^MemTotal: | awk '{print $2}'`
MEM="$(($MEM / 1024))"
elif [ -x "/usr/sbin/prtconf" ]; then
# Solaris
MEM=`/usr/sbin/prtconf | grep "^Memory size" | awk '{print $3}'`
elif [ -x "/usr/sbin/system_profiler" ]; then
# MacOS
MEMo=`/usr/sbin/system_profiler SPHardwareDataType | grep Memory:`
MEM=`echo "$MEMo" | awk '{print $2}'`
MEMu=`echo "$MEMo" | awk '{print $3}'`
case $MEMu in
GB)
MEM="$(($MEM * 1024))"
;;
MB)
;;
*)
echo "Unknown memory unit in system_profile output: $MEMu"
;;
esac
elif [ -n "$ROOTDIR" -a -x "$ROOTDIR/mksnt/sysinf" ]; then
# Windows/MKS
MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
MEM="$(($machine_memory / 1024))"
else
echo "Unable to determine amount of physical memory on the machine"
fi
if [ $MEM -lt 2000 ]; then
echo "Test skipped due to low (or unknown) memory on the system: $MEM Mb"
exit 0
fi
echo "MEMORY=$MEM Mb"
set -x
cp ${TESTSRC}/Test7005594.java .
@ -50,7 +89,7 @@ cp ${TESTSRC}/Test7005594.sh .
${TESTJAVA}/bin/javac -d . Test7005594.java
${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
result=$?