--- trunk/src/cpus/cpu_hppa.c	2007/10/08 16:19:11	18
+++ trunk/src/cpus/cpu_hppa.c	2007/10/08 16:19:23	20
@@ -15,7 +15,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)
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: cpu_hppa.c,v 1.2 2005/10/22 17:24:20 debug Exp $
+ *  $Id: cpu_hppa.c,v 1.6 2005/11/17 21:26:06 debug Exp $
  *
  *  HP PA-RISC CPU emulation.
  *
@@ -83,7 +83,7 @@
 		    hppa_invalidate_code_translation;
 	}
 
-	/*  Only hppaow name and caches etc for CPU nr 0 (in SMP machines):  */
+	/*  Only show name and caches etc for CPU nr 0 (in SMP machines):  */
 	if (cpu_id == 0) {
 		debug("%s", cpu->name);
 	}
@@ -125,7 +125,7 @@
 void hppa_cpu_register_dump(struct cpu *cpu, int gprs, int coprocs)
 {
 	char *symbol;
-	uint64_t offset, tmp;
+	uint64_t offset;
 	int i, x = cpu->cpu_id, nregs = 32;
 	int bits32 = cpu->cd.hppa.bits == 32;
 
@@ -191,32 +191,6 @@
 
 
 /*
- *  hppa_cpu_show_full_statistics():
- *
- *  Show detailed statistics on opcode usage on each cpu.
- */
-void hppa_cpu_show_full_statistics(struct machine *m)
-{
-	fatal("hppa_cpu_show_full_statistics(): TODO\n");
-}
-
-
-/*
- *  hppa_cpu_tlbdump():
- *
- *  Called from the debugger to dump the TLB in a readable format.
- *  x is the cpu number to dump, or -1 to dump all CPUs.
- *
- *  If rawflag is nonzero, then the TLB contents isn't formated nicely,
- *  just dumped.
- */
-void hppa_cpu_tlbdump(struct machine *m, int x, int rawflag)
-{
-	fatal("hppa_cpu_tlbdump(): TODO\n");
-}
-
-
-/*
  *  hppa_cpu_interrupt():
  */
 int hppa_cpu_interrupt(struct cpu *cpu, uint64_t irq_nr)
@@ -242,19 +216,18 @@
  *  Convert an instruction word into human readable format, for instruction
  *  tracing.
  *
- *  If running is 1, cpu->pc hppaould be the address of the instruction.
+ *  If running is 1, cpu->pc should be the address of the instruction.
  *
  *  If running is 0, things that depend on the runtime environment (eg.
- *  register contents) will not be hppaown, and addr will be used instead of
+ *  register contents) will not be shown, and addr will be used instead of
  *  cpu->pc for relative addresses.
  */
 int hppa_cpu_disassemble_instr(struct cpu *cpu, unsigned char *instr,
 	int running, uint64_t dumpaddr, int bintrans)
 {
-	uint64_t offset, addr;
+	uint64_t offset;
 	uint32_t iword;
-	int hi6;
-	char *symbol, *mnem = "ERROR";
+	char *symbol;
 
 	if (running)
 		dumpaddr = cpu->pc;