From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9OAg-00074a-HM for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:15:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9OAf-00073y-Ou for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:15:58 -0500 Received: from [199.232.76.173] (port=46006 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9OAf-00073t-Gz for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:15:57 -0500 Received: from savannah.gnu.org ([199.232.41.3]:39285 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L9OAf-0008HH-7p for qemu-devel@nongnu.org; Sun, 07 Dec 2008 13:15:57 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L9OAe-0005vu-Hr for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:15:56 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L9OAd-0005vl-Er for qemu-devel@nongnu.org; Sun, 07 Dec 2008 18:15:55 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sun, 07 Dec 2008 18:15:55 +0000 Subject: [Qemu-devel] [5923] Remove FORCE_RET() and RETURN() Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5923 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5923 Author: aurel32 Date: 2008-12-07 18:15:54 +0000 (Sun, 07 Dec 2008) Log Message: ----------- Remove FORCE_RET() and RETURN() Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/dyngen-exec.h trunk/target-arm/op_helper.c trunk/target-cris/exec.h trunk/target-cris/op_helper.c trunk/target-i386/op_helper.c trunk/target-i386/ops_sse.h trunk/target-sh4/exec.h Modified: trunk/dyngen-exec.h =================================================================== --- trunk/dyngen-exec.h 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/dyngen-exec.h 2008-12-07 18:15:54 UTC (rev 5923) @@ -198,9 +198,6 @@ #error unsupported CPU #endif -/* force GCC to generate only one epilog at the end of the function */ -#define FORCE_RET() __asm__ __volatile__("" : : : "memory"); - #define xglue(x, y) x ## y #define glue(x, y) xglue(x, y) #define stringify(s) tostring(s) Modified: trunk/target-arm/op_helper.c =================================================================== --- trunk/target-arm/op_helper.c 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-arm/op_helper.c 2008-12-07 18:15:54 UTC (rev 5923) @@ -509,7 +509,6 @@ rm = ((T1 & 0xff00ff00) >> 8) | (T0 & 0xff00ff00); T0 = rd; T1 = rm; - FORCE_RET(); } void HELPER(neon_trn_u16)(void) @@ -520,7 +519,6 @@ rm = (T1 >> 16) | (T0 & 0xffff0000); T0 = rd; T1 = rm; - FORCE_RET(); } /* Worker routines for zip and unzip. */ @@ -534,7 +532,6 @@ | ((T1 << 8) & 0xff0000) | (T1 & 0xff000000); T0 = rd; T1 = rm; - FORCE_RET(); } void HELPER(neon_zip_u8)(void) @@ -547,7 +544,6 @@ | ((T0 >> 8) & 0xff0000) | (T1 & 0xff000000); T0 = rd; T1 = rm; - FORCE_RET(); } void HELPER(neon_zip_u16)(void) @@ -557,5 +553,4 @@ tmp = (T0 & 0xffff) | (T1 << 16); T1 = (T1 & 0xffff0000) | (T0 >> 16); T0 = tmp; - FORCE_RET(); } Modified: trunk/target-cris/exec.h =================================================================== --- trunk/target-cris/exec.h 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-cris/exec.h 2008-12-07 18:15:54 UTC (rev 5923) @@ -25,8 +25,6 @@ #include "cpu.h" #include "exec-all.h" -#define RETURN() __asm__ __volatile__("" : : : "memory"); - static inline void env_to_regs(void) { } Modified: trunk/target-cris/op_helper.c =================================================================== --- trunk/target-cris/op_helper.c 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-cris/op_helper.c 2008-12-07 18:15:54 UTC (rev 5923) @@ -189,7 +189,6 @@ } #endif env->regs[reg] = env->sregs[srs][sreg]; - RETURN(); } static void cris_ccs_rshift(CPUState *env) Modified: trunk/target-i386/op_helper.c =================================================================== --- trunk/target-i386/op_helper.c 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-i386/op_helper.c 2008-12-07 18:15:54 UTC (rev 5923) @@ -1745,7 +1745,6 @@ } EAX = (EAX & ~0xffff) | al | (ah << 8); CC_SRC = eflags; - FORCE_RET(); } void helper_aas(void) @@ -1770,7 +1769,6 @@ } EAX = (EAX & ~0xffff) | al | (ah << 8); CC_SRC = eflags; - FORCE_RET(); } void helper_daa(void) @@ -1798,7 +1796,6 @@ eflags |= parity_table[al]; /* pf */ eflags |= (al & 0x80); /* sf */ CC_SRC = eflags; - FORCE_RET(); } void helper_das(void) @@ -1829,7 +1826,6 @@ eflags |= parity_table[al]; /* pf */ eflags |= (al & 0x80); /* sf */ CC_SRC = eflags; - FORCE_RET(); } void helper_into(int next_eip_addend) @@ -3553,7 +3549,6 @@ ret = floatx_compare(ST0, FT0, &env->fp_status); env->fpus = (env->fpus & ~0x4500) | fcom_ccval[ret + 1]; - FORCE_RET(); } void helper_fucom_ST0_FT0(void) @@ -3562,7 +3557,6 @@ ret = floatx_compare_quiet(ST0, FT0, &env->fp_status); env->fpus = (env->fpus & ~0x4500) | fcom_ccval[ret+ 1]; - FORCE_RET(); } static const int fcomi_ccval[4] = {CC_C, CC_Z, 0, CC_Z | CC_P | CC_C}; @@ -3576,7 +3570,6 @@ eflags = helper_cc_compute_all(CC_OP); eflags = (eflags & ~(CC_Z | CC_P | CC_C)) | fcomi_ccval[ret + 1]; CC_SRC = eflags; - FORCE_RET(); } void helper_fucomi_ST0_FT0(void) @@ -3588,7 +3581,6 @@ eflags = helper_cc_compute_all(CC_OP); eflags = (eflags & ~(CC_Z | CC_P | CC_C)) | fcomi_ccval[ret + 1]; CC_SRC = eflags; - FORCE_RET(); } void helper_fadd_ST0_FT0(void) @@ -3773,7 +3765,6 @@ { if (env->fpus & FPUS_SE) fpu_raise_exception(); - FORCE_RET(); } void helper_fninit(void) @@ -4629,7 +4620,6 @@ if (v < low || v > high) { raise_exception(EXCP05_BOUND); } - FORCE_RET(); } void helper_boundl(target_ulong a0, int v) @@ -4640,7 +4630,6 @@ if (v < low || v > high) { raise_exception(EXCP05_BOUND); } - FORCE_RET(); } static float approx_rsqrt(float a) Modified: trunk/target-i386/ops_sse.h =================================================================== --- trunk/target-i386/ops_sse.h 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-i386/ops_sse.h 2008-12-07 18:15:54 UTC (rev 5923) @@ -58,7 +58,6 @@ d->W(7) >>= shift; #endif } - FORCE_RET(); } void glue(helper_psraw, SUFFIX)(Reg *d, Reg *s) @@ -104,7 +103,6 @@ d->W(7) <<= shift; #endif } - FORCE_RET(); } void glue(helper_psrld, SUFFIX)(Reg *d, Reg *s) @@ -125,7 +123,6 @@ d->L(3) >>= shift; #endif } - FORCE_RET(); } void glue(helper_psrad, SUFFIX)(Reg *d, Reg *s) @@ -163,7 +160,6 @@ d->L(3) <<= shift; #endif } - FORCE_RET(); } void glue(helper_psrlq, SUFFIX)(Reg *d, Reg *s) @@ -182,7 +178,6 @@ d->Q(1) >>= shift; #endif } - FORCE_RET(); } void glue(helper_psllq, SUFFIX)(Reg *d, Reg *s) @@ -201,7 +196,6 @@ d->Q(1) <<= shift; #endif } - FORCE_RET(); } #if SHIFT == 1 @@ -216,7 +210,6 @@ d->B(i) = d->B(i + shift); for(i = 16 - shift; i < 16; i++) d->B(i) = 0; - FORCE_RET(); } void glue(helper_pslldq, SUFFIX)(Reg *d, Reg *s) @@ -230,7 +223,6 @@ d->B(i) = d->B(i - shift); for(i = 0; i < shift; i++) d->B(i) = 0; - FORCE_RET(); } #endif @@ -432,7 +424,6 @@ d->L(i) = (int16_t)s->W(2*i) * (int16_t)d->W(2*i) + (int16_t)s->W(2*i+1) * (int16_t)d->W(2*i+1); } - FORCE_RET(); } #if SHIFT == 0 @@ -479,7 +470,6 @@ if (s->B(i) & 0x80) stb(a0 + i, d->B(i)); } - FORCE_RET(); } void glue(helper_movl_mm_T0, SUFFIX) (Reg *d, uint32_t val) @@ -917,7 +907,6 @@ s1 = s->XMM_S(0); ret = float32_compare_quiet(s0, s1, &env->sse_status); CC_SRC = comis_eflags[ret + 1]; - FORCE_RET(); } void helper_comiss(Reg *d, Reg *s) @@ -929,7 +918,6 @@ s1 = s->XMM_S(0); ret = float32_compare(s0, s1, &env->sse_status); CC_SRC = comis_eflags[ret + 1]; - FORCE_RET(); } void helper_ucomisd(Reg *d, Reg *s) @@ -941,7 +929,6 @@ d1 = s->XMM_D(0); ret = float64_compare_quiet(d0, d1, &env->sse_status); CC_SRC = comis_eflags[ret + 1]; - FORCE_RET(); } void helper_comisd(Reg *d, Reg *s) @@ -953,7 +940,6 @@ d1 = s->XMM_D(0); ret = float64_compare(d0, d1, &env->sse_status); CC_SRC = comis_eflags[ret + 1]; - FORCE_RET(); } uint32_t helper_movmskps(Reg *s) Modified: trunk/target-sh4/exec.h =================================================================== --- trunk/target-sh4/exec.h 2008-12-07 18:15:45 UTC (rev 5922) +++ trunk/target-sh4/exec.h 2008-12-07 18:15:54 UTC (rev 5923) @@ -43,8 +43,6 @@ #include "softmmu_exec.h" #endif -#define RETURN() __asm__ __volatile__("") - static inline void regs_to_env(void) { /* XXXXX */