--- trunk/src/cpus/cpu_avr.c	2007/10/08 16:20:18	27
+++ trunk/src/cpus/cpu_avr.c	2007/10/08 16:20:26	28
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_avr.c,v 1.18 2006/06/16 18:31:25 debug Exp $
+ *  $Id: cpu_avr.c,v 1.20 2006/07/16 13:32:26 debug Exp $
  *
  *  Atmel AVR (8-bit) CPU emulation.
  */
@@ -71,6 +71,7 @@
 	if (type == 0)
 		return 0;
 
+	cpu->run_instr = avr_run_instr;
 	cpu->memory_rw = avr_memory_rw;
 	cpu->update_translation_table = avr_update_translation_table;
 	cpu->invalidate_translation_caches =
@@ -167,9 +168,9 @@
 	}
 
 	debug("cpu%i: nr of instructions: %lli\n", x,
-	    (long long)cpu->machine->ncycles);
+	    (long long)cpu->machine->ninstrs);
 	debug("cpu%i: nr of cycles:       %lli\n", x,
-	    (long long)(cpu->machine->ncycles + cpu->cd.avr.extra_cycles));
+	    (long long)(cpu->machine->ninstrs + cpu->cd.avr.extra_cycles));
 }