tool: take directory path instead of name prefix in --viper-output

Signed-off-by: Zoltan A. Kocsis <11808286+zaklogician@users.noreply.github.com>

Author: zaklogician

tool/microkit/src/argparse.rs

@@ -29,7 +29,7 @@ pub fn print_help(sdk: &Sdk) {
     );
     println!("  --config CONFIG");
     println!("  --capdl-json CAPDL_SPEC (JSON format)");
-    println!("  --viper-output PREFIX");
+    println!("  --viper-output DIRECTORY_PATH");
     println!("  --search-path [SEARCH_PATH ...]");
 }
 
@@ -70,7 +70,7 @@ pub struct Args {
     pub config: String,
     pub report_path: PathBuf,
     pub capdl_json_path: Option<PathBuf>,
-    pub viper_output_prefix: Option<String>,
+    pub viper_output_dir: Option<PathBuf>,
     pub output_path: PathBuf,
     pub search_paths: Vec<PathBuf>,
     pub requested_image_type: RequestedImageType,
@@ -169,7 +169,7 @@ impl Args {
         let mut output_path = PathBuf::from("loader.img");
         let mut report_path = PathBuf::from("report.txt");
         let mut capdl_json_path = None;
-        let mut viper_output_prefix = None;
+        let mut viper_output_dir = None;
         let mut search_paths = Vec::new();
 
         let mut sdf_path = None;
@@ -209,7 +209,7 @@ impl Args {
                     search_paths.extend(params.into_iter().map(PathBuf::from));
                 }
                 "--viper-output" => {
-                    viper_output_prefix = Some(consume_parameter(&mut args, "--viper-output")?);
+                    viper_output_dir = Some(consume_parameter(&mut args, "--viper-output")?.into());
                 }
                 "--image-type" => {
                     let value = consume_parameter(&mut args, "--image-type")?;
@@ -268,7 +268,7 @@ impl Args {
             config,
             report_path,
             capdl_json_path,
-            viper_output_prefix,
+            viper_output_dir,
             output_path,
             search_paths,
             requested_image_type,

tool/microkit/src/main.rs

@@ -33,7 +33,7 @@ use microkit_tool::viper;
 use microkit_tool::{DisjointMemoryRegion, MemoryRegion};
 use std::collections::HashMap;
 use std::fs::{self, metadata};
-use std::path::{Path, PathBuf};
+use std::path::{Path};
 
 const MAX_BUILD_ITERATION: usize = 3;
 
@@ -695,7 +695,15 @@ fn main() -> Result<(), String> {
                 fs::write(capdl_json, &serialised).unwrap();
             };
 
-            if let Some(viper_output_prefix) = args.viper_output_prefix {
+            if let Some(viper_output_dir) = args.viper_output_dir {
+                // NB returns Ok if the directory already exists, that's fine
+                fs::create_dir_all(&viper_output_dir).unwrap_or_else(|source| {
+                    eprintln!(
+                        "ERROR: cannot write Viper output directory {}: {source}",
+                        &viper_output_dir.display()
+                    );
+                    std::process::exit(1);
+                });
                 for view in viper::get_combined_views(&spec_container, &system) {
                     let mut output =
                         String::from(
@@ -706,13 +714,16 @@ fn main() -> Result<(), String> {
                             )
                         );
                     view.export(&mut output);
-                    let path = PathBuf::from(format!("{}{}.vpr", viper_output_prefix, view.pd_name));
-                    // fs::write(&path, output).map_err(|source| {
-                    //     MainError::CannotWriteFile { path, source }
-                    //     .to_string()
-                    // })?;
-                    fs::write(&path, output).expect("TODO")
+                    let path = viper_output_dir.join(format!("{}.vpr", view.pd_name));
+                    fs::write(&path, output).unwrap_or_else(|source| {
+                        eprintln!(
+                            "ERROR: cannot write Viper output file {}: {source}",
+                            &path.display()
+                        );
+                        std::process::exit(1);
+                    });
                 }
+
             }
 
             write_report(&spec_container, &kernel_config, &args.report_path);