1.1 --- a/src/cpu/mips/vm/mips_64.ad Wed Mar 08 05:42:36 2017 -0500
1.2 +++ b/src/cpu/mips/vm/mips_64.ad Wed Mar 08 08:57:26 2017 -0500
1.3 @@ -682,16 +682,15 @@
1.4
1.5 // relocation entries for call stub, compiled java to interpreter
1.6 uint reloc_java_to_interp() {
1.7 - return 16; // in emit_java_to_interp + in Java_Static_Call
1.8 + return 12; // in emit_java_to_interp + in Java_Static_Call
1.9 }
1.10
1.11 bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
1.12 - if( Assembler::is_simm16(offset) ) return true;
1.13 - else
1.14 - {
1.15 - assert(false, "Not implemented yet !" );
1.16 - Unimplemented();
1.17 - }
1.18 + if( Assembler::is_simm16(offset) ) return true;
1.19 + else {
1.20 + assert(false, "Not implemented yet !" );
1.21 + Unimplemented();
1.22 + }
1.23 }
1.24
1.25
1.26 @@ -952,15 +951,11 @@
1.27 // from the start of the call to the point where the return address
1.28 // will point.
1.29 int MachCallStaticJavaNode::ret_addr_offset() {
1.30 - assert(NativeCall::instruction_size == 24, "in MachCallStaticJavaNode::ret_addr_offset");
1.31 - //The value ought to be 16 bytes.
1.32 //lui
1.33 //ori
1.34 - //dsll
1.35 - //ori
1.36 //jalr
1.37 //nop
1.38 - return NativeCall::instruction_size;
1.39 + return 16;
1.40 }
1.41
1.42 int MachCallDynamicJavaNode::ret_addr_offset() {
1.43 @@ -3399,7 +3394,7 @@
1.44 __ relocate(relocInfo::static_call_type);
1.45 }
1.46
1.47 - __ patchable_set48(T9, $meth$$method);
1.48 + __ patchable_call32(T9, $meth$$method);
1.49 __ jalr(T9);
1.50 __ nop();
1.51 if( _method ) { // Emit stub for static call
1.52 @@ -12068,7 +12063,7 @@
1.53 ins_encode( Java_Static_Call( meth ) );
1.54 ins_pipe( pipe_slow );
1.55 ins_pc_relative(1);
1.56 - ins_alignment(16);
1.57 + ins_alignment(8);
1.58 %}
1.59
1.60 // Call Java Dynamic Instruction
