Minor stuff

Use .text segment padding for LayeredFS payload

exceptions/arm11/linker.ld

@@ -5,6 +5,7 @@ ENTRY(_start)
 SECTIONS
 {
     . = 0;
+
     .text   : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
     .rodata : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
     .data   : ALIGN(4) { *(.data*); . = ALIGN(8); *(.bss* COMMON); . = ALIGN(8); }

exceptions/arm9/linker.ld

@@ -5,6 +5,7 @@ ENTRY(_start)
 SECTIONS
 {
     . = 0x01FF7FE0;
+
     .text   : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
     .rodata : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
     .data   : ALIGN(4) { *(.data*); . = ALIGN(8); *(.bss* COMMON); . = ALIGN(8); }

haxloader/diffs/1.diff

@@ -103,7 +103,7 @@ diff -uNr a/source/brahma.c b/source/brahma.c
 diff -uNr a/source/main.c b/source/main.c
 --- a/source/main.c	2016-09-26 16:05:36.363067000 +0200
 +++ b/source/main.c	2016-09-26 21:40:35.202513018 +0200
-@@ -10,7 +10,7 @@
+@@ -38,7 +38,7 @@
  
  int main (void) {
      if (brahma_init()) {
@@ -112,7 +112,7 @@ diff -uNr a/source/main.c b/source/main.c
              goto error;
          firm_reboot();
          brahma_exit();
-@@ -22,7 +22,7 @@
+@@ -50,7 +50,7 @@
  error:
      gfxInitDefault();
      consoleInit(GFX_BOTTOM, NULL);

haxloader/diffs/2.diff

@@ -1,8 +1,8 @@
 diff -uNr a/source/main.c b/source/main.c
 --- a/source/main.c	2016-09-11 01:04:25.665231884 +0200
 +++ b/source/main.c	2016-09-14 12:36:28.601439550 +0200
-@@ -9,6 +9,7 @@
+@@ -37,6 +37,7 @@
- #endif
+ }
  
  int main (void) {
 +    svcSleepThread(2500 * 1000000ULL);

haxloader/linker.ld

@@ -1,11 +1,14 @@
+OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+
 ENTRY(_start)
 SECTIONS
 {
     . = 0x23F00000;
-    .text.start : { *(.text.start) }
+
-    .text : { *(.text) }
+    .text   : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
-    .data : { *(.data) }
+    .rodata : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
-    .bss : { *(.bss COMMON) }
+    .data   : ALIGN(4) { *(.data*); . = ALIGN(8); *(.bss* COMMON); . = ALIGN(8); }
-    .rodata : { *(.rodata) }
+
     . = ALIGN(4);
 }

injector/patches/romfsredir.s

@@ -14,8 +14,8 @@
 _start:
 
     ; Jumps here before the fsOpenFileDirectly call
-    _mountSd:
+    _mountArchive:
-        b       mountSd
+        b       mountArchive
         .word   0xdead0000  ; Substituted opcode
         .word   0xdead0001  ; Branch to hooked function
 
@@ -25,41 +25,43 @@ _start:
         .word   0xdead0002  ; Substituted opcode
         .word   0xdead0003  ; Branch to hooked function
 
-    ; Mounts SDMC and registers the archive as 'sdmc:'
+    ; Mounts the archive and registers it as 'lf:'
-    mountSd:
+    mountArchive:
         cmp     r3, #3
-        bne     _mountSd+4
+        bne     _mountArchive + 4
         stmfd   sp!, {r0-r4, lr}
         sub     sp, sp, #4
-        load    r1, archive
+        load    r1, archiveId
         mov     r0, sp
         load    r4, fsMountArchive
         blx     r4
         mov     r3, #0
         mov     r2, #0
         ldr     r1, [sp]
-        addr    r0, sdmcArchiveName
+        addr    r0, archiveName
         load    r4, fsRegisterArchive
         blx     r4
         add     sp, sp, #4
         ldmfd   sp!, {r0-r4, lr}
-        b       _mountSd+4
+        b       _mountArchive + 4
 
     ; Check the path passed to iFileOpen.
     ; If it is trying to access a RomFS file, we try to
-    ; open it from the title folder on the sdcard.
+    ; open it from the LayeredFS folder.
-    ; If the file cannot be opened from the sdcard, we just open
+    ; If the file cannot be opened, we just open
     ; it from its original archive like nothing happened
     fsRedir:
         stmfd   sp!, {r0-r12, lr}
         ldrb    r12, [r1]
-        cmp     r12, #0x72  ; 'r', should include "rom:" and "rom2:"
+        cmp     r12, #0x72 ; 'r', should include "rom:", "rom2:" and "rex:"
+        cmpne   r12, #0x70 ; 'p', should include "patch:"
+        cmpne   r12, #0x65 ; 'e', should include "ext:"
         bne 	endRedir
         sub     sp, sp, #0x400
         pathRedir:
             stmfd   sp!, {r0-r3}
             add     r0, sp, #0x10
-            addr    r3, sdmcCustomPath
+            addr    r3, customPath
             pathRedir_1:
                 ldrb    r2, [r3], #1
                 strh    r2, [r0], #2
@@ -89,12 +91,10 @@ _start:
 
 .pool
 .align 4
-    sdmcArchiveName :       .word 0xdead0007
+    archiveName       : .dcb "lf:", 0
-                            .dcb ":", 0
-    .align 4
     fsMountArchive    : .word 0xdead0005
     fsRegisterArchive : .word 0xdead0006
-    archive        :        .word 0xdead0008
+    archiveId         : .word 0xdead0007
-    sdmcCustomPath :        .word 0xdead0004
+    customPath        : .word 0xdead0004
 
 .close

injector/source/loader.c

@@ -158,7 +158,7 @@ static Result load_code(u64 progid, prog_addrs_t *shared, u64 prog_handle, int i
   u16 progver = g_exheader.codesetinfo.flags.remasterversion[0] | (g_exheader.codesetinfo.flags.remasterversion[1] << 8);
 
   // patch
-  patchCode(progid, progver, (u8 *)shared->text_addr, shared->total_size << 12);
+  patchCode(progid, progver, (u8 *)shared->text_addr, shared->total_size << 12, g_exheader.codesetinfo.text.codesize, g_exheader.codesetinfo.ro.codesize);
 
   return 0;
 }

injector/source/patcher.c

@@ -289,12 +289,9 @@ static u32 findFunctionStart(u8* code, u32 pos)
     return 0xFFFFFFFF;
 }
 
-static bool findLayeredFsSymbols(u8* code, u32 size, u32 *fsMountArchive, u32 *fsRegisterArchive, u32 *fsTryOpenFile, u32 *fsOpenFileDirectly, u32 *throwFatalError)
+static inline bool findLayeredFsSymbols(u8 *code, u32 size, u32 *fsMountArchive, u32 *fsRegisterArchive, u32 *fsTryOpenFile, u32 *fsOpenFileDirectly)
 {
-    bool found = false;
+    for(u32 addr = 0; addr <= size - 4; addr += 4)
-    u32 svcConnectToPort = 0xFFFFFFFF;
-
-    for(u32 addr = 0; !found && addr <= size - 4; addr += 4)
     {
         if(*fsMountArchive == 0xFFFFFFFF)
         {
@@ -310,24 +307,43 @@ static bool findLayeredFsSymbols(u8* code, u32 size, u32 *fsMountArchive, u32 *f
             }
         }
 
-        if(addr <= size - 12 && *fsRegisterArchive == 0xFFFFFFFF && *(u32 *)(code + addr) == 0xE3500008 && (*(u32 *)(code + addr + 4) & 0xFFF00FF0) == 0xE1800400 && (*(u32 *)(code + addr + 8) & 0xFFF00FF0) == 0xE1800FC0)
+        if(addr <= size - 12 && *fsRegisterArchive == 0xFFFFFFFF && *(u32 *)(code + addr) == 0xE3500008 &&
+           (*(u32 *)(code + addr + 4) & 0xFFF00FF0) == 0xE1800400 && (*(u32 *)(code + addr + 8) & 0xFFF00FF0) == 0xE1800FC0)
             *fsRegisterArchive = findFunctionStart(code, addr);
 
-        if(addr <= size - 16 && *fsTryOpenFile == 0xFFFFFFFF && *(u32 *)(code + addr + 0xC) == 0xE12FFF3C &&
+        if(addr <= size - 0x40 && *fsTryOpenFile == 0xFFFFFFFF && *(u32 *)(code + addr + 4) == 0x1AFFFFFC && *(u32 *)(code + addr) == 0xE351003A &&
-           ((*(u32 *)(code + addr) == 0xE1A0100D) || (*(u32 *)(code + addr) == 0xE28D1010)) && (*(u32 *)(code + addr + 4) == 0xE590C000) &&
+           *(u32 *)(code + addr + 0x34) == 0xE590C000 && *(u32 *)(code + addr + 0x3C) == 0xE12FFF3C)
-           ((*(u32 *)(code + addr + 8) == 0xE1A00004) || (*(u32 *)(code + addr + 8) == 0xE1A00005)))
             *fsTryOpenFile = findFunctionStart(code, addr);
 
         if(*fsOpenFileDirectly == 0xFFFFFFFF && *(u32 *)(code + addr) == 0x08030204)
             *fsOpenFileDirectly = findFunctionStart(code, addr);
 
-        if(addr >= 4 && svcConnectToPort == 0xFFFFFFFF && *(u32 *)(code + addr) == 0xEF00002D)
+        if(*fsMountArchive != 0xFFFFFFFF && *fsRegisterArchive != 0xFFFFFFFF && *fsTryOpenFile != 0xFFFFFFFF && *fsOpenFileDirectly != 0xFFFFFFFF) return true;
-            svcConnectToPort = addr - 4;
-
-        if(svcConnectToPort != 0xFFFFFFFF && *fsMountArchive != 0xFFFFFFFF && *fsRegisterArchive != 0xFFFFFFFF && *fsTryOpenFile != 0xFFFFFFFF && *fsOpenFileDirectly != 0xFFFFFFFF) found = true;
     }
 
-    if(found)
+    return false;
+}
+
+static inline bool findLayeredFsPayloadOffset(u8 *code, u32 size, u32 *payloadOffset)
+{
+    //First check for sufficient padding at the end of the .text segment
+    if(((size + 4095) & 0xFFFFF000) - size >= romfsredir_bin_size)
+    {
+        *payloadOffset = size;
+
+        return true;
+    }
+
+    //If there isn't enough padding look for the "throwFatalError" function to replace
+    u32 svcConnectToPort = 0xFFFFFFFF;
+
+    for(u32 addr = 4; svcConnectToPort == 0xFFFFFFFF && addr <= size - 4; addr += 4)
+    {
+        if(*(u32 *)(code + addr) == 0xEF00002D)
+            svcConnectToPort = addr - 4;
+    }
+
+    if(svcConnectToPort != 0xFFFFFFFF)
     {
         u32 func = 0xFFFFFFFF;
 
@@ -341,9 +357,12 @@ static bool findLayeredFsSymbols(u8* code, u32 size, u32 *fsMountArchive, u32 *f
                 if(*(u32 *)(code + pos) == 0xE200167E) func = 0xFFFFFFFF;
         }
 
-        *throwFatalError = func;
+        if(func != 0xFFFFFFFF)
+        {
+            *payloadOffset = func;
 
-        if(func != 0xFFFFFFFF) return true;
+            return true;
+        }
     }
 
     return false;
@@ -499,22 +518,23 @@ static inline bool patchLayeredFs(u64 progId, u8* code, u32 size)
     char path[] = "/luma/titles/0000000000000000/romfs";
     progIdToStr(path + 28, progId);
 
-    u32 archive = checkLumaDir(path);
+    u32 archiveId = checkLumaDir(path);
 
-    if(!archive) return true;
+    if(!archiveId) return true;
 
-    const char *mount = archive == ARCHIVE_SDMC ? "sdmc:" : "nand:";
+    static const char *archiveName = "lf:";
 
     u32 fsMountArchive = 0xFFFFFFFF,
         fsRegisterArchive = 0xFFFFFFFF,
         fsTryOpenFile = 0xFFFFFFFF,
         fsOpenFileDirectly = 0xFFFFFFFF,
-        throwFatalError;
+        payloadOffset;
 
-    if(!findLayeredFsSymbols(code, size, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly, &throwFatalError)) return false;
+    if(!findLayeredFsSymbols(code, size, &fsMountArchive, &fsRegisterArchive, &fsTryOpenFile, &fsOpenFileDirectly) ||
+       !findLayeredFsPayloadOffset(code, size, &payloadOffset)) return false;
 
     //Setup the payload
-    u8 *payload = code + throwFatalError;
+    u8 *payload = code + payloadOffset;
     memcpy(payload, romfsredir_bin, romfsredir_bin_size);
 
     //Insert symbols in the payload
@@ -527,17 +547,17 @@ static inline bool patchLayeredFs(u64 progId, u8* code, u32 size)
                 payload32[i] = *(u32 *)(code + fsOpenFileDirectly);
                 break;
             case 0xdead0001:
-                payload32[i] = MAKE_BRANCH(throwFatalError + i * 4, fsOpenFileDirectly + 4);
+                payload32[i] = MAKE_BRANCH(payloadOffset + i * 4, fsOpenFileDirectly + 4);
                 break;
             case 0xdead0002:
                 payload32[i] = *(u32 *)(code + fsTryOpenFile);
                 break;
             case 0xdead0003:
-                payload32[i] = MAKE_BRANCH(throwFatalError + i * 4, fsTryOpenFile + 4);
+                payload32[i] = MAKE_BRANCH(payloadOffset + i * 4, fsTryOpenFile + 4);
                 break;
             case 0xdead0004:
-                memcpy(payload32 + i, mount, 5);
+                memcpy(payload32 + i, archiveName, 3);
-                memcpy((u8 *)(payload32 + i) + 5, path, sizeof(path));
+                memcpy((u8 *)(payload32 + i) + 3, path, sizeof(path));
                 break;
             case 0xdead0005:
                 payload32[i] = 0x100000 + fsMountArchive;
@@ -546,22 +566,19 @@ static inline bool patchLayeredFs(u64 progId, u8* code, u32 size)
                 payload32[i] = 0x100000 + fsRegisterArchive;
                 break;
             case 0xdead0007:
-                memcpy(payload32 + i, mount, 4);
+                payload32[i] = archiveId;
-                break;
-            case 0xdead0008:
-                payload32[i] = archive;
                 break;
         }
     }
 
     //Place the hooks
-    *(u32 *)(code + fsOpenFileDirectly) = MAKE_BRANCH(fsOpenFileDirectly, throwFatalError);
+    *(u32 *)(code + fsOpenFileDirectly) = MAKE_BRANCH(fsOpenFileDirectly, payloadOffset);
-    *(u32 *)(code + fsTryOpenFile) = MAKE_BRANCH(fsTryOpenFile, throwFatalError + 12);
+    *(u32 *)(code + fsTryOpenFile) = MAKE_BRANCH(fsTryOpenFile, payloadOffset + 12);
 
     return true;
 }
 
-void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
+void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 roSize)
 {
     loadCFWInfo();
 
@@ -582,7 +599,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         };
 
         //Patch SMDH region checks
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), -31,
                 patch,
