redo application paging and system calls, rename mercury to hilbert

2 files changed, 54 insertions, 0 deletions

diff --git a/include/hilbert/kernel/storage/bd/memory.hpp b/include/hilbert/kernel/storage/bd/memory.hpp
new file mode 100644
index 0000000..7702cb3
--- /dev/null
+++ b/include/hilbert/kernel/storage/bd/memory.hpp
@@ -0,0 +1,22 @@
+#ifndef HILBERT_KERNEL_STORAGE_BD_MEMORY_HPP
+#define HILBERT_KERNEL_STORAGE_BD_MEMORY_HPP
+
+#include <hilbert/kernel/storage.hpp>
+
+namespace hilbert::kernel::storage::bd {
+
+  class memory : public block_device {
+
+  private:
+    uint8_t *buffer;
+
+  public:
+    memory(void *buffer, uint64_t buffer_len);
+
+    bd_result read_blocks_no_cache(uint64_t start, uint64_t count, void *into) override;
+
+  };
+
+}
+
+#endif
diff --git a/include/hilbert/kernel/storage/fs/tarfs.hpp b/include/hilbert/kernel/storage/fs/tarfs.hpp
new file mode 100644
index 0000000..80e6030
--- /dev/null
+++ b/include/hilbert/kernel/storage/fs/tarfs.hpp
@@ -0,0 +1,32 @@
+#ifndef HILBERT_KERNEL_STORAGE_FS_TARFS_HPP
+#define HILBERT_KERNEL_STORAGE_FS_TARFS_HPP
+
+#include <hilbert/kernel/storage.hpp>
+
+namespace hilbert::kernel::storage::fs {
+
+  class tarfs_instance : public file_system_instance {
+
+  private:
+    block_device *bd;
+
+    fs_result next_node(node_id_t node, std::optional<node_id_t> &out);
+    fs_result read_full_name(node_id_t node, utility::string &out);
+    //len <= 12.
+    fs_result read_num(uint64_t offset, unsigned len, uint64_t &out);
+    fs_result first_child_starting_at(node_id_t parent, node_id_t start, std::optional<node_id_t> &out);
+    fs_result get_dir_entry(node_id_t node, dir_entry &entry);
+
+  public:
+    tarfs_instance(block_device *bd);
+
+    fs_result get_root_node(node_id_t &out);
+    fs_result get_first_child(node_id_t node, std::optional<dir_entry> &out, directory_iter_t &iter_out);
+    fs_result get_next_child(node_id_t node, std::optional<dir_entry> &out, directory_iter_t &iter);
+    fs_result read_bytes_from_file(node_id_t node, uint64_t start, uint64_t count, void *into);
+
+  };
+
+}
+
+#endif