cleanup

Author: CohenArthur

compiler/plc_driver/src/pipelines.rs

@@ -300,7 +300,7 @@ impl<T: SourceContainer + Sync> AnnotatedProject<T> {
                     unit,
                     dependencies,
                     literals,
-                    todo!("give GOT layout for singlemodules?"),
+                    todo!("give GOT layout for single modules?"),
                 )
             })
             .reduce(|a, b| {
@@ -390,7 +390,7 @@ impl<T: SourceContainer + Sync> AnnotatedProject<T> {
         let got_layout = compile_options
             .got_layout_file
             .as_ref()
-            .map(|path| read_got_layout(&path, ConfigFormat::JSON))
+            .map(|path| read_got_layout(path, ConfigFormat::JSON))
             .transpose()?;
 
         let got_layout = Mutex::new(got_layout);
@@ -437,8 +437,6 @@ impl<T: SourceContainer + Sync> AnnotatedProject<T> {
                             &got_layout,
                         )?;
 
-                        dbg!(module.persist_to_string());
-
                         module
                             .persist(
                                 Some(&compile_directory),

src/codegen.rs

@@ -2,7 +2,6 @@
 use std::{
     cell::RefCell,
     collections::HashMap,
-    fs,
     ops::Deref,
     path::{Path, PathBuf},
     sync::Mutex,
@@ -144,8 +143,6 @@ impl<'ink> CodeGen<'ink> {
                 acc.push(format!("{}_instance", p.get_name()));
                 acc
             });
-        let test: Vec<_> =
-            program_globals.clone().into_iter().map(|s| crate::index::get_initializer_name(&s)).collect();
 
         let functions = global_index.get_pous().values().filter_map(|p| match p {
             PouIndexEntry::Function { name, linkage: LinkageType::Internal, is_generated: false, .. }
@@ -169,10 +166,7 @@ impl<'ink> CodeGen<'ink> {
                 acc
             });
 
-        // let all_names: Vec<_> = all_names.collect();
-
         if let Some(got_entries) = &mut *got_layout.lock().unwrap() {
-            // let got_entries = read_got_layout(location.as_str(), *format)?;
             let mut new_symbols = Vec::new();
             let mut new_got_entries = HashMap::new();
             let mut new_got = HashMap::new();
@@ -198,18 +192,13 @@ impl<'ink> CodeGen<'ink> {
                 new_got.insert(idx, name.to_string());
             }
 
-            // FIXME: Remove - moved out of there
-            // Now we can write new_got_entries back out to a file.
-            // write_got_layout(new_got_entries, location.as_str(), *format)?;
-
             // Construct our GOT as a new global array. We initialise this array in the loader code.
             let got_size: u32 = new_got
                 .keys()
                 .max()
                 .map_or(0, |m| *m + 1)
                 .try_into()
                 .expect("the computed custom GOT size is too large");
-            eprintln!("creating __custom_got array");
 
             let ptr_ty = llvm.context.i8_type().ptr_type(AddressSpace::default());
             let empty_got = ptr_ty

src/codegen/generators/variable_generator.rs

@@ -6,7 +6,6 @@ use crate::{
     index::{get_initializer_name, Index, PouIndexEntry, VariableIndexEntry},
     resolver::{AnnotationMap, AstAnnotations, Dependency},
 };
-use indexmap::IndexSet;
 use inkwell::{module::Module, values::GlobalValue};
 use plc_ast::ast::LinkageType;
 use plc_diagnostics::diagnostics::Diagnostic;

src/codegen/llvm_index.rs

@@ -5,7 +5,6 @@ use plc_diagnostics::diagnostics::Diagnostic;
 use plc_source::source_location::SourceLocation;
 use plc_util::convention::qualified_name;
 use rustc_hash::FxHashMap;
-use std::collections::HashMap;
 
 /// Index view containing declared values for the current context
 /// Parent Index is the a fallback lookup index for values not declared locally
@@ -57,8 +56,6 @@ impl<'ink> LlvmTypedIndex<'ink> {
         }
         for (name, index) in other.got_indices.drain() {
             self.got_indices.insert(name, index);
-
-            dbg!(&self.got_indices);
         }
         for (name, assocication) in other.initial_value_associations.drain() {
             self.initial_value_associations.insert(name, assocication);
@@ -178,8 +175,6 @@ impl<'ink> LlvmTypedIndex<'ink> {
     }
 
     pub fn insert_new_got_index(&mut self, variable_name: &str) -> Result<(), Diagnostic> {
-        eprintln!("llvm_index: inserting {variable_name}");
-        // FIXME: Does that start at 0 or 1?
         let idx = self.got_indices.values().max().copied().unwrap_or(0);
 
         self.got_indices.insert(variable_name.to_lowercase(), idx);