[aarch64-port-dev ] /hg/icedtea7-forest-aarch64/hotspot: 3 new changesets

[Andrew Dinn]

[forwarding bounced check-in message from icedtea7-forest-aarch64 repo]
------ This is a copy of the message, including all the headers. ------

Return-path: <adinn at icedtea.classpath.org>
Received: from localhost ([127.0.0.1] helo=icedtea.classpath.org)
	by icedtea.classpath.org with esmtp (Exim 4.69)
	(envelope-from <adinn at icedtea.classpath.org>)
	id 1Xro9f-00027M-10
	for aarch64-port-dev at openjdk.java.net; Fri, 21 Nov 2014 13:21:43 +0000
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: Fri, 21 Nov 2014 13:21:42 +0000
Subject: /hg/icedtea7-forest-aarch64/hotspot: 3 new changesets
From: adinn at icedtea.classpath.org
X-Hg-Notification: changeset 7b52d065b907
Message-Id:
<hg.7b52d065b907.1416576103.-5017525213744097322 at icedtea.classpath.org>
To: aarch64-port-dev at openjdk.java.net

changeset 7b52d065b907 in /hg/icedtea7-forest-aarch64/hotspot
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=7b52d065b907
author: adinn
date: Fri Nov 21 13:18:41 2014 +0000

	correct for difference in inlcude hierarchy


changeset 9042d4f79d90 in /hg/icedtea7-forest-aarch64/hotspot
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=9042d4f79d90
author: adinn
date: Fri Nov 21 13:20:53 2014 +0000

	correct typos


changeset ae4b26e6783b in /hg/icedtea7-forest-aarch64/hotspot
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/hotspot?cmd=changeset;node=ae4b26e6783b
author: adinn
date: Fri Nov 21 13:21:30 2014 +0000

	Use os::malloc to allocate the register map.


diffstat:

 src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp                       |  2 +-
 src/cpu/aarch64/vm/frame_aarch64.cpp                             |  2 +-
 src/cpu/aarch64/vm/nativeInst_aarch64.cpp                        |  2 +-
 src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp |  1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 594d27b1a368 -r ae4b26e6783b
src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp
--- a/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	Fri Nov 21 11:26:24
2014 +0000
+++ b/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp	Fri Nov 21 13:21:30
2014 +0000
@@ -80,7 +80,7 @@
   pop(r0, sp);
 #endif
   reset_last_Java_frame(true, true);
-  __ maybe_isb();
+  maybe_isb();

   // check for pending exceptions
   { Label L;
diff -r 594d27b1a368 -r ae4b26e6783b src/cpu/aarch64/vm/frame_aarch64.cpp
--- a/src/cpu/aarch64/vm/frame_aarch64.cpp	Fri Nov 21 11:26:24 2014 +0000
+++ b/src/cpu/aarch64/vm/frame_aarch64.cpp	Fri Nov 21 13:21:30 2014 +0000
@@ -810,7 +810,7 @@
 		   unsigned long bcx, unsigned long thread) {
   RegisterMap map((JavaThread*)thread, false);
   if (!reg_map) {
-    reg_map = (RegisterMap*)new char[sizeof map];
+    reg_map = (RegisterMap*)os::malloc(sizeof map, mtNone);
   }
   memcpy(reg_map, &map, sizeof map);
   {
diff -r 594d27b1a368 -r ae4b26e6783b
src/cpu/aarch64/vm/nativeInst_aarch64.cpp
--- a/src/cpu/aarch64/vm/nativeInst_aarch64.cpp	Fri Nov 21 11:26:24 2014
+0000
+++ b/src/cpu/aarch64/vm/nativeInst_aarch64.cpp	Fri Nov 21 13:21:30 2014
+0000
@@ -191,7 +191,7 @@
   return Instruction_aarch64::extract(int_at(0), 30, 23) == 0b11100101;
 }

-/ MT safe inserting of a jump over a jump or a nop (used by
nmethod::makeZombie)
+// MT safe inserting of a jump over a jump or a nop (used by
nmethod::makeZombie)

 void NativeJump::patch_verified_entry(address entry, address
verified_entry, address dest) {
   ptrdiff_t disp = dest - verified_entry;
diff -r 594d27b1a368 -r ae4b26e6783b
src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp
--- a/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp
Fri Nov 21 11:26:24 2014 +0000
+++ b/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp
Fri Nov 21 13:21:30 2014 +0000
@@ -27,6 +27,7 @@
 #define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP

 #include "runtime/atomic.hpp"
+#include "atomic_linux_aarch64.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "vm_version_aarch64.hpp"