Commit 2573109866ead12fd0fa7442b33c8bf4aa125456

Authored by bellard
1 parent 9dfa5b42

pass function name to JMUP_TB()


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@366 c046a42c-6fe2-441c-8c8c-71466251a162
op-arm.c
@@ -238,104 +238,104 @@ void OPPROTO op_logic_T1_cc(void) @@ -238,104 +238,104 @@ void OPPROTO op_logic_T1_cc(void)
238 void OPPROTO op_test_eq(void) 238 void OPPROTO op_test_eq(void)
239 { 239 {
240 if (env->NZF == 0) 240 if (env->NZF == 0)
241 - JUMP_TB(PARAM1, 0, PARAM2); 241 + JUMP_TB(op_test_eq, PARAM1, 0, PARAM2);
242 FORCE_RET(); 242 FORCE_RET();
243 } 243 }
244 244
245 void OPPROTO op_test_ne(void) 245 void OPPROTO op_test_ne(void)
246 { 246 {
247 if (env->NZF != 0) 247 if (env->NZF != 0)
248 - JUMP_TB(PARAM1, 0, PARAM2); 248 + JUMP_TB(op_test_ne, PARAM1, 0, PARAM2);
249 FORCE_RET(); 249 FORCE_RET();
250 } 250 }
251 251
252 void OPPROTO op_test_cs(void) 252 void OPPROTO op_test_cs(void)
253 { 253 {
254 if (env->CF != 0) 254 if (env->CF != 0)
255 - JUMP_TB(PARAM1, 0, PARAM2); 255 + JUMP_TB(op_test_cs, PARAM1, 0, PARAM2);
256 FORCE_RET(); 256 FORCE_RET();
257 } 257 }
258 258
259 void OPPROTO op_test_cc(void) 259 void OPPROTO op_test_cc(void)
260 { 260 {
261 if (env->CF == 0) 261 if (env->CF == 0)
262 - JUMP_TB(PARAM1, 0, PARAM2); 262 + JUMP_TB(op_test_cc, PARAM1, 0, PARAM2);
263 FORCE_RET(); 263 FORCE_RET();
264 } 264 }
265 265
266 void OPPROTO op_test_mi(void) 266 void OPPROTO op_test_mi(void)
267 { 267 {
268 if ((env->NZF & 0x80000000) != 0) 268 if ((env->NZF & 0x80000000) != 0)
269 - JUMP_TB(PARAM1, 0, PARAM2); 269 + JUMP_TB(op_test_mi, PARAM1, 0, PARAM2);
270 FORCE_RET(); 270 FORCE_RET();
271 } 271 }
272 272
273 void OPPROTO op_test_pl(void) 273 void OPPROTO op_test_pl(void)
274 { 274 {
275 if ((env->NZF & 0x80000000) == 0) 275 if ((env->NZF & 0x80000000) == 0)
276 - JUMP_TB(PARAM1, 0, PARAM2); 276 + JUMP_TB(op_test_pl, PARAM1, 0, PARAM2);
277 FORCE_RET(); 277 FORCE_RET();
278 } 278 }
279 279
280 void OPPROTO op_test_vs(void) 280 void OPPROTO op_test_vs(void)
281 { 281 {
282 if ((env->VF & 0x80000000) != 0) 282 if ((env->VF & 0x80000000) != 0)
283 - JUMP_TB(PARAM1, 0, PARAM2); 283 + JUMP_TB(op_test_vs, PARAM1, 0, PARAM2);
284 FORCE_RET(); 284 FORCE_RET();
285 } 285 }
286 286
287 void OPPROTO op_test_vc(void) 287 void OPPROTO op_test_vc(void)
288 { 288 {
289 if ((env->VF & 0x80000000) == 0) 289 if ((env->VF & 0x80000000) == 0)
290 - JUMP_TB(PARAM1, 0, PARAM2); 290 + JUMP_TB(op_test_vc, PARAM1, 0, PARAM2);
291 FORCE_RET(); 291 FORCE_RET();
292 } 292 }
293 293
294 void OPPROTO op_test_hi(void) 294 void OPPROTO op_test_hi(void)
295 { 295 {
296 if (env->CF != 0 && env->NZF != 0) 296 if (env->CF != 0 && env->NZF != 0)
297 - JUMP_TB(PARAM1, 0, PARAM2); 297 + JUMP_TB(op_test_hi, PARAM1, 0, PARAM2);
298 FORCE_RET(); 298 FORCE_RET();
299 } 299 }
300 300
301 void OPPROTO op_test_ls(void) 301 void OPPROTO op_test_ls(void)
302 { 302 {
303 if (env->CF == 0 || env->NZF == 0) 303 if (env->CF == 0 || env->NZF == 0)
304 - JUMP_TB(PARAM1, 0, PARAM2); 304 + JUMP_TB(op_test_ls, PARAM1, 0, PARAM2);
305 FORCE_RET(); 305 FORCE_RET();
306 } 306 }
307 307
308 void OPPROTO op_test_ge(void) 308 void OPPROTO op_test_ge(void)
309 { 309 {
310 if (((env->VF ^ env->NZF) & 0x80000000) == 0) 310 if (((env->VF ^ env->NZF) & 0x80000000) == 0)
311 - JUMP_TB(PARAM1, 0, PARAM2); 311 + JUMP_TB(op_test_ge, PARAM1, 0, PARAM2);
312 FORCE_RET(); 312 FORCE_RET();
313 } 313 }
314 314
315 void OPPROTO op_test_lt(void) 315 void OPPROTO op_test_lt(void)
316 { 316 {
317 if (((env->VF ^ env->NZF) & 0x80000000) != 0) 317 if (((env->VF ^ env->NZF) & 0x80000000) != 0)
318 - JUMP_TB(PARAM1, 0, PARAM2); 318 + JUMP_TB(op_test_lt, PARAM1, 0, PARAM2);
319 FORCE_RET(); 319 FORCE_RET();
320 } 320 }
321 321
322 void OPPROTO op_test_gt(void) 322 void OPPROTO op_test_gt(void)
323 { 323 {
324 if (env->NZF != 0 && ((env->VF ^ env->NZF) & 0x80000000) == 0) 324 if (env->NZF != 0 && ((env->VF ^ env->NZF) & 0x80000000) == 0)
325 - JUMP_TB(PARAM1, 0, PARAM2); 325 + JUMP_TB(op_test_gt, PARAM1, 0, PARAM2);
326 FORCE_RET(); 326 FORCE_RET();
327 } 327 }
328 328
329 void OPPROTO op_test_le(void) 329 void OPPROTO op_test_le(void)
330 { 330 {
331 if (env->NZF == 0 || ((env->VF ^ env->NZF) & 0x80000000) != 0) 331 if (env->NZF == 0 || ((env->VF ^ env->NZF) & 0x80000000) != 0)
332 - JUMP_TB(PARAM1, 0, PARAM2); 332 + JUMP_TB(op_test_le, PARAM1, 0, PARAM2);
333 FORCE_RET(); 333 FORCE_RET();
334 } 334 }
335 335
336 void OPPROTO op_jmp(void) 336 void OPPROTO op_jmp(void)
337 { 337 {
338 - JUMP_TB(PARAM1, 1, PARAM2); 338 + JUMP_TB(op_jmp, PARAM1, 1, PARAM2);
339 } 339 }
340 340
341 void OPPROTO op_exit_tb(void) 341 void OPPROTO op_exit_tb(void)
op-i386.c
@@ -508,7 +508,7 @@ void OPPROTO op_cmpxchg8b(void) @@ -508,7 +508,7 @@ void OPPROTO op_cmpxchg8b(void)
508 508
509 void OPPROTO op_jmp_tb_next(void) 509 void OPPROTO op_jmp_tb_next(void)
510 { 510 {
511 - JUMP_TB(PARAM1, 0, PARAM2); 511 + JUMP_TB(op_jmp_tb_next, PARAM1, 0, PARAM2);
512 } 512 }
513 513
514 void OPPROTO op_movl_T0_0(void) 514 void OPPROTO op_movl_T0_0(void)
@@ -1016,9 +1016,9 @@ void OPPROTO op_clts(void) @@ -1016,9 +1016,9 @@ void OPPROTO op_clts(void)
1016 void OPPROTO op_jcc(void) 1016 void OPPROTO op_jcc(void)
1017 { 1017 {
1018 if (T0) 1018 if (T0)
1019 - JUMP_TB(PARAM1, 0, PARAM2); 1019 + JUMP_TB(op_jcc, PARAM1, 0, PARAM2);
1020 else 1020 else
1021 - JUMP_TB(PARAM1, 1, PARAM3); 1021 + JUMP_TB(op_jcc, PARAM1, 1, PARAM3);
1022 FORCE_RET(); 1022 FORCE_RET();
1023 } 1023 }
1024 1024
ops_template.h
@@ -238,18 +238,18 @@ void OPPROTO glue(op_jb_sub, SUFFIX)(void) @@ -238,18 +238,18 @@ void OPPROTO glue(op_jb_sub, SUFFIX)(void)
238 src2 = CC_SRC; 238 src2 = CC_SRC;
239 239
240 if ((DATA_TYPE)src1 < (DATA_TYPE)src2) 240 if ((DATA_TYPE)src1 < (DATA_TYPE)src2)
241 - JUMP_TB(PARAM1, 0, PARAM2); 241 + JUMP_TB(glue(op_jb_sub, SUFFIX), PARAM1, 0, PARAM2);
242 else 242 else
243 - JUMP_TB(PARAM1, 1, PARAM3); 243 + JUMP_TB(glue(op_jb_sub, SUFFIX), PARAM1, 1, PARAM3);
244 FORCE_RET(); 244 FORCE_RET();
245 } 245 }
246 246
247 void OPPROTO glue(op_jz_sub, SUFFIX)(void) 247 void OPPROTO glue(op_jz_sub, SUFFIX)(void)
248 { 248 {
249 if ((DATA_TYPE)CC_DST == 0) 249 if ((DATA_TYPE)CC_DST == 0)
250 - JUMP_TB(PARAM1, 0, PARAM2); 250 + JUMP_TB(glue(op_jz_sub, SUFFIX), PARAM1, 0, PARAM2);
251 else 251 else
252 - JUMP_TB(PARAM1, 1, PARAM3); 252 + JUMP_TB(glue(op_jz_sub, SUFFIX), PARAM1, 1, PARAM3);
253 FORCE_RET(); 253 FORCE_RET();
254 } 254 }
255 255
@@ -260,18 +260,18 @@ void OPPROTO glue(op_jbe_sub, SUFFIX)(void) @@ -260,18 +260,18 @@ void OPPROTO glue(op_jbe_sub, SUFFIX)(void)
260 src2 = CC_SRC; 260 src2 = CC_SRC;
261 261
262 if ((DATA_TYPE)src1 <= (DATA_TYPE)src2) 262 if ((DATA_TYPE)src1 <= (DATA_TYPE)src2)
263 - JUMP_TB(PARAM1, 0, PARAM2); 263 + JUMP_TB(glue(op_jbe_sub, SUFFIX), PARAM1, 0, PARAM2);
264 else 264 else
265 - JUMP_TB(PARAM1, 1, PARAM3); 265 + JUMP_TB(glue(op_jbe_sub, SUFFIX), PARAM1, 1, PARAM3);
266 FORCE_RET(); 266 FORCE_RET();
267 } 267 }
268 268
269 void OPPROTO glue(op_js_sub, SUFFIX)(void) 269 void OPPROTO glue(op_js_sub, SUFFIX)(void)
270 { 270 {
271 if (CC_DST & SIGN_MASK) 271 if (CC_DST & SIGN_MASK)
272 - JUMP_TB(PARAM1, 0, PARAM2); 272 + JUMP_TB(glue(op_js_sub, SUFFIX), PARAM1, 0, PARAM2);
273 else 273 else
274 - JUMP_TB(PARAM1, 1, PARAM3); 274 + JUMP_TB(glue(op_js_sub, SUFFIX), PARAM1, 1, PARAM3);
275 FORCE_RET(); 275 FORCE_RET();
276 } 276 }
277 277
@@ -282,9 +282,9 @@ void OPPROTO glue(op_jl_sub, SUFFIX)(void) @@ -282,9 +282,9 @@ void OPPROTO glue(op_jl_sub, SUFFIX)(void)
282 src2 = CC_SRC; 282 src2 = CC_SRC;
283 283
284 if ((DATA_STYPE)src1 < (DATA_STYPE)src2) 284 if ((DATA_STYPE)src1 < (DATA_STYPE)src2)
285 - JUMP_TB(PARAM1, 0, PARAM2); 285 + JUMP_TB(glue(op_jl_sub, SUFFIX), PARAM1, 0, PARAM2);
286 else 286 else
287 - JUMP_TB(PARAM1, 1, PARAM3); 287 + JUMP_TB(glue(op_jl_sub, SUFFIX), PARAM1, 1, PARAM3);
288 FORCE_RET(); 288 FORCE_RET();
289 } 289 }
290 290
@@ -295,9 +295,9 @@ void OPPROTO glue(op_jle_sub, SUFFIX)(void) @@ -295,9 +295,9 @@ void OPPROTO glue(op_jle_sub, SUFFIX)(void)
295 src2 = CC_SRC; 295 src2 = CC_SRC;
296 296
297 if ((DATA_STYPE)src1 <= (DATA_STYPE)src2) 297 if ((DATA_STYPE)src1 <= (DATA_STYPE)src2)
298 - JUMP_TB(PARAM1, 0, PARAM2); 298 + JUMP_TB(glue(op_jle_sub, SUFFIX), PARAM1, 0, PARAM2);
299 else 299 else
300 - JUMP_TB(PARAM1, 1, PARAM3); 300 + JUMP_TB(glue(op_jle_sub, SUFFIX), PARAM1, 1, PARAM3);
301 FORCE_RET(); 301 FORCE_RET();
302 } 302 }
303 303
@@ -555,14 +555,14 @@ void OPPROTO glue(op_movl_T0_Dshift, SUFFIX)(void) @@ -555,14 +555,14 @@ void OPPROTO glue(op_movl_T0_Dshift, SUFFIX)(void)
555 void OPPROTO glue(op_string_jz_sub, SUFFIX)(void) 555 void OPPROTO glue(op_string_jz_sub, SUFFIX)(void)
556 { 556 {
557 if ((DATA_TYPE)CC_DST == 0) 557 if ((DATA_TYPE)CC_DST == 0)
558 - JUMP_TB(PARAM1, 1, PARAM2); 558 + JUMP_TB(glue(op_string_jz_sub, SUFFIX), PARAM1, 1, PARAM2);
559 FORCE_RET(); 559 FORCE_RET();
560 } 560 }
561 561
562 void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void) 562 void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void)
563 { 563 {
564 if ((DATA_TYPE)CC_DST != 0) 564 if ((DATA_TYPE)CC_DST != 0)
565 - JUMP_TB(PARAM1, 1, PARAM2); 565 + JUMP_TB(glue(op_string_jnz_sub, SUFFIX), PARAM1, 1, PARAM2);
566 FORCE_RET(); 566 FORCE_RET();
567 } 567 }
568 568
@@ -570,7 +570,7 @@ void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void) @@ -570,7 +570,7 @@ void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void)
570 void OPPROTO glue(op_jz_ecx, SUFFIX)(void) 570 void OPPROTO glue(op_jz_ecx, SUFFIX)(void)
571 { 571 {
572 if ((DATA_TYPE)ECX == 0) 572 if ((DATA_TYPE)ECX == 0)
573 - JUMP_TB(PARAM1, 1, PARAM2); 573 + JUMP_TB(glue(op_jz_ecx, SUFFIX), PARAM1, 1, PARAM2);
574 FORCE_RET(); 574 FORCE_RET();
575 } 575 }
576 #endif 576 #endif