Refactoring

FractalFir · Feb 16, 2025 · 25c6f80 · 25c6f80
1 parent fa34609
commit 25c6f80
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 820 deletions.
diff --git a/src/alloc_erorr_hook.rs b/src/alloc_erorr_hook.rs
diff --git a/src/assembly.rs b/src/assembly.rs
@@ -1,7 +1,6 @@
 pub use crate::fn_ctx::MethodCompileCtx;
 use crate::{
     basic_block::handler_for_block,
-    cil::span_source_info,
     codegen_error::{CodegenError, MethodCodegenError},
     r#type::get_type,
     rustc_middle::dep_graph::DepContext,
@@ -866,3 +865,21 @@ pub fn add_const_value(asm: &mut cilly::v2::Assembly, bytes: u128) -> StaticFiel
 
     field_desc
 }
+
+
+pub(crate) fn span_source_info(tcx: TyCtxt, span: rustc_span::Span) -> CILRoot {
+    let (file, lstart, cstart, lend, mut cend) = tcx.sess.source_map().span_to_location_info(span);
+    let file = file.map_or(String::new(), |file| {
+        file.name
+            .display(rustc_span::FileNameDisplayPreference::Local)
+            .to_string()
+    });
+    if cstart >= cend {
+        cend = cstart + 1;
+    }
+    CILRoot::source_info(
+        &file,
+        (lstart as u64)..(lend as u64),
+        (cstart as u64)..(cend as u64),
+    )
+}
diff --git a/src/builtin/atomic.rs b/src/builtin/atomic.rs
diff --git a/src/builtin/casts.rs b/src/builtin/casts.rs
diff --git a/src/builtin/mod.rs b/src/builtin/mod.rs
diff --git a/src/builtin/panic_location.rs b/src/builtin/panic_location.rs
diff --git a/src/builtin/select.rs b/src/builtin/select.rs
diff --git a/src/cil/mod.rs b/src/cil/mod.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -96,8 +96,7 @@ extern crate rustc_symbol_mangling;
 extern crate rustc_target;
 extern crate rustc_ty_utils;
 extern crate stable_mir;
-/// Used for handling OOM in compiler
-mod alloc_erorr_hook;
+
 
 // Modules
 /// Code handling the creation of aggreate values (Arrays, enums,structs,tuples,etc.)
@@ -108,8 +107,7 @@ pub mod assembly;
 pub mod basic_block;
 /// Code handling binary operations
 mod binop;
-/// Implementation of key external functions(eg. libc) necesary for propely running a Rust executable
-pub mod builtin;
+
 mod call_info;
 /// Code hansling rust `as` casts.
 mod casts;
@@ -146,8 +144,6 @@ mod rvalue;
 pub mod statement;
 /// Converts a terminator of a basic block into CIL ops.
 mod terminator;
-/// Code handling transmutes.
-mod transmute;
 /// Code related to types.
 pub mod r#type;
 
@@ -341,7 +337,12 @@ impl ArchiveBuilderBuilder for RlibArchiveBuilder {
 #[no_mangle]
 /// Entrypoint of the codegen. This function starts the backend up, and returns a reference to it to rustc.
 pub extern "Rust" fn __rustc_codegen_backend() -> Box<dyn CodegenBackend> {
-    std::alloc::set_alloc_error_hook(alloc_erorr_hook::custom_alloc_error_hook);
+    std::alloc::set_alloc_error_hook(custom_alloc_error_hook);
     Box::new(MyBackend)
 }
 pub use cilly::{DATA_PTR, ENUM_TAG, METADATA};
+use std::alloc::Layout;
+
+pub fn custom_alloc_error_hook(layout: Layout) {
+    panic!("memory allocation of {} bytes failed", layout.size());
+}
diff --git a/src/libc.rs b/src/libc.rs
diff --git a/src/liblets/panic_info.rs b/src/liblets/panic_info.rs