Skip to content

Commit f818917

Browse files
arghunterarghunter
committed
merge doom
2 parents ee4040c + 9f3f1cc commit f818917

19 files changed

Lines changed: 1170 additions & 768509 deletions

‎RISC-V-Scaffold-Basys3/RISC-V-Scaffold-Basys3.xpr‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,46 @@
9898
<Attr Name="UsedIn" Val="simulation"/>
9999
</FileInfo>
100100
</File>
101+
<File Path="$PPRDIR/../generated/UartRx.sv">
102+
<FileInfo>
103+
<Attr Name="AutoDisabled" Val="1"/>
104+
<Attr Name="UsedIn" Val="synthesis"/>
105+
<Attr Name="UsedIn" Val="implementation"/>
106+
<Attr Name="UsedIn" Val="simulation"/>
107+
</FileInfo>
108+
</File>
109+
<File Path="$PPRDIR/../generated/obj_dir/VMain.h">
110+
<FileInfo>
111+
<Attr Name="AutoDisabled" Val="1"/>
112+
<Attr Name="UsedIn" Val="synthesis"/>
113+
<Attr Name="UsedIn" Val="simulation"/>
114+
<Attr Name="IsVisible" Val="1"/>
115+
</FileInfo>
116+
</File>
117+
<File Path="$PPRDIR/../generated/obj_dir/VMain__pch.h">
118+
<FileInfo>
119+
<Attr Name="AutoDisabled" Val="1"/>
120+
<Attr Name="UsedIn" Val="synthesis"/>
121+
<Attr Name="UsedIn" Val="simulation"/>
122+
<Attr Name="IsVisible" Val="1"/>
123+
</FileInfo>
124+
</File>
125+
<File Path="$PPRDIR/../generated/obj_dir/VMain__Syms.h">
126+
<FileInfo>
127+
<Attr Name="AutoDisabled" Val="1"/>
128+
<Attr Name="UsedIn" Val="synthesis"/>
129+
<Attr Name="UsedIn" Val="simulation"/>
130+
<Attr Name="IsVisible" Val="1"/>
131+
</FileInfo>
132+
</File>
133+
<File Path="$PPRDIR/../generated/obj_dir/VMain___024root.h">
134+
<FileInfo>
135+
<Attr Name="AutoDisabled" Val="1"/>
136+
<Attr Name="UsedIn" Val="synthesis"/>
137+
<Attr Name="UsedIn" Val="simulation"/>
138+
<Attr Name="IsVisible" Val="1"/>
139+
</FileInfo>
140+
</File>
101141
<File Path="$PSRCDIR/sources_1/ip/clk_wiz_0/clk_wiz_0.xci">
102142
<FileInfo>
103143
<Attr Name="UsedIn" Val="synthesis"/>
@@ -119,7 +159,14 @@
119159
<Attr Name="UsedIn" Val="simulation"/>
120160
</FileInfo>
121161
</File>
122-
<File Path="$PPRDIR/../generated/ALU.sv">
162+
<File Path="$PPRDIR/../generated/Core.sv">
163+
<FileInfo>
164+
<Attr Name="UsedIn" Val="synthesis"/>
165+
<Attr Name="UsedIn" Val="implementation"/>
166+
<Attr Name="UsedIn" Val="simulation"/>
167+
</FileInfo>
168+
</File>
169+
<File Path="$PPRDIR/../generated/DecodeStage.sv">
123170
<FileInfo>
124171
<Attr Name="UsedIn" Val="synthesis"/>
125172
<Attr Name="UsedIn" Val="implementation"/>
@@ -210,6 +257,13 @@
210257
<Attr Name="UsedIn" Val="simulation"/>
211258
</FileInfo>
212259
</File>
260+
<File Path="$PPRDIR/../generated/ReadStage.sv">
261+
<FileInfo>
262+
<Attr Name="UsedIn" Val="synthesis"/>
263+
<Attr Name="UsedIn" Val="implementation"/>
264+
<Attr Name="UsedIn" Val="simulation"/>
265+
</FileInfo>
266+
</File>
213267
<File Path="$PPRDIR/../generated/Registers.sv">
214268
<FileInfo>
215269
<Attr Name="UsedIn" Val="synthesis"/>

‎build.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@ echo "Converting to binary..."
2222
echo "Converting to hex..."
2323
python convert.py "$BIN" "$HEX" || exit 1
2424
echo "Loading program..."
25+
<<<<<<< HEAD
2526
python load_program.py "$HEX" --port /dev/ttyUSB1
2627
echo "Cleaning up..."
2728
rm -f "$OBJ" "$ELF" "$BIN" #"$HEX"
2829
echo "Done."
30+
=======
31+
python load_program.py "$HEX" --port /dev/ttyUSB3
32+
echo "Cleaning up..."
33+
rm -f "$OBJ" "$ELF" "$BIN" #"$HEX"
34+
echo "Done."
35+
>>>>>>> 9f3f1ccb74f58cfae7e2055ad46a2933e7b06a25

