tsiry-sandratraina.com
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita
audio
rust
zig
deno
mpris
rockbox
mpd
Fix .ncbss from possibly overlapping .ncdata in plugins/codecs.
(Take #2)
If .bss wasn't large enough, and .ncdata was empty, .ncbss would be
at an address overlapping the alignment-padded end of .ncdata and
and linking would fail with an overlap error.
Adds plugin load end address that accounts for IRAM going past
the final .bss sections, making IRAM overlay compatible. load_code
could also use this instead of the file size.
The .lds becomes a bit more straightforward and explicit when
assigning addresses.
Change-Id: Id0c33f257710e97ece2c831e0feaaa32c1a14e05
+53
-32
apps/plugins/plugin.lds
+53
-32
apps/plugins/plugin.lds
···
247
247
{
248
248
*(.rodata*)
249
249
#if defined(IRAMSIZE) && IRAMSIZE == 0
250
-
*(.irodata)
250
+
*(.irodata)
251
251
#endif
252
-
. = ALIGN(0x4);
253
252
} > PLUGIN_RAM
254
253
255
254
.data :
256
255
{
257
256
*(.data*)
258
257
#if defined(IRAMSIZE) && IRAMSIZE == 0
259
-
*(.idata)
258
+
*(.idata)
260
259
#endif
261
260
} > PLUGIN_RAM
262
-
261
+
263
262
#if NOCACHE_BASE != 0
264
263
.ncdata . + NOCACHE_BASE :
265
264
{
266
265
. = ALIGN(CACHEALIGN_SIZE);
267
266
*(.ncdata*)
268
267
. = ALIGN(CACHEALIGN_SIZE);
269
-
/* EABI currently needs iramcopy defined here, otherwise .iram can sometimes
270
-
have an incorrect load address, breaking codecs. */
271
-
#if defined(IRAMSIZE)
268
+
/* EABI currently needs these defined here, otherwise .iram and .bss can
269
+
sometimes have an incorrect load address, breaking codecs and plugins. */
270
+
bssaddr = . - NOCACHE_BASE;
271
+
#if defined(IRAMSIZE) && IRAMSIZE != 0
272
272
iramcopy = . - NOCACHE_BASE;
273
273
#endif
274
274
} AT> PLUGIN_RAM
275
275
/* This definition is used when NOCACHE_BASE is 0. The address offset bug only
276
276
seems to occur when the empty .ncdata is present. */
277
-
#elif defined(IRAMSIZE)
277
+
#else
278
+
bssaddr = .;
279
+
#if defined(IRAMSIZE) && IRAMSIZE != 0
278
280
iramcopy = .;
281
+
#endif
279
282
#endif
280
283
281
284
/DISCARD/ :
···
286
289
#endif
287
290
}
288
291
289
-
#if defined(IRAMSIZE) && IRAMSIZE != 0
290
-
.iram IRAMORIG : AT ( iramcopy)
291
-
{
292
-
iramstart = .;
293
-
*(.icode)
294
-
*(.irodata)
295
-
*(.idata)
296
-
iramend = .;
297
-
} > PLUGIN_IRAM
298
-
299
-
300
-
.ibss (NOLOAD) :
301
-
{
302
-
iedata = .;
303
-
*(.ibss)
304
-
. = ALIGN(0x4);
305
-
iend = .;
306
-
} > PLUGIN_IRAM
307
-
#endif
308
-
309
-
.bss (NOLOAD) :
292
+
.bss bssaddr (NOLOAD) :
310
293
{
311
294
plugin_bss_start = .;
312
295
_plugin_bss_start = .;
313
296
*(.bss*)
314
297
#if defined(IRAMSIZE) && IRAMSIZE == 0
315
-
*(.ibss)
298
+
*(.ibss)
316
299
#endif
317
300
*(COMMON)
318
301
. = ALIGN(0x4);
···
324
307
. = ALIGN(CACHEALIGN_SIZE);
325
308
*(.ncbss*)
326
309
. = ALIGN(CACHEALIGN_SIZE);
310
+
/* We won't trust this one any more than with .ncdata */
311
+
pluginendaddr = . - NOCACHE_BASE;
327
312
} AT> PLUGIN_RAM
313
+
#else
314
+
pluginendaddr = .;
328
315
#endif
329
316
330
-
/* Restore . */
331
-
.pluginend . - NOCACHE_BASE :
317
+
/* Final end of plugin after IRAM setup. The plugin or codec buffer
318
+
is considered unused by the in-RAM image at this point once IRAM
319
+
is copied. */
320
+
.pluginend pluginendaddr :
332
321
{
333
322
_plugin_end_addr = .;
334
323
plugin_end_addr = .;
324
+
}
325
+
326
+
#if defined(IRAMSIZE) && IRAMSIZE != 0
327
+
.iram IRAMORIG : AT (iramcopy)
328
+
{
329
+
iramstart = .;
330
+
*(.icode)
331
+
*(.irodata)
332
+
*(.idata)
333
+
iramend = .;
334
+
} > PLUGIN_IRAM
335
+
336
+
.ibss (NOLOAD) :
337
+
{
338
+
iedata = .;
339
+
*(.ibss)
340
+
. = ALIGN(0x4);
341
+
iend = .;
342
+
} > PLUGIN_IRAM
343
+
344
+
loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram));
345
+
#else
346
+
loadendaddr = plugin_end_addr;
347
+
#endif
348
+
349
+
/* This is for ovl_offset.pl and is the highest address that must
350
+
be loaded into the plugin buffer (past the end of last data in
351
+
stored image). */
352
+
.pluginloadend loadendaddr :
353
+
{
354
+
_plugin_load_end_addr = .;
355
+
plugin_load_end_addr = .;
335
356
}
336
357
337
358
/* Special trick to avoid a linker error when no other sections are
+1
-1
tools/ovl_offset.pl
+1
-1
tools/ovl_offset.pl