/hg/release/icedtea7-forest-2.6/hotspot: PR2914: byte_map_base i...

[andrew at icedtea.classpath.org]

changeset 825fa447453a in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=825fa447453a
author: aph
date: Wed Apr 06 18:30:45 2016 +0100

	PR2914: byte_map_base is not page aligned on OpenJDK 7


diffstat:

 src/cpu/aarch64/vm/assembler_aarch64.cpp |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r f614dcff9829 -r 825fa447453a src/cpu/aarch64/vm/assembler_aarch64.cpp
--- a/src/cpu/aarch64/vm/assembler_aarch64.cpp	Thu Mar 24 21:35:21 2016 +0000
+++ b/src/cpu/aarch64/vm/assembler_aarch64.cpp	Wed Apr 06 18:30:45 2016 +0100
@@ -4938,7 +4938,8 @@
     // and it might even be negative.
     unsigned long offset;
     adrp(reg, ExternalAddress((address)byte_map_base), offset);
-    assert(offset == 0, "misaligned card table base");
+    if (offset != 0)
+      add(reg, reg, offset);
   } else {
     mov(reg, (uint64_t)byte_map_base);
   }