1.1 --- a/src/cpu.h	Tue Jan 01 05:08:38 2008 +0000
     1.2 +++ b/src/cpu.h	Mon Jan 14 09:04:03 2008 +0000
     1.3 @@ -19,9 +19,8 @@
     1.4  #ifndef dream_cpu_H
     1.5  #define dream_cpu_H 1
     1.6  
     1.7 -#include <stdint.h>
     1.8 -#include <stdlib.h>
     1.9 -#include <glib/gtypes.h>
    1.10 +#include "lxdream.h"
    1.11 +#include "mem.h"
    1.12  
    1.13  #ifdef __cplusplus
    1.14  extern "C" {
    1.15 @@ -58,8 +57,8 @@
    1.16      disasm_func_t disasm_func; /* Disassembly function */
    1.17      gboolean (*step_func)(); /* Single step function */
    1.18      int (*is_valid_page_func)(uint32_t); /* Test for valid memory page */
    1.19 -    void (*set_breakpoint)(uint32_t, int);
    1.20 -    gboolean (*clear_breakpoint)(uint32_t, int);
    1.21 +    void (*set_breakpoint)(uint32_t, breakpoint_type_t);
    1.22 +    gboolean (*clear_breakpoint)(uint32_t, breakpoint_type_t);
    1.23      int (*get_breakpoint)(uint32_t);
    1.24      size_t instr_size; /* Size of instruction */
    1.25      char *regs; /* Pointer to start of registers */