From 8153391dd7df8beebd56686fee70514c9613f9f2 Mon Sep 17 00:00:00 2001
From: ptitSeb <sebastien.chev@gmail.com>
Date: Sun, 9 Jul 2023 10:37:18 +0200
Subject: [PATCH] Some slight adjustment to DynablocAge and steam/heroic
 settings

---
 src/custommem.c         | 16 +++++++++-------
 src/dynarec/dynablock.c |  2 +-
 src/tools/rcfile.c      |  4 +++-
 system/box64.box64rc    |  8 ++++----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/custommem.c b/src/custommem.c
index 12a561b0d..4293c8484 100644
--- a/src/custommem.c
+++ b/src/custommem.c
@@ -549,14 +549,16 @@ uintptr_t AllocDynarecMap(size_t size, size_t age)
             while(sub && (uintptr_t)sub<end) {
                 blockmark_t* n = NEXT_BLOCK(sub);
                 dynablock_t* db = NULL;
-                if(sub->next.fill)
-                    db = *(dynablock_t**)((uintptr_t)sub+sizeof(blockmark_t));
+                if(n->next.fill)
+                    db = *(dynablock_t**)((uintptr_t)n+sizeof(blockmark_t));
+                if(db) {
+                    size_t new_age = AgeDynablock(db, age);
+                    if(!new_age)    // db has been removed
+                        n = sub;    // go back 1 step
+                    else if(new_age<newage || !newage)
+                        newage = new_age;
+                }
                 sub = n;
-                size_t new_age = db?AgeDynablock(db, age):age;
-                if(!new_age)
-                    sub = (blockmark_t*)list->chunks[i].block;
-                else if(new_age<newage || !newage)
-                    newage = new_age;
             }
             list->minage[i] = newage;
         }
diff --git a/src/dynarec/dynablock.c b/src/dynarec/dynablock.c
index 991f72d92..f84e98e7f 100755
--- a/src/dynarec/dynablock.c
+++ b/src/dynarec/dynablock.c
@@ -125,7 +125,7 @@ size_t AgeDynablock(dynablock_t* db, size_t age)
         }
         return db->age;
     }
-    return age;
+    return 0;
 }
 
 
diff --git a/src/tools/rcfile.c b/src/tools/rcfile.c
index 00a9eed31..6256ea881 100644
--- a/src/tools/rcfile.c
+++ b/src/tools/rcfile.c
@@ -38,6 +38,8 @@ static const char default_rcfile[] =
 "[heroic]\n"
 "BOX64_NOSANDBOX=1\n"
 "BOX64_MALLOC_HACK=2\n"
+"BOX64_DYNAREC_BIGBLOCK=0\n"
+"BOX64_DYNAREC8AGE=4096\n"
 "\n"
 "[LotCG.x86_64]\n"
 "BOX64_DYNAREC_FASTROUND=0\n"
@@ -55,7 +57,7 @@ static const char default_rcfile[] =
 "BOX64_NOSANDBOX=1\n"
 "BOX64_MALLOC_HACK=2\n"
 "BOX64_LOG=0\n"
-"BOX64_DYNAREC_BIGBLOCK=2\n"
+"BOX64_DYNAREC_BIGBLOCK=1\n"
 "BOX64_DYNAREC8AGE=4096\n"
 "\n"
 "[steam-runtime-check-requirements]\n"
diff --git a/system/box64.box64rc b/system/box64.box64rc
index 14b0ce4f4..c0362b15b 100644
--- a/system/box64.box64rc
+++ b/system/box64.box64rc
@@ -49,8 +49,8 @@ BOX64_DYNAREC_FASTROUND=0
 [heroic]
 BOX64_NOSANDBOX=1
 BOX64_MALLOC_HACK=2
-BOX64_DYNAREC_BIGBLOCK=2
-BOX64_DYNAREC_AGE=2048
+BOX64_DYNAREC_BIGBLOCK=0
+BOX64_DYNAREC_AGE=4096
 
 [LotCG.x86_64]
 BOX64_DYNAREC_FASTROUND=0
@@ -89,8 +89,8 @@ BOX64_EMULATED_LIBS=libSDL2-2.0.so.0:libSDL2_ttf-2.0.so.0
 BOX64_NOSANDBOX=1
 BOX64_LOG=0
 BOX64_MALLOC_HACK=2
-BOX64_DYNAREC_BIGBLOCK=2
-BOX64_DYNAREC_AGE=2048
+BOX64_DYNAREC_BIGBLOCK=1
+BOX64_DYNAREC_AGE=4096
 # if steamwebhelper takes too much memory, enable next line to disable it
 #BOX64_EXIT=1