From: bellard Date: Mon, 11 Aug 2003 22:19:11 +0000 (+0000) Subject: pass function name to JMUP_TB() X-Git-Tag: TizenStudio_2.0_p2.3~15847 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2573109866ead12fd0fa7442b33c8bf4aa125456;p=sdk%2Femulator%2Fqemu.git pass function name to JMUP_TB() git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@366 c046a42c-6fe2-441c-8c8c-71466251a162 --- diff --git a/op-arm.c b/op-arm.c index fcc4ddc..98ef9a0 100644 --- a/op-arm.c +++ b/op-arm.c @@ -238,104 +238,104 @@ void OPPROTO op_logic_T1_cc(void) void OPPROTO op_test_eq(void) { if (env->NZF == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_eq, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_ne(void) { if (env->NZF != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_ne, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_cs(void) { if (env->CF != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_cs, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_cc(void) { if (env->CF == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_cc, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_mi(void) { if ((env->NZF & 0x80000000) != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_mi, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_pl(void) { if ((env->NZF & 0x80000000) == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_pl, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_vs(void) { if ((env->VF & 0x80000000) != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_vs, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_vc(void) { if ((env->VF & 0x80000000) == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_vc, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_hi(void) { if (env->CF != 0 && env->NZF != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_hi, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_ls(void) { if (env->CF == 0 || env->NZF == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_ls, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_ge(void) { if (((env->VF ^ env->NZF) & 0x80000000) == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_ge, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_lt(void) { if (((env->VF ^ env->NZF) & 0x80000000) != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_lt, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_gt(void) { if (env->NZF != 0 && ((env->VF ^ env->NZF) & 0x80000000) == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_gt, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_test_le(void) { if (env->NZF == 0 || ((env->VF ^ env->NZF) & 0x80000000) != 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_test_le, PARAM1, 0, PARAM2); FORCE_RET(); } void OPPROTO op_jmp(void) { - JUMP_TB(PARAM1, 1, PARAM2); + JUMP_TB(op_jmp, PARAM1, 1, PARAM2); } void OPPROTO op_exit_tb(void) diff --git a/op-i386.c b/op-i386.c index 60ae5e5..833b1f9 100644 --- a/op-i386.c +++ b/op-i386.c @@ -508,7 +508,7 @@ void OPPROTO op_cmpxchg8b(void) void OPPROTO op_jmp_tb_next(void) { - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_jmp_tb_next, PARAM1, 0, PARAM2); } void OPPROTO op_movl_T0_0(void) @@ -1016,9 +1016,9 @@ void OPPROTO op_clts(void) void OPPROTO op_jcc(void) { if (T0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(op_jcc, PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(op_jcc, PARAM1, 1, PARAM3); FORCE_RET(); } diff --git a/ops_template.h b/ops_template.h index 1c65131..b55ccf9 100644 --- a/ops_template.h +++ b/ops_template.h @@ -238,18 +238,18 @@ void OPPROTO glue(op_jb_sub, SUFFIX)(void) src2 = CC_SRC; if ((DATA_TYPE)src1 < (DATA_TYPE)src2) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_jb_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_jb_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } void OPPROTO glue(op_jz_sub, SUFFIX)(void) { if ((DATA_TYPE)CC_DST == 0) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_jz_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_jz_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } @@ -260,18 +260,18 @@ void OPPROTO glue(op_jbe_sub, SUFFIX)(void) src2 = CC_SRC; if ((DATA_TYPE)src1 <= (DATA_TYPE)src2) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_jbe_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_jbe_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } void OPPROTO glue(op_js_sub, SUFFIX)(void) { if (CC_DST & SIGN_MASK) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_js_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_js_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } @@ -282,9 +282,9 @@ void OPPROTO glue(op_jl_sub, SUFFIX)(void) src2 = CC_SRC; if ((DATA_STYPE)src1 < (DATA_STYPE)src2) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_jl_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_jl_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } @@ -295,9 +295,9 @@ void OPPROTO glue(op_jle_sub, SUFFIX)(void) src2 = CC_SRC; if ((DATA_STYPE)src1 <= (DATA_STYPE)src2) - JUMP_TB(PARAM1, 0, PARAM2); + JUMP_TB(glue(op_jle_sub, SUFFIX), PARAM1, 0, PARAM2); else - JUMP_TB(PARAM1, 1, PARAM3); + JUMP_TB(glue(op_jle_sub, SUFFIX), PARAM1, 1, PARAM3); FORCE_RET(); } @@ -555,14 +555,14 @@ void OPPROTO glue(op_movl_T0_Dshift, SUFFIX)(void) void OPPROTO glue(op_string_jz_sub, SUFFIX)(void) { if ((DATA_TYPE)CC_DST == 0) - JUMP_TB(PARAM1, 1, PARAM2); + JUMP_TB(glue(op_string_jz_sub, SUFFIX), PARAM1, 1, PARAM2); FORCE_RET(); } void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void) { if ((DATA_TYPE)CC_DST != 0) - JUMP_TB(PARAM1, 1, PARAM2); + JUMP_TB(glue(op_string_jnz_sub, SUFFIX), PARAM1, 1, PARAM2); FORCE_RET(); } @@ -570,7 +570,7 @@ void OPPROTO glue(op_string_jnz_sub, SUFFIX)(void) void OPPROTO glue(op_jz_ecx, SUFFIX)(void) { if ((DATA_TYPE)ECX == 0) - JUMP_TB(PARAM1, 1, PARAM2); + JUMP_TB(glue(op_jz_ecx, SUFFIX), PARAM1, 1, PARAM2); FORCE_RET(); } #endif