kaholaz/TDT4255
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix jump!

Browse source
This commit is contained in:
Sebastian Bugge 2024-10-10 00:04:18 +02:00
parent 323e373d0e
commit 7b633f2a75
Signed by: kaholaz
GPG key ID: 2EFFEDEE03519691
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/Decoder.scala
View file

@ -87,7 +87,7 @@ class Decoder() extends Module {
// signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp // signal regWrite, memRead, memWrite, branch, jump, branchType, Op1Select, Op2Select, ImmSelect, ALUOp
JAL -> List(Y, N, N, Y, Y, branchType.jump, PC, imm, ImmFormat.JTYPE, ALUOps.ADD ), JAL -> List(Y, N, N, Y, Y, branchType.jump, PC, imm, ImmFormat.JTYPE, ALUOps.ADD ),
JALR -> List(Y, N, N, Y, Y, branchType.jump, rs1, imm, ImmFormat.JTYPE, ALUOps.ADDR ), JALR -> List(Y, N, N, Y, Y, branchType.jump, rs1, imm, ImmFormat.ITYPE, ALUOps.ADDR ),
) )

13
src/test/resources/tests/jump.s
View file

@ -1,11 +1,8 @@
main: main:
addi x2, x2, 4 jal x1, end
j loop addi x1, x1, 0
end:
done done
loop: end:
bge x1, x2, end jr x1
addi x1, x1, 1 addi x1, x1, 1
j loop

2
src/test/scala/Manifest.scala
View file

@ -19,7 +19,7 @@ import LogParser._
object Manifest { object Manifest {
val singleTest = "branch.s" val singleTest = "jump.s"
val nopPadded = true val nopPadded = true