Feature/virtual file system

Cargo.toml

@@ -23,6 +23,7 @@ opt-level = "s" # Optimize binary size
 [profile.dev]
 debug = true    # Symbols are nice and they don't increase the size on Flash.
 opt-level = "z" # Optimize binary size and turn off loop vectorization.
+# opt-level = 0 # Disable optimizations to speed up compilation and in case of bugs.
 
 [features]
 ESP32 = ["Xtensa"]

Modules/Bindings/Cargo.toml

@@ -22,7 +22,7 @@ path = "Tests/File_system.rs"
 name = "Task_bindings_tests"
 path = "Tests/Task.rs"
 
-[[test]]
-name = "Graphics_bindings_tests"
-path = "Tests/Graphics.rs"
+# [[test]]
+# name = "Graphics_bindings_tests"
+# path = "Tests/Graphics.rs"
 

Modules/Bindings/Tests/File_system.rs

@@ -3,10 +3,7 @@
 #![allow(non_upper_case_globals)]
 
 use Bindings::File_system_bindings;
-use File_system::{
-    Drivers::Native::File_system_type,
-    Prelude::{Path_type, Virtual_file_system_type},
-};
+use File_system::{Drivers::Native::File_system_type, Prelude::Path_type};
 use Virtual_machine::{Data_type, Instantiate_test_environment, WasmValue};
 
 #[test]
@@ -16,17 +13,15 @@ fn Integration_test() {
     );
 
     let Virtual_file_system =
-        Virtual_file_system_type::New(Task::Manager_type::New(), Users::Manager_type::New());
+        File_system::Initialize(Task::Manager_type::New(), Users::Manager_type::New())
+            .expect("Failed to initialize file system");
 
     let Native_file_system = File_system_type::New().expect("Failed to create file system");
 
     let _ = Virtual_file_system.Mount(Box::new(Native_file_system), Path_type::Get_root());
 
