hanez/fun
1
0
Fork 0
forked from fun/fun
Code Pull requests Activity

Some more Fun VM and Rust interaction. (0.38.2)

Browse source
This commit is contained in:
Johannes Findeisen 2026-01-29 02:53:14 +01:00
commit c2e7f3869e
17 changed files with 251 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/rust/src/lib.rs
View file

@ -2,15 +2,13 @@
* This file is part of the Fun programming language.
* https://fun-lang.xyz/
*
* Copyright 2025 Johannes Findeisen <you@hanez.org>
* Copyright 2026 Johannes Findeisen <you@hanez.org>
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
* Added: 2026-01-27
*/
#![no_std]
// Use an FFI-safe opaque handle for the VM pointer
pub type Vm = core::ffi::c_void;
@ -37,7 +35,7 @@ pub extern "C" fn fun_rust_get_string() -> *const core::ffi::c_char {
b"Hello from Rust ops!\0".as_ptr() as *const _
}
// Print a C string via libc printf to stdout (acceptable under no_std via extern)
// Print a C string via libc printf to stdout
#[no_mangle]
pub extern "C" fn fun_rust_print_string(msg: *const core::ffi::c_char) -> i32 {
unsafe {
@ -50,12 +48,4 @@ pub extern "C" fn fun_rust_print_string(msg: *const core::ffi::c_char) -> i32 {
0
}
// Provide personality symbol to satisfy some linkers in no_std builds
#[no_mangle]
pub extern "C" fn rust_eh_personality() {}
// Minimal panic handler for no_std; abort behavior requested via Cargo profile
#[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {}
}
// No custom panic handler; use std default

36
src/rust/src/vm/mod.rs
View file

@ -2,7 +2,7 @@
* This file is part of the Fun programming language.
* https://fun-lang.xyz/
*
* Copyright 2025 Johannes Findeisen <you@hanez.org>
* Copyright 2026 Johannes Findeisen <you@hanez.org>
* Licensed under the terms of the Apache-2.0 license.
* https://opensource.org/license/apache-2-0
*
@ -16,10 +16,18 @@
//! ABI helpers declared on the C side (`vm_pop_i64`, `vm_push_i64`).
use super::Vm;
//use core::mem::size_of;
use core::ptr;
extern "C" {
fn vm_pop_i64(vm: *mut Vm) -> i64;
fn vm_push_i64(vm: *mut Vm, v: i64);
fn vm_as_mut_ptr(vm: *mut Vm) -> *mut core::ffi::c_void;
fn vm_sizeof() -> usize;
fn vm_value_sizeof() -> usize;
fn vm_offset_of_exit_code() -> usize;
fn vm_offset_of_sp() -> usize;
fn vm_offset_of_stack() -> usize;
}
/// Multiply the top two integers on the VM stack.
@ -68,3 +76,29 @@ pub extern "C" fn fun_op_rdiv(vm: *mut Vm) -> i32 {
}
0
}
/// Demo: push current stack pointer (vm.sp) using raw offset access.
#[no_mangle]
pub extern "C" fn fun_op_rget_sp(vm: *mut Vm) -> i32 {
unsafe {
let base = vm_as_mut_ptr(vm) as *mut u8;
let off_sp = vm_offset_of_sp();
let sp_ptr = base.add(off_sp) as *const i32;
let sp = ptr::read(sp_ptr);
vm_push_i64(vm, sp as i64);
}
0
}
/// Demo: set vm.exit_code to a value popped from the stack (i64 -> i32 cast).
#[no_mangle]
pub extern "C" fn fun_op_rset_exit(vm: *mut Vm) -> i32 {
unsafe {
let code = vm_pop_i64(vm) as i32;
let base = vm_as_mut_ptr(vm) as *mut u8;
let off_ec = vm_offset_of_exit_code();
let ec_ptr = base.add(off_ec) as *mut i32;
ptr::write(ec_ptr, code);
}
0
}