--- trunk/src/include/cpu_hppa.h	2007/10/08 16:19:11	18
+++ trunk/src/include/cpu_hppa.h	2007/10/08 16:19:23	20
@@ -18,7 +18,7 @@
  *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- *  ARE DISCLAIMED.  IN NO EVENT HPPAALL THE AUTHOR OR CONTRIBUTORS BE LIABLE   
+ *  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE   
  *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  *  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_hppa.h,v 1.8 2005/10/27 14:01:15 debug Exp $
+ *  $Id: cpu_hppa.h,v 1.12 2005/11/16 21:15:19 debug Exp $
  */
 
 #include "misc.h"
@@ -63,12 +63,12 @@
 
 #define	HPPA_MAX_VPH_TLB_ENTRIES		256
 struct hppa_vpg_tlb_entry {
-	int		valid;
-	int		writeflag;
+	unsigned char	valid;
+	unsigned char	writeflag;
 	int64_t		timestamp;
-	unsigned char	*host_page;
 	uint64_t	vaddr_page;
 	uint64_t	paddr_page;
+	unsigned char	*host_page;
 };
 
 struct hppa_cpu {
@@ -88,6 +88,8 @@
 	struct hppa_instr_call	*cur_ic_page;
 	struct hppa_instr_call	*next_ic;
 
+	void			(*combination_check)(struct cpu *,
+				    struct hppa_instr_call *, int low_addr);
 
 	/*
 	 *  Virtual -> physical -> host address translation:
@@ -104,6 +106,7 @@
 	struct hppa_tc_physpage    *phys_page[HPPA_N_VPH_ENTRIES];
 
 	uint32_t		   phystranslation[HPPA_N_VPH_ENTRIES/32];
+	uint8_t			   vaddr_to_tlbindex[HPPA_N_VPH_ENTRIES];
 };