xin/ysyx-workbench
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

> configure(npc)

Browse source 
ysyx_22040000 李心杨
 Linux calcite 6.6.19 #1-NixOS SMP PREEMPT_DYNAMIC Fri Mar  1 12:35:11 UTC 2024 x86_64 GNU/Linux
  09:31:03  up   0:21,  2 users,  load average: 1.72, 1.48, 0.91
This commit is contained in:
tracer-ysyx 2024-03-09 09:31:03 +08:00 committed by xinyangli
parent 147014c8fa
commit dee37632f1
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
npc/core/src/main/scala/Main.scala
View file

@ -33,12 +33,9 @@ class Keyboard extends Module {
io.segs := seg_handler.io.segs io.segs := seg_handler.io.segs
} }
<<<<<<< Updated upstream
=======
class Flowpc extends Module { class Flowpc extends Module {
val io = IO(new Bundle { }) val io = IO(new Bundle { })
val register_file = new RegisterFile(readPorts = 2); val register_file = new RegisterFile(readPorts = 2);
val pc = new ProgramCounter(32); val pc = new ProgramCounter(32);
val adder = new SRAM() val adder = new SRAM()
} }
>>>>>>> Stashed changes