--- a/src/cpu.h	Mon Dec 12 10:37:41 2005 +0000
+++ b/src/cpu.h	Sun Dec 25 08:24:11 2005 +0000
@@ -1,8 +1,27 @@
+/**
+ * $Id: cpu.h,v 1.6 2005-12-25 05:56:55 nkeynes Exp $
+ * 
+ * Generic CPU definitions, primarily for providing information to the GUI.
+ *
+ * Copyright (c) 2005 Nathan Keynes.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 
-#ifndef dream_disasm_H
-#define dream_disasm_H 1
+#ifndef dream_cpu_H
+#define dream_cpu_H 1
 
+#include <stdint.h>
 #include <stdlib.h>
+#include <glib/gtypes.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,6 +38,7 @@
 typedef uint32_t (*disasm_func_t)(uint32_t pc, char *buffer, int buflen, char *opcode );
 
 typedef int (*is_valid_page_t)(uint32_t pc);
+typedef gboolean (*step_func_t)();
 
 #define REG_INT 0
 #define REG_FLT 1
@@ -33,21 +53,24 @@
     void *value;
 } reg_desc_t;
 
+/**
+ * CPU definition structure - basic information and support functions.
+ */
 typedef struct cpu_desc_struct {
   char *name; /* CPU Name */
   disasm_func_t disasm_func; /* Disassembly function */
+  step_func_t step_func; /* Single step function */
+  is_valid_page_t is_valid_page_func; /* Test for valid memory page */
   size_t instr_size; /* Size of instruction */
   char *regs; /* Pointer to start of registers */
   size_t regs_size; /* Size of register structure in bytes */
   const struct reg_desc_struct *regs_info; /* Description of all registers */
   uint32_t *pc; /* Pointer to PC register */
   uint32_t *icount; /* Pointer to instruction counter */
-  /* Memory map? */
-    is_valid_page_t is_valid_page_func; /* Test for valid memory page */
 } *cpu_desc_t;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* !dream_disasm_H */
+#endif /* !dream_cpu_H */