infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-15 21:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

8198750: [s390+x86_32+aarch64] Fix build after jdk-8195142

Browse Source 
Reviewed-by: stuefe, shade
This commit is contained in:
Martin Doerr 2018-02-27 11:45:04 +01:00
parent 899b64249c
commit 03af65fa7d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
View File

@ -4514,7 +4514,7 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, unsigned long &byt
void MacroAssembler::load_byte_map_base(Register reg) {
jbyte *byte_map_base =
((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base;
((CardTableModRefBS*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base();
if (is_valid_AArch64_address((address)byte_map_base)) {
// Strictly speaking the byte_map_base isn't an address at all,

6
src/hotspot/cpu/s390/macroAssembler_s390.cpp
View File

@ -3710,7 +3710,7 @@ void MacroAssembler::g1_write_barrier_post(Register Rstore_addr,
assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3.
G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set();
G1CardTable* ct = bs->card_table();
CardTable* ct = bs->card_table();
assert(bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier");
BLOCK_COMMENT("g1_write_barrier_post {");
@ -3750,8 +3750,8 @@ void MacroAssembler::g1_write_barrier_post(Register Rstore_addr,
Rbase = noreg; // end of lifetime
// Filter young.
assert((unsigned int)G1SATBCardTableModRefBS::g1_young_card_val() <= 255, "otherwise check this code");
z_cli(0, Rcard_addr, (int)G1SATBCardTableModRefBS::g1_young_card_val());
assert((unsigned int)G1CardTable::g1_young_card_val() <= 255, "otherwise check this code");
z_cli(0, Rcard_addr, (int)G1CardTable::g1_young_card_val());
z_bre(filtered);
// Check the card value. If dirty, we're done.

1
src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
View File

@ -706,6 +706,7 @@ class StubGenerator: public StubCodeGenerator {
__ bind(filtered);
}
break;
#endif // INCLUDE_ALL_GCS
case BarrierSet::CardTableModRef:
break;
default :