‎disabled-tests/MainSpec.scala‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
package RISCV
2+
3+
import chisel3._
4+
import chisel3.simulator.scalatest.ChiselSim
5+
import org.scalatest.freespec.AnyFreeSpec
6+
import org.scalatest.matchers.must.Matchers
7+
import scala.io.Source
8+
import java.nio.file.{Files, Paths}
9+
import java.nio.ByteBuffer
10+
import chisel3.simulator.PeekPokeAPI.TestableRecord
11+
12+
class MainSpec extends AnyFreeSpec with Matchers with ChiselSim {
13+
"Main should execute Store and Load Instructions correctly" in {
14+
simulate(new Main()) { dut =>
15+
// Load hex file, one instruction per line
16+
val instructions = Source
17+
.fromFile("./programs/hello.hex")
18+
.getLines()
19+
.filter(_.trim.nonEmpty)
20+
.map(line => java.lang.Long.parseLong(line.trim, 16))
21+
.toSeq
22+
23+
dut.io.debug_write.poke(true.B)
24+
25+
instructions.zipWithIndex.foreach { case (instr, idx) =>
26+
dut.io.debug_write_address.poke(idx.U)
27+
dut.io.debug_write_data.poke(instr.U(32.W))
28+
dut.clock.step(1)
29+
}
30+
31+
dut.io.debug_write.poke(false.B)
32+
dut.clock.step(1)
33+
34+
dut.io.execute.poke(true.B)
35+
dut.clock.step(64)
36+
}
37+
}
38+
39+
// "Main should execute Store and Load Instructions correctly" in {
40+
// simulate(new Main()) { dut =>
41+
// dut.io.debug_write.poke(true.B)
42+
43+
// dut.io.debug_write_address.poke(0.U)
44+
// dut.io.debug_write_data.poke(0x00004137L.U)
45+
// dut.clock.step(1)
46+
47+
// dut.io.debug_write_address.poke(1.U)
48+
// dut.io.debug_write_data.poke(0x000041b7L.U)
49+
// dut.clock.step(1)
50+
51+
// dut.io.debug_write_address.poke(2.U)
52+
// dut.io.debug_write_data.poke(0x00408093L.U)
53+
// dut.clock.step(1)
54+
55+
// dut.io.debug_write_address.poke(3.U)
56+
// dut.io.debug_write_data.poke(0x00218133L.U)
57+
// dut.clock.step(1)
58+
59+
// dut.io.debug_write_address.poke(4.U)
60+
// dut.io.debug_write_data.poke(0x00110023L.U)
61+
// dut.clock.step(1)
62+
63+
// dut.io.debug_write_address.poke(5.U)
64+
// dut.io.debug_write_data.poke(0xff5ff06fL.U)
65+
// dut.clock.step(1)
66+
67+
// // dut.io.debug_write_address.poke(0.U)
68+
// // dut.io.debug_write_data.poke(0b000000000111_00000_000_00001_0010011.U) // ADDI
69+
// // dut.clock.step(1)
70+
71+
// // dut.io.debug_write_address.poke(1.U)
72+
// // dut.io.debug_write_data.poke(0b0000000_00001_00000_010_00000_0100011.U) // SW
73+
// // dut.clock.step(1)
74+
75+
// // dut.io.debug_write_address.poke(2.U)
76+
// // dut.io.debug_write_data.poke(0b000000000000_00000_010_00010_0000011.U) // LW
77+
// // dut.clock.step(1)
78+
79+
// dut.io.debug_write.poke(false.B)
80+
// dut.clock.step(1)
81+
82+
// dut.io.execute.poke(true.B)
83+
// dut.clock.step(24)
84+
// }
85+
// }
86+
}

‎programs/hello.c‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int main() {
3939
int ballY = 120;
4040
int dX = 1;
4141
int dY = 1;
42-
42+
4343
for (int i = 0; i < 320; i++) {
4444
frame[i] = 0xFF;
4545
frame[239 * 320 + i] = 0xFF;
@@ -133,6 +133,13 @@ int main() {
133133
for (int y = -20; y <= 20; y++) {
134134
frame[320 * (paddY2 + y) + 299 + x] = 0xE0;
135135
}
136+
<<<<<<< HEAD
137+
=======
138+
}
139+
140+
for (int i = 0; i < 8000; i++) {
141+
__asm__ volatile("nop");
142+
>>>>>>> 9f3f1ccb74f58cfae7e2055ad46a2933e7b06a25
136143
}
137144
*uart_tx = 'a';
138145
while (*timer - ctime < 8000) {

0 commit comments

Comments
 (0)