gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use automatic allocation for section data

Browse Source
This commit is contained in:
Rangi42
2024-02-22 15:45:09 -05:00
committed by Sylvie
parent 72e9f55368
commit dec1811d20
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asm/section.hpp
View File

@@ -5,6 +5,7 @@
#include <deque> #include <deque>
#include <stdint.h> #include <stdint.h>
#include <vector>
#include "linkdefs.hpp" #include "linkdefs.hpp"
#include "platform.hpp" // NONNULL #include "platform.hpp" // NONNULL
@@ -38,7 +39,7 @@ struct Section {
uint8_t align; // Exactly as specified in `ALIGN[]` uint8_t align; // Exactly as specified in `ALIGN[]`
uint16_t alignOfs; uint16_t alignOfs;
std::deque<struct Patch> patches; std::deque<struct Patch> patches;
uint8_t *data; std::vector<uint8_t> data;
}; };
struct SectionSpec { struct SectionSpec {

2
src/asm/output.cpp
View File

@@ -135,7 +135,7 @@ static void writesection(struct Section const &sect, FILE *f)
putlong(sect.alignOfs, f); putlong(sect.alignOfs, f);
if (sect_HasData(sect.type)) { if (sect_HasData(sect.type)) {
fwrite(sect.data, 1, sect.size, f); fwrite(sect.data.data(), 1, sect.size, f);
putlong(sect.patches.size(), f); putlong(sect.patches.size(), f);
for (struct Patch const &patch : sect.patches) for (struct Patch const &patch : sect.patches)

9
src/asm/section.cpp
View File

@@ -286,13 +286,8 @@ static struct Section *createSection(char const *name, enum SectionType type,
sect.alignOfs = alignOffset; sect.alignOfs = alignOffset;
// It is only needed to allocate memory for ROM sections. // It is only needed to allocate memory for ROM sections.
if (sect_HasData(type)) { if (sect_HasData(type))
sect.data = (uint8_t *)malloc(sectionTypeInfo[type].size); sect.data.resize(sectionTypeInfo[type].size);
if (sect.data == NULL)
fatalerror("Not enough memory for section: %s\n", strerror(errno));
} else {
sect.data = NULL;
}
return &sect; return &sect;
} }