[mupen64plus-core] 252/310: Remove obsolete variable; caused crashes in PD/Goldeneye in Android Ed.

[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 5d175def08cd426e4f4c9e44bfe2262db3b79ccd
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Dec 13 16:28:36 2013 +0100

    Remove obsolete variable; caused crashes in PD/Goldeneye in Android Ed.
---
 debian/changelog                       |  2 ++
 debian/patches/obsolete_variable.patch | 59 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 00df0b5..bbf5b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mupen64plus-core (2.0-4) UNRELEASED; urgency=low
       read/write
     - Add config_currentstateslot.patch, Use correct config parameter string
       (CurrentSaveSlot->CurrentStateSlot)
+    - Add obsolete_variable.patch, Remove obsolete variable; caused crashes
+      in PD/Goldeneye in Android Ed.
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 05 Oct 2013 22:52:30 +0200
 
diff --git a/debian/patches/obsolete_variable.patch b/debian/patches/obsolete_variable.patch
new file mode 100644
index 0000000..0af8748
--- /dev/null
+++ b/debian/patches/obsolete_variable.patch
@@ -0,0 +1,59 @@
+Description: Remove obsolete variable; caused crashes in PD/Goldeneye in Android Ed.
+Author: littleguy77 <mattlichter at live.com>
+
+---
+diff --git a/src/r4300/interpreter_cop0.def b/src/r4300/interpreter_cop0.def
+index 313ec9db440b7c367dfbe95ce81e2bc0635ac1d4..98f8eaa597b0b7fd936e3c5c444ed5ec998f05a5 100644
+--- a/src/r4300/interpreter_cop0.def
++++ b/src/r4300/interpreter_cop0.def
+@@ -72,10 +72,8 @@ DECLARE_INSTRUCTION(MTC0)
+       interupt_unsafe_state = 1;
+       if (next_interupt <= Count) gen_interupt();
+       interupt_unsafe_state = 0;
+-      debug_count += Count;
+       translate_event_queue((unsigned int) rrt & 0xFFFFFFFF);
+       Count = (unsigned int) rrt & 0xFFFFFFFF;
+-      debug_count -= Count;
+       break;
+     case 10:   // EntryHi
+       EntryHi = (unsigned int) rrt & 0xFFFFE0FF;
+diff --git a/src/r4300/r4300.c b/src/r4300/r4300.c
+index 200722ed811803bdad17bf7d7fc1662c6b98d24d..5b57ce694d17aaabe18e864eef379f2e024c396d 100644
+--- a/src/r4300/r4300.c
++++ b/src/r4300/r4300.c
+@@ -61,7 +61,6 @@ long long int local_rs;
+ long long int reg_cop1_fgr_64[32];
+ tlb tlb_e[32];
+ unsigned int delay_slot, skip_jump = 0, dyna_interp = 0, last_addr;
+-unsigned long long int debug_count = 0;
+ unsigned int CIC_Chip;
+ char invalid_code[0x100000];
+ 
+@@ -983,7 +982,6 @@ void r4300_execute(void)
+ 
+     current_instruction_table = cached_interpreter_table;
+ 
+-    debug_count = 0;
+     delay_slot=0;
+     stop = 0;
+     rompause = 0;
+@@ -1067,7 +1065,6 @@ void r4300_execute(void)
+         free_blocks();
+     }
+ 
+-    debug_count+= Count;
+     DebugMessage(M64MSG_INFO, "R4300 emulator finished.");
+ 
+     /* print instruction counts */
+diff --git a/src/r4300/r4300.h b/src/r4300/r4300.h
+index 7c0b9488424638199cd876f05f67208c119b9878..679690351a0fd467087afde3ea4e2ad3ad5487a7 100644
+--- a/src/r4300/r4300.h
++++ b/src/r4300/r4300.h
+@@ -39,7 +39,6 @@ extern long long int reg_cop1_fgr_64[32];
+ extern int FCR0, FCR31;
+ extern tlb tlb_e[32];
+ extern unsigned int delay_slot, skip_jump, dyna_interp, op;
+-extern unsigned long long int debug_count;
+ extern unsigned int r4300emu;
+ extern unsigned int next_interupt, CIC_Chip;
+ extern int rounding_mode, trunc_mode, round_mode, ceil_mode, floor_mode;
diff --git a/debian/patches/series b/debian/patches/series
index 61d6bc0..28804c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ counter_per_op.patch
 two_events_interrupt.patch
 delay_si.patch
 config_currentstateslot.patch
+obsolete_variable.patch

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