DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-03 00:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[makerom] RSF key: "ExeFs" & "PlainRegion" (and childs), are no longer needed.

Browse Source
This commit is contained in:
jakcron
2015-10-09 21:35:27 +08:00
parent 954c0cf126
commit d5f0d2c096
4 changed files with 73 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerom/elf.c
+72 -131
View File
@@ -5,6 +5,8 @@
#include "elf.h" #include "elf.h"
#include "blz.h" #include "blz.h"
const char *SDK_PLAINREGION_SEGMENT_NAME = ".module_id";
int ImportPlainRegionFromFile(ncch_settings *set); int ImportPlainRegionFromFile(ncch_settings *set);
int ImportExeFsCodeBinaryFromFile(ncch_settings *set); int ImportExeFsCodeBinaryFromFile(ncch_settings *set);
@@ -14,9 +16,7 @@ u32 SizeToPage(u32 memorySize, elf_context *elf);
int GetBSSFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set); int GetBSSFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set);
int ImportPlainRegionFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set); int ImportPlainRegionFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set);
int CreateExeFsCode(elf_context *elf, u8 *elfFile, ncch_settings *set); int CreateExeFsCode(elf_context *elf, u8 *elfFile, ncch_settings *set);
int CreateCodeSegmentFromElf(code_segment *out, elf_context *elf, u8 *elfFile, char **names, u32 nameNum); int CreateCodeSegmentFromElf(code_segment *out, elf_context *elf, u8 *elfFile, u64 segment_flags);
elf_segment** GetContinuousSegments(u16 *ContinuousSegmentNum, elf_context *elf, char **names, u32 nameNum);
elf_segment** GetSegments(u16 *SegmentNum, elf_context *elf, char **names, u32 nameNum);
// ELF Functions // ELF Functions
int GetElfContext(elf_context *elf, u8 *elfFile); int GetElfContext(elf_context *elf, u8 *elfFile);
@@ -234,39 +234,28 @@ int GetBSSFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set)
int ImportPlainRegionFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set) // Doesn't work same as N makerom int ImportPlainRegionFromElf(elf_context *elf, u8 *elfFile, ncch_settings *set) // Doesn't work same as N makerom
{ {
if(!set->rsfSet->PlainRegionNum) return 0; u64 size = 0;
u16 *index = calloc(set->rsfSet->PlainRegionNum,sizeof(u16)); u64 offset = 0;
for (u16 i = 0; i < elf->activeSegments; i++) {
/* Getting index Values for each section */ if (strcmp(elf->segments[i].name, SDK_PLAINREGION_SEGMENT_NAME) == 0) {
for(int i = 0; i < set->rsfSet->PlainRegionNum; i++){ size = elf->segments[i].header->sizeInFile;
index[i] = GetElfSectionIndexFromName(set->rsfSet->PlainRegion[i],elf,elfFile); offset = elf->segments[i].header->offsetInFile;
} break;
// Eliminating Duplicated Sections
for(int i = set->rsfSet->PlainRegionNum - 1; i >= 0; i--){
for(int j = i-1; j >= 0; j--){
if(index[i] == index[j]) index[i] = 0;
} }
} }
/* Calculating Total Size of Data */
u64 totalSize = 0;
for(int i = 0; i < set->rsfSet->PlainRegionNum; i++){
totalSize += elf->sections[index[i]].size;
}
/* Creating Output Buffer */
set->sections.plainRegion.size = align(totalSize,set->options.blockSize); if (size > 0) {
set->sections.plainRegion.buffer = malloc(set->sections.plainRegion.size); /* Creating Output Buffer */
if(!set->sections.plainRegion.buffer) {fprintf(stderr,"[ELF ERROR] Not enough memory\n"); return MEM_ERROR;} set->sections.plainRegion.size = align(size, set->options.blockSize);
memset(set->sections.plainRegion.buffer,0,set->sections.plainRegion.size); set->sections.plainRegion.buffer = malloc(set->sections.plainRegion.size);
if (!set->sections.plainRegion.buffer) { fprintf(stderr, "[ELF ERROR] Not enough memory\n"); return MEM_ERROR; }
memset(set->sections.plainRegion.buffer, 0, set->sections.plainRegion.size);
/* Storing Sections */ /* Copy Plain Region */
u64 pos = 0; memcpy(set->sections.plainRegion.buffer, elfFile+offset, size);
for(int i = 0; i < set->rsfSet->PlainRegionNum; i++){
memcpy((set->sections.plainRegion.buffer+pos),elf->sections[index[i]].ptr,elf->sections[index[i]].size);
pos += elf->sections[index[i]].size;
} }
return 0; return 0;
} }
@@ -280,11 +269,11 @@ int CreateExeFsCode(elf_context *elf, u8 *elfFile, ncch_settings *set)
code_segment rwdata; code_segment rwdata;
memset(&rwdata,0,sizeof(code_segment)); memset(&rwdata,0,sizeof(code_segment));
int result = CreateCodeSegmentFromElf(&text,elf,elfFile,set->rsfSet->ExeFs.Text,set->rsfSet->ExeFs.TextNum); int result = CreateCodeSegmentFromElf(&text,elf,elfFile,(PF_R|PF_X));
if(result) return result; if(result) return result;
result = CreateCodeSegmentFromElf(&rodata,elf,elfFile,set->rsfSet->ExeFs.ReadOnly,set->rsfSet->ExeFs.ReadOnlyNum); result = CreateCodeSegmentFromElf(&rodata,elf,elfFile,(PF_R));
if(result) return result; if(result) return result;
result = CreateCodeSegmentFromElf(&rwdata,elf,elfFile,set->rsfSet->ExeFs.ReadWrite,set->rsfSet->ExeFs.ReadWriteNum); result = CreateCodeSegmentFromElf(&rwdata,elf,elfFile,(PF_R | PF_W));
if(result) return result; if(result) return result;
/* Checking the existence of essential ELF Segments */ /* Checking the existence of essential ELF Segments */
@@ -336,131 +325,81 @@ int CreateExeFsCode(elf_context *elf, u8 *elfFile, ncch_settings *set)
return 0; return 0;
} }
int CreateCodeSegmentFromElf(code_segment *out, elf_context *elf, u8 *elfFile, char **names, u32 nameNum) int CreateCodeSegmentFromElf(code_segment *out, elf_context *elf, u8 *elfFile, u64 segment_flags)
{ {
u16 ContinuousSegmentNum = 0; memset(out, 0, sizeof(code_segment));
memset(out,0,sizeof(code_segment));
elf_segment **ContinuousSegments = GetContinuousSegments(&ContinuousSegmentNum,elf,names,nameNum); u16 seg_num = 0;
if (ContinuousSegments == NULL){ elf_segment **seg = calloc(elf->activeSegments, sizeof(elf_segment*));
if(!ContinuousSegmentNum){// Nothing Was Found
//printf("Nothing was found\n"); for (u16 i = 0; i < elf->activeSegments; i++) {
return 0; // Skip SDK ELF plain region
if (strcmp(elf->segments[i].name, SDK_PLAINREGION_SEGMENT_NAME) == 0)
continue;
//printf("SegName: %s (flags: %x)\n", elf->segments[i].name, elf->segments[i].header->flags);
if ((elf->segments[i].header->flags & ~PF_CTRSDK) == segment_flags) {
if (seg_num == 0) {
seg[seg_num] = &elf->segments[i];
seg_num++;
}
else if (elf->segments[i].vAddr == (u32)align(seg[seg_num - 1]->vAddr, seg[seg_num-1]->header->alignment)) {
seg[seg_num] = &elf->segments[i];
seg_num++;
}
} }
else // Error with found segments
return ELF_SEGMENTS_NOT_CONTINUOUS;
} }
/* Return if there are no applicable segment */
if (seg_num == 0)
return 0;
/* Getting Segment Size/Settings */ /* Getting Segment Size/Settings */
u32 vAddr = 0; u32 vAddr = 0;
u32 memorySize = 0; u32 memorySize = 0;
for(int i = 0; i < ContinuousSegmentNum; i++){ for (u16 i = 0; i < seg_num; i++) {
if (i==0){ if (i == 0) {
vAddr = ContinuousSegments[i]->vAddr; vAddr = seg[i]->vAddr;
} }
else{ // Add rounded size from previous segment else { // Add rounded size from previous segment
u32 padding = ContinuousSegments[i]->vAddr - (vAddr + memorySize); u32 padding = seg[i]->vAddr - (vAddr + memorySize);
memorySize += padding; memorySize += padding;
} }
memorySize += ContinuousSegments[i]->header->sizeInMemory; memorySize += seg[i]->header->sizeInMemory;
if(IsBss(&ContinuousSegments[i]->sections[ContinuousSegments[i]->sectionNum-1])) if (IsBss(&seg[i]->sections[seg[i]->sectionNum - 1]))
memorySize -= ContinuousSegments[i]->sections[ContinuousSegments[i]->sectionNum-1].size; memorySize -= seg[i]->sections[seg[i]->sectionNum - 1].size;
} }
// For Check // For Check
#ifdef DEBUG #ifdef DEBUG
printf("Address: 0x%x\n",vAddr); printf("Address: 0x%x\n", vAddr);
printf("Size: 0x%x\n",memorySize); printf("Size: 0x%x\n", memorySize);
#endif #endif
out->address = vAddr; out->address = vAddr;
out->size = memorySize; out->size = memorySize;
out->maxPageNum = SizeToPage(memorySize,elf); out->maxPageNum = SizeToPage(memorySize, elf);
out->data = malloc(memorySize); out->data = malloc(memorySize);
/* Writing Segment to Buffer */ /* Writing Segment to Buffer */
//vAddr = 0; for (int i = 0; i < seg_num; i++) {
//memorySize = 0;
for(int i = 0; i < ContinuousSegmentNum; i++){
/*
if (i==0)
vAddr = ContinuousSegments[i]->vAddr;
else{ for (int j = 0; j < seg[i]->sectionNum; j++) {
u32 num = ContinuousSegments[i]->vAddr - (vAddr + memorySize); elf_section_entry *section = &seg[i]->sections[j];
memorySize += num; if (!IsBss(section)) {
} u8 *pos = (out->data + (section->address - seg[i]->vAddr));
*/ memcpy(pos, section->ptr, section->size);
//u32 size = 0;
for (int j = 0; j < ContinuousSegments[i]->sectionNum; j++){
elf_section_entry *section = &ContinuousSegments[i]->sections[j];
if (!IsBss(section)){
u8 *pos = (out->data + (section->address - ContinuousSegments[i]->vAddr));
memcpy(pos,section->ptr,section->size);
//size += section->size; //size += section->size;
} }
//else if (j == (ContinuousSegments[i]->sectionNum-1))
//memorySize -= section->size;
//'else
//size += section->size;
} }
} }
free(ContinuousSegments); free(seg);
return 0; return 0;
} }
elf_segment** GetContinuousSegments(u16 *ContinuousSegmentNum, elf_context *elf, char **names, u32 nameNum)
{
u16 SegmentNum = 0;
elf_segment **Segments = GetSegments(&SegmentNum, elf, names, nameNum);
if (Segments == NULL || SegmentNum == 0){ // No Segments for the names were found
//printf("Not Found Segment\n");
return NULL;
}
if (SegmentNum == 1){ //Return as there is no need to check
*ContinuousSegmentNum = SegmentNum;
return Segments;
}
u32 vAddr = Segments[0]->vAddr + Segments[0]->header->sizeInMemory;
for (int i = 1; i < SegmentNum; i++){
if (Segments[i]->vAddr != (u32)align(vAddr,Segments[i]->header->alignment)){ //Each Segment must start after each other
fprintf(stderr,"[ELF ERROR] %s segment and %s segment are not continuous\n", Segments[i]->name, Segments[i - 1]->name);
free(Segments);
*ContinuousSegmentNum = 0xffff; // Signify to function that an error occured
return NULL;
}
}
*ContinuousSegmentNum = SegmentNum;
return Segments;
}
elf_segment** GetSegments(u16 *SegmentNum, elf_context *elf, char **names, u32 nameNum)
{
if (names == NULL)
{
return NULL;
}
elf_segment **Segments = calloc(nameNum,sizeof(elf_segment*));
*SegmentNum = 0; // There can be a max of nameNum Segments, however, they might not all exist
for (int i = 0; i < nameNum; i++){
for(int j = 0; j < elf->activeSegments; j++){
if(strcmp(names[i],elf->segments[j].name) == 0){ // If there is a match, store Segment data pointer & increment index
Segments[*SegmentNum] = &elf->segments[j];
*SegmentNum = *SegmentNum + 1;
}
}
}
return Segments;
}
// ELF Functions // ELF Functions
int GetElfContext(elf_context *elf, u8 *elfFile) int GetElfContext(elf_context *elf, u8 *elfFile)
@@ -547,9 +486,11 @@ void PrintElfContext(elf_context *elf, u8 *elfFile)
printf(" Segment [%d][%s]\n",i,elf->segments[i].name); printf(" Segment [%d][%s]\n",i,elf->segments[i].name);
printf(" > Size : 0x%"PRIx64"\n",elf->segments[i].header->sizeInFile); printf(" > Size : 0x%"PRIx64"\n",elf->segments[i].header->sizeInFile);
printf(" > Address : 0x%"PRIx64"\n",elf->segments[i].vAddr); printf(" > Address : 0x%"PRIx64"\n",elf->segments[i].vAddr);
printf(" > Flags: 0x%"PRIx64"\n", elf->segments[i].header->flags);
printf(" > Type: 0x%"PRIx64"\n", elf->segments[i].header->type);
printf(" > Sections : %d\n",elf->segments[i].sectionNum); printf(" > Sections : %d\n",elf->segments[i].sectionNum);
for(int j = 0; j < elf->segments[i].sectionNum; j++) for(int j = 0; j < elf->segments[i].sectionNum; j++)
printf(" > Section [%d][%s]\n",j,elf->segments[i].sections[j].name); printf(" > Section [%d][%s][0x%"PRIx64"][0x%"PRIx64"]\n",j,elf->segments[i].sections[j].name, elf->segments[i].sections[j].flags, elf->segments[i].sections[j].type);
/* /*
char outpath[100]; char outpath[100];
makerom/elf_hdr.h
+1
View File
@@ -161,6 +161,7 @@ typedef struct
#define PT_LOPROC 0x70000000 /* Start of processor-specific */ #define PT_LOPROC 0x70000000 /* Start of processor-specific */
#define PT_HIPROC 0x7fffffff /* End of processor-specific */ #define PT_HIPROC 0x7fffffff /* End of processor-specific */
#define PF_CTRSDK 0x80000000
#define PF_R 0x4 /* p_flags */ #define PF_R 0x4 /* p_flags */
#define PF_W 0x2 #define PF_W 0x2
#define PF_X 0x1 #define PF_X 0x1
makerom/rsf_settings.c
-59
View File
@@ -5,8 +5,6 @@ void GET_AccessControlInfo(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_SystemControlInfo(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_SystemControlInfo(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_BasicInfo(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_BasicInfo(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_RomFs(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_RomFs(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_ExeFs(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_PlainRegion(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_TitleInfo(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_TitleInfo(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_CardInfo(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_CardInfo(ctr_yaml_context *ctx, rsf_settings *rsf);
void GET_CommonHeaderKey(ctr_yaml_context *ctx, rsf_settings *rsf); void GET_CommonHeaderKey(ctr_yaml_context *ctx, rsf_settings *rsf);
@@ -23,8 +21,6 @@ void EvaluateRSF(rsf_settings *rsf, ctr_yaml_context *ctx)
else if(cmpYamlValue("SystemControlInfo",ctx)) {FinishEvent(ctx); GET_SystemControlInfo(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("SystemControlInfo",ctx)) {FinishEvent(ctx); GET_SystemControlInfo(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("BasicInfo",ctx)) {FinishEvent(ctx); GET_BasicInfo(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("BasicInfo",ctx)) {FinishEvent(ctx); GET_BasicInfo(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("RomFs",ctx)) {FinishEvent(ctx); GET_RomFs(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("RomFs",ctx)) {FinishEvent(ctx); GET_RomFs(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("ExeFs",ctx)) {FinishEvent(ctx); GET_ExeFs(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("PlainRegion",ctx)) {FinishEvent(ctx); GET_PlainRegion(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("TitleInfo",ctx)) {FinishEvent(ctx); GET_TitleInfo(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("TitleInfo",ctx)) {FinishEvent(ctx); GET_TitleInfo(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("CardInfo",ctx)) {FinishEvent(ctx); GET_CardInfo(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("CardInfo",ctx)) {FinishEvent(ctx); GET_CardInfo(ctx,rsf); goto GET_NextGroup;}
else if(cmpYamlValue("CommonHeaderKey",ctx)) {FinishEvent(ctx); GET_CommonHeaderKey(ctx,rsf); goto GET_NextGroup;} else if(cmpYamlValue("CommonHeaderKey",ctx)) {FinishEvent(ctx); GET_CommonHeaderKey(ctx,rsf); goto GET_NextGroup;}
@@ -240,39 +236,6 @@ void GET_RomFs(ctr_yaml_context *ctx, rsf_settings *rsf)
FinishEvent(ctx); FinishEvent(ctx);
} }
void GET_ExeFs(ctr_yaml_context *ctx, rsf_settings *rsf)
{
/* Checking That Group is in a map */
if(!CheckMappingEvent(ctx)) return;
u32 InitLevel = ctx->Level;
/* Checking each child */
GetEvent(ctx);
while(ctx->Level == InitLevel){
if(ctx->error || ctx->done) return;
// Handle childs
if(cmpYamlValue("Text",ctx)) rsf->ExeFs.TextNum = SetYAMLSequence(&rsf->ExeFs.Text,"Text",ctx);
else if(cmpYamlValue("ReadOnly",ctx)) rsf->ExeFs.ReadOnlyNum = SetYAMLSequence(&rsf->ExeFs.ReadOnly,"ReadOnly",ctx);
else if(cmpYamlValue("ReadWrite",ctx)) rsf->ExeFs.ReadWriteNum = SetYAMLSequence(&rsf->ExeFs.ReadWrite,"ReadWrite",ctx);
else{
fprintf(stderr,"[RSF ERROR] Unrecognised key '%s'\n",GetYamlString(ctx));
ctx->error = YAML_UNKNOWN_KEY;
FinishEvent(ctx);
return;
}
// Finish event start next
FinishEvent(ctx);
GetEvent(ctx);
}
FinishEvent(ctx);
}
void GET_PlainRegion(ctr_yaml_context *ctx, rsf_settings *rsf)
{
rsf->PlainRegionNum = SetYAMLSequence(&rsf->PlainRegion,"PlainRegion",ctx);
}
void GET_TitleInfo(ctr_yaml_context *ctx, rsf_settings *rsf) void GET_TitleInfo(ctr_yaml_context *ctx, rsf_settings *rsf)
{ {
/* Checking That Group is in a map */ /* Checking That Group is in a map */
@@ -487,28 +450,6 @@ void free_RsfSettings(rsf_settings *set)
} }
free(set->RomFs.File); free(set->RomFs.File);
//ExeFs
for(u32 i = 0; i < set->ExeFs.TextNum; i++){
free(set->ExeFs.Text[i]);
}
free(set->ExeFs.Text);
for(u32 i = 0; i < set->ExeFs.ReadOnlyNum; i++){
free(set->ExeFs.ReadOnly[i]);
}
free(set->ExeFs.ReadOnly);
for(u32 i = 0; i < set->ExeFs.ReadWriteNum; i++){
free(set->ExeFs.ReadWrite[i]);
}
free(set->ExeFs.ReadWrite);
//PlainRegion
for(u32 i = 0; i < set->PlainRegionNum; i++){
free(set->PlainRegion[i]);
}
free(set->PlainRegion);
//TitleInfo //TitleInfo
free(set->TitleInfo.Platform); free(set->TitleInfo.Platform);
free(set->TitleInfo.Category); free(set->TitleInfo.Category);
makerom/user_settings.h
-12
View File
@@ -169,18 +169,6 @@ typedef struct
char **File; char **File;
} RomFs; } RomFs;
struct{
u32 TextNum;
char **Text;
u32 ReadOnlyNum;
char **ReadOnly;
u32 ReadWriteNum;
char **ReadWrite;
} ExeFs;
u32 PlainRegionNum;
char **PlainRegion;
struct{ struct{
// Strings // Strings
char *Platform; char *Platform;