--- trunk/src/include/cpu_hppa.h	2007/10/08 16:18:51	14
+++ trunk/src/include/cpu_hppa.h	2007/10/08 16:19:37	22
@@ -2,7 +2,7 @@
 #define	CPU_HPPA_H
 
 /*
- *  Copyright (C) 2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2005-2006  Anders Gavare.  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are met:
@@ -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.5 2005/09/07 07:10:17 debug Exp $
+ *  $Id: cpu_hppa.h,v 1.15 2006/02/13 04:23:25 debug Exp $
  */
 
 #include "misc.h"
@@ -40,79 +40,44 @@
 #define	HPPA_N_IC_ARGS			3
 #define	HPPA_INSTR_ALIGNMENT_SHIFT	2
 #define	HPPA_IC_ENTRIES_SHIFT		10
-#define	HPPA_IC_ENTRIES_PER_PAGE		(1 << HPPA_IC_ENTRIES_SHIFT)
+#define	HPPA_IC_ENTRIES_PER_PAGE	(1 << HPPA_IC_ENTRIES_SHIFT)
 #define	HPPA_PC_TO_IC_ENTRY(a)		(((a)>>HPPA_INSTR_ALIGNMENT_SHIFT) \
 					& (HPPA_IC_ENTRIES_PER_PAGE-1))
 #define	HPPA_ADDR_TO_PAGENR(a)		((a) >> (HPPA_IC_ENTRIES_SHIFT \
 					+ HPPA_INSTR_ALIGNMENT_SHIFT))
 
-struct hppa_instr_call {
-	void	(*f)(struct cpu *, struct hppa_instr_call *);
-	size_t	arg[HPPA_N_IC_ARGS];
-};
+DYNTRANS_MISC_DECLARATIONS(hppa,HPPA,uint64_t)
 
-/*  Translation cache struct for each physical page:  */
-struct hppa_tc_physpage {
-	uint32_t	next_ofs;	/*  or 0 for end of chain  */
-	uint64_t	physaddr;
-	int		flags;
-	struct hppa_instr_call ics[HPPA_IC_ENTRIES_PER_PAGE + 1];
-};
+#define	HPPA_MAX_VPH_TLB_ENTRIES		128
 
-#define	HPPA_N_VPH_ENTRIES		1048576
 
-#define	HPPA_MAX_VPH_TLB_ENTRIES		256
-struct hppa_vpg_tlb_entry {
-	int		valid;
-	int		writeflag;
-	int64_t		timestamp;
-	unsigned char	*host_page;
-	uint64_t	vaddr_page;
-	uint64_t	paddr_page;
-};
+#define	HPPA_NREGS		32
 
 struct hppa_cpu {
 	int		bits;		/*  32 or 64  */
 
-	uint64_t	r[32];
+	uint64_t	r[HPPA_NREGS];
 
 
 	/*
-	 *  Instruction translation cache:
+	 *  Instruction translation cache and Virtual->Physical->Host
+	 *  address translation:
 	 */
-
-	/*  cur_ic_page is a pointer to an array of HPPA_IC_ENTRIES_PER_PAGE
-	    instruction call entries. next_ic points to the next such
-	    call to be executed.  */
-	struct hppa_tc_physpage	*cur_physpage;
-	struct hppa_instr_call	*cur_ic_page;
-	struct hppa_instr_call	*next_ic;
-
-
-	/*
-	 *  Virtual -> physical -> host address translation:
-	 *
-	 *  host_load and host_store point to arrays of HPPA_N_VPH_ENTRIES
-	 *  pointers (to host pages); phys_addr points to an array of
-	 *  HPPA_N_VPH_ENTRIES uint32_t.
-	 */
-
-	struct hppa_vpg_tlb_entry  vph_tlb_entry[HPPA_MAX_VPH_TLB_ENTRIES];
-	unsigned char		    *host_load[HPPA_N_VPH_ENTRIES]; 
-	unsigned char		    *host_store[HPPA_N_VPH_ENTRIES];
-	uint32_t		    phys_addr[HPPA_N_VPH_ENTRIES]; 
-	struct hppa_tc_physpage    *phys_page[HPPA_N_VPH_ENTRIES];
+	DYNTRANS_ITC(hppa)
+	VPH_TLBS(hppa,HPPA)
+	VPH32(hppa,HPPA,uint64_t,uint8_t)
+	VPH64(hppa,HPPA,uint8_t)
 };
 
 
 /*  cpu_hppa.c:  */
 void hppa_update_translation_table(struct cpu *cpu, uint64_t vaddr_page,
 	unsigned char *host_page, int writeflag, uint64_t paddr_page);
-void hppa_invalidate_translation_caches_paddr(struct cpu *cpu, uint64_t, int);
+void hppa_invalidate_translation_caches(struct cpu *cpu, uint64_t, int);
 void hppa_invalidate_code_translation(struct cpu *cpu, uint64_t, int);
 void hppa32_update_translation_table(struct cpu *cpu, uint64_t vaddr_page,
 	unsigned char *host_page, int writeflag, uint64_t paddr_page);
-void hppa32_invalidate_translation_caches_paddr(struct cpu *cpu, uint64_t, int);
+void hppa32_invalidate_translation_caches(struct cpu *cpu, uint64_t, int);
 void hppa32_invalidate_code_translation(struct cpu *cpu, uint64_t, int);
 int hppa_memory_rw(struct cpu *cpu, struct memory *mem, uint64_t vaddr,
 	unsigned char *data, size_t len, int writeflag, int cache_flags);