minor busybear fixes

This commit is contained in:
Noah Boorstin 2021-04-26 13:24:39 -04:00
parent 0850c18cb7
commit ee628e388a
2 changed files with 2 additions and 15 deletions

View File

@ -35,7 +35,8 @@ vopt +acc work.testbench -o workopt
vsim workopt -suppress 8852,12070
do ./wave-dos/peripheral-waves.do
#do ./wave-dos/peripheral-waves.do
do ./wave-dos/busybear-waves.do
#-- Run the Simulation
run -all

View File

@ -1,21 +1,7 @@
`include "wally-config.vh"
// *** Noah please check which way you need to fix the merge conflict.
// Ross was not sure.
// merge conflict main
module testbench();
/* -----\/----- EXCLUDED -----\/-----
// merge conflict icache-almost-ready
package ahbliteState;
typedef enum {IDLE, MEMREAD, MEMWRITE, INSTRREAD, INSTRREADC, ATOMICREAD, ATOMICWRITE, MMUTRANSLATE} statetype;
endpackage
module testbench_busybear();
-----/\----- EXCLUDED -----/\----- */
logic clk, reset;
logic [31:0] GPIOPinsIn;
logic [31:0] GPIOPinsOut, GPIOPinsEn;