Separate example from core

Author: phcoder

Cargo.toml

@@ -1,11 +1,6 @@
-[package]
-authors = ["Vladimir Serbinenko <[email protected]>"]
-edition = "2018"
-readme = "README.md"
-name = "grub-rust-hello"
-version = "0.1.0"
-
-[dependencies]
+[workspace]
+members = ["grub_rust_core", "grub_rust_example"]
+resolver = "3"
 
 [profile.release]
 codegen-units = 1 # better optimizations
@@ -20,5 +15,5 @@ debug = true # symbols are nice and they don't increase the size on Flash
 lto = true # better optimizations
 panic="abort"
 
-[lib]
-crate-type = ["lib", "cdylib"]
+[workspace.dependencies]
+grub = { path = "grub_rust_core" }

grub_rust_core/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+authors = ["Vladimir Serbinenko <[email protected]>"]
+edition = "2018"
+name = "grub"
+version = "0.1.0"
+
+[dependencies]
+
+[lib]
+crate-type = ["staticlib", "lib"]

src/grub_lib.rs renamed to grub_rust_core/src/lib.rs

@@ -1,3 +1,10 @@
+#![no_std]
+#![no_main]
+#![feature(extern_types)]
+#![feature(rustc_attrs)]
+#![feature(format_args_nl)]
+#![feature(inherent_str_constructors)]
+
 extern crate alloc;
 
 use alloc::vec::Vec;
@@ -45,7 +52,7 @@ extern "C" {
 #[cfg_attr(not(test), rustc_diagnostic_item = "print_macro")]
 macro_rules! print {
     ($($arg:tt)*) => {{
-        $crate::grub_lib::print_fmt(format_args!($($arg)*));
+        $crate::print_fmt(format_args!($($arg)*));
     }};
 }
 
@@ -56,38 +63,24 @@ macro_rules! println {
         $crate::print!("\n")
     };
     ($($arg:tt)*) => {{
-        $crate::grub_lib::print_fmt(format_args_nl!($($arg)*));
+        $crate::print_fmt(format_args_nl!($($arg)*));
     }};
 }
 
 #[macro_export]
 macro_rules! dprintln {
     ($cond:expr, $($args: expr),*) => {
-	$crate::grub_lib::real_dprintln(file!(), line!(), $cond, format_args_nl!($($args)*));
+	$crate::real_dprintln(file!(), line!(), $cond, format_args_nl!($($args)*));
     }
 }
 
 #[macro_export]
 macro_rules! eformat {
     ($num:expr, $($args: expr),*) => {
-	$crate::grub_lib::GrubError::new_fmt($num, format_args!($($args)*))
-    }
-}
-
-#[macro_export]
-macro_rules! format {
-    ($($args: expr),*) => {
-	$crate::grub_lib::format(format_args!($($args)*))
+	$crate::GrubError::new_fmt($num, format_args!($($args)*))
     }
 }
 
-pub fn format(args: Arguments<'_>) -> String {
-    let mut w = StrWriter {output: "".to_string()};
-    let _ = fmt::write(&mut w, args);
-
-    return w.output;
-}
-
 #[no_mangle]
 pub extern "C" fn strlen(s: *const c_char) -> usize {
     return unsafe { grub_strlen(s) }; 

grub_rust_example/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+authors = ["Vladimir Serbinenko <[email protected]>"]
+edition = "2018"
+readme = "README.md"
+name = "grub-rust-hello"
+version = "0.1.0"
+
+[dependencies]
+grub = { workspace = true }
+
+[lib]
+crate-type = ["lib"]

src/lib.rs renamed to grub_rust_example/src/lib.rs

@@ -5,14 +5,19 @@
 #![feature(format_args_nl)]
 #![feature(inherent_str_constructors)]
 
-mod grub_lib;
-
 extern crate alloc;
+extern crate grub;
 
 use alloc::string::ToString;
 use core::cmp::min;
 use core::convert::TryFrom;
 
+use alloc::format;
+
+use grub::dprintln;
+use grub::println;
+use grub::eformat;
+
 #[link_section = ".modname"]
 #[no_mangle]
 pub static GRUB_MODNAME: [u8; 11] = *b"rust_hello\0";
@@ -21,14 +26,14 @@ pub static GRUB_MODNAME: [u8; 11] = *b"rust_hello\0";
 pub static GRUB_LICENSE: [u8; 15] = *b"LICENSE=GPLv3+\0";
 
 
-fn rust_hello (argv: &[&str]) -> Result<(), grub_lib::GrubError> {
+fn rust_hello (argv: &[&str]) -> Result<(), grub::GrubError> {
     println!("Hello, world argv={argv:?}");
     dprintln!("hello", "hello from debug");
     return Ok(());
 }
 
-fn rust_err (argv: &[&str]) -> Result<(), grub_lib::GrubError> {
-    return Err(eformat!(grub_lib::ErrT::Io, "hello from error argv={argv:?}"));
+fn rust_err (argv: &[&str]) -> Result<(), grub::GrubError> {
+    return Err(eformat!(grub::ErrT::Io, "hello from error argv={argv:?}"));
 }
 
 fn hexdump (start: u64, buf: &[u8])
@@ -88,11 +93,11 @@ fn hexdump (start: u64, buf: &[u8])
 }
 
 
-fn rust_hexdump (args: &[&str]) -> Result<(), grub_lib::GrubError> {
+fn rust_hexdump (args: &[&str]) -> Result<(), grub::GrubError> {
     let mut length = 256;
     let mut skip = 0;
 
-    let mut file = grub_lib::File::open(args[0], &grub_lib::FileType::Hexcat)?;
+    let mut file = grub::File::open(args[0], &grub::FileType::Hexcat)?;
 
     file.seek(skip);
 
@@ -119,15 +124,15 @@ fn rust_hexdump (args: &[&str]) -> Result<(), grub_lib::GrubError> {
 
 #[no_mangle]
 pub extern "C" fn grub_mod_init() {
-    grub_lib::Command::register("rust_hello", rust_hello,
+    grub::Command::register("rust_hello", rust_hello,
 				"Rust hello", "Say hello from Rust.");
-    grub_lib::Command::register("rust_err", rust_err,
+    grub::Command::register("rust_err", rust_err,
 				"Rust error", "Error out from Rust.");
-    grub_lib::Command::register("rust_hexdump", rust_hexdump,
+    grub::Command::register("rust_hexdump", rust_hexdump,
 				"Rust hexdump", "Hexdump a file from Rust.");
 }
 
 #[no_mangle]
 pub extern "C" fn grub_mod_fini() {
-    grub_lib::Command::unregister_all();
+    grub::Command::unregister_all();
 }