mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from shinyquagsire23/nro-edge

Browse Source 
elf2nro tweaks
This commit is contained in:
plutoo 2017-11-14 01:47:30 +01:00 committed by GitHub
commit e6fee70ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crt0/switch_crt0.s
View File

@ -3,8 +3,10 @@
_start: _start:
bl startup bl startup
.word 0
.ascii "HOMEBREW" .ascii "HOMEBREW"
.org _start+0x80
startup: startup:
// get aslr base // get aslr base
sub x28, x30, #4 sub x28, x30, #4

26
tools/elf2nro.c
View File

@ -105,10 +105,9 @@ int main(int argc, char* argv[]) {
Elf64_Phdr* phdrs = (Elf64_Phdr*) &elf[hdr->e_phoff]; Elf64_Phdr* phdrs = (Elf64_Phdr*) &elf[hdr->e_phoff];
size_t i, j = 0; size_t i, j = 0;
size_t file_off = sizeof(NroHeader) + sizeof(NroStart); size_t file_off = 0;
uint8_t* comp_buf[3]; uint8_t* buf[3];
int comp_sz[3];
for (i=0; i<4; i++) { for (i=0; i<4; i++) {
Elf64_Phdr* phdr = NULL; Elf64_Phdr* phdr = NULL;
@ -131,19 +130,19 @@ int main(int argc, char* argv[]) {
break; break;
} }
nro_hdr.Segments[i].FileOff = file_off; nro_hdr.Segments[i].FileOff = phdr->p_vaddr;
nro_hdr.Segments[i].Size = phdr->p_filesz + phdr->p_memsz; nro_hdr.Segments[i].Size = (phdr->p_memsz + 0xFFF) & ~0xFFF;
nro_hdr.Segments[i].Size = (nro_hdr.Segments[i].Size + 0xFFF) & ~0xFFF; buf[i] = malloc(nro_hdr.Segments[i].Size);
comp_buf[i] = malloc(phdr->p_filesz); memset(buf[i], 0, nro_hdr.Segments[i].Size);
if (comp_buf[i] == NULL) { if (buf[i] == NULL) {
fprintf(stderr, "Out of memory!\n"); fprintf(stderr, "Out of memory!\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
memcpy(comp_buf[i], &elf[phdr->p_offset], phdr->p_filesz); memcpy(buf[i], &elf[phdr->p_offset], phdr->p_filesz);
file_off += phdr->p_filesz + phdr->p_memsz; file_off += nro_hdr.Segments[i].Size;
file_off = (file_off + 0xFFF) & ~0xFFF; file_off = (file_off + 0xFFF) & ~0xFFF;
} }
@ -157,14 +156,15 @@ int main(int argc, char* argv[]) {
nro_hdr.size = file_off; nro_hdr.size = file_off;
// TODO check retvals // TODO check retvals
fwrite(&nro_start, sizeof(nro_start), 1, out);
fwrite(&nro_hdr, sizeof(nro_hdr), 1, out);
for (i=0; i<3; i++) for (i=0; i<3; i++)
{ {
fseek(out, nro_hdr.Segments[i].FileOff, SEEK_SET); fseek(out, nro_hdr.Segments[i].FileOff, SEEK_SET);
fwrite(comp_buf[i], comp_sz[i], 1, out); fwrite(buf[i], nro_hdr.Segments[i].Size, 1, out);
} }
fseek(out, sizeof(nro_start), SEEK_SET);
fwrite(&nro_hdr, sizeof(nro_hdr), 1, out);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }