--- trunk/src/include/cpu_avr.h	2007/10/08 16:19:11	18
+++ trunk/src/include/cpu_avr.h	2007/10/08 16:19:23	20
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_avr.h,v 1.7 2005/10/27 14:01:15 debug Exp $
+ *  $Id: cpu_avr.h,v 1.10 2005/11/16 21:15:19 debug Exp $
  */
 
 #include "misc.h"
@@ -49,6 +49,7 @@
 
 struct avr_instr_call {
 	void	(*f)(struct cpu *, struct avr_instr_call *);
+	int	len;
 	size_t	arg[AVR_N_IC_ARGS];
 };
 
@@ -65,12 +66,11 @@
 
 #define	AVR_MAX_VPH_TLB_ENTRIES		256
 struct avr_vpg_tlb_entry {
-	int		valid;
-	int		writeflag;
-	int64_t		timestamp;
-	unsigned char	*host_page;
+	unsigned char	valid;
+	unsigned char	writeflag;
 	uint32_t	vaddr_page;
 	uint32_t	paddr_page;
+	unsigned char	*host_page;
 };
 
 
@@ -117,6 +117,8 @@
 	struct avr_instr_call	*cur_ic_page;
 	struct avr_instr_call	*next_ic;
 
+	void			(*combination_check)(struct cpu *,
+				    struct avr_instr_call *, int low_addr);
 
 	/*
 	 *  Virtual -> physical -> host address translation:
@@ -133,6 +135,7 @@
 	struct avr_tc_physpage		*phys_page[AVR_N_VPH_ENTRIES];
 
 	uint32_t			phystranslation[AVR_N_VPH_ENTRIES/32];
+	uint8_t				vaddr_to_tlbindex[AVR_N_VPH_ENTRIES];
 };