From a5be3727e9df6de1cff249da4126cd5d9263f354 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Sat, 5 Jun 2021 17:51:28 +0200
Subject: Better handling of on-purpose SIGSEGV

---
 src/libtools/signals.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/libtools')

diff --git a/src/libtools/signals.c b/src/libtools/signals.c
index adc28413..34669f30 100755
--- a/src/libtools/signals.c
+++ b/src/libtools/signals.c
@@ -771,11 +771,22 @@ void my_box64signalhandler(int32_t sig, siginfo_t* info, void * ucntx)
         if(db && db->x64_addr>= addr && (db->x64_addr+db->x64_size)<addr) {
             dynarec_log(LOG_INFO, "Warning, addr inside current dynablock!\n");
         }
+        static void* glitch_pc = NULL;
+        static void* glitch_addr = NULL;
+        static int glitch_prot = 0;
         if(addr && pc && db) {
-            // probably a glitch due to intensive multitask...
-            dynarec_log(/*LOG_DEBUG*/LOG_INFO, "SIGSEGV with Access error on %p for %p , db=%p, retrying\n", pc, addr, db);
-            relockMutex(Locks);
-            return; // try again
+            if((glitch_pc!=pc || glitch_addr!=addr || glitch_prot!=prot)) {
+                // probably a glitch due to intensive multitask...
+                dynarec_log(/*LOG_DEBUG*/LOG_INFO, "SIGSEGV with Access error on %p for %p , db=%p, retrying\n", pc, addr, db);
+                relockMutex(Locks);
+                glitch_pc = pc;
+                glitch_addr = addr;
+                glitch_prot = prot;
+                return; // try again
+            }
+            glitch_pc = NULL;
+            glitch_addr = NULL;
+            glitch_prot = 0;
         }
     }
 #else
-- 
cgit 1.4.1