ltcc: output separate runtime.lt.o to avoid duplication when loading multiple object files in ltvm

This commit is contained in:
Michael Sippel 2024-10-18 21:24:10 +02:00
parent 388454e083
commit b268544955
Signed by: senvas
GPG key ID: F96CF119C34B64A6

View file

@ -32,7 +32,60 @@ fn main() {
let args = Args::parse(); let args = Args::parse();
let mut linker = tisc::Linker::new(); let mut linker = tisc::Linker::new();
let root_scope = ltcore::runtime::init_runtime(&mut linker); let mut runtime_linker = tisc::Linker::new();
let root_scope = ltcore::runtime::init_runtime(&mut runtime_linker);
let runtime_obj_file = tisc::linker::ObjectFile {
symbols: root_scope.read().unwrap().clone()
.export()
.into_iter()
.filter_map(|(symbol, def)| match def {
ltcore::symbols::SymbolDef::Procedure { in_types:_, out_types:_, link_addr, export } => {
if true {
match link_addr {
tisc::LinkAddr::Absolute(w) => {
// eprintln!("add symbol {} -> {}", symbol, w);
Some(( symbol, w ))
}
tisc::LinkAddr::Relative{ symbol: b, offset } => {
let addr = runtime_linker.get_link_addr(&b).unwrap_or(-1);
// eprintln!("relative symbol {} -> {}({})+{}", symbol, b, addr, offset);
Some((symbol, addr + offset))
}
}
} else {
None
}
}
_ => None
})
.collect(),
code: runtime_linker.link_partial().expect("Link error:")
.into_iter()
.map(|w| match w {
tisc::assembler::AssemblyWord::Symbol(
tisc::LinkAddr::Absolute(a)
) => {
tisc::assembler::AssemblyWord::Symbol(
tisc::LinkAddr::Relative{
symbol: "runtime.lt.o".into(),
offset: a
}
)
},
w => w
})
.collect()
};
let mut runtime_output = std::io::BufWriter::new(
std::fs::File::create("runtime.lt.o").expect("Failed to open file")
);
bincode::serialize_into( runtime_output, &runtime_obj_file );
let mut main_scope = Scope::with_parent(&root_scope); let mut main_scope = Scope::with_parent(&root_scope);
for path in args.sources { for path in args.sources {