@@ -598,7 +615,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
 
         u8 mostRecentFpdVer = 10;
 
-        u8 *off = memsearch(code, pattern, size, sizeof(pattern));
+        u8 *off = memsearch(code, pattern, textSize, sizeof(pattern));
 
         if(off == NULL) goto error;
 
@@ -649,7 +666,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         }
 
         //Patch Ver. string
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern) - 2, 0,
                 patch,
@@ -669,7 +686,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
             };
 
             //Disable updates from foreign carts (makes carts region-free)
-            u32 ret = patchMemory(code, size,
+            u32 ret = patchMemory(code, textSize,
                           pattern,
                           sizeof(pattern), 0,
                           patch,
@@ -689,7 +706,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
                     0x0C, 0x00, 0x94, 0x15
                 };
 
-                u32 *off = (u32 *)memsearch(code, pattern, size, sizeof(pattern));
+                u32 *off = (u32 *)memsearch(code, pattern, textSize, sizeof(pattern));
 
                 if(off == NULL) goto error;
 
@@ -712,7 +729,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         };
 
         //Disable SecureInfo signature check
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), 0,
                 patch,
@@ -725,7 +742,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
                              patch[] = u"C";
 
             //Use SecureInfo_C
-            if(patchMemory(code, size,
+            if(patchMemory(code + textSize, roSize,
                    pattern,
                    sizeof(pattern) - 2, 22,
                    patch,
@@ -750,19 +767,19 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         };
 
         //Disable CRR0 signature (RSA2048 with SHA256) check and CRO0/CRR0 SHA256 hash checks (section hashes, and hash table)
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), -9,
                 patch,
                 sizeof(patch), 1
             ) ||
-           !patchMemory(code, size,
+           !patchMemory(code, textSize,
                 pattern2,
                 sizeof(pattern2), 1,
                 patch,
                 sizeof(patch), 1
             ) ||
-           !patchMemory(code, size,
+           !patchMemory(code, textSize,
                 pattern3,
                 sizeof(pattern3), -2,
                 patch,
@@ -783,13 +800,13 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         };
 
         //Patch UNITINFO checks to make ErrDisp more verbose
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), -1,
                 patch,
                 sizeof(patch), 1
             ) ||
-           patchMemory(code, size,
+           patchMemory(code, textSize,
                pattern2,
                sizeof(pattern2), 0,
                patch,
@@ -807,7 +824,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         };
 
         //Patch DLP region checks
-        if(!patchMemory(code, size,
+        if(!patchMemory(code, textSize,
                 pattern,
                 sizeof(pattern), 0,
                 patch,
@@ -823,17 +840,17 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size)
         if(!loadTitleCodeSection(progId, code, size) ||
            !applyCodeIpsPatch(progId, code, size) ||
            !loadTitleLocaleConfig(progId, &regionId, &languageId) ||
-           !patchLayeredFs(progId, code, size)) goto error;
+           !patchLayeredFs(progId, code, textSize)) goto error;
 
         if(regionId != 0xFF)
         {
             u32 CFGUHandleOffset;
-            u8 *CFGU_GetConfigInfoBlk2_endPos = getCfgOffsets(code, size, &CFGUHandleOffset);
+            u8 *CFGU_GetConfigInfoBlk2_endPos = getCfgOffsets(code, textSize, &CFGUHandleOffset);
 
             if(CFGU_GetConfigInfoBlk2_endPos == NULL ||
-               !patchCfgGetLanguage(code, size, languageId, CFGU_GetConfigInfoBlk2_endPos)) goto error;
+               !patchCfgGetLanguage(code, textSize, languageId, CFGU_GetConfigInfoBlk2_endPos)) goto error;
 
-            patchCfgGetRegion(code, size, regionId, CFGUHandleOffset);
+            patchCfgGetRegion(code, textSize, regionId, CFGUHandleOffset);
         }
     }
 

injector/source/patcher.h

@@ -44,4 +44,4 @@ enum flags
     ISSAFEMODE
 };
 
-void patchCode(u64 progId, u16 progVer, u8 *code, u32 size);
+void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 roSize);

