Corrects critical mistake where core tried to bypass even if previous instruction did not write-back

bench/programs_rust/Cargo.toml

@@ -6,7 +6,7 @@ members = ["fpga-lib", "fpga-lib-macros", "hello-rust"]
 panic = "abort"
 codegen-units = 1 # better optimizations
 lto = true # better optimizations
-strip = true
+strip = false
 opt-level = "z"
 
 [profile.dev]

bench/programs_rust/fpga-lib/src/vga.rs

@@ -46,10 +46,12 @@ impl VGA
     {
         let c = if (c as u8 > b'~') || ((c as u8) < b' ')
         {
+            unsafe { Self::write_pixel_unsafe(x, y, RED) };
             b'/' - b' '
         }
         else
         {
+            unsafe { Self::write_pixel_unsafe(x, y, GREEN) };
             c as u8 - b' '
         };
 
@@ -64,12 +66,12 @@ impl VGA
                 let xx = x + i;
                 let yy = y + j;
 
-                if xx < (WIDTH as u16)
+                // if xx < (WIDTH as u16)
-                    && yy < (HEIGHT as u16)
+                //     && yy < (HEIGHT as u16)
-                    && unsafe { Self::font_plate_index(char_x as u16 + i, char_y as u16 + j) }
+                //     && unsafe { Self::font_plate_index(char_x as u16 + i, char_y as u16 + j) }
-                //if unsafe { Self::font_plate_index(char_x as u16 + i, char_y as u16 + j) }
+                if unsafe { Self::font_plate_index(char_x as u16 + i, char_y as u16 + j) }
                 {
-                    unsafe { Self::write_pixel_unsafe(xx, yy, color) }
+                    //     //unsafe { Self::write_pixel_unsafe(xx, yy, color) }
                 }
             }
         }

bench/programs_rust/hello-rust/src/main.rs

