Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/cpu/x86/vm/assembler_x86.cpp	Tue Aug 23 11:06:30 2011 +0200
     1.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp	Thu Aug 25 18:56:52 2011 -0700
     1.3 @@ -2307,7 +2307,7 @@
     1.4  }
     1.5  
     1.6  void Assembler::prefetchnta(Address src) {
     1.7 -  NOT_LP64(assert(VM_Version::supports_sse2(), "must support"));
     1.8 +  NOT_LP64(assert(VM_Version::supports_sse(), "must support"));
     1.9    InstructionMark im(this);
    1.10    prefetch_prefix(src);
    1.11    emit_byte(0x18);

     2.1 --- a/test/compiler/5091921/Test7005594.sh	Tue Aug 23 11:06:30 2011 +0200
     2.2 +++ b/test/compiler/5091921/Test7005594.sh	Thu Aug 25 18:56:52 2011 -0700
     2.3 @@ -43,6 +43,45 @@
     2.4  echo "TESTCLASSES=${TESTCLASSES}"
     2.5  echo "CLASSPATH=${CLASSPATH}"
     2.6  
     2.7 +# Amount of physical memory in megabytes
     2.8 +MEM=0
     2.9 +if [ -f "/proc/meminfo" ]; then
    2.10 +  # Linux, Windows/Cygwin
    2.11 +  MEM=`cat /proc/meminfo |grep ^MemTotal: | awk '{print $2}'`
    2.12 +  MEM="$(($MEM / 1024))"
    2.13 +elif [ -x "/usr/sbin/prtconf" ]; then
    2.14 +  # Solaris
    2.15 +  MEM=`/usr/sbin/prtconf | grep "^Memory size" | awk '{print $3}'`
    2.16 +elif [ -x "/usr/sbin/system_profiler" ]; then
    2.17 +  # MacOS
    2.18 +  MEMo=`/usr/sbin/system_profiler SPHardwareDataType | grep Memory:`
    2.19 +  MEM=`echo "$MEMo" | awk '{print $2}'`
    2.20 +  MEMu=`echo "$MEMo" | awk '{print $3}'`
    2.21 +  case $MEMu in
    2.22 +  GB)
    2.23 +    MEM="$(($MEM * 1024))"
    2.24 +    ;;
    2.25 +  MB)
    2.26 +    ;;
    2.27 +  *)
    2.28 +    echo "Unknown memory unit in system_profile output: $MEMu"
    2.29 +    ;;
    2.30 +  esac
    2.31 +elif [ -n "$ROOTDIR" -a -x "$ROOTDIR/mksnt/sysinf" ]; then
    2.32 +  # Windows/MKS
    2.33 +  MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
    2.34 +  MEM="$(($machine_memory / 1024))"
    2.35 +else
    2.36 +  echo "Unable to determine amount of physical memory on the machine"
    2.37 +fi
    2.38 +
    2.39 +if [ $MEM -lt 2000 ]; then
    2.40 +  echo "Test skipped due to low (or unknown) memory on the system: $MEM Mb"
    2.41 +  exit 0
    2.42 +fi
    2.43 +
    2.44 +echo "MEMORY=$MEM Mb"
    2.45 +
    2.46  set -x
    2.47  
    2.48  cp ${TESTSRC}/Test7005594.java .
    2.49 @@ -50,7 +89,7 @@
    2.50  
    2.51  ${TESTJAVA}/bin/javac -d . Test7005594.java
    2.52  
    2.53 -${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
    2.54 +${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
    2.55  
    2.56  result=$?
    2.57