fix(fd_write): don't use system call

- remove obsolete wasm file

Author: mkroening

src/arch/aarch64/kernel/mod.rs

@@ -36,50 +36,6 @@ const SERIAL_PORT_BAUDRATE: u32 = 115_200;
 global_asm!(include_str!("setjmp.s"));
 global_asm!(include_str!("longjmp.s"));
 
-pub(crate) struct Console {
-	serial_port: SerialPort,
-}
-
-impl Console {
-	pub fn new() -> Self {
-		CoreLocal::install();
-
-		let base = env::boot_info()
-			.hardware_info
-			.serial_port_base
-			.map(|uartport| uartport.get())
-			.unwrap_or_default()
-			.try_into()
-			.unwrap();
-
-		let serial_port = SerialPort::new(base);
-
-		serial_port.init(SERIAL_PORT_BAUDRATE);
-
-		Self { serial_port }
-	}
-
-	pub fn write(&mut self, buf: &[u8]) {
-		self.serial_port.write_buf(buf);
-	}
-
-	pub fn read(&mut self) -> Option<u8> {
-		None
-	}
-
-	pub fn is_empty(&self) -> bool {
-		true
-	}
-
-	pub fn register_waker(&mut self, _waker: &Waker) {}
-}
-
-impl Default for Console {
-	fn default() -> Self {
-		Self::new()
-	}
-}
-
 #[repr(align(8))]
 pub(crate) struct AlignedAtomicU32(AtomicU32);
 

src/arch/riscv64/kernel/mod.rs

@@ -36,38 +36,6 @@ use crate::env;
 use crate::init_cell::InitCell;
 use crate::mm::physicalmem::PHYSICAL_FREE_LIST;
 
-pub(crate) struct Console {}
-
-impl Console {
-	pub fn new() -> Self {
-		CoreLocal::install();
-
-		Self {}
-	}
-
-	pub fn write(&mut self, buf: &[u8]) {
-		for byte in buf {
-			sbi_rt::console_write_byte(*byte);
-		}
-	}
-
-	pub fn read(&mut self) -> Option<u8> {
-		None
-	}
-
-	pub fn is_empty(&self) -> bool {
-		true
-	}
-
-	pub fn register_waker(&mut self, _waker: &Waker) {}
-}
-
-impl Default for Console {
-	fn default() -> Self {
-		Self::new()
-	}
-}
-
 global_asm!(include_str!("setjmp.s"));
 global_asm!(include_str!("longjmp.s"));
 

src/arch/x86_64/kernel/mod.rs

@@ -46,57 +46,6 @@ pub mod vga;
 global_asm!(include_str!("setjmp.s"));
 global_asm!(include_str!("longjmp.s"));
 
-pub(crate) struct Console {
-	serial_port: SerialPort,
-}
-
-impl Console {
-	pub fn new() -> Self {
-		CoreLocal::install();
-
-		let base = env::boot_info()
-			.hardware_info
-			.serial_port_base
-			.unwrap()
-			.get();
-		let serial_port = unsafe { SerialPort::new(base) };
-		Self { serial_port }
-	}
-
-	pub fn write(&mut self, buf: &[u8]) {
-		self.serial_port.send(buf);
-
-		#[cfg(feature = "vga")]
-		for &byte in buf {
-			// vga::write_byte() checks if VGA support has been initialized,
-			// so we don't need any additional if clause around it.
-			vga::write_byte(byte);
-		}
-	}
-
-	pub fn buffer_input(&mut self) {
-		self.serial_port.buffer_input();
-	}
-
-	pub fn read(&mut self) -> Option<u8> {
-		self.serial_port.read()
-	}
-
-	pub fn is_empty(&self) -> bool {
-		self.serial_port.is_empty()
-	}
-
-	pub fn register_waker(&mut self, waker: &Waker) {
-		self.serial_port.register_waker(waker);
-	}
-}
-
-impl Default for Console {
-	fn default() -> Self {
-		Self::new()
-	}
-}
-
 pub fn get_ram_address() -> PhysAddr {
 	PhysAddr::new(env::boot_info().hardware_info.phys_addr_range.start)
 }

src/arch/x86_64/mm/paging.rs

@@ -173,7 +173,7 @@ pub fn map<S>(
 			if let Ok((_frame, flush)) = unmap {
 				unmapped = true;
 				flush.flush();
-				debug!("Had to unmap page {page:?} before mapping.");
+				trace!("Had to unmap page {page:?} before mapping.");
 			}
 			let map = unsafe { mapper.map_to(page, frame, flags, &mut *frame_allocator) };
 			match map {
@@ -267,7 +267,7 @@ where
 			// FIXME: Some sentinel pages around stacks are supposed to be unmapped.
 			// We should handle this case there instead of here.
 			Err(UnmapError::PageNotMapped) => {
-				debug!("Tried to unmap {page:?}, which was not mapped.");
+				trace!("Tried to unmap {page:?}, which was not mapped.");
 			}
 			Err(err) => panic!("{err:?}"),
 		}

src/wasm/capi.rs

@@ -1,6 +1,5 @@
-use core::cell::UnsafeCell;
-
 use align_address::Align;
+use hermit_sync::InterruptTicketMutex;
 use memory_addresses::VirtAddr;
 
 use crate::arch;
@@ -55,26 +54,24 @@ pub type wasmtime_trap_handler_t =
 #[allow(non_camel_case_types)]
 pub enum wasmtime_memory_image {}
 
-#[thread_local]
-static TLS: UnsafeCell<*mut u8> = UnsafeCell::new(core::ptr::null_mut());
+/// We support only single threaded application and use lock to get access to the TLS variable.
+static TLS: InterruptTicketMutex<usize> = InterruptTicketMutex::new(0);
 
 /// Wasmtime requires a single pointer's space of TLS to be used at runtime,
 /// and this function returns the current value of the TLS variable.
 ///
 /// This value should default to `NULL`.
 #[unsafe(no_mangle)]
 pub extern "C" fn wasmtime_tls_get() -> *mut u8 {
-	unsafe { TLS.get().read() }
+	*TLS.lock() as *mut u8
 }
 
 // Sets the current TLS value for Wasmtime to the provided value.
 ///
 /// This value should be returned when later calling `wasmtime_tls_get`.
 #[unsafe(no_mangle)]
 pub extern "C" fn wasmtime_tls_set(ptr: *mut u8) {
-	unsafe {
-		TLS.get().write(ptr);
-	}
+	*TLS.lock() = ptr as usize;
 }
 
 /// Returns the page size, in bytes, of the current system.