Merge branch 'main' of github.com:higherorderco/hvm

Cargo.toml

@@ -6,6 +6,10 @@ build = "build.rs"
 description = "A massively parallel, optimal functional runtime in Rust."
 license = "Apache-2.0"
 
+[lib]
+name = "hvm"
+path = "src/lib.rs"
+
 [dependencies]
 TSPL = "0.0.12"
 clap = "4.5.2"

src/hvm.c

@@ -390,11 +390,11 @@ static inline u32 get_u24(Numb word) {
 
 // Constructor and getters for I24 (signed 24-bit integer)
 static inline Numb new_i24(i32 val) {
-  return (((u32)val << 4) & 0xFFFFFF) | I24;
+  return (((u32)val & 0xFFFFFF) << 4) | I24;
 }
 
 static inline i32 get_i24(Numb word) {
-  return (((word >> 4) & 0xFFFFFF) << 8) >> 8;
+  return ((i32)((word >> 4) & 0xFFFFFF)) << 8 >> 8;
 }
 
 // Constructor and getters for F24 (24-bit float)

src/hvm.cu

@@ -694,11 +694,11 @@ __device__ __host__ inline u32 get_u24(Numb word) {
 
 // Constructor and getters for I24 (signed 24-bit integer)
 __device__ __host__ inline Numb new_i24(i32 val) {
-  return (((u32)val << 4) & 0xFFFFFF) | I24;
+  return (((u32)val & 0xFFFFFF) << 4) | I24;
 }
 
 __device__ __host__ inline i32 get_i24(Numb word) {
-  return (((word >> 4) & 0xFFFFFF) << 8) >> 8;
+  return ((i32)((word >> 4) & 0xFFFFFF)) << 8 >> 8;
 }
 
 // Constructor and getters for F24 (24-bit float)

src/lib.rs

@@ -0,0 +1,3 @@
+pub mod ast;
+pub mod cmp;
+pub mod hvm;

src/main.rs

@@ -3,15 +3,12 @@
 #![allow(unused_variables)]
 
 use clap::{Arg, ArgAction, Command};
+use ::hvm::{ast, cmp, hvm};
 use std::fs;
 use std::io::Write;
 use std::path::PathBuf;
 use std::process::Command as SysCommand;
 
-mod ast;
-mod cmp;
-mod hvm;
-
 #[cfg(feature = "c")]
 extern "C" {
   fn hvm_c(book_buffer: *const u32, run_io: bool);