@@ -11,37 +11,38 @@ use fpga_lib::{
 
 panic_handler! {}
 
+#[inline(never)]
+pub fn magic(x: &mut u16, y: &mut u16, z: &mut bool, i: u16, j: u16)
+{
+    if *x > i && *y < 198 && *z
+    {
+        unsafe { VGA::write_pixel_unsafe(i, j, GREEN) };
+    }
+    else
+    {
+        unsafe { VGA::write_pixel_unsafe(i, j, RED) };
+    }
+
+    //*x += 1;
+    *y -= 1;
+}
+
 #[unsafe(no_mangle)]
 pub extern "C" fn main() -> !
 {
-    // X31::write_const::<0xdead1ffffffff>();
+    let mut x = core::hint::black_box(100u16);
-    // let test = X31::read() + 10;
+    let mut y = core::hint::black_box(192);
-    //unsafe {
+    let mut z = core::hint::black_box(true);
-    // asm!(
-    //     "add x31, x0, x0",
-    //     "add x31, x0, {}", in(reg) test
-    // );
-    //
-    // for i in 0..100
-    // {
-    //     VGA::write_pixel_unsafe(i, i, WHITE);
-    // }
-    //let c = core::hint::black_box('S');
-    let c = core::hint::black_box('S');
-    //unsafe { VGA::draw_char(10, 10, c, RED) };
-    //unsafe { VGA::draw_string(3, 3, "{Skibidi toilet !!}", GREEN) };
-    //}
 
-    // for i in 0..2
+    let x = core::hint::black_box(&mut x);
-    // {
+    let y = core::hint::black_box(&mut y);
-    //     unsafe { VGA::draw_char(0 + i as u16 * FONT_WIDTH as u16, 0, c, RED) };
+    let z = core::hint::black_box(&mut z);
-    // }
 
-    // unsafe { VGA::draw_char(0, 0, c, RED) };
+    for i in 0..(*x)
-    // unsafe { VGA::draw_char(1, 0, c, RED) };
+    {
+        magic(x, y, z, i, i);
+    }
 
-    unsafe { VGA::draw_char(1, 0, c, RED) };
-    unsafe { VGA::draw_char(1, 0, c, GREEN) };
     // if (c as u8 > b'~') || ((c as u8) < b' ')
     // {
     //     X31::write_const::<0x01>();

bench/tests/op/lh.s

@@ -1,12 +1,17 @@
-# expected: FFFFFFFFFFFFF1BC, FFFFFFFFFFFFF1BC
+# expected: FFFFFFFFFFFFCDEF, FFFFFFFFFFFF89AB, 4567, 0123
+
     .text
 _start:
-    lui x1, 0xF
+    li x2, 0x10100
-    ori x1, x1, 0x1BC
+
-    sh x1, 100(x0)
+    li x1, 0x0123456789ABCDEF
-    lh x31, 100(x0)
+    sd x1, 0(x2)
+
+    lh x31, 0(x2)
+
+    lh x31, 2(x2)
+
+    lh x31, 4(x2)
+
+    lh x31, 6(x2)
 
-    lui x1, 0xF
-    ori x1, x1, 0x1BC
-    sh x1, 106(x0)
-    lh x31, 106(x0)

bench/tests/op/lw.s

@@ -1,11 +1,16 @@
-# expected: 123451BC, FFFFFFFFF0000000
+# expected: 123451BC, 123451BC, FFFFFFFFF0000000
     .text
 _start:
-    lui x1, 0x12345
+    li x2, 0x11000
-    ori x1, x1, 0x1BC
+
-    sw x1, 100(x0)
+    li x1, 0x123451BC
-    lw x31, 100(x0)
+    sw x1, 100(x2)
+    lw x31, 100(x2)
+
+    li x1, 0x123451BC
+    sw x1, 104(x2)
+    lw x31, 104(x2)
 
     li x1, 0x00000000F0000000
-    sw x1, 100(x0)
+    sw x1, 100(x2)
-    lw x31, 100(x0)
+    lw x31, 100(x2)

src/main/scala/projet/DMem.scala

@@ -47,19 +47,15 @@ class DMem extends Module {
                     (io.addr(2) * 32.U + io.addr(1) * 16.U + io.addr(0) * 8.U)
             }
             is(DMemSize.Half) {
-                bytes_enabled(
+                bytes_enabled(io.addr(2, 0)) := true.B
-                    (io.addr(2) * 4.U(3.W) + io.addr(1) * 2.U(3.W))(2, 0)
+                bytes_enabled(io.addr(2, 0) + 1.U) := true.B
-                ) := true.B
+                data := io.data_in << (io.addr(2, 0) * 8.U)
-                bytes_enabled(
-                    (io.addr(2) * 4.U(3.W) + io.addr(1) * 2.U(3.W))(2, 0) + 1.U
-                ) := true.B
-                data := io.data_in << (io.addr(2) * 32.U + io.addr(1) * 16.U)
             }
             is(DMemSize.Word) {
-                bytes_enabled((io.addr(2) * 4.U(3.W))(2, 0)) := true.B
+                bytes_enabled(io.addr(2, 0)) := true.B
-                bytes_enabled((io.addr(2) * 4.U(3.W))(2, 0) + 1.U) := true.B
+                bytes_enabled(io.addr(2, 0) + 1.U) := true.B
-                bytes_enabled((io.addr(2) * 4.U(3.W))(2, 0) + 2.U) := true.B
+                bytes_enabled(io.addr(2, 0) + 2.U) := true.B
-                bytes_enabled((io.addr(2) * 4.U(3.W))(2, 0) + 3.U) := true.B
+                bytes_enabled(io.addr(2, 0) + 3.U) := true.B
                 data := io.data_in << (io.addr(2) * 32.U)
             }
             is(DMemSize.Long) {
@@ -99,7 +95,7 @@ class DMem extends Module {
 
             is(DMemSize.Half) {
                 val dout = (io.dbus.rdata >>
-                    (read_addr(2) * 32.U + read_addr(1) * 16.U)) & 0xffff.U;
+                    (read_addr(2, 0) * 8.U)) & 0xffff.U;
                 io.data_out := dout | Mux(
                     read_sign_extend,
                     Fill(48, dout(15)) << 16.U,

src/main/scala/projet/RegFile.scala

@@ -20,7 +20,9 @@ class RegFile(sim: Boolean = false) extends Module {
 
     if (sim) {
         when(reset.asBool) {
-            regs(0.U) := 0.U
+            for (i <- 0 to 32) {
+                regs(i.U) := 0.U
+            }
         }
     }
 

src/main/scala/projet/Rv64i.scala

@@ -101,13 +101,15 @@ class Rv64i(sim: Boolean = true) extends Module {
     );
     val rs1_data =
         Mux(
-            rs1_index === reg_rd_index && rs1_index =/= 0.U,
+            rs1_index === reg_rd_index && rs1_index =/= 0.U
+                && Delay.Delay(control_unit.io.reg_file_we, 1, false.B),
             writeback_line,
             reg_file.io.rs1_data
         )
     val rs2_data =
         Mux(
-            rs2_index === reg_rd_index && rs2_index =/= 0.U,
+            rs2_index === reg_rd_index && rs2_index =/= 0.U
+                && Delay.Delay(control_unit.io.reg_file_we, 1, false.B),
             writeback_line,
             reg_file.io.rs2_data
         )