Merge branch 'master' of https://git.williammiceli.systems/williammiceli-wmu/ece3570-lab2

Browse Source

# Conflicts:
#	lab2CA.sim/sim_1/behav/xsim/xsim.dir/CPU9bits_tb_behav/webtalk/xsim_webtalk.tcl
#	lab2CA.sim/sim_1/behav/xsim/xsim.dir/CPU9bits_tb_behav/xsim.mem
#	lab2CA.srcs/sources_1/new/dataMemory.v
#	lab2CA.srcs/sources_1/new/instructionMemory.v
#	lab2CA.xpr

...

This commit is contained in:

Johannes

2019-03-24 17:08:42 -04:00

parent 03df69372a 8e72409386

commit 033e606d5d

5 changed files with 230 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

lab2CA.sim/sim_1/behav/xsim/xelab.pb

Binary file not shown.

BIN

lab2CA.sim/sim_1/behav/xsim/xvlog.pb

Binary file not shown.