equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2015, 2018, 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. |
24 |
24 |
25 #include "precompiled.hpp" |
25 #include "precompiled.hpp" |
26 #include "code/codeCache.hpp" |
26 #include "code/codeCache.hpp" |
27 #include "code/relocInfo.hpp" |
27 #include "code/relocInfo.hpp" |
28 #include "code/relocInfo_ext.hpp" |
28 #include "code/relocInfo_ext.hpp" |
|
29 #include "gc/shared/cardTable.hpp" |
29 #include "gc/shared/cardTableModRefBS.hpp" |
30 #include "gc/shared/cardTableModRefBS.hpp" |
30 #include "gc/shared/collectedHeap.hpp" |
31 #include "gc/shared/collectedHeap.hpp" |
31 #include "memory/universe.hpp" |
32 #include "memory/universe.hpp" |
32 #include "runtime/os.hpp" |
33 #include "runtime/os.hpp" |
33 #include "utilities/debug.hpp" |
34 #include "utilities/debug.hpp" |
57 } |
58 } |
58 return (address)Universe::heap()->end_addr(); |
59 return (address)Universe::heap()->end_addr(); |
59 } |
60 } |
60 case symbolic_Relocation::card_table_reference: { |
61 case symbolic_Relocation::card_table_reference: { |
61 BarrierSet* bs = Universe::heap()->barrier_set(); |
62 BarrierSet* bs = Universe::heap()->barrier_set(); |
62 CardTableModRefBS* ct = (CardTableModRefBS*)bs; |
63 CardTableModRefBS* ctbs = barrier_set_cast<CardTableModRefBS>(bs); |
63 return (address)ct->byte_map_base; |
64 CardTable* ct = ctbs->card_table(); |
|
65 return (address)ct->byte_map_base(); |
64 } |
66 } |
65 case symbolic_Relocation::mark_bits_reference: { |
67 case symbolic_Relocation::mark_bits_reference: { |
66 return (address)Universe::verify_mark_bits(); |
68 return (address)Universe::verify_mark_bits(); |
67 } |
69 } |
68 case symbolic_Relocation::mark_mask_reference: { |
70 case symbolic_Relocation::mark_mask_reference: { |