jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Finalize linker script

This commit is contained in:
Jaby 2023-08-27 16:45:56 +02:00 committed by Jaby
parent 99ae40bdfe
commit 31f7ff8994
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/psexe.ld
View File

@ -31,9 +31,10 @@ ENTRY(_ZN10JabyEngine5startEv)
TLOAD_ADDR = DEFINED(TLOAD_ADDR) ? TLOAD_ADDR : 0x80010000; TLOAD_ADDR = DEFINED(TLOAD_ADDR) ? TLOAD_ADDR : 0x80010000;
MEMORY { MEMORY {
loader : ORIGIN = (TLOAD_ADDR - 0x800), LENGTH = 2048 loader : ORIGIN = (TLOAD_ADDR - 0x800), LENGTH = 2048
ram (rwx) : ORIGIN = 0x80010000, LENGTH = 2M - 0x10000 ram(rwx) : ORIGIN = 0x80010000, LENGTH = 2M - 0x10000
dcache : ORIGIN = 0x1f800000, LENGTH = 0x400 ram_alt(rwx) : ORIGIN = 0x80010000, LENGTH = 2M - 0x10000
dcache : ORIGIN = 0x1f800000, LENGTH = 0x400
} }
__ram_top = ORIGIN(ram) + LENGTH(ram); __ram_top = ORIGIN(ram) + LENGTH(ram);
@ -92,7 +93,7 @@ SECTIONS {
/*Only needed for the PSX BIOS to load the entire game*/ /*Only needed for the PSX BIOS to load the entire game*/
. = ALIGN(2048); . = ALIGN(2048);
__planschi_end = .; __planschi_end = .;
} } > ram_alt
} }
SECTIONS { SECTIONS {

2
src/Tools/mkoverlay/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "mkoverlay" name = "mkoverlay"
version = "1.5.0" version = "1.5.1"
edition = "2021" edition = "2021"
[profile.release] [profile.release]

2
src/Tools/mkoverlay/src/creator/ldscript.rs
View File

@ -19,7 +19,7 @@ pub fn write(output: &mut Output, overlay_desc: &OverlayDesc) -> Result<(), Erro
writeln!(output, "\t/*{}*/", slot.name)?; writeln!(output, "\t/*{}*/", slot.name)?;
writeln!(output, "\tOVERLAY {} : NOCROSSREFS SUBALIGN(4) {{", slot_start_adr)?; writeln!(output, "\tOVERLAY {} : NOCROSSREFS SUBALIGN(4) {{", slot_start_adr)?;
write_section(output, &slot.sections, false)?; write_section(output, &slot.sections, false)?;
writeln!(output, "\t}} > ram")?; writeln!(output, "\t}} > ram_alt")?;
writeln!(output, "\t. = ALIGN(4);")?; writeln!(output, "\t. = ALIGN(4);")?;
writeln!(output, concat!("\t", section_end_name_template!(), " = .;"), slot.name)?; writeln!(output, concat!("\t", section_end_name_template!(), " = .;"), slot.name)?;
writeln!(output, "")?; writeln!(output, "")?;