From d3c498231e4debcfbdef4a28aad84dc2dec44f53 Mon Sep 17 00:00:00 2001
From: saji <saji@saji.dev>
Date: Sun, 5 May 2024 01:41:26 -0500
Subject: [PATCH] reformat, only set mode for gal16v8

---
 compiler/src/fitter.rs | 33 +++++++++++++++++++--------------
 compiler/src/main.rs   |  6 ++++--
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/compiler/src/fitter.rs b/compiler/src/fitter.rs
index c453669..8f94389 100644
--- a/compiler/src/fitter.rs
+++ b/compiler/src/fitter.rs
@@ -26,7 +26,7 @@ pub enum MappingError {
     SopTooBig {
         name: String,
         sop_size: usize,
-        wanted_size: usize
+        wanted_size: usize,
     },
 
     #[error("Unknown error")]
@@ -97,8 +97,12 @@ fn map_remaining_olmc(
         }
         None => {
             let minsize = unused.iter().map(|x| x.1).min().unwrap();
-            Err(MappingError::SopTooBig {name: sop.name.unwrap(), sop_size: sopsize, wanted_size: minsize})
-        },
+            Err(MappingError::SopTooBig {
+                name: sop.name.unwrap(),
+                sop_size: sopsize,
+                wanted_size: minsize,
+            })
+        }
     }
 }
 
@@ -307,7 +311,11 @@ pub fn graph_convert(graph: &Graph, pcf: PcfFile, chip: Chip) -> anyhow::Result<
                 let rowsize = chip.num_rows_for_olmc(olmc_row);
                 if sopsize > rowsize {
                     return Err(MappingError::SopTooBig {
-                        name: sop.name.unwrap(), sop_size: sopsize, wanted_size: rowsize }.into());
+                        name: sop.name.unwrap(),
+                        sop_size: sopsize,
+                        wanted_size: rowsize,
+                    }
+                    .into());
                 }
                 info!("Found a real pin to map: Mapping node {o:?} onto row {olmc_row}");
 
@@ -377,13 +385,12 @@ pub fn graph_convert(graph: &Graph, pcf: PcfFile, chip: Chip) -> anyhow::Result<
                             let tri_sop = get_sop_for_olmc(graph, node, "E")?;
                             debug!("Sop found, {:?}", tri_sop);
                             assert_eq!(tri_sop.parameters.depth, 1);
-                            let tri_term = make_term_from_sop(graph, &pcf, &olmcmap, &chip, tri_sop);
+                            let tri_term =
+                                make_term_from_sop(graph, &pcf, &olmcmap, &chip, tri_sop);
                             debug!("Term for tristate SOP made = {:?}", tri_term);
                             tri_term
                         }
-                        Net::LiteralOne => {
-                            true_term(0)
-                        }
+                        Net::LiteralOne => true_term(0),
                         Net::LiteralZero => {
                             warn!("Making a false term for output enable, this shouldn't happen!");
                             false_term(0)
@@ -393,7 +400,6 @@ pub fn graph_convert(graph: &Graph, pcf: PcfFile, chip: Chip) -> anyhow::Result<
                         }
                     };
 
-
                     let outpin = Pin {
                         pin: 0, // PIN VALUE IS DISCARDED FOR THIS CALL
                         neg: o.parameters.inverted,
@@ -409,12 +415,11 @@ pub fn graph_convert(graph: &Graph, pcf: PcfFile, chip: Chip) -> anyhow::Result<
                         "Setting base for olmc outpin: {:?}, pinmode: {:?}",
                         outpin, pinmode
                     );
-                    bp.olmcs[idx].set_base(&outpin, term, pinmode).ok_or(MappingError::Unknown)?;
-                    let dummy_pin = Pin {
-                        pin: 0, neg: false
-                    };
+                    bp.olmcs[idx]
+                        .set_base(&outpin, term, pinmode)
+                        .ok_or(MappingError::Unknown)?;
+                    let dummy_pin = Pin { pin: 0, neg: false };
                     bp.olmcs[idx].set_enable(&dummy_pin, tri_term)?;
-
                 } else {
                     panic!("screaming");
                 }
diff --git a/compiler/src/main.rs b/compiler/src/main.rs
index e46afb5..79a2999 100644
--- a/compiler/src/main.rs
+++ b/compiler/src/main.rs
@@ -104,8 +104,10 @@ fn synth(s: SynthArgs) -> Result<()> {
     let res = graph_convert(&g, pcf, s.chip.to_galette())?;
 
     let mut gal = build(&res)?;
-
-    gal.set_mode(galette::gal::Mode::Registered);
+    
+    if matches!(s.chip, ChipType::GAL16V8) {
+        gal.set_mode(galette::gal::Mode::Registered);
+    }
 
     let config = Config {
         gen_pin: false,