-    let (_Runtime, _Module, Instance) = Instantiate_test_environment(
-        Binary_buffer,
-        File_system_bindings::New(Virtual_file_system.clone()),
-        &Data_type::New(),
-    );
+    let (_Runtime, _Module, Instance) =
+        Instantiate_test_environment(Binary_buffer, File_system_bindings, &Data_type::New());
 
     assert_eq!(
         Instance

Modules/Bindings/Tests/Task.rs

@@ -2,11 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 
-use Bindings::{File_system_bindings, Task_bindings};
-use File_system::{
-    Drivers::Native::File_system_type,
-    Prelude::{Path_type, Virtual_file_system_type},
-};
+use Bindings::Task_bindings;
 use Virtual_machine::{Data_type, Instantiate_test_environment, WasmValue};
 
 #[test]

Modules/Bindings/src/File_system.rs

@@ -1,28 +1,19 @@
-use std::mem::MaybeUninit;
-
 use Binding_tool::Bind_function_native;
 use File_system::Prelude::*;
 use Virtual_machine::{Function_descriptor_type, Function_descriptors, Registrable_trait};
-pub struct File_system_bindings {}
 
-impl Registrable_trait for File_system_bindings {
-    fn Get_functions(&self) -> &[Function_descriptor_type] {
-        &File_system_bindings_functions
-    }
-}
+pub struct File_system_bindings;
 
 impl File_system_bindings {
-    pub fn New(File_system: Virtual_file_system_type) -> Self {
-        unsafe {
-            Virtual_file_system.write(File_system);
-        }
-
+    pub fn New() -> Self {
         Self {}
     }
 }
 
-fn Get_virtual_file_system() -> &'static Virtual_file_system_type {
-    unsafe { Virtual_file_system.assume_init_ref() }
+impl Registrable_trait for File_system_bindings {
+    fn Get_functions(&self) -> &[Function_descriptor_type] {
+        &File_system_bindings_functions
+    }
 }
 
 const File_system_bindings_functions: [Function_descriptor_type; 8] = Function_descriptors!(
@@ -36,18 +27,20 @@ const File_system_bindings_functions: [Function_descriptor_type; 8] = Function_d
     Delete_binding
 );
 
-static mut Virtual_file_system: MaybeUninit<Virtual_file_system_type> = MaybeUninit::uninit();
-
-fn New_path(Path: &str) -> Result<&Path_type> {
+fn New_path(Path: &str) -> Result_type<&Path_type> {
     Path_type::New(Path).ok_or(Error_type::Invalid_path)
 }
 
+fn Get_virtual_file_system() -> &'static Virtual_file_system_type {
+    File_system::Get_instance().expect("File system not initialized")
+}
+
 #[Bind_function_native(Prefix = "File_system")]
 fn Open(
     Path: &str,
     Flags: Flags_type,
     File_identifier: &mut Unique_file_identifier_type,
-) -> Result<()> {
+) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     *File_identifier = Get_virtual_file_system().Open(Path, Flags)?;
@@ -56,7 +49,7 @@ fn Open(
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Close_file(File_identifier: Unique_file_identifier_type) -> Result<()> {
+fn Close_file(File_identifier: Unique_file_identifier_type) -> Result_type<()> {
     Get_virtual_file_system().Close(File_identifier)
 }
 
@@ -65,7 +58,7 @@ fn Read(
     File_identifier: Unique_file_identifier_type,
     Buffer: &mut [u8],
     Read_size: &mut Size_type,
-) -> Result<()> {
+) -> Result_type<()> {
     *Read_size = Get_virtual_file_system().Read(File_identifier, Buffer)?;
 
     Ok(())
@@ -76,19 +69,19 @@ fn Write(
     File_identifier: Unique_file_identifier_type,
     Buffer: &[u8],
     Write_size: &mut Size_type,
-) -> Result<()> {
+) -> Result_type<()> {
     *Write_size = Get_virtual_file_system().Write(File_identifier, Buffer)?;
 
     Ok(())
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Flush(File_identifier: Unique_file_identifier_type) -> Result<()> {
+fn Flush(File_identifier: Unique_file_identifier_type) -> Result_type<()> {
     Get_virtual_file_system().Flush(File_identifier)
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Get_file_type(Path: &str, Type: &mut u32) -> Result<()> {
+fn Get_file_type(Path: &str, Type: &mut u32) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     *Type = Get_virtual_file_system().Get_type(Path)? as u32;
@@ -97,7 +90,7 @@ fn Get_file_type(Path: &str, Type: &mut u32) -> Result<()> {
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Get_file_size(Path: &str, Size: &mut Size_type) -> Result<()> {
+fn Get_file_size(Path: &str, Size: &mut Size_type) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     *Size = Get_virtual_file_system().Get_size(Path)?;
@@ -110,14 +103,14 @@ fn Set_position(
     File_identifier: Unique_file_identifier_type,
     Position: &Position_type,
     Result_value: &mut Size_type,
-) -> Result<()> {
+) -> Result_type<()> {
     *Result_value = Get_virtual_file_system().Set_position(File_identifier, Position)?;
 
     Ok(())
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Delete_file(Path: &str, Recursive: bool) -> Result<()> {
+fn Delete_file(Path: &str, Recursive: bool) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     Get_virtual_file_system().Delete(Path, Recursive)?;
@@ -126,7 +119,7 @@ fn Delete_file(Path: &str, Recursive: bool) -> Result<()> {
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Create_file(Path: &str) -> Result<()> {
+fn Create_file(Path: &str) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     Get_virtual_file_system()
@@ -137,7 +130,7 @@ fn Create_file(Path: &str) -> Result<()> {
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Create_directory(Path: &str, Recursive: bool) -> Result<()> {
+fn Create_directory(Path: &str, Recursive: bool) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     Get_virtual_file_system().Create_directory(Path, Recursive)?;
@@ -146,7 +139,7 @@ fn Create_directory(Path: &str, Recursive: bool) -> Result<()> {
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Delete(Path: &str, Recursive: bool) -> Result<()> {
+fn Delete(Path: &str, Recursive: bool) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     Get_virtual_file_system().Delete(Path, Recursive)?;
@@ -155,7 +148,7 @@ fn Delete(Path: &str, Recursive: bool) -> Result<()> {
 }
 
 #[Bind_function_native(Prefix = "File_system")]
-fn Exists(Path: &str, Exists: &mut bool) -> Result<()> {
+fn Exists(Path: &str, Exists: &mut bool) -> Result_type<()> {
     let Path = New_path(Path)?;
 
     *Exists = Get_virtual_file_system().Exists(Path)?;

Modules/Bindings/src/lib.rs

@@ -8,5 +8,5 @@ pub use File_system::*;
 mod Task;
 pub use Task::*;
 
-mod Graphics;
-pub use Graphics::*;
+//mod Graphics;
+//pub use Graphics::*;