--- trunk/src/cpus/generate_arm_dpi.c	2007/10/08 16:19:28	21
+++ trunk/src/cpus/generate_arm_dpi.c	2007/10/08 16:19:37	22
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: generate_arm_dpi.c,v 1.3 2005/11/11 07:31:31 debug Exp $
+ *  $Id: generate_arm_dpi.c,v 1.5 2005/12/26 12:32:10 debug Exp $
  */
 
 #include <stdio.h>
@@ -39,10 +39,10 @@
 	"tst", "teq", "cmp", "cmn", "orr", "mov", "bic", "mvn" };
 
 
-char *uppercase(char *l)
+static char *uppercase(char *l)
 {
 	static char staticbuf[1000];
-	int i = 0;
+	size_t i = 0;
 
 	while (*l && i < sizeof(staticbuf)) {
 		char u = *l++;
@@ -65,12 +65,14 @@
 	printf("#include <stdio.h>\n#include <stdlib.h>\n"
 	    "#include \"cpu.h\"\n"
 	    "#include \"misc.h\"\n"
-	    "#include \"arm_quick_pc_to_pointers.h\"\n"
+	    "#define DYNTRANS_PC_TO_POINTERS arm_pc_to_pointers\n"
+	    "#include \"quick_pc_to_pointers.h\"\n"
 	    "#define reg(x) (*((uint32_t *)(x)))\n");
 	printf("extern void arm_instr_nop(struct cpu *, "
 	    "struct arm_instr_call *);\n");
 	printf("extern void arm_instr_invalid(struct cpu *, "
 	    "struct arm_instr_call *);\n");
+	printf("extern void arm_pc_to_pointers(struct cpu *);\n");
 
 	for (reg=0; reg<=2; reg++)
 	  for (pc=0; pc<=1; pc++)