[mupen64plus-core] 160/310: Add debugger_api.patch, Move breakpoint typedef and BPT_* macros to api headers

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 446c4c24537989c0021374f5273ea0ccaa54b71f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 20 19:57:20 2012 +0200

    Add debugger_api.patch, Move breakpoint typedef and BPT_* macros to api headers
---
 debian/changelog                  |  8 +++++
 debian/patches/debugger_api.patch | 71 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 80 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 896a526..1bfbb66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus-core (1.99.5-5) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - Add debugger_api.patch, Move breakpoint typedef and BPT_* macros to api
+      headers
+
+ -- Sven Eckelmann <sven at narfation.org>  Sun, 20 May 2012 19:55:40 +0200
+
 mupen64plus-core (1.99.5-4) unstable; urgency=low
 
   * debian/patches:
diff --git a/debian/patches/debugger_api.patch b/debian/patches/debugger_api.patch
new file mode 100644
index 0000000..a03db67
--- /dev/null
+++ b/debian/patches/debugger_api.patch
@@ -0,0 +1,71 @@
+Description: moved breakpoint typedef and BPT_* macros from dbg_breakpoints.h into m64p_types.h
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/769d4a908a0c
+Author: Richard Goedeken <Richard at fascinationsoftware.com>
+
+---
+diff --git a/src/api/m64p_types.h b/src/api/m64p_types.h
+index 8a965f81433b39e451bbe0cef847f702ae02c15a..6062d7d6b099bb352868d1e348b06a4f87499438 100644
+--- a/src/api/m64p_types.h
++++ b/src/api/m64p_types.h
+@@ -233,6 +233,28 @@ typedef enum {
+   M64P_BKP_CMD_CHECK
+ } m64p_dbg_bkp_command;
+ 
++#define BREAKPOINTS_MAX_NUMBER  128
++
++#define BPT_FLAG_ENABLED        0x01
++#define BPT_FLAG_CONDITIONAL    0x02
++#define BPT_FLAG_COUNTER        0x04
++#define BPT_FLAG_READ           0x08
++#define BPT_FLAG_WRITE          0x10
++#define BPT_FLAG_EXEC           0x20
++#define BPT_FLAG_LOG            0x40 //Log to the console when this breakpoint hits.
++
++#define BPT_CHECK_FLAG(a, b)  ((a.flags & b) == b)
++#define BPT_SET_FLAG(a, b)    a.flags = (a.flags | b);
++#define BPT_CLEAR_FLAG(a, b)  a.flags = (a.flags & (~b));
++#define BPT_TOGGLE_FLAG(a, b) a.flags = (a.flags ^ b);
++
++typedef struct _breakpoint {
++    unsigned int address; 
++    unsigned int endaddr;
++    unsigned int flags;
++    //unsigned int condition;  //Placeholder for breakpoint condition
++    } breakpoint;
++
+ /* ------------------------------------------------- */
+ /* Structures and Types for Core Video Extension API */
+ /* ------------------------------------------------- */
+diff --git a/src/debugger/dbg_breakpoints.h b/src/debugger/dbg_breakpoints.h
+index 0a7152c5b65447366a82ea693b0f110a2686eb5a..e6d163fe5d30989794c4c83908cee27af8c740b4 100644
+--- a/src/debugger/dbg_breakpoints.h
++++ b/src/debugger/dbg_breakpoints.h
+@@ -22,27 +22,7 @@
+ #ifndef __BREAKPOINTS_H__
+ #define __BREAKPOINTS_H__
+ 
+-#define BREAKPOINTS_MAX_NUMBER  128
+-
+-#define BPT_FLAG_ENABLED        0x01
+-#define BPT_FLAG_CONDITIONAL    0x02
+-#define BPT_FLAG_COUNTER        0x04
+-#define BPT_FLAG_READ           0x08
+-#define BPT_FLAG_WRITE          0x10
+-#define BPT_FLAG_EXEC           0x20
+-#define BPT_FLAG_LOG            0x40 //Log to the console when this breakpoint hits.
+-
+-#define BPT_CHECK_FLAG(a, b)  ((a.flags & b) == b)
+-#define BPT_SET_FLAG(a, b)    a.flags = (a.flags | b);
+-#define BPT_CLEAR_FLAG(a, b)  a.flags = (a.flags & (~b));
+-#define BPT_TOGGLE_FLAG(a, b) a.flags = (a.flags ^ b);
+-
+-typedef struct _breakpoint {
+-    uint32 address; 
+-    uint32 endaddr;
+-    uint32 flags;
+-    //uint32 condition;  //Placeholder for breakpoint condition
+-    } breakpoint;
++#include "../api/m64p_types.h"
+ 
+ extern int g_NumBreakpoints;
+ extern breakpoint g_Breakpoints[];
diff --git a/debian/patches/series b/debian/patches/series
index 12cfbc5..345f607 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ printf_fixup.patch
 floatingpoint_config.patch
 debugger_memory_breakpoints.patch
 rjump_gcc47.patch
+debugger_api.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git