From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9QLG-0005nb-HS for qemu-devel@nongnu.org; Sun, 07 Dec 2008 15:35:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9QLG-0005nN-4J for qemu-devel@nongnu.org; Sun, 07 Dec 2008 15:35:02 -0500 Received: from [199.232.76.173] (port=58441 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9QLF-0005nK-MP for qemu-devel@nongnu.org; Sun, 07 Dec 2008 15:35:01 -0500 Received: from savannah.gnu.org ([199.232.41.3]:34093 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 1L9QLF-0002Lr-CI for qemu-devel@nongnu.org; Sun, 07 Dec 2008 15:35:01 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L9QLE-0004ph-Ul for qemu-devel@nongnu.org; Sun, 07 Dec 2008 20:35:01 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L9QLE-0004pd-KW for qemu-devel@nongnu.org; Sun, 07 Dec 2008 20:35:00 +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 20:35:00 +0000 Subject: [Qemu-devel] [5936] Some cleanups after dyngen removal 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: 5936 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5936 Author: aurel32 Date: 2008-12-07 20:35:00 +0000 (Sun, 07 Dec 2008) Log Message: ----------- Some cleanups after dyngen removal 1. hostregs_helper.h: fix comment 2. translate-all.c: rename dyngen_code(_search_pc) to tcg_gen_code(_search_pc) 3. tcg.c: - rename dyngen_table_op_count to tcg_table_op_count - no need to generate a log of dyngen ops generated - rename dyngen_code(_search_pc) to tcg_gen_code(_search_pc) 4. tcg.h: rename dyngen_code(_search_pc) to tcg_gen_code(_search_pc) Signed-off-by: Laurent Desnogues Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hostregs_helper.h trunk/tcg/tcg.c trunk/tcg/tcg.h trunk/translate-all.c Modified: trunk/hostregs_helper.h =================================================================== --- trunk/hostregs_helper.h 2008-12-07 19:39:58 UTC (rev 5935) +++ trunk/hostregs_helper.h 2008-12-07 20:35:00 UTC (rev 5936) @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* The GCC global register vairable extension is used to reserve some - host registers for use by dyngen. However only the core parts of the - translation engine are compiled with these settings. We must manually +/* The GCC global register variable extension is used to reserve some + host registers for use by generated code. However only the core parts of + the translation engine are compiled with these settings. We must manually save/restore these registers when called from regular code. It is not sufficient to save/restore T0 et. al. as these may be declared with a datatype smaller than the actual register. */ Modified: trunk/tcg/tcg.c =================================================================== --- trunk/tcg/tcg.c 2008-12-07 19:39:58 UTC (rev 5935) +++ trunk/tcg/tcg.c 2008-12-07 20:35:00 UTC (rev 5936) @@ -1890,20 +1890,15 @@ #ifdef CONFIG_PROFILER -static int64_t dyngen_table_op_count[NB_OPS]; +static int64_t tcg_table_op_count[NB_OPS]; void dump_op_count(void) { int i; FILE *f; - f = fopen("/tmp/op1.log", "w"); - for(i = 0; i < INDEX_op_end; i++) { - fprintf(f, "%s %" PRId64 "\n", tcg_op_defs[i].name, dyngen_table_op_count[i]); - } - fclose(f); - f = fopen("/tmp/op2.log", "w"); + f = fopen("/tmp/op.log", "w"); for(i = INDEX_op_end; i < NB_OPS; i++) { - fprintf(f, "%s %" PRId64 "\n", tcg_op_defs[i].name, dyngen_table_op_count[i]); + fprintf(f, "%s %" PRId64 "\n", tcg_op_defs[i].name, tcg_table_op_count[i]); } fclose(f); } @@ -1953,7 +1948,7 @@ for(;;) { opc = gen_opc_buf[op_index]; #ifdef CONFIG_PROFILER - dyngen_table_op_count[opc]++; + tcg_table_op_count[opc]++; #endif def = &tcg_op_defs[opc]; #if 0 @@ -2030,7 +2025,7 @@ return -1; } -int dyngen_code(TCGContext *s, uint8_t *gen_code_buf) +int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf) { #ifdef CONFIG_PROFILER { @@ -2058,7 +2053,7 @@ offset bytes from the start of the TB. The contents of gen_code_buf must not be changed, though writing the same values is ok. Return -1 if not found. */ -int dyngen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset) +int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset) { return tcg_gen_code_common(s, gen_code_buf, offset); } Modified: trunk/tcg/tcg.h =================================================================== --- trunk/tcg/tcg.h 2008-12-07 19:39:58 UTC (rev 5935) +++ trunk/tcg/tcg.h 2008-12-07 20:35:00 UTC (rev 5936) @@ -314,8 +314,8 @@ void tcg_context_init(TCGContext *s); void tcg_func_start(TCGContext *s); -int dyngen_code(TCGContext *s, uint8_t *gen_code_buf); -int dyngen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); +int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf); +int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset); void tcg_set_frame(TCGContext *s, int reg, tcg_target_long start, tcg_target_long size); Modified: trunk/translate-all.c =================================================================== --- trunk/translate-all.c 2008-12-07 19:39:58 UTC (rev 5935) +++ trunk/translate-all.c 2008-12-07 20:35:00 UTC (rev 5936) @@ -118,7 +118,7 @@ s->interm_time += profile_getclock() - ti; s->code_time -= profile_getclock(); #endif - gen_code_size = dyngen_code(s, gen_code_buf); + gen_code_size = tcg_gen_code(s, gen_code_buf); *gen_code_size_ptr = gen_code_size; #ifdef CONFIG_PROFILER s->code_time += profile_getclock(); @@ -177,7 +177,7 @@ s->tb_jmp_offset = NULL; s->tb_next = tb->tb_next; #endif - j = dyngen_code_search_pc(s, (uint8_t *)tc_ptr, searched_pc - tc_ptr); + j = tcg_gen_code_search_pc(s, (uint8_t *)tc_ptr, searched_pc - tc_ptr); if (j < 0) return -1; /* now find start of instruction before */