Tue, 10 Jul 2018 10:06:03 +0800
#7275 [C1] Fix assert(is_simm16(v)) failed: must be simm16 (/home/fool/c1/jdk8-mips-c1/hotspot/src/cpu/mips/vm/assembler_mips.cpp:246)
src/cpu/mips/vm/c1_LIRAssembler_mips.cpp | file | annotate | diff | comparison | revisions | |
src/cpu/mips/vm/macroAssembler_mips.cpp | file | annotate | diff | comparison | revisions |
1.1 --- a/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp Mon Jul 09 10:17:47 2018 +0800 1.2 +++ b/src/cpu/mips/vm/c1_LIRAssembler_mips.cpp Tue Jul 10 10:06:03 2018 +0800 1.3 @@ -3970,7 +3970,7 @@ 1.4 __ ld_ptr(AT, counter_addr); 1.5 __ addi(AT, AT, -DataLayout::counter_increment); 1.6 __ st_ptr(AT, counter_addr); 1.7 - __ b(*stub->entry()); 1.8 + __ b_far(*stub->entry()); 1.9 __ delayed()->nop(); 1.10 } 1.11
2.1 --- a/src/cpu/mips/vm/macroAssembler_mips.cpp Mon Jul 09 10:17:47 2018 +0800 2.2 +++ b/src/cpu/mips/vm/macroAssembler_mips.cpp Tue Jul 10 10:06:03 2018 +0800 2.3 @@ -150,12 +150,10 @@ 2.4 2.5 #ifndef PRODUCT 2.6 if (!is_simm16((target - branch - 4) >> 2)) { 2.7 - tty->print_cr("Illegal patching: target=0x%lx", target); 2.8 - int *p = (int *)branch; 2.9 - for (int i = -10; i < 10; i++) { 2.10 - tty->print("0x%lx, ", p[i]); 2.11 - } 2.12 - tty->print_cr(""); 2.13 + tty->print_cr("Illegal patching: branch = 0x%lx, target = 0x%lx", branch, target); 2.14 + tty->print_cr("======= Start decoding at branch = 0x%lx =======", branch); 2.15 + Disassembler::decode(branch - 4 * 16, branch + 4 * 16, tty); 2.16 + tty->print_cr("======= End of decoding ======="); 2.17 } 2.18 #endif 2.19