diff --git a/examples/log/build.rs b/examples/log/build.rs new file mode 100644 index 000000000..43c3deb4f --- /dev/null +++ b/examples/log/build.rs @@ -0,0 +1,17 @@ +// NOTE: Adapted from cortex-m/build.rs +use std::env; + +fn main() { + let target = env::var("TARGET").unwrap(); + + let target_os = target.split('-').nth(2).unwrap_or("none"); + + // If we're not running on a desktop-class operating system, emit the "baremetal" + // config setting. This will enable software to do tasks such as + // managing memory. + if target_os == "none" { + println!("cargo:rustc-cfg=baremetal"); + } + + println!("cargo:rerun-if-changed=build.rs"); +} diff --git a/examples/log/src/main.rs b/examples/log/src/main.rs index cbb432146..b08316eeb 100644 --- a/examples/log/src/main.rs +++ b/examples/log/src/main.rs @@ -1,50 +1,67 @@ -#![no_std] -#![no_main] +#![cfg_attr(baremetal, no_std)] +#![cfg_attr(baremetal, no_main)] +#[cfg(baremetal)] #[macro_use] mod debug; + mod log_string; mod start; -use core::panic::PanicInfo; -use core::fmt::Write; use log_string::LogString; +use core::fmt::Write; -#[panic_handler] -fn handle_panic(arg: &PanicInfo) -> ! { - println!("PANIC!"); - println!("Details: {:?}", arg); - xous::syscall::wait_event(); - loop {} +#[cfg(not(baremetal))] +mod native_nostd { + pub fn init() {} } -fn handle_irq(irq_no: usize, arg: *mut usize) { - print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); +#[cfg(baremetal)] +mod native_nostd { + use core::panic::PanicInfo; - while let Some(c) = debug::DEFAULT.getc() { - print!("0x{:02x}", c); + #[panic_handler] + fn handle_panic(arg: &PanicInfo) -> ! { + println!("PANIC!"); + println!("Details: {:?}", arg); + xous::syscall::wait_event(); + loop {} + } + + fn handle_irq(irq_no: usize, arg: *mut usize) { + print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); + + while let Some(c) = crate::debug::DEFAULT.getc() { + print!("0x{:02x}", c); + } + println!(); + } + + pub fn init() { + let uart = xous::syscall::map_memory( + xous::MemoryAddress::new(0xf000_4000), + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't map serial port"); + unsafe { crate::debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() }; + println!("Mapped UART @ {:08x}", uart.addr.get()); + + println!("Process: map success!"); + crate::debug::DEFAULT.enable_rx(); + + println!("Allocating IRQ..."); + xous::syscall::claim_interrupt(4, handle_irq, core::ptr::null_mut::()) + .expect("couldn't claim interrupt"); } - println!(); } -#[no_mangle] +#[cfg_attr(baremetal, no_mangle)] fn main() { - let uart = xous::syscall::map_memory( - xous::MemoryAddress::new(0xf000_4000), - None, - 4096, - xous::MemoryFlags::R | xous::MemoryFlags::W, - ) - .expect("couldn't map serial port"); - unsafe { debug::DEFAULT_UART_ADDR = uart.as_mut_ptr() }; - println!("Mapped UART @ {:08x}", uart.addr.get()); - - println!("Process: map success!"); - debug::DEFAULT.enable_rx(); - - println!("Allocating IRQ..."); - xous::syscall::claim_interrupt(4, handle_irq, 0 as *mut usize) - .expect("couldn't claim interrupt"); + if cfg!(not(any(windows,unix))) { + native_nostd::init(); + } // println!("Allocating a ton of space on the stack..."); // { @@ -79,33 +96,33 @@ fn main() { xous::syscall::create_server(xous::make_name!("📜")).expect("couldn't create server"); println!("Server listening on address {:?}", server_addr); - let mut counter = 0; + let mut counter: usize = 0; loop { - if counter & 0xfff == 0 { + if counter.trailing_zeros() >= 12 { println!("Counter tick: {}", counter); } counter += 1; - // // println!("Waiting for an event..."); - // let mut envelope = xous::syscall::receive_message(server_addr).expect("couldn't get address"); - // // println!("Got message envelope: {:?}", envelope); - // match &mut envelope.message { - // xous::Message::Scalar(msg) => { - // println!("Scalar message from {}: {:?}", envelope.sender, msg) - // } - // xous::Message::Move(msg) => { - // let log_entry = LogString::from_message(msg); - // println!("Moved log message from {}: {}", envelope.sender, log_entry); - // } - // xous::Message::ImmutableBorrow(msg) => { - // let log_entry = LogString::from_message(msg); - // println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry); - // } - // xous::Message::MutableBorrow(msg) => { - // let mut log_entry = LogString::from_message(msg); - // println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry); - // writeln!(log_entry, " << HELLO FROM THE SERVER").unwrap(); - // } - // } - + println!("Waiting for an event..."); + let mut envelope = + xous::syscall::receive_message(server_addr).expect("couldn't get address"); + println!("Got message envelope: {:?}", envelope); + match &mut envelope.message { + xous::Message::Scalar(msg) => { + println!("Scalar message from {}: {:?}", envelope.sender, msg) + } + xous::Message::Move(msg) => { + let log_entry = LogString::from_message(msg); + println!("Moved log message from {}: {}", envelope.sender, log_entry); + } + xous::Message::ImmutableBorrow(msg) => { + let log_entry = LogString::from_message(msg); + println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry); + } + xous::Message::MutableBorrow(msg) => { + let mut log_entry = LogString::from_message(msg); + println!("Immutably borrowed log message from {}: {}", envelope.sender, log_entry); + writeln!(log_entry, " << HELLO FROM THE SERVER").unwrap(); + } + } } }