1.1 --- a/src/cpu/mips/vm/mips_64.ad Mon Jun 11 17:42:16 2018 +0800
1.2 +++ b/src/cpu/mips/vm/mips_64.ad Tue Jun 12 13:58:17 2018 +0800
1.3 @@ -1522,7 +1522,7 @@
1.4 Register iCache = as_Register(ic_reg);
1.5 __ load_klass(T9, receiver);
1.6 __ beq(T9, iCache, L);
1.7 - __ nop();
1.8 + __ delayed()->nop();
1.9
1.10 __ relocate(relocInfo::runtime_call_type);
1.11 __ patchable_jump((address)SharedRuntime::get_ic_miss_stub());
1.12 @@ -3362,7 +3362,7 @@
1.13 /* 2013/7/22 Jin: Refer to X86_64's RDI */
1.14 __ move(result, 0);
1.15 __ b(done);
1.16 - __ nop();
1.17 + __ delayed()->nop();
1.18
1.19 __ bind(miss);
1.20 __ move(result, 1);
1.21 @@ -6545,7 +6545,7 @@
1.22
1.23 __ move(S3, oop);
1.24 __ jr(target);
1.25 - __ nop();
1.26 + __ delayed()->nop();
1.27 %}
1.28
1.29 ins_pipe( pipe_jump );
1.30 @@ -7583,7 +7583,7 @@
1.31 __ b(L);
1.32 else
1.33 __ b(int(0));
1.34 - __ nop();
1.35 + __ delayed()->nop();
1.36 %}
1.37
1.38 ins_pipe( pipe_jump );
1.39 @@ -7648,7 +7648,7 @@
1.40 default:
1.41 Unimplemented();
1.42 }
1.43 - __ nop();
1.44 + __ delayed()->nop();
1.45 %}
1.46 ins_pipe( pipe_jump );
1.47 ins_pc_relative(1);
1.48 @@ -7713,7 +7713,7 @@
1.49 default:
1.50 Unimplemented();
1.51 }
1.52 - __ nop();
1.53 + __ delayed()->nop();
1.54 %}
1.55 ins_pipe( pipe_jump );
1.56 ins_pc_relative(1);
1.57 @@ -7747,7 +7747,7 @@
1.58 default:
1.59 Unimplemented();
1.60 }
1.61 - __ nop();
1.62 + __ delayed()->nop();
1.63 %}
1.64
1.65 ins_pipe( pipe_jump );
1.66 @@ -7785,7 +7785,7 @@
1.67 default:
1.68 Unimplemented();
1.69 }
1.70 - __ nop();
1.71 + __ delayed()->nop();
1.72 %}
1.73
1.74 ins_pc_relative(1);
1.75 @@ -7824,7 +7824,7 @@
1.76 default:
1.77 Unimplemented();
1.78 }
1.79 - __ nop();
1.80 + __ delayed()->nop();
1.81 %}
1.82
1.83 ins_pc_relative(1);
1.84 @@ -7891,7 +7891,7 @@
1.85 default:
1.86 Unimplemented();
1.87 }
1.88 - __ nop();
1.89 + __ delayed()->nop();
1.90 %}
1.91
1.92 ins_pc_relative(1);
1.93 @@ -7928,7 +7928,7 @@
1.94 default:
1.95 Unimplemented();
1.96 }
1.97 - __ nop();
1.98 + __ delayed()->nop();
1.99 %}
1.100 //TODO: pipe_branchP or create pipe_branchN LEE
1.101 ins_pc_relative(1);
1.102 @@ -7993,7 +7993,7 @@
1.103 default:
1.104 Unimplemented();
1.105 }
1.106 - __ nop();
1.107 + __ delayed()->nop();
1.108 %}
1.109 ins_pc_relative(1);
1.110 ins_pipe( pipe_alu_branch );
1.111 @@ -8055,7 +8055,7 @@
1.112 default:
1.113 Unimplemented();
1.114 }
1.115 - __ nop();
1.116 + __ delayed()->nop();
1.117 %}
1.118
1.119 ins_pc_relative(1);
1.120 @@ -8120,7 +8120,7 @@
1.121 default:
1.122 Unimplemented();
1.123 }
1.124 - __ nop();
1.125 + __ delayed()->nop();
1.126 %}
1.127
1.128 ins_pc_relative(1);
1.129 @@ -8183,7 +8183,7 @@
1.130 default:
1.131 Unimplemented();
1.132 }
1.133 - __ nop();
1.134 + __ delayed()->nop();
1.135 %}
1.136
1.137 ins_pc_relative(1);
1.138 @@ -8242,7 +8242,7 @@
1.139 default:
1.140 Unimplemented();
1.141 }
1.142 - __ nop();
1.143 + __ delayed()->nop();
1.144 %}
1.145
1.146 ins_pc_relative(1);
1.147 @@ -8308,7 +8308,7 @@
1.148 default:
1.149 Unimplemented();
1.150 }
1.151 - __ nop();
1.152 + __ delayed()->nop();
1.153 %}
1.154
1.155 ins_pc_relative(1);
1.156 @@ -8363,7 +8363,7 @@
1.157 default:
1.158 Unimplemented();
1.159 }
1.160 - __ nop();
1.161 + __ delayed()->nop();
1.162 %}
1.163
1.164 ins_pc_relative(1);
1.165 @@ -8432,7 +8432,7 @@
1.166 default:
1.167 Unimplemented();
1.168 }
1.169 - __ nop();
1.170 + __ delayed()->nop();
1.171 %}
1.172
1.173 ins_pc_relative(1);
1.174 @@ -8655,7 +8655,7 @@
1.175 default:
1.176 Unimplemented();
1.177 }
1.178 - __ nop();
1.179 + __ delayed()->nop();
1.180 %}
1.181
1.182
1.183 @@ -8723,7 +8723,7 @@
1.184 default:
1.185 Unimplemented();
1.186 }
1.187 - __ nop();
1.188 + __ delayed()->nop();
1.189 %}
1.190
1.191 ins_pc_relative(1);
1.192 @@ -8789,7 +8789,7 @@
1.193 default:
1.194 Unimplemented();
1.195 }
1.196 - __ nop();
1.197 + __ delayed()->nop();
1.198 %}
1.199
1.200 ins_pc_relative(1);
1.201 @@ -10277,41 +10277,41 @@
1.202 switch(flag) {
1.203 case 0x01: //equal
1.204 __ bne(op1, op2, L);
1.205 - __ nop();
1.206 + __ delayed()->nop();
1.207 __ mov_s(dst, src);
1.208 __ bind(L);
1.209 break;
1.210 case 0x02: //not_equal
1.211 __ beq(op1, op2, L);
1.212 - __ nop();
1.213 + __ delayed()->nop();
1.214 __ mov_s(dst, src);
1.215 __ bind(L);
1.216 break;
1.217 case 0x03: //great
1.218 __ slt(AT, op2, op1);
1.219 __ beq(AT, R0, L);
1.220 - __ nop();
1.221 + __ delayed()->nop();
1.222 __ mov_s(dst, src);
1.223 __ bind(L);
1.224 break;
1.225 case 0x04: //great_equal
1.226 __ slt(AT, op1, op2);
1.227 __ bne(AT, R0, L);
1.228 - __ nop();
1.229 + __ delayed()->nop();
1.230 __ mov_s(dst, src);
1.231 __ bind(L);
1.232 break;
1.233 case 0x05: //less
1.234 __ slt(AT, op1, op2);
1.235 __ beq(AT, R0, L);
1.236 - __ nop();
1.237 + __ delayed()->nop();
1.238 __ mov_s(dst, src);
1.239 __ bind(L);
1.240 break;
1.241 case 0x06: //less_equal
1.242 __ slt(AT, op2, op1);
1.243 __ bne(AT, R0, L);
1.244 - __ nop();
1.245 + __ delayed()->nop();
1.246 __ mov_s(dst, src);
1.247 __ bind(L);
1.248 break;
1.249 @@ -10342,41 +10342,41 @@
1.250 switch(flag) {
1.251 case 0x01: //equal
1.252 __ bne(op1, op2, L);
1.253 - __ nop();
1.254 + __ delayed()->nop();
1.255 __ mov_d(dst, src);
1.256 __ bind(L);
1.257 break;
1.258 case 0x02: //not_equal
1.259 __ beq(op1, op2, L);
1.260 - __ nop();
1.261 + __ delayed()->nop();
1.262 __ mov_d(dst, src);
1.263 __ bind(L);
1.264 break;
1.265 case 0x03: //great
1.266 __ slt(AT, op2, op1);
1.267 __ beq(AT, R0, L);
1.268 - __ nop();
1.269 + __ delayed()->nop();
1.270 __ mov_d(dst, src);
1.271 __ bind(L);
1.272 break;
1.273 case 0x04: //great_equal
1.274 __ slt(AT, op1, op2);
1.275 __ bne(AT, R0, L);
1.276 - __ nop();
1.277 + __ delayed()->nop();
1.278 __ mov_d(dst, src);
1.279 __ bind(L);
1.280 break;
1.281 case 0x05: //less
1.282 __ slt(AT, op1, op2);
1.283 __ beq(AT, R0, L);
1.284 - __ nop();
1.285 + __ delayed()->nop();
1.286 __ mov_d(dst, src);
1.287 __ bind(L);
1.288 break;
1.289 case 0x06: //less_equal
1.290 __ slt(AT, op2, op1);
1.291 __ bne(AT, R0, L);
1.292 - __ nop();
1.293 + __ delayed()->nop();
1.294 __ mov_d(dst, src);
1.295 __ bind(L);
1.296 break;
1.297 @@ -10407,41 +10407,41 @@
1.298 switch(flag) {
1.299 case 0x01: //equal
1.300 __ bne(op1, op2, L);
1.301 - __ nop();
1.302 + __ delayed()->nop();
1.303 __ mov_d(dst, src);
1.304 __ bind(L);
1.305 break;
1.306 case 0x02: //not_equal
1.307 __ beq(op1, op2, L);
1.308 - __ nop();
1.309 + __ delayed()->nop();
1.310 __ mov_d(dst, src);
1.311 __ bind(L);
1.312 break;
1.313 case 0x03: //great
1.314 __ slt(AT, op2, op1);
1.315 __ beq(AT, R0, L);
1.316 - __ nop();
1.317 + __ delayed()->nop();
1.318 __ mov_d(dst, src);
1.319 __ bind(L);
1.320 break;
1.321 case 0x04: //great_equal
1.322 __ slt(AT, op1, op2);
1.323 __ bne(AT, R0, L);
1.324 - __ nop();
1.325 + __ delayed()->nop();
1.326 __ mov_d(dst, src);
1.327 __ bind(L);
1.328 break;
1.329 case 0x05: //less
1.330 __ slt(AT, op1, op2);
1.331 __ beq(AT, R0, L);
1.332 - __ nop();
1.333 + __ delayed()->nop();
1.334 __ mov_d(dst, src);
1.335 __ bind(L);
1.336 break;
1.337 case 0x06: //less_equal
1.338 __ slt(AT, op2, op1);
1.339 __ bne(AT, R0, L);
1.340 - __ nop();
1.341 + __ delayed()->nop();
1.342 __ mov_d(dst, src);
1.343 __ bind(L);
1.344 break;
1.345 @@ -13106,7 +13106,7 @@
1.346
1.347 ins_encode %{
1.348 __ jr(RA);
1.349 - __ nop();
1.350 + __ delayed()->nop();
1.351 %}
1.352
1.353 ins_pipe( pipe_jump );
1.354 @@ -13151,7 +13151,7 @@
1.355 }
1.356
1.357 __ jr(T9);
1.358 - __ nop();
1.359 + __ delayed()->nop();
1.360
1.361 %}
1.362 ins_pipe(pipe_jump);
1.363 @@ -13185,7 +13185,7 @@
1.364 __ move(exception_oop, oop);
1.365
1.366 __ jr(target);
1.367 - __ nop();
1.368 + __ delayed()->nop();
1.369 %}
1.370 ins_pipe( pipe_jump );
1.371 %}