linker.ld

@@ -9,7 +9,6 @@ SECTIONS
     .text       : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
     .rodata     : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
     .data       : ALIGN(4) { *(.data*); . = ALIGN(4); }
-
     .bss        : ALIGN(8) { __bss_start = .; *(.bss* COMMON); . = ALIGN(8); __bss_end = .; }
 
     . = ALIGN(4);

loader/linker.ld

@@ -5,6 +5,7 @@ ENTRY(_start)
 SECTIONS
 {
     . = 0x24FFFE00;
+
     .text   : ALIGN(4) { *(.text.start) *(.text*); . = ALIGN(4); }
     .rodata : ALIGN(4) { *(.rodata*); . = ALIGN(4); }
     .data   : ALIGN(4) { *(.data*); . = ALIGN(8); *(.bss* COMMON); . = ALIGN(8); }

source/config.c

@@ -182,11 +182,11 @@ void configMenu(bool isSdMode, bool oldPinStatus, u32 oldPinMode)
                                           "The service and archive patches\n"
                                           "don't work on New 3DS FIRMs between\n"
                                           "9.3 and 10.4.\n\n"
-                                          "Only change this if you know what you\n"
+                                          "Only select this if you know what you\n"
                                           "are doing!",
 
                                           "Make the console be always detected\n"
-                                          "as a development unit\n"
+                                          "as a development unit, and conversely.\n"
                                           "(which breaks online features, amiibo\n"
                                           "and retail CIAs, but allows installing\n"
                                           "and booting some developer software).\n\n"

source/main.c

@@ -240,7 +240,8 @@ boot:
     bool loadFromStorage = CONFIG(LOADEXTFIRMSANDMODULES);
     u32 firmVersion = loadFirm(&firmType, firmSource, loadFromStorage, isSafeMode);
 
-    bool doUnitinfoPatch = CONFIG(PATCHUNITINFO), enableExceptionHandlers = CONFIG(ENABLEEXCEPTIONHANDLERS);
+    bool doUnitinfoPatch = CONFIG(PATCHUNITINFO),
+         enableExceptionHandlers = CONFIG(ENABLEEXCEPTIONHANDLERS);
     u32 res;
     switch(firmType)
     {

source/screen.c

@@ -47,9 +47,6 @@ static const u32 brightness[4] = {0x5F, 0x4C, 0x39, 0x26};
 
 void  __attribute__((naked)) arm11Stub(void)
 {
-    //Disable interrupts
-    __asm(".word 0xF10C01C0");
-
     WAIT_FOR_ARM9();
 }
 

source/screen.h

@@ -33,7 +33,7 @@
 
 #define ARESCREENSINITIALIZED (PDN_GPU_CNT != 1)
 
-#define ARM11_STUB_ADDRESS 0x1FFFFD00
+#define ARM11_STUB_ADDRESS 0x1FFFFF00
 #define WAIT_FOR_ARM9()    *arm11Entry = 0; while(!*arm11Entry); ((void (*)())*arm11Entry)();
 
 #define SCREEN_TOP_WIDTH     400

source/start.s

@@ -91,6 +91,7 @@ start:
     mov r1, #0x340
     str r1, [r0]
 
+    @ Clear BSS
     ldr r0, =__bss_start
     mov r1, #0
     ldr r2, =__bss_end