forked from AbleOS/holey-bytes
adding --optimize flag to the compiler
This commit is contained in:
parent
4d699fcbf1
commit
7d53706e71
|
@ -2,3 +2,4 @@
|
|||
--fmt-stdout - dont write the formatted file but print it
|
||||
--dump-asm - output assembly instead of raw code, (the assembly is more for debugging the compiler)
|
||||
--threads <1...> - number of threads compiler can use [default: 1]
|
||||
--optimize - compile with optimizing compiler (dangerose)
|
||||
|
|
|
@ -2,6 +2,7 @@ use {
|
|||
crate::{
|
||||
codegen,
|
||||
parser::{self, Ast, FileKind, ParserCtx},
|
||||
son,
|
||||
},
|
||||
alloc::{string::String, vec::Vec},
|
||||
core::{fmt::Write, num::NonZeroUsize},
|
||||
|
@ -38,6 +39,7 @@ pub struct Options {
|
|||
pub fmt: bool,
|
||||
pub fmt_stdout: bool,
|
||||
pub dump_asm: bool,
|
||||
pub optimize: bool,
|
||||
pub extra_threads: usize,
|
||||
}
|
||||
|
||||
|
@ -51,6 +53,7 @@ impl Options {
|
|||
|
||||
Ok(Options {
|
||||
fmt: args.contains(&"--fmt"),
|
||||
optimize: args.contains(&"--optimize"),
|
||||
fmt_stdout: args.contains(&"--fmt-stdout"),
|
||||
dump_asm: args.contains(&"--dump-asm"),
|
||||
extra_threads: args
|
||||
|
@ -85,6 +88,19 @@ pub fn run_compiler(root_file: &str, options: Options, out: &mut Vec<u8>) -> std
|
|||
} else if options.fmt_stdout {
|
||||
let ast = parsed.ast.into_iter().next().unwrap();
|
||||
write!(out, "{ast}").unwrap();
|
||||
} else if options.optimize {
|
||||
let mut codegen = son::Codegen::default();
|
||||
codegen.files = &parsed.ast;
|
||||
codegen.push_embeds(parsed.embeds);
|
||||
|
||||
codegen.generate();
|
||||
if options.dump_asm {
|
||||
codegen
|
||||
.disasm(unsafe { std::mem::transmute::<&mut Vec<u8>, &mut String>(out) })
|
||||
.map_err(|e| io::Error::other(e.to_string()))?;
|
||||
} else {
|
||||
codegen.assemble(out);
|
||||
}
|
||||
} else {
|
||||
let mut codegen = codegen::Codegen::default();
|
||||
codegen.files = parsed.ast;
|
||||
|
|
|
@ -22,9 +22,9 @@ use {
|
|||
fmt::{self, Debug, Display, Write},
|
||||
format_args as fa, mem,
|
||||
ops::{self},
|
||||
usize,
|
||||
},
|
||||
hashbrown::hash_map,
|
||||
hbbytecode::DisasmError,
|
||||
regalloc2::VReg,
|
||||
std::{borrow::ToOwned, panic},
|
||||
};
|
||||
|
@ -1822,12 +1822,22 @@ impl<'a> Codegen<'a> {
|
|||
load
|
||||
}
|
||||
|
||||
pub fn generate(&mut self) {
|
||||
self.find_type(0, 0, Err("main"), self.files);
|
||||
pub fn generate(&mut self, entry: FileId) {
|
||||
self.find_type(0, entry, Err("main"), self.files);
|
||||
self.make_func_reachable(0);
|
||||
self.complete_call_graph();
|
||||
}
|
||||
|
||||
pub fn assemble(&mut self, buf: &mut Vec<u8>) {
|
||||
self.tys.reassemble(buf);
|
||||
}
|
||||
|
||||
pub fn disasm(&mut self, output: &mut String) -> Result<(), DisasmError> {
|
||||
let mut bin = Vec::new();
|
||||
self.assemble(&mut bin);
|
||||
self.tys.disasm(&bin, self.files, output, |_| {})
|
||||
}
|
||||
|
||||
fn make_func_reachable(&mut self, func: ty::Func) {
|
||||
let fuc = &mut self.tys.ins.funcs[func as usize];
|
||||
if fuc.offset == u32::MAX {
|
||||
|
|
Loading…
Reference in a new issue