Mercurial > hg > truffle
comparison src/share/vm/memory/blockOffsetTable.cpp @ 14521:29ccc4cbabca
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 12 Mar 2014 13:30:08 +0100 |
parents | 63a4eb8bcd23 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14520:f84115370178 | 14521:29ccc4cbabca |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
588 return ub; | 588 return ub; |
589 } | 589 } |
590 | 590 |
591 // Otherwise, find the block start using the table, but taking | 591 // Otherwise, find the block start using the table, but taking |
592 // care (cf block_start_unsafe() above) not to parse any objects/blocks | 592 // care (cf block_start_unsafe() above) not to parse any objects/blocks |
593 // on the cards themsleves. | 593 // on the cards themselves. |
594 size_t index = _array->index_for(addr); | 594 size_t index = _array->index_for(addr); |
595 assert(_array->address_for_index(index) == addr, | 595 assert(_array->address_for_index(index) == addr, |
596 "arg should be start of card"); | 596 "arg should be start of card"); |
597 | 597 |
598 HeapWord* q = (HeapWord*)addr; | 598 HeapWord* q = (HeapWord*)addr; |