[mupen64plus-core] 254/310: Cleanup counter_per_op.patch

[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 8b4138d5f5c35c709561780482be6cbbe9f34402
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Dec 14 16:57:57 2013 +0100

    Cleanup counter_per_op.patch
---
 debian/changelog                    |  7 +++++++
 debian/patches/counter_per_op.patch | 20 +++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4dcfcd2..c9ae5ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-core (2.0-5) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - Cleanup patch counter_per_op.patch
+
+ -- Sven Eckelmann <sven at narfation.org>  Sat, 14 Dec 2013 16:57:37 +0100
+
 mupen64plus-core (2.0-4) unstable; urgency=low
 
   * Fix version number of the unicode FTBFS bug in the changelog
diff --git a/debian/patches/counter_per_op.patch b/debian/patches/counter_per_op.patch
index c54e896..d673924 100644
--- a/debian/patches/counter_per_op.patch
+++ b/debian/patches/counter_per_op.patch
@@ -184,14 +184,11 @@ index 399a9fbaa1460d02cff831b2d7c5a1efd0471edc..7c0b9488424638199cd876f05f67208c
  void init_blocks(void);
  void free_blocks(void);
 diff --git a/src/r4300/x86/gr4300.c b/src/r4300/x86/gr4300.c
-index d2ed999728842ca39e299cbd039338b1d5aee39e..30484a563641381fee8799070fe60a34ba221aa0 100644
+index d2ed999728842ca39e299cbd039338b1d5aee39e..830d4c36e222c192d86870bda5bc09d35efa8f0a 100644
 --- a/src/r4300/x86/gr4300.c
 +++ b/src/r4300/x86/gr4300.c
-@@ -44,25 +44,20 @@ static int eax, ebx, ecx, edx, esp, ebp, esi, edi;
- int branch_taken;
+@@ -47,22 +47,18 @@ int branch_taken;
  
- /* static functions */
--
  static void genupdate_count(unsigned int addr)
  {
 -#ifndef COMPARE_CORE
@@ -218,18 +215,11 @@ index d2ed999728842ca39e299cbd039338b1d5aee39e..30484a563641381fee8799070fe60a34
  
  static void gencheck_interupt(unsigned int instr_structure)
 diff --git a/src/r4300/x86_64/gr4300.c b/src/r4300/x86_64/gr4300.c
-index 15db43fd54563a8e2197b60ad03e3b445cf62bdc..0354fde3556a1bf58b6b37b9944ef0f661d722f4 100644
+index 15db43fd54563a8e2197b60ad03e3b445cf62bdc..41d836a56b0221e5c9fb527b361c9aaf902c18d2 100644
 --- a/src/r4300/x86_64/gr4300.c
 +++ b/src/r4300/x86_64/gr4300.c
-@@ -84,13 +84,14 @@ static long long debug_reg_storage[8];
- int branch_taken = 0;
- 
- /* static functions */
--
- static void genupdate_count(unsigned int addr)
- {
--#if !defined(COMPARE_CORE) && !defined(DBG)
-+#if !defined(COMPARE_CORE) && !defined(DBG) && 0
+@@ -90,7 +90,9 @@ static void genupdate_count(unsigned int addr)
+ #if !defined(COMPARE_CORE) && !defined(DBG)
     mov_reg32_imm32(EAX, addr);
     sub_xreg32_m32rel(EAX, (unsigned int*)(&last_addr));
 -   shr_reg32_imm8(EAX, 1);

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