--- trunk/src/include/cpu_mips.h	2007/10/08 16:18:22	9
+++ trunk/src/include/cpu_mips.h	2007/10/08 16:18:27	10
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_mips.h,v 1.13 2005/03/14 12:49:16 debug Exp $
+ *  $Id: cpu_mips.h,v 1.16 2005/06/26 22:23:43 debug Exp $
  */
 
 #include "misc.h"
@@ -203,7 +203,7 @@
 
 /*  Virtual to host address translation tables:  */
 struct vth32_table {
-	void			*haddr_entry[1024];
+	void			*haddr_entry[1024 * 2];
 	uint32_t		paddr_entry[1024];
 	uint32_t		*bintrans_chunks[1024];
 	struct vth32_table	*next_free;
@@ -290,7 +290,8 @@
 	uint64_t	bintrans_data_vaddr[N_BINTRANS_VADDR_TO_HOST];
 	unsigned char	*bintrans_data_hostpage[N_BINTRANS_VADDR_TO_HOST];
 
-	void		(*bintrans_loadstore_32bit)(struct cpu *);	/*  Note: incorrect args  */
+	void		(*bintrans_load_32bit)(struct cpu *);	/*  Note: incorrect args  */
+	void		(*bintrans_store_32bit)(struct cpu *);	/*  Note: incorrect args  */
 	void		(*bintrans_jump_to_32bit_pc)(struct cpu *);
 	void		(*bintrans_simple_exception)(struct cpu *, int);
 	void		(*bintrans_fast_rfe)(struct cpu *);
@@ -362,12 +363,13 @@
 	int		cache_linesize[2];
 	int		cache_mask[2];
 	int		cache_miss_penalty[2];
+
+	/*  Other stuff:  */
+	uint64_t	cop0_config_select1;
 };
 
 
 /*  cpu_mips.c:  */
-struct cpu *mips_cpu_new(struct memory *mem, struct machine *machine,
-        int cpu_id, char *cpu_type_name);
 void mips_cpu_show_full_statistics(struct machine *m);
 void mips_cpu_tlbdump(struct machine *m, int x, int rawflag);
 void mips_cpu_register_match(struct machine *m, char *name, 
@@ -398,9 +400,10 @@
 void clear_all_chunks_from_all_tables(struct cpu *cpu);
 void mips_invalidate_translation_caches_paddr(struct cpu *cpu, uint64_t paddr);
 void coproc_register_read(struct cpu *cpu,
-        struct mips_coproc *cp, int reg_nr, uint64_t *ptr);
+        struct mips_coproc *cp, int reg_nr, uint64_t *ptr, int select);
 void coproc_register_write(struct cpu *cpu,
-        struct mips_coproc *cp, int reg_nr, uint64_t *ptr, int flag64);
+        struct mips_coproc *cp, int reg_nr, uint64_t *ptr, int flag64,
+	int select);
 void coproc_tlbpr(struct cpu *cpu, int readflag);
 void coproc_tlbwri(struct cpu *cpu, int randomflag);
 void coproc_rfe(struct cpu *cpu);