Mercurial > hg > release > icedtea7-forest-2.6 > hotspot

changeset 6415:825fa447453a icedtea-2.6.6pre01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2914: byte_map_base is not page aligned on OpenJDK 7
author aph
date Wed, 06 Apr 2016 18:30:45 +0100
parents f614dcff9829
children 3ad8648ae6ce
files src/cpu/aarch64/vm/assembler_aarch64.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
   }