--- trunk/src/cpus/generate_tail.c	2007/10/08 16:22:43	43
+++ trunk/src/cpus/generate_tail.c	2007/10/08 16:22:56	44
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: generate_tail.c,v 1.16 2007/06/07 15:36:24 debug Exp $
+ *  $Id: generate_tail.c,v 1.21 2007/06/28 13:36:47 debug Exp $
  */
 
 #include <stdio.h>
@@ -67,32 +67,25 @@
 	printf("\n/*\n *  AUTOMATICALLY GENERATED! Do not edit.\n */\n\n");
 
 	printf("extern size_t dyntrans_cache_size;\n");
-	printf("extern int native_code_translation_enabled;\n");
-	printf("#include \"native.h\"\n");
 
 	printf("#ifdef DYNTRANS_32\n");
 	printf("#define MODE32\n");
 	printf("#endif\n");
 
-	printf("#define DYNTRANS_FUNCTION_TRACE "
+	printf("#define DYNTRANS_FUNCTION_TRACE_DEF "
 	    "%s_cpu_functioncall_trace\n", a);
 	printf("#include \"cpu_dyntrans.c\"\n");
-	printf("#undef DYNTRANS_FUNCTION_TRACE\n\n");
+	printf("#undef DYNTRANS_FUNCTION_TRACE_DEF\n\n");
 
 	printf("#define DYNTRANS_INIT_TABLES "
 	    "%s_cpu_init_tables\n", a);
 	printf("#include \"cpu_dyntrans.c\"\n");
 	printf("#undef DYNTRANS_INIT_TABLES\n\n");
 
-	printf("#define DYNTRANS_TIMER_SAMPLE_TICK "
-	    "%s_timer_sample_tick\n", a);
-	printf("#include \"cpu_dyntrans.c\"\n");
-	printf("#undef DYNTRANS_TIMER_SAMPLE_TICK\n\n");
-
-	printf("#define DYNTRANS_TC_ALLOCATE_DEFAULT_PAGE "
+	printf("#define DYNTRANS_TC_ALLOCATE_DEFAULT_PAGE_DEF "
 	    "%s_tc_allocate_default_page\n", a);
 	printf("#include \"cpu_dyntrans.c\"\n");
-	printf("#undef DYNTRANS_TC_ALLOCATE_DEFAULT_PAGE\n\n");
+	printf("#undef DYNTRANS_TC_ALLOCATE_DEFAULT_PAGE_DEF\n\n");
 
 	printf("#define DYNTRANS_INVAL_ENTRY\n");
 	printf("#include \"cpu_dyntrans.c\"\n");
@@ -115,7 +108,7 @@
 
 	printf("#define MEMORY_RW %s_memory_rw\n", a);
 	printf("#define MEM_%s\n", uppercase(a));
-	printf("#include \"../memory_rw.c\"\n");
+	printf("#include \"memory_rw.c\"\n");
 	printf("#undef MEM_%s\n", uppercase(a));
 	printf("#undef MEMORY_RW\n\n");
 
@@ -141,9 +134,9 @@
 	printf("#include \"quick_pc_to_pointers.h\"\n");
 	printf("#include \"cpu_%s_instr.c\"\n\n", a);
 
-	printf("#define DYNTRANS_RUN_INSTR %s_run_instr\n", a);
+	printf("#define DYNTRANS_RUN_INSTR_DEF %s_run_instr\n", a);
 	printf("#include \"cpu_dyntrans.c\"\n");
-	printf("#undef DYNTRANS_RUN_INSTR\n\n");
+	printf("#undef DYNTRANS_RUN_INSTR_DEF\n\n");
 
 
 	printf("#ifdef DYNTRANS_DUALMODE_32\n");
@@ -198,9 +191,9 @@
 	    "#define DYNTRANS_PC_TO_POINTERS %s_pc_to_pointers\n"
 	    "#define DYNTRANS_PC_TO_POINTERS32 %s32_pc_to_pointers\n\n", a, a);
 
-	printf("#define DYNTRANS_RUN_INSTR %s32_run_instr\n", a);
+	printf("#define DYNTRANS_RUN_INSTR_DEF %s32_run_instr\n", a);
 	printf("#include \"cpu_dyntrans.c\"\n");
-	printf("#undef DYNTRANS_RUN_INSTR\n\n");
+	printf("#undef DYNTRANS_RUN_INSTR_DEF\n\n");
 
 	printf("#endif /*  DYNTRANS_DUALMODE_32  */\n\n\n");