Merged linker & start.s files thanks to @Wolfvak

This commit is contained in:
d0k3 2017-02-24 21:26:44 +01:00
parent 65734816f2
commit abc524e5db
11 changed files with 123 additions and 204 deletions

View File

@ -18,7 +18,7 @@ include $(DEVKITARM)/ds_rules
#---------------------------------------------------------------------------------
export TARGET := SafeSigHaxInstaller
BUILD := build
SOURCES := source source/common source/fs source/crypto source/fatfs source/nand source/safety source/abstraction
SOURCES := source source/common source/fs source/crypto source/fatfs source/nand source/safety
DATA := data
INCLUDES := source source/common source/font source/fs source/crypto source/fatfs source/nand source/safety
@ -27,9 +27,8 @@ INCLUDES := source source/common source/font source/fs source/crypto source/fatf
#---------------------------------------------------------------------------------
ARCH := -mthumb -mthumb-interwork -flto
CFLAGS := -g -Wall -Wextra -Wpedantic -Wcast-align -pedantic -O2\
-march=armv5te -mtune=arm946e-s -fomit-frame-pointer\
-ffast-math -std=c99\
CFLAGS := -g -Wall -Wextra -Wpedantic -Wcast-align -Wno-main -O2\
-march=armv5te -mtune=arm946e-s -fomit-frame-pointer -ffast-math -std=gnu99\
$(ARCH)
CFLAGS += $(INCLUDE) -DEXEC_$(EXEC_METHOD) -DARM9
@ -51,13 +50,7 @@ endif
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
ASFLAGS := -g $(ARCH) -DEXEC_$(EXEC_METHOD)
LDFLAGS = -nostartfiles -g $(ARCH) -Wl,-Map,$(TARGET).map
ifeq ($(EXEC_METHOD),GATEWAY)
LDFLAGS += --specs=../gateway.specs
else ifeq ($(EXEC_METHOD),A9LH)
LDFLAGS += --specs=../a9lh.specs
endif
LDFLAGS = -T../link.ld -nostartfiles -g $(ARCH) -Wl,-Map,$(TARGET).map
LIBS :=
@ -111,36 +104,34 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
.PHONY: common clean all gateway a9lh cakehax cakerop brahma release
.PHONY: common clean all gateway binary cakehax cakerop brahma release
#---------------------------------------------------------------------------------
all: a9lh
all: binary
common:
@[ -d $(OUTPUT_D) ] || mkdir -p $(OUTPUT_D)
@[ -d $(BUILD) ] || mkdir -p $(BUILD)
submodules:
@-git submodule update --init --recursive
gateway: common
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile EXEC_METHOD=GATEWAY
binary: common
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
gateway: binary
@cp resources/LauncherTemplate.dat $(OUTPUT_D)/Launcher.dat
@dd if=$(OUTPUT).bin of=$(OUTPUT_D)/Launcher.dat bs=1497296 seek=1 conv=notrunc
a9lh: common
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile EXEC_METHOD=A9LH
cakehax: submodules common
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile EXEC_METHOD=GATEWAY
cakehax: submodules binary
@make dir_out=$(OUTPUT_D) name=$(TARGET).dat -C CakeHax bigpayload
@dd if=$(OUTPUT).bin of=$(OUTPUT).dat bs=512 seek=160
cakerop: cakehax
@make DATNAME=$(TARGET).dat DISPNAME=$(TARGET) GRAPHICS=../resources/CakesROP -C CakesROP
@mv CakesROP/CakesROP.nds $(OUTPUT_D)/$(TARGET).nds
brahma: submodules a9lh
brahma: submodules binary
@[ -d BrahmaLoader/data ] || mkdir -p BrahmaLoader/data
@cp $(OUTPUT).bin BrahmaLoader/data/payload.bin
@cp resources/BrahmaAppInfo BrahmaLoader/resources/AppInfo
@ -148,22 +139,22 @@ brahma: submodules a9lh
@make --no-print-directory -C BrahmaLoader APP_TITLE=$(TARGET)
@mv BrahmaLoader/output/*.3dsx $(OUTPUT_D)
@mv BrahmaLoader/output/*.smdh $(OUTPUT_D)
release:
@rm -fr $(BUILD) $(OUTPUT_D) $(RELEASE)
@make --no-print-directory binary
@-make --no-print-directory cakerop
@rm -fr $(BUILD) $(OUTPUT).bin $(OUTPUT).elf $(CURDIR)/$(LOADER)/data
@make --no-print-directory brahma
@-make --no-print-directory brahma
@[ -d $(RELEASE) ] || mkdir -p $(RELEASE)
@[ -d $(RELEASE)/$(TARGET) ] || mkdir -p $(RELEASE)/$(TARGET)
@-cp $(OUTPUT).bin $(RELEASE)
@cp $(OUTPUT).bin $(RELEASE)
@-cp $(OUTPUT).dat $(RELEASE)
@-cp $(OUTPUT).nds $(RELEASE)
@-cp $(OUTPUT).3dsx $(RELEASE)/$(TARGET)
@-cp $(OUTPUT).smdh $(RELEASE)/$(TARGET)
@cp $(CURDIR)/README.md $(RELEASE)
@-7z a $(RELEASE)/$(TARGET)-`date +'%Y%m%d-%H%M%S'`.zip $(RELEASE)/*
#---------------------------------------------------------------------------------
clean:
@echo clean CakeHax...

13
a9lh.ld
View File

@ -1,13 +0,0 @@
ENTRY(_start)
SECTIONS
{
. = 0x23F00000;
.text.start : { *(.text.start) }
.text : { *(.text) }
.data : { *(.data) }
.bss : { __bss_start = .; *(.bss COMMON) }
__bss_end = .;
.rodata : { *(.rodata) }
. = ALIGN(4);
__end__ = ABSOLUTE(.);
}

View File

@ -1,5 +0,0 @@
%rename link old_link
*link:
%(old_link) -T ../a9lh.ld%s

View File

@ -1,13 +0,0 @@
ENTRY(_start)
SECTIONS
{
. = 0x08000000;
.text.start : { *(.text.start) }
.text : { *(.text) }
.data : { *(.data) }
.bss : { __bss_start = .; *(.bss COMMON) }
__bss_end = .;
.rodata : { *(.rodata) }
. = ALIGN(4);
__end__ = ABSOLUTE(.);
}

View File

@ -1,5 +0,0 @@
%rename link old_link
*link:
%(old_link) -T ../gateway.ld%s

18
link.ld Normal file
View File

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

View File

@ -1,85 +0,0 @@
#ifdef EXEC_A9LH
.section .text.start
.align 4
.global _start
_start:
@ Change the stack pointer
mov sp, #0x27000000
@ Disable caches / mpu
mrc p15, 0, r4, c1, c0, 0 @ read control register
bic r4, #(1<<12) @ - instruction cache disable
bic r4, #(1<<2) @ - data cache disable
bic r4, #(1<<0) @ - mpu disable
mcr p15, 0, r4, c1, c0, 0 @ write control register
@ Clear bss
ldr r0, =__bss_start
ldr r1, =__bss_end
mov r2, #0
.bss_clr:
cmp r0, r1
beq .bss_clr_done
str r2, [r0], #4
b .bss_clr
.bss_clr_done:
@ Give read/write access to all the memory regions
ldr r5, =0x33333333
mcr p15, 0, r5, c5, c0, 2 @ write data access
mcr p15, 0, r5, c5, c0, 3 @ write instruction access
@ Sets MPU permissions and cache settings
ldr r0, =0xFFFF001D @ ffff0000 32k | bootrom (unprotected part)
ldr r1, =0x3000801B @ 30000000 16k | dtcm
ldr r2, =0x01FF801D @ 01ff8000 32k | itcm
ldr r3, =0x08000029 @ 08000000 2M | arm9 mem (O3DS / N3DS)
ldr r4, =0x10000029 @ 10000000 2M | io mem (ARM9 / first 2MB)
ldr r5, =0x20000037 @ 20000000 256M | fcram (O3DS / N3DS)
ldr r6, =0x1FF00027 @ 1FF00000 1M | dsp / axi wram
ldr r7, =0x1800002D @ 18000000 8M | vram (+ 2MB)
mov r8, #0x2D
mcr p15, 0, r0, c6, c0, 0
mcr p15, 0, r1, c6, c1, 0
mcr p15, 0, r2, c6, c2, 0
mcr p15, 0, r3, c6, c3, 0
mcr p15, 0, r4, c6, c4, 0
mcr p15, 0, r5, c6, c5, 0
mcr p15, 0, r6, c6, c6, 0
mcr p15, 0, r7, c6, c7, 0
mcr p15, 0, r8, c3, c0, 0 @ Write bufferable 0, 2, 5
mcr p15, 0, r8, c2, c0, 0 @ Data cacheable 0, 2, 5
mcr p15, 0, r8, c2, c0, 1 @ Inst cacheable 0, 2, 5
@ Enable dctm
ldr r1, =0x3000800A @ set dtcm
mcr p15, 0, r1, c9, c1, 0 @ set the dtcm Region Register
@ Enable caches
mrc p15, 0, r4, c1, c0, 0 @ read control register
orr r4, r4, #(1<<18) @ - itcm enable
orr r4, r4, #(1<<16) @ - dtcm enable
orr r4, r4, #(1<<12) @ - instruction cache enable
orr r4, r4, #(1<<2) @ - data cache enable
orr r4, r4, #(1<<0) @ - mpu enable
mcr p15, 0, r4, c1, c0, 0 @ write control register
@ Flush caches
mov r5, #0
mcr p15, 0, r5, c7, c5, 0 @ flush I-cache
mcr p15, 0, r5, c7, c6, 0 @ flush D-cache
mcr p15, 0, r5, c7, c10, 4 @ drain write buffer
@ Fixes mounting of SDMC
ldr r0, =0x10000020
mov r1, #0x340
str r1, [r0]
bl main
.die:
b .die
#endif // EXEC_A9LH

View File

@ -37,6 +37,9 @@
#define align(v,a) \
(((v) % (a)) ? ((v) + (a) - ((v) % (a))) : (v))
#define ENTRY_BRAHMA (1)
#define ENTRY_GATEWAY (2)
// SafeSigHaxInstaller version
#define VERSION "0.0.3"

View File

@ -215,23 +215,25 @@ bool ShowPrompt(bool ask, const char *format, ...)
}
bool ShowUnlockSequence(u32 seqlvl, const char *format, ...) {
const int seqcolors[6] = { COLOR_STD_FONT, COLOR_BRIGHTGREEN, COLOR_BRIGHTYELLOW,
COLOR_RED, COLOR_BRIGHTBLUE, COLOR_DARKRED };
const u32 sequences[6][5] = {
const int seqcolors[7] = { COLOR_STD_FONT, COLOR_BRIGHTGREEN, COLOR_BRIGHTYELLOW,
COLOR_ORANGE, COLOR_BRIGHTBLUE, COLOR_RED, COLOR_DARKRED };
const u32 sequences[7][5] = {
{ BUTTON_RIGHT, BUTTON_DOWN, BUTTON_RIGHT, BUTTON_DOWN, BUTTON_A },
{ BUTTON_LEFT, BUTTON_DOWN, BUTTON_RIGHT, BUTTON_UP, BUTTON_A },
{ BUTTON_LEFT, BUTTON_RIGHT, BUTTON_DOWN, BUTTON_UP, BUTTON_A },
{ BUTTON_LEFT, BUTTON_UP, BUTTON_RIGHT, BUTTON_UP, BUTTON_A },
{ BUTTON_RIGHT, BUTTON_DOWN, BUTTON_LEFT, BUTTON_DOWN, BUTTON_A },
{ BUTTON_DOWN, BUTTON_LEFT, BUTTON_UP, BUTTON_LEFT, BUTTON_A }
{ BUTTON_DOWN, BUTTON_LEFT, BUTTON_UP, BUTTON_LEFT, BUTTON_A },
{ BUTTON_UP, BUTTON_DOWN, BUTTON_LEFT, BUTTON_RIGHT, BUTTON_A }
};
const char seqsymbols[6][5] = {
const char seqsymbols[7][5] = {
{ '\x1A', '\x19', '\x1A', '\x19', 'A' },
{ '\x1B', '\x19', '\x1A', '\x18', 'A' },
{ '\x1B', '\x1A', '\x19', '\x18', 'A' },
{ '\x1B', '\x18', '\x1A', '\x18', 'A' },
{ '\x1A', '\x19', '\x1B', '\x19', 'A' },
{ '\x19', '\x1B', '\x18', '\x1B', 'A' }
{ '\x19', '\x1B', '\x18', '\x1B', 'A' },
{ '\x18', '\x19', '\x1B', '\x1A', 'A' }
};
const u32 len = 5;
u32 lvl = 0;

View File

@ -21,7 +21,7 @@
#define FONT_HEIGHT_EXT 8
#endif
#define RGB(r,g,b) (r<<24|b<<16|g<<8|r)
#define RGB(r,g,b) ((r)<<24|(b)<<16|(g)<<8|(r))
#define COLOR_BLACK RGB(0x00, 0x00, 0x00)
#define COLOR_WHITE RGB(0xFF, 0xFF, 0xFF)
@ -32,6 +32,7 @@
#define COLOR_BLUE RGB(0x00, 0x00, 0xFF)
#define COLOR_YELLOW RGB(0xFF, 0xFF, 0x00)
#define COLOR_CYAN RGB(0xFF, 0x00, 0xFF)
#define COLOR_ORANGE RGB(0xFF, 0xA5, 0x00)
#define COLOR_BRIGHTRED RGB(0xFF, 0x30, 0x30)
#define COLOR_DARKRED RGB(0x80, 0x00, 0x00)
@ -51,15 +52,8 @@
#define COLOR_STD_BG COLOR_BLACK
#define COLOR_STD_FONT COLOR_WHITE
#ifdef EXEC_GATEWAY
#define TOP_SCREEN (u8*)(*(u32*)((uint32_t)0x080FFFC0 + 4 * (*(u32*)0x080FFFD8 & 1)))
#define BOT_SCREEN (u8*)(*(u32*)((uint32_t)0x080FFFD0 + 4 * (*(u32*)0x080FFFDC & 1)))
#elif defined(EXEC_A9LH)
#define TOP_SCREEN (u8*)(*(u32*)0x23FFFE00)
#define BOT_SCREEN (u8*)(*(u32*)0x23FFFE08)
#else
#error "Unknown execution method"
#endif
#define TOP_SCREEN (u8*)(*(u32*)0x23FFFE00)
#define BOT_SCREEN (u8*)(*(u32*)0x23FFFE08)
void ClearScreen(unsigned char *screen, int color);
void ClearScreenF(bool clear_top, bool clear_bottom, int color);

View File

@ -1,68 +1,103 @@
#ifdef EXEC_GATEWAY
.section .text.start
.global _start
.align 4
.arm
_vectors:
ldr pc, =InfiniteLoop
.pool
ldr pc, =InfiniteLoop
.pool
ldr pc, =InfiniteLoop
.pool
ldr pc, =InfiniteLoop
.pool
ldr pc, =InfiniteLoop
.pool
ldr pc, =InfiniteLoop
.pool
@ if the binary is booted from Brahma/CakeHax/k9lh
@ the entrypoint is <start + 0x0>
@ framebuffers are already set
_start:
ldr sp,=0x22140000
nop
nop
nop
nop
nop
nop
nop
nop
nop
nop
nop @ dummy
b _skip_gw
@ if the binary is booted from the GW exploit
@ the entrypoint is <start + 0x30>
_start_gw:
@@wait for the arm11 kernel threads to be ready
ldr r1, =0x10000
mov r1, #0x10000
waitLoop9:
sub r1, #1
cmp r1, #0
bgt waitLoop9
ldr r1, =0x10000
mov r1, #0x10000
waitLoop92:
sub r1, #1
cmp r1, #0
bgt waitLoop92
@ copy the payload to the standard entrypoint (0x23F00000)
adr r0, _start
add r1, r0, #0x100000
ldr r2, .entry
.copy_binary_fcram:
cmp r0, r1
ldrlt r3, [r0], #4
strlt r3, [r2], #4
blt .copy_binary_fcram
@ setup framebuffers to look like Brahma/etc
ldr r0, .gw_fba
ldr r1, [r0, #0x18]
and r1, #1
ldr r1, [r0, r1, lsl #2] @ r1 := top framebuffer loc
mov r2, r1 @ r2 := top framebuffer loc
ldr r0, .gw_fbb
ldr r3, [r0, #0xC]
and r3, #1
ldr r3, [r0, r3, lsl #2] @ r3 := bottom framebuffer loc
ldr r0, .cakehax
stmia r0, {r1,r2,r3}
@ framebuffers properly set
ldr r3, .entry
bx r3
.gw_fba: .word 0x080FFFC0
.gw_fbb: .word 0x080FFFD0
.cakehax: .word 0x23FFFE00
.entry: .word 0x23F00000
_skip_gw:
@ Disable caches / mpu
mrc p15, 0, r4, c1, c0, 0 @ read control register
bic r4, #(1<<12) @ - instruction cache disable
bic r4, #(1<<2) @ - data cache disable
bic r4, #(1<<0) @ - mpu disable
mcr p15, 0, r4, c1, c0, 0 @ write control register
@ Clear bss
ldr r0, =__bss_start
ldr r1, =__bss_end
ldr r1, =__end__
mov r2, #0
.bss_clr:
cmp r0, r1
beq .bss_clr_done
str r2, [r0], #4
b .bss_clr
.bss_clr_done:
cmp r0, r1
strlt r2, [r0], #4
blt .bss_clr
@ Give read/write access to all the memory regions
ldr r5, =0x33333333
mcr p15, 0, r5, c5, c0, 2 @ write data access
mcr p15, 0, r5, c5, c0, 3 @ write instruction access
@ Sets MPU permissions and cache settings
ldr r0, =0xFFFF001D @ ffff0000 32k | bootrom (unprotected part)
ldr r0, =0xFFFF001F @ ffff0000 64k | bootrom (unprotected / protected)
ldr r1, =0x3000801B @ 30000000 16k | dtcm
ldr r2, =0x01FF801D @ 01ff8000 32k | itcm
ldr r3, =0x08000029 @ 08000000 2M | arm9 mem (O3DS / N3DS)
@ -86,7 +121,7 @@ _start:
@ Enable dctm
ldr r1, =0x3000800A @ set dtcm
mcr p15, 0, r1, c9, c1, 0 @ set the dtcm Region Register
@ Enable caches
mrc p15, 0, r4, c1, c0, 0 @ read control register
orr r4, r4, #(1<<18) @ - itcm enable
@ -107,12 +142,9 @@ _start:
mov r1, #0x340
str r1, [r0]
ldr sp, =0x22160000
ldr r3, =main
blx r3
mov sp, #0x27000000
blx main
b _start
.pool
InfiniteLoop:
b InfiniteLoop
#endif // EXEC_GATEWAY