[mupen64plus-core] 171/310: Rebase patches on top of 1.99.5+14+99517e4bc1b8
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:57:52 UTC 2015
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 4c89816c8caaa124b9e7b992ad18553ba495a47c
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Jun 16 21:58:13 2012 +0200
Rebase patches on top of 1.99.5+14+99517e4bc1b8
---
debian/changelog | 7 +
debian/patches/debugger_api.patch | 71 ----------
debian/patches/debugger_memory_breakpoints.patch | 143 ---------------------
debian/patches/dejavu-font.patch | 6 +-
.../patches/disable_recompiler_disassembler.patch | 12 +-
debian/patches/floatingpoint_config.patch | 38 ------
debian/patches/gcc_lto.patch | 29 -----
debian/patches/printf_fixup.patch | 8 +-
debian/patches/printf_function_pointer.patch | 54 --------
debian/patches/rjump_gcc47.patch | 24 ----
debian/patches/series | 7 -
debian/patches/unused_bdslot.patch | 41 ------
12 files changed, 20 insertions(+), 420 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ce718e..5079572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
mupen64plus-core (1.99.5+14+99517e4bc1b8-1) UNRELEASED; urgency=low
* New Upstream Snapshot from 99517e4bc1b80c0501fa2e50ba2024331e542f3c
+ * debian/patches:
+ - Remove upstream merged debugger_api.patch,
+ debugger_memory_breakpoints.patch, floatingpoint_config.patch,
+ gcc_lto.patch, printf_function_pointer.patch, rjump_gcc47.patch,
+ unused_bdslot.patch
+ - Rebase dejavu-font.patch, disable_recompiler_disassembler.patch,
+ printf_fixup.patch
-- Sven Eckelmann <sven at narfation.org> Sat, 16 Jun 2012 21:52:13 +0200
diff --git a/debian/patches/debugger_api.patch b/debian/patches/debugger_api.patch
deleted file mode 100644
index a03db67..0000000
--- a/debian/patches/debugger_api.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/debugger_memory_breakpoints.patch b/debian/patches/debugger_memory_breakpoints.patch
deleted file mode 100644
index 89f153d..0000000
--- a/debian/patches/debugger_memory_breakpoints.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Description: Fix off-by-one error of memory in memory debugger
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/bc378bd0fac2
-
----
-diff --git a/src/debugger/dbg_breakpoints.c b/src/debugger/dbg_breakpoints.c
-index 34929bb9a54f8f4a349f16a7a745cce4ce846365..a297580f9b96fd96d20c3367f99cc4d0fa72a0e8 100644
---- a/src/debugger/dbg_breakpoints.c
-+++ b/src/debugger/dbg_breakpoints.c
-@@ -74,13 +74,13 @@ void enable_breakpoint( int bpt)
-
- if(BPT_CHECK_FLAG((*curBpt), BPT_FLAG_READ)) {
- for(bptAddr = curBpt->address; bptAddr <= (curBpt->endaddr | 0xFFFF); bptAddr+=0x10000)
-- if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0xFFFF, BPT_FLAG_ENABLED | BPT_FLAG_READ) == -1)
-+ if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0x10000, BPT_FLAG_ENABLED | BPT_FLAG_READ) == -1)
- activate_memory_break_read((uint32) bptAddr);
- }
-
- if(BPT_CHECK_FLAG((*curBpt), BPT_FLAG_WRITE)) {
- for(bptAddr = curBpt->address; bptAddr <= (curBpt->endaddr | 0xFFFF); bptAddr+=0x10000)
-- if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0xFFFF, BPT_FLAG_ENABLED | BPT_FLAG_WRITE) == -1)
-+ if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0x10000, BPT_FLAG_ENABLED | BPT_FLAG_WRITE) == -1)
- activate_memory_break_write((uint32) bptAddr);
- }
-
-@@ -96,13 +96,13 @@ void disable_breakpoint( int bpt )
-
- if(BPT_CHECK_FLAG((*curBpt), BPT_FLAG_READ)) {
- for(bptAddr = curBpt->address; bptAddr <= ((unsigned long)(curBpt->endaddr | 0xFFFF)); bptAddr+=0x10000)
-- if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0xFFFF, BPT_FLAG_ENABLED | BPT_FLAG_READ) == -1)
-+ if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0x10000, BPT_FLAG_ENABLED | BPT_FLAG_READ) == -1)
- deactivate_memory_break_read((uint32) bptAddr);
- }
-
- if(BPT_CHECK_FLAG((*curBpt), BPT_FLAG_WRITE)) {
- for(bptAddr = curBpt->address; bptAddr <= ((unsigned long)(curBpt->endaddr | 0xFFFF)); bptAddr+=0x10000)
-- if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0xFFFF, BPT_FLAG_ENABLED | BPT_FLAG_WRITE) == -1)
-+ if(lookup_breakpoint((uint32) bptAddr & 0xFFFF0000, 0x10000, BPT_FLAG_ENABLED | BPT_FLAG_WRITE) == -1)
- deactivate_memory_break_write((uint32) bptAddr);
- }
-
-@@ -124,7 +124,7 @@ void remove_breakpoint_by_num( int bpt )
-
- void remove_breakpoint_by_address( uint32 address )
- {
-- int bpt = lookup_breakpoint( address, 0, 0 );
-+ int bpt = lookup_breakpoint( address, 1, 0 );
- if(bpt==-1)
- {
- DebugMessage(M64MSG_ERROR, "Tried to remove Nonexistant breakpoint %x!", address);
-@@ -151,7 +151,7 @@ void replace_breakpoint_num( int bpt, breakpoint* copyofnew )
- int lookup_breakpoint( uint32 address, uint32 size, uint32 flags)
- {
- int i;
-- uint64 endaddr = ((uint64)address) + ((uint64)size);
-+ uint64 endaddr = ((uint64)address) + ((uint64)size) - 1;
-
- for( i=0; i < g_NumBreakpoints; i++)
- {
-@@ -176,7 +176,7 @@ int lookup_breakpoint( uint32 address, uint32 size, uint32 flags)
-
- int check_breakpoints( uint32 address )
- {
-- return lookup_breakpoint( address, 0, BPT_FLAG_ENABLED | BPT_FLAG_EXEC );
-+ return lookup_breakpoint( address, 1, BPT_FLAG_ENABLED | BPT_FLAG_EXEC );
- }
-
-
-diff --git a/src/memory/memory.c b/src/memory/memory.c
-index f002fc3a71682cb9ab2760fac5880fd3c23e154a..97fb9c202051adf444a57c9d83216a2782cd898c 100644
---- a/src/memory/memory.c
-+++ b/src/memory/memory.c
-@@ -1165,7 +1165,7 @@ void update_SP(void)
- for (j=start; j<=end; j++)
- {
- #ifdef DBG
-- if (lookup_breakpoint(0x80000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0x80000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_READ ) != -1)
- {
- readmem[0x8000+j] = read_rdram_break;
-@@ -1182,7 +1182,7 @@ void update_SP(void)
- readmemd[0xa000+j] = read_rdramd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_READ ) != -1)
- {
- readmem[0xa000+j] = read_rdram_break;
-@@ -1199,7 +1199,7 @@ void update_SP(void)
- readmemd[0x8000+j] = read_rdramd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0x80000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0x80000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_WRITE ) != -1)
- {
- writemem[0x8000+j] = write_rdram_break;
-@@ -1216,7 +1216,7 @@ void update_SP(void)
- writememd[0x8000+j] = write_rdramd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_WRITE ) != -1)
- {
- writemem[0xa000+j] = write_rdram_break;
-@@ -1276,7 +1276,7 @@ void update_SP(void)
- for (j=start; j<=end; j++)
- {
- #ifdef DBG
-- if (lookup_breakpoint(0x80000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0x80000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_READ ) != -1)
- {
- readmem[0x8000+j] = read_rdramFB_break;
-@@ -1293,7 +1293,7 @@ void update_SP(void)
- readmemd[0xa000+j] = read_rdramFBd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_READ ) != -1)
- {
- readmem[0xa000+j] = read_rdramFB_break;
-@@ -1310,7 +1310,7 @@ void update_SP(void)
- readmemd[0x8000+j] = read_rdramFBd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0x80000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0x80000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_WRITE ) != -1)
- {
- writemem[0x8000+j] = write_rdramFB_break;
-@@ -1327,7 +1327,7 @@ void update_SP(void)
- writememd[0x8000+j] = write_rdramFBd;
- #ifdef DBG
- }
-- if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0xFFFF,
-+ if (lookup_breakpoint(0xa0000000 + j * 0x10000, 0x10000,
- BPT_FLAG_ENABLED | BPT_FLAG_WRITE ) != -1)
- {
- writemem[0xa000+j] = write_rdramFB_break;
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index 117c599..8fa0389 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index e2df2c65e2dbceb0d7f7bc3854056e98c867132a..919355785628c10cdcf6ffc6787f882279db69af 100644
+index b59ca0bade6ae2c871a1d77d215b71d2d0f9ed36..eae0dce01279d005527a9e37e35a0c727a2b57d7 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -423,6 +423,7 @@ install: $(TARGET)
+@@ -422,6 +422,7 @@ install: $(TARGET)
$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
@@ -16,7 +16,7 @@ index e2df2c65e2dbceb0d7f7bc3854056e98c867132a..919355785628c10cdcf6ffc6787f8822
$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 77348d8c2388403f7a41dba94952e85895670e87..e0853fd8845d48b2a92fbb0d7ac31b4f60be63f1 100644
+index 3f8ea24aa54da754b15f443913f92a275710a3f3..0b0e3f281937f55e2601dfa7c07aac0a055b9660 100644
--- a/src/osd/osd.cpp
+++ b/src/osd/osd.cpp
@@ -39,7 +39,7 @@ extern "C" {
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
index 340410f..ae52090 100644
--- a/debian/patches/disable_recompiler_disassembler.patch
+++ b/debian/patches/disable_recompiler_disassembler.patch
@@ -9,10 +9,10 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 919355785628c10cdcf6ffc6787f882279db69af..3a5f5497280d92ab86f15706e2ae057da94d34a3 100644
+index eae0dce01279d005527a9e37e35a0c727a2b57d7..dc6ac17ea221a8c27cc0dfb256be431d25ff09bb 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -376,7 +376,7 @@ ifeq ($(DEBUGGER), 1)
+@@ -374,7 +374,7 @@ ifeq ($(DEBUGGER), 1)
$(SRCDIR)/debugger/dbg_decoder.c \
$(SRCDIR)/debugger/dbg_memory.c \
$(SRCDIR)/debugger/dbg_breakpoints.c
@@ -22,12 +22,12 @@ index 919355785628c10cdcf6ffc6787f882279db69af..3a5f5497280d92ab86f15706e2ae057d
# generate a list of object files to build, make a temporary directory for them
diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index 5925daa78119c6b7892a238eb203d2517d140178..ef2f16375d735291370900cddec9549df4e01e8c 100644
+index 1767ca4e8ff47a8bffb3c612f1678c0314b38b68..c5afbd8682373010c67b7bd90b4a119aeab1bd9c 100644
--- a/src/debugger/dbg_memory.c
+++ b/src/debugger/dbg_memory.c
-@@ -33,7 +33,7 @@
- #include "r4300/ops.h"
- #include "main/rom.h"
+@@ -73,7 +73,7 @@ static MEMBREAKREAD(read_romd, 8);
+
+ static MEMBREAKWRITE(write_rom, 8);
-#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__))
+#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__)) && 0
diff --git a/debian/patches/floatingpoint_config.patch b/debian/patches/floatingpoint_config.patch
deleted file mode 100644
index e6027f4..0000000
--- a/debian/patches/floatingpoint_config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Support locales with commas instead of periods for decimal separator
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/8497ae23150f
-
----
-diff --git a/src/api/config.c b/src/api/config.c
-index 4de179032345bde4efcedaec414845e4d0e3e120..feeb821716f16049490fe58977072edd933aa4f7 100644
---- a/src/api/config.c
-+++ b/src/api/config.c
-@@ -98,22 +98,13 @@ static void strip_whitespace(char *string)
-
- static int is_numeric(const char *string)
- {
-- int dots = 0;
-+ char chTemp[16];
-+ float fTemp;
-+ int rval = sscanf(string, "%f%8s", &fTemp, chTemp);
-
-- if (*string == '-') string++;
--
-- while (*string != 0)
-- {
-- char ch = *string++;
-- if (ch >= '0' && ch <= '9')
-- continue;
-- else if (ch == '.' && dots == 0)
-- dots++;
-- else
-- return 0;
-- }
--
-- return 1; /* true, input is numeric */
-+ /* I want to find exactly one matched input item: a number with no garbage on the end */
-+ /* I use sscanf() instead of a custom loop because this routine must handle locales in which the decimal separator is not '.' */
-+ return (rval == 1);
- }
-
- static config_var *find_section_var(config_section *section, const char *ParamName)
diff --git a/debian/patches/gcc_lto.patch b/debian/patches/gcc_lto.patch
deleted file mode 100644
index 10835c5..0000000
--- a/debian/patches/gcc_lto.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Enable experimental support for link-time optimization
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/99517e4bc1b8
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 3a5f5497280d92ab86f15706e2ae057da94d34a3..992cc16afac3ccb429337f9ec6dc0f2c24f1d66b 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -414,6 +414,7 @@ targets:
- @echo " DBG_COUNT=1 == print R4300 instruction count totals (64-bit dynarec only)"
- @echo " DBG_COMPARE=1 == enable core-synchronized r4300 debugging"
- @echo " DBG_PROFILE=1 == dump profiling data for r4300 dynarec to data file"
-+ @echo " LTO=1 == enable experimental build with link-time optimization"
- @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-@@ -446,6 +447,11 @@ CFLAGS += -MD
- -include $(OBJECTS:.o=.d)
-
- CXXFLAGS += $(CFLAGS)
-+ifeq ($(LTO), 1)
-+ CFLAGS += -flto
-+ CXXFLAGS += -flto
-+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS)
-+endif
-
- # standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index c1e4ac5..1a1dcf4 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -19,7 +19,7 @@ index 50b67a661b64642041de6042a87a19894ca2876f..55a84bcb9c61339b2795a0c91add3f04
#endif /* API_CALLBACKS_H */
diff --git a/src/debugger/dbg_decoder.c b/src/debugger/dbg_decoder.c
-index 30bef2ab3e341e1705db9da91f0f4272df718591..d5bf75c25061fd34c4d08298e1746c6f05cb8690 100644
+index 6cd56ba7bac99e08b81374c5c2cdc900d2fb127d..99ff7a92b62a8dde15124abc7eaa070d59daa90b 100644
--- a/src/debugger/dbg_decoder.c
+++ b/src/debugger/dbg_decoder.c
@@ -228,6 +228,11 @@ lookup_rel_lo16 ( struct r4k_dis_t * state,
@@ -35,7 +35,7 @@ index 30bef2ab3e341e1705db9da91f0f4272df718591..d5bf75c25061fd34c4d08298e1746c6f
{
int l;
diff --git a/src/main/main.h b/src/main/main.h
-index 3f3a3ea37792204200c0bd2b751b104164813b99..7f475eba4945634cc7e91fdb54b381e254983612 100644
+index cce51116c463dd17f44cff36a82e3d5f4648598e..aa2cbc13e35fbfe32315f4c8e0bb6fd0cea42d34 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -39,7 +39,7 @@ void new_frame(void);
@@ -48,7 +48,7 @@ index 3f3a3ea37792204200c0bd2b751b104164813b99..7f475eba4945634cc7e91fdb54b381e2
m64p_error main_run(void);
void main_stop(void);
diff --git a/src/osd/osd.h b/src/osd/osd.h
-index 98d564526c3186d4d02751e198e650af6a1d2831..547712ae03a94a127b86ca9ed7447f54707e9b14 100644
+index cdf36bf0e6f9134518f726bf3f63baa08a9df953..5fd45024ef7f84a2372deabb28eac73224ae6489 100644
--- a/src/osd/osd.h
+++ b/src/osd/osd.h
@@ -87,8 +87,8 @@ extern "C" {
@@ -60,5 +60,5 @@ index 98d564526c3186d4d02751e198e650af6a1d2831..547712ae03a94a127b86ca9ed7447f54
+osd_message_t * osd_new_message(enum osd_corner, const char *, ...) __attribute__ ((format (printf, 2, 3)));
+void osd_update_message(osd_message_t *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
void osd_delete_message(osd_message_t *);
- void osd_message_set_corner(osd_message_t *, enum osd_corner);
void osd_message_set_static(osd_message_t *);
+ void osd_message_set_user_managed(osd_message_t *);
diff --git a/debian/patches/printf_function_pointer.patch b/debian/patches/printf_function_pointer.patch
deleted file mode 100644
index 04c2bb4..0000000
--- a/debian/patches/printf_function_pointer.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Print function pointer using %p instead of %x
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/3fe78796a127
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
-index ef2f16375d735291370900cddec9549df4e01e8c..b2c8b63d50dd3b5ad0aa9746d0619e6801a70272 100644
---- a/src/debugger/dbg_memory.c
-+++ b/src/debugger/dbg_memory.c
-@@ -436,7 +436,7 @@ int get_memory_type(uint32 addr){
- else if((readfunc == read_mi) || (readfunc == read_mi_break))
- return MEM_MI;
- else
-- DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger get_memory_type(): %x", readfunc);
-+ DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger get_memory_type(): %p", readfunc);
- return MEM_NOMEM;
- }
-
-@@ -558,7 +558,7 @@ void activate_memory_break_read(uint32 addr) {
- readmemd[addr >> 16] = read_romd_break;
- }
- else
-- DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_read(): %x", readfunc);
-+ DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_read(): %p", readfunc);
- }
-
- void deactivate_memory_break_read(uint32 addr) {
-@@ -679,7 +679,7 @@ void deactivate_memory_break_read(uint32 addr) {
- readmemd[addr >> 16] = read_romd;
- }
- else
-- DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_read(): %x", readfunc);
-+ DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_read(): %p", readfunc);
- }
-
- void activate_memory_break_write(uint32 addr) {
-@@ -806,7 +806,7 @@ void activate_memory_break_write(uint32 addr) {
- writememd[addr >> 16] = write_nothingd_break;
- }
- else
-- DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_write(): %x", writefunc);
-+ DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger activate_memory_break_write(): %p", writefunc);
- }
-
- void deactivate_memory_break_write(uint32 addr) {
-@@ -933,7 +933,7 @@ void deactivate_memory_break_write(uint32 addr) {
- writememd[addr >> 16] = write_nothingd;
- }
- else
-- DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_write(): %x", writefunc);
-+ DebugMessage(M64MSG_ERROR, "Unknown memory type in debugger deactivate_memory_break_write(): %p", writefunc);
- }
-
- /* Following are the breakpoint functions for memory access calls. See debugger/memory.h
diff --git a/debian/patches/rjump_gcc47.patch b/debian/patches/rjump_gcc47.patch
deleted file mode 100644
index 640a33c..0000000
--- a/debian/patches/rjump_gcc47.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix name of PIC thunks with gcc 4.7
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/4ad3ff32544f
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/r4300/x86/rjump.c b/src/r4300/x86/rjump.c
-index 0fb8bba01e076549d223954ead414d1143a969a6..6007025b420e805034e8f3abe2a048fbca8b62dc 100644
---- a/src/r4300/x86/rjump.c
-+++ b/src/r4300/x86/rjump.c
-@@ -94,8 +94,13 @@ void dyna_start(void (*code)(void))
- #elif defined(__GNUC__) && defined(__i386__)
- #if defined(__PIC__)
- /* for -fPIC (shared libraries) */
-+ #if __GNUC_PREREQ (4, 7)
-+ # define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
-+ #else
-+ # define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg
-+ #endif
- #define STORE_EBX
-- #define LOAD_EBX "call __i686.get_pc_thunk.bx \n" \
-+ #define LOAD_EBX "call " GET_PC_THUNK_STR(bx) " \n" \
- "addl $_GLOBAL_OFFSET_TABLE_, %%ebx \n"
- #else
- /* for non-PIC binaries */
diff --git a/debian/patches/series b/debian/patches/series
index 2f6df4b..f2b4630 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
dejavu-font.patch
printf_fixup.patch
-floatingpoint_config.patch
-debugger_memory_breakpoints.patch
-rjump_gcc47.patch
-debugger_api.patch
disable_recompiler_disassembler.patch
-unused_bdslot.patch
-printf_function_pointer.patch
-gcc_lto.patch
diff --git a/debian/patches/unused_bdslot.patch b/debian/patches/unused_bdslot.patch
deleted file mode 100644
index d7c12d8..0000000
--- a/debian/patches/unused_bdslot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Remove unused variable bdslot
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/382c921de4d0
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/debugger/dbg_decoder.c b/src/debugger/dbg_decoder.c
-index d5bf75c25061fd34c4d08298e1746c6f05cb8690..ece9f7423076b27a93d7b20427d700354e847bce 100644
---- a/src/debugger/dbg_decoder.c
-+++ b/src/debugger/dbg_decoder.c
-@@ -288,7 +288,6 @@ db_disasm_insn ( struct r4k_dis_t * state,
- bool altfmt )
- {
- char * rel;
-- bool bdslot = false;
- InstFmt i;
-
- i.word = insn;
-@@ -348,7 +347,6 @@ db_disasm_insn ( struct r4k_dis_t * state,
- case OP_JR:
- case OP_JALR:
- db_printf(state, "%s", r4k_str_reg_name[i.RType.rs]);
-- bdslot = true;
- break;
- case OP_MTLO:
- case OP_MTHI:
-@@ -432,7 +430,6 @@ db_disasm_insn ( struct r4k_dis_t * state,
- r4k_str_reg_name[i.IType.rt]);
- pr_displ:
- print_addr( state, loc + 4 + ((short)i.IType.imm << 2) );
-- bdslot = true;
- break;
-
- case OP_COP0:
-@@ -566,7 +563,6 @@ db_disasm_insn ( struct r4k_dis_t * state,
- case OP_JAL:
- db_printf(state, "%-16s", r4k_str_op_name[i.JType.op]);
- print_addr(state, (loc & 0xF0000000) | (i.JType.target << 2));
-- bdslot = true;
- break;
-
- case OP_LDC1:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git
More information about the Pkg-games-commits
mailing list