From 0f905afe36f19d874d09eff52ae423bf41ba7088 Mon Sep 17 00:00:00 2001
From: PurplePower <60787289+PurplePower@users.noreply.github.com>
Date: Mon, 18 Nov 2024 23:17:58 +0800
Subject: [PATCH] fixes

---
 lab1/csrc/say_goodbye.c                      |   4 ++--
 lab1/src/main/resources/say_goodbye.asmbin   | Bin 4192 -> 4192 bytes
 lab1/vivado/z710/z710.xdc                    |   2 +-
 lab2/csrc/say_goodbye.c                      |   4 ++--
 lab2/src/main/resources/say_goodbye.asmbin   | Bin 4192 -> 4192 bytes
 lab2/src/main/scala/board/z710v1.3/Top.scala |  12 ++++++------
 lab2/vivado/z710/z710.xdc                    |   2 +-
 lab3/csrc/say_goodbye.c                      |   4 ++--
 lab3/src/main/resources/say_goodbye.asmbin   | Bin 4192 -> 4192 bytes
 lab4/csrc/say_goodbye.c                      |   4 ++--
 lab4/src/main/resources/say_goodbye.asmbin   | Bin 4192 -> 4192 bytes
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lab1/csrc/say_goodbye.c b/lab1/csrc/say_goodbye.c
index c605273..6848120 100644
--- a/lab1/csrc/say_goodbye.c
+++ b/lab1/csrc/say_goodbye.c
@@ -32,10 +32,10 @@ int main() {
       {
         uart_send_char(*p);
         p++;
-        waste_some_time(200);
+        waste_some_time(500);
       }
 
-      waste_some_time(400);
+      waste_some_time(500);
 
       break;  // print once, but pressing CPU reset can print again
     }
diff --git a/lab1/src/main/resources/say_goodbye.asmbin b/lab1/src/main/resources/say_goodbye.asmbin
index 05f0f0080561368f20a17b7b49fd8f28ec4f33ad..d72478c61d1885051b279afd586d0fdacdb76769 100644
GIT binary patch
delta 30
mcmaE$@IYaMACr)S{B#BehUX0oU-Cc1{}E<&kYAj@#0LPa{|cx8

delta 30
mcmaE$@IYaMACpi6&vXU`hUX0oU-Cc1{}E<okX)R=#0LPdQVNd%

diff --git a/lab1/vivado/z710/z710.xdc b/lab1/vivado/z710/z710.xdc
index c6e297d..e0301e8 100644
--- a/lab1/vivado/z710/z710.xdc
+++ b/lab1/vivado/z710/z710.xdc
@@ -10,7 +10,7 @@
 
 ##Clock signal
 set_property -dict {PACKAGE_PIN K17 IOSTANDARD LVCMOS33} [get_ports io_clock]
-create_clock -period 20.000 -name sys_clk_pin -waveform {0.000 10.000} -add [get_ports io_clock]
+create_clock -period 8.000 -name sys_clk_pin -waveform {0.000 4.000} -add [get_ports io_clock]
 
 
 
diff --git a/lab2/csrc/say_goodbye.c b/lab2/csrc/say_goodbye.c
index c605273..6848120 100644
--- a/lab2/csrc/say_goodbye.c
+++ b/lab2/csrc/say_goodbye.c
@@ -32,10 +32,10 @@ int main() {
       {
         uart_send_char(*p);
         p++;
-        waste_some_time(200);
+        waste_some_time(500);
       }
 
-      waste_some_time(400);
+      waste_some_time(500);
 
       break;  // print once, but pressing CPU reset can print again
     }
diff --git a/lab2/src/main/resources/say_goodbye.asmbin b/lab2/src/main/resources/say_goodbye.asmbin
index 05f0f0080561368f20a17b7b49fd8f28ec4f33ad..d72478c61d1885051b279afd586d0fdacdb76769 100644
GIT binary patch
delta 30
mcmaE$@IYaMACr)S{B#BehUX0oU-Cc1{}E<&kYAj@#0LPa{|cx8

delta 30
mcmaE$@IYaMACpi6&vXU`hUX0oU-Cc1{}E<okX)R=#0LPdQVNd%

