1.1 --- a/src/cpu/mips/vm/templateTable_mips_64.cpp Mon Jun 11 17:42:16 2018 +0800
1.2 +++ b/src/cpu/mips/vm/templateTable_mips_64.cpp Tue Jun 12 13:58:17 2018 +0800
1.3 @@ -1243,7 +1243,7 @@
1.4 Label L_skip;
1.5 __ andr(AT, T9, AT);
1.6 __ beq(AT, R0, L_skip);
1.7 - __ nop();
1.8 + __ delayed()->nop();
1.9 __ andi(FSR, FSR, 0x1);
1.10 __ bind(L_skip);
1.11
1.12 @@ -2009,7 +2009,7 @@
1.13 Label has_counters;
1.14 __ ld(AT, T3, in_bytes(Method::method_counters_offset())); // use AT as MDO, TEMP
1.15 __ bne(AT, R0, has_counters);
1.16 - __ nop();
1.17 + __ delayed()->nop();
1.18 __ push(T3);
1.19 //__ push(A7);
1.20 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::build_method_counters),
1.21 @@ -2018,7 +2018,7 @@
1.22 __ pop(T3);
1.23 __ ld(AT, T3, in_bytes(Method::method_counters_offset())); // use AT as MDO, TEMP
1.24 __ beq(AT, R0, dispatch);
1.25 - __ nop();
1.26 + __ delayed()->nop();
1.27 __ bind(has_counters);
1.28
1.29 // increment back edge counter
1.30 @@ -2843,7 +2843,7 @@
1.31
1.32 Label notVolatile;
1.33 __ beq(scratch, R0, notVolatile);
1.34 - __ nop();
1.35 + __ delayed()->nop();
1.36 volatile_barrier();
1.37 __ bind(notVolatile);
1.38 }
1.39 @@ -3136,7 +3136,7 @@
1.40
1.41 Label notVolatile;
1.42 __ beq(scratch, R0, notVolatile);
1.43 - __ nop();
1.44 + __ delayed()->nop();
1.45 volatile_barrier();
1.46 __ bind(notVolatile);
1.47 }
1.48 @@ -3327,7 +3327,7 @@
1.49 {
1.50 Label notVolatile;
1.51 __ beq(scratch, R0, notVolatile);
1.52 - __ nop();
1.53 + __ delayed()->nop();
1.54 volatile_barrier();
1.55 __ bind(notVolatile);
1.56 }
1.57 @@ -3432,7 +3432,7 @@
1.58
1.59 Label notVolatile;
1.60 __ beq(scratch, R0, notVolatile);
1.61 - __ nop();
1.62 + __ delayed()->nop();
1.63 volatile_barrier();
1.64 __ bind(notVolatile);
1.65 }
1.66 @@ -3479,7 +3479,7 @@
1.67 {
1.68 Label notVolatile;
1.69 __ beq(scratch, R0, notVolatile);
1.70 - __ nop();
1.71 + __ delayed()->nop();
1.72 volatile_barrier();
1.73 __ bind(notVolatile);
1.74 }
1.75 @@ -3529,7 +3529,7 @@
1.76
1.77 Label notVolatile;
1.78 __ beq(scratch, R0, notVolatile);
1.79 - __ nop();
1.80 + __ delayed()->nop();
1.81 volatile_barrier();
1.82 __ bind(notVolatile);
1.83 }
1.84 @@ -3575,7 +3575,7 @@
1.85 {
1.86 Label notVolatile;
1.87 __ beq(scratch, R0, notVolatile);
1.88 - __ nop();
1.89 + __ delayed()->nop();
1.90 volatile_barrier();
1.91 __ bind(notVolatile);
1.92 }
1.93 @@ -3607,7 +3607,7 @@
1.94
1.95 Label notVolatile;
1.96 __ beq(scratch, R0, notVolatile);
1.97 - __ nop();
1.98 + __ delayed()->nop();
1.99 volatile_barrier();
1.100 __ bind(notVolatile);
1.101 }
1.102 @@ -3633,7 +3633,7 @@
1.103 {
1.104 Label notVolatile;
1.105 __ beq(scratch, R0, notVolatile);
1.106 - __ nop();
1.107 + __ delayed()->nop();
1.108 volatile_barrier();
1.109 __ bind(notVolatile);
1.110 }
1.111 @@ -4374,7 +4374,7 @@
1.112 // Collect counts on whether this test sees NULLs a lot or not.
1.113 if (ProfileInterpreter) {
1.114 __ beq(R0, R0, done);
1.115 - __ nop();
1.116 + __ delayed()->nop();
1.117 __ bind(is_null);
1.118 __ profile_null_seen(T3);
1.119 } else {
