From 7f937331075ed06ddef949ada6c148a7b9fcb4d9 Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Tue, 30 Aug 2016 02:18:32 +0200
Subject: [PATCH] Rewrite the module copying function

---
 source/firm.c   | 39 ++++++++++++++++++---------------------
 source/memory.c |  2 +-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/source/firm.c b/source/firm.c
index fe7629f..53fc7db 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -351,33 +351,30 @@ static inline void patch2xNativeAndSafeFirm(void)
 
 static inline void copySection0AndInjectSystemModules(void)
 {
-    u8 *arm11Section0 = (u8 *)firm + section[0].offset;
+    u32 srcModuleSize,
+        dstModuleSize;
 
-    struct
+    for(u8 *src = (u8 *)firm + section[0].offset, *srcEnd = src + section[0].size, *dst = section[0].address;
+        src < srcEnd; src += srcModuleSize, dst += dstModuleSize)
     {
-        u32 size;
-        const u8 *addr;
-    } modules[5];
+        srcModuleSize = *(u32 *)(src + 0x104) * 0x200;
+        char *moduleName = (char *)(src + 0x200);
 
-    u32 n = 0,
-        loaderIndex;
-    u8 *pos = arm11Section0;
+        void *module;
 
-    for(u8 *end = pos + section[0].size; pos < end; pos += modules[n++].size)
-    {
-        modules[n].addr = pos;
-        modules[n].size = *(u32 *)(pos + 0x104) * 0x200;
+        if(memcmp(moduleName, "loader", 6) == 0)
+        {
+            module = (void *)injector;
+            dstModuleSize = injector_size;
+        }
+        else
+        {
+            module = src;
+            dstModuleSize = srcModuleSize;
+        }
 
-        if(memcmp(modules[n].addr + 0x200, "loader", 7) == 0) loaderIndex = n;
+        memcpy(dst, module, dstModuleSize);
     }
-
-    modules[loaderIndex].addr = injector;
-    modules[loaderIndex].size = injector_size;
-
-    pos = section[0].address;
-
-    for(u32 i = 0; i < n; pos += modules[i++].size)
-        memcpy(pos, modules[i].addr, modules[i].size);
 }
 
 static inline void launchFirm(FirmwareType firmType)
diff --git a/source/memory.c b/source/memory.c
index e7a05c9..03a36ae 100644
--- a/source/memory.c
+++ b/source/memory.c
@@ -41,7 +41,7 @@ void memset32(void *dest, u32 filler, u32 size)
 {
     u32 *dest32 = (u32 *)dest;
 
-    for (u32 i = 0; i < size / 4; i++)
+    for(u32 i = 0; i < size / 4; i++)
         dest32[i] = filler;
 }