From 8b1c270910fce13077864bf39d6e88971a6eb062 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Wed, 8 Jan 2025 12:34:47 +0100 Subject: Implement the .include statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This needed some heavy lifting when it comes to how files were located. This means that statements like .include/.incbin now take into consideration a new list made out of SourceInfo, which holds enough information to translate from which file a node comes from. This has also been added into errors, so they are more informative on what went wrong. In order to tests this, besides all the regular unit tests, a new e2e test has been added. Signed-off-by: Miquel Sabaté Solà --- lib/xixanta/fuzz/fuzz_targets/fuzz_target_assembler.rs | 6 +----- lib/xixanta/fuzz/fuzz_targets/fuzz_target_parser.rs | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/xixanta/fuzz') diff --git a/lib/xixanta/fuzz/fuzz_targets/fuzz_target_assembler.rs b/lib/xixanta/fuzz/fuzz_targets/fuzz_target_assembler.rs index 9b9119b..a402998 100644 --- a/lib/xixanta/fuzz/fuzz_targets/fuzz_target_assembler.rs +++ b/lib/xixanta/fuzz/fuzz_targets/fuzz_target_assembler.rs @@ -4,9 +4,5 @@ use libfuzzer_sys::fuzz_target; use xixanta::assembler::assemble; fuzz_target!(|data: &[u8]| { - let _ = assemble( - data, - "empty", - std::env::current_dir().unwrap().to_path_buf(), - ); + let _ = assemble(data, "empty", xixanta::SourceInfo::default()); }); diff --git a/lib/xixanta/fuzz/fuzz_targets/fuzz_target_parser.rs b/lib/xixanta/fuzz/fuzz_targets/fuzz_target_parser.rs index 442dbbf..da8a350 100644 --- a/lib/xixanta/fuzz/fuzz_targets/fuzz_target_parser.rs +++ b/lib/xixanta/fuzz/fuzz_targets/fuzz_target_parser.rs @@ -4,5 +4,5 @@ use libfuzzer_sys::fuzz_target; fuzz_target!(|data: &[u8]| { let mut parser = xixanta::parser::Parser::default(); - let _ = parser.parse(data); + let _ = parser.parse(data, xixanta::SourceInfo::default()); }); -- cgit v1.2.3