diff --git a/lab2/src/main/scala/board/z710v1.3/Top.scala b/lab2/src/main/scala/board/z710v1.3/Top.scala
index 8744371..bd52382 100644
--- a/lab2/src/main/scala/board/z710v1.3/Top.scala
+++ b/lab2/src/main/scala/board/z710v1.3/Top.scala
@@ -35,14 +35,14 @@ class Top(binaryFilename: String = "say_goodbye.asmbin") extends Module {
   val mem = Module(new Memory(Parameters.MemorySizeInWords))
   // val hdmi_display = Module(new HDMIDisplay)
   // val display = Module(new CharacterDisplay)
-  // val timer = Module(new Timer)
+  val timer = Module(new Timer)
   val uart = Module(new Uart(frequency = clock_freq, baudRate = 115200)) // 31M or 32M is good, 33M more error
   val dummy = Module(new Dummy)
 
   // display.io.bundle <> dummy.io.bundle
   mem.io.bundle <> dummy.io.bundle
   mem.io.debug_read_address := 0.U
-  // timer.io.bundle <> dummy.io.bundle
+  timer.io.bundle <> dummy.io.bundle
   uart.io.bundle <> dummy.io.bundle
   io.tx := uart.io.txd
   uart.io.rxd := io.rx
@@ -63,10 +63,10 @@ class Top(binaryFilename: String = "say_goodbye.asmbin") extends Module {
 
   withClock(CPU_tick.asClock) {
     val cpu = Module(new CPU)
-    // cpu.io.interrupt_flag := Cat(uart.io.signal_interrupt, timer.io.signal_interrupt)
-    // cpu.io.csr_regs_debug_read_address := 0.U
-    // cpu.io.regs_debug_read_address := 0.U
-    cpu.io.debug_read_address := 0.U
+    cpu.io.interrupt_flag := Cat(uart.io.signal_interrupt, timer.io.signal_interrupt)
+    cpu.io.csr_regs_debug_read_address := 0.U
+    cpu.io.regs_debug_read_address := 0.U
+    // cpu.io.debug_read_address := 0.U
     // cpu.io.memory_bundle.read_data := 0.U
     cpu.io.instruction_valid := rom_loader.io.load_finished
     mem.io.instruction_address := cpu.io.instruction_address
diff --git a/lab2/vivado/z710/z710.xdc b/lab2/vivado/z710/z710.xdc
index c6e297d..e0301e8 100644
--- a/lab2/vivado/z710/z710.xdc
+++ b/lab2/vivado/z710/z710.xdc
@@ -10,7 +10,7 @@
 
 ##Clock signal
 set_property -dict {PACKAGE_PIN K17 IOSTANDARD LVCMOS33} [get_ports io_clock]
-create_clock -period 20.000 -name sys_clk_pin -waveform {0.000 10.000} -add [get_ports io_clock]
+create_clock -period 8.000 -name sys_clk_pin -waveform {0.000 4.000} -add [get_ports io_clock]
 
 
 
diff --git a/lab3/csrc/say_goodbye.c b/lab3/csrc/say_goodbye.c
index c605273..6848120 100644
--- a/lab3/csrc/say_goodbye.c
+++ b/lab3/csrc/say_goodbye.c
@@ -32,10 +32,10 @@ int main() {
       {
         uart_send_char(*p);
         p++;
-        waste_some_time(200);
+        waste_some_time(500);
       }
 
-      waste_some_time(400);
+      waste_some_time(500);
 
       break;  // print once, but pressing CPU reset can print again
     }
diff --git a/lab3/src/main/resources/say_goodbye.asmbin b/lab3/src/main/resources/say_goodbye.asmbin
index 05f0f0080561368f20a17b7b49fd8f28ec4f33ad..d72478c61d1885051b279afd586d0fdacdb76769 100644
GIT binary patch
delta 30
mcmaE$@IYaMACr)S{B#BehUX0oU-Cc1{}E<&kYAj@#0LPa{|cx8

delta 30
mcmaE$@IYaMACpi6&vXU`hUX0oU-Cc1{}E<okX)R=#0LPdQVNd%

diff --git a/lab4/csrc/say_goodbye.c b/lab4/csrc/say_goodbye.c
index c605273..6848120 100644
--- a/lab4/csrc/say_goodbye.c
+++ b/lab4/csrc/say_goodbye.c
@@ -32,10 +32,10 @@ int main() {
       {
         uart_send_char(*p);
         p++;
-        waste_some_time(200);
+        waste_some_time(500);
       }
 
-      waste_some_time(400);
+      waste_some_time(500);
 
       break;  // print once, but pressing CPU reset can print again
     }
diff --git a/lab4/src/main/resources/say_goodbye.asmbin b/lab4/src/main/resources/say_goodbye.asmbin
index 05f0f0080561368f20a17b7b49fd8f28ec4f33ad..d72478c61d1885051b279afd586d0fdacdb76769 100644
GIT binary patch
delta 30
mcmaE$@IYaMACr)S{B#BehUX0oU-Cc1{}E<&kYAj@#0LPa{|cx8

delta 30
mcmaE$@IYaMACpi6&vXU`hUX0oU-Cc1{}E<okX)R=#0LPdQVNd%