[FIX] fixing block links

Cr0a3 · Sep 11, 2024 · 3a1a610 · 3a1a610
1 parent 360e894
commit 3a1a610
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/CodeGen/compilation/br.rs b/src/CodeGen/compilation/br.rs
@@ -34,10 +34,10 @@ impl CompilationHelper {
         };
 
         let mut cmp = MachineInstr::new(
-            MachineMnemonic::Compare(iftrue, iffalse)
+            MachineMnemonic::Compare(iffalse, iftrue) // val == 0 -> iffalse | else -> iftrue
         );
         cmp.add_operand(src);
-        cmp.add_operand(MachineOperand::Imm(1));
+        cmp.add_operand(MachineOperand::Imm(0));
 
         mc_sink.push( cmp );
     }

diff --git a/src/IR/module.rs b/src/IR/module.rs
@@ -160,7 +160,7 @@ impl Module {
 
             let mut comp = vec![];
 
-            let mut block_links: Vec<((i64, i64, i64, i64), String, String)> = vec![];
+            let mut block_links: Vec<((i64, i64, i64, i64), String, String, i64)> = vec![];
 
             let mut block_adrs = HashMap::new();
 
@@ -177,7 +177,7 @@ impl Module {
                             link.at as i64 + (prev_len as i64) + link.addend + idx
                         };
 
-                        block_links.push(((adr(0), adr(1), adr(2), adr(3)), link.to, link.from));
+                        block_links.push(((adr(0), adr(1), adr(2), adr(3)), link.to, link.from, link.at as i64));
                     } else {
                         obj.link(Link { 
                             from: link.from, 
@@ -190,11 +190,11 @@ impl Module {
                 }
             }
 
-            for (idx, target, source) in block_links {
+            for (idx, target, source, off) in block_links {
                 let mut target_adr = *block_adrs.get(&target).expect("hmm i made a programming error") as i64;
                 let source_adr = *block_adrs.get(&source).expect("hmm i made a programming error") as i64 + 5;
 
-                target_adr = -(source_adr - target_adr);
+                target_adr = target_adr - source_adr - (off - source_adr);
 
                 let bytes = target_adr.to_be_bytes();