--- trunk/src/include/cpu_sh.h	2007/10/08 16:19:11	18
+++ trunk/src/include/cpu_sh.h	2007/10/08 16:19:23	20
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_sh.h,v 1.7 2005/10/27 14:01:15 debug Exp $
+ *  $Id: cpu_sh.h,v 1.10 2005/11/16 21:15:19 debug Exp $
  */
 
 #include "misc.h"
@@ -63,12 +63,12 @@
 
 #define	SH_MAX_VPH_TLB_ENTRIES		256
 struct sh_vpg_tlb_entry {
-	int		valid;
-	int		writeflag;
+	uint8_t		valid;
+	uint8_t		writeflag;
 	int64_t		timestamp;
-	unsigned char	*host_page;
 	uint64_t	vaddr_page;
 	uint64_t	paddr_page;
+	unsigned char	*host_page;
 };
 
 struct sh_cpu {
@@ -89,6 +89,8 @@
 	struct sh_instr_call	*cur_ic_page;
 	struct sh_instr_call	*next_ic;
 
+	void			(*combination_check)(struct cpu *,
+				    struct sh_instr_call *, int low_addr);
 
 	/*
 	 *  Virtual -> physical -> host address translation:
@@ -105,6 +107,7 @@
 	struct sh_tc_physpage    *phys_page[SH_N_VPH_ENTRIES];
 
 	uint32_t		 phystranslation[SH_N_VPH_ENTRIES/32];
+	uint8_t			 vaddr_to_tlbindex[SH_N_VPH_ENTRIES];
 };