This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Rocco, Kaitlyn, Kim, David Lab 3 submission#22

Open

rdiverdi wants to merge 109 commits intoCompArchFA17:masterfrom

davpapp:rocco_dev

Commits on Nov 5, 2017

creating work plan
dpapp
committed
finished work plan
dpapp
committed

Commits on Nov 6, 2017

Worked on IF stage
KaitlynKeil
committed
Made a variably-sized dff
KaitlynKeil
committed
added two input 32 bit adder with overflow flag for program counter
rdiverdi
committed
Merge pull request #1 from KaitlynKeil/master
KaitlynKeil
authored

Commits on Nov 7, 2017

Commits on Nov 8, 2017

added dm
kwinter213
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
kwinter213
committed
Trying to fix ifetch; not fully done
KaitlynKeil
committed
Fixing merge conflicts
KaitlynKeil
committed
Added case statement things
KaitlynKeil
committed
Fixed the ifetch
KaitlynKeil
committed
Committing some top module changes
kwinter213
committed

Commits on Nov 9, 2017

Changed some formatting
KaitlynKeil
committed
Formatting, fixing R decode for funct
KaitlynKeil
committed
setup control with the correct inputs and op-code values
rdiverdi
committed
OMerge branch 'master' of https://github.com/KaitlynKeil/Lab3
rdiverdi
committed
coded in control signals to control.v
rdiverdi
committed
Adding a test file for control, in middle of debugging
KaitlynKeil
committed
fixed the test for the controller
rdiverdi
committed
Control module (and test) completed
KaitlynKeil
committed
Testing for instruction decode DONE
dpapp
committed
Merge branch 'master' of github.com:davpapp/Lab3
dpapp
committed
adding register and all tests for it
dpapp
committed
a few changes
kwinter213
committed
adding all tests for ALU
dpapp
committed
some changes? Hopefully this works
kwinter213
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
kwinter213
committed
Comments in CPU
dpapp
committed
comments in cpu
dpapp
committed
Updated the test, tried to fix a few things
KaitlynKeil
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
KaitlynKeil
committed
Fixed a numbering system error
KaitlynKeil
committed

Commits on Nov 13, 2017

Commits on Nov 14, 2017

Working on assembly test
KaitlynKeil
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
KaitlynKeil
committed
Updating structure
KaitlynKeil
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
kwinter213
committed
Made the multiplier work
KaitlynKeil
committed
Updated a few things, theoretically made JAL and JR work
KaitlynKeil
committed
Made SW work better potentially?
KaitlynKeil
committed
Changed a thing so that this works
KaitlynKeil
committed
Finished the assembly test
KaitlynKeil
committed

Commits on Nov 15, 2017

Attempting to add the rt/rd mux
KaitlynKeil
committed
Also, making a new memory module
KaitlynKeil
committed
for pull
dpapp
committed
fixed merge conflict
dpapp
committed

Commits on Nov 16, 2017

fixing merge conflicts
kwinter213
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
kwinter213
committed
switching ALUS
kwinter213
committed
updated ALU with zero flag
kwinter213
committed
figuring out conflicts between includes
dpapp
committed
fixed hex char problem
dpapp
committed
updates while I quickly launder
kwinter213
committed
fixed errors in CPUcontrol
dpapp
committed
fixed cpucontrol
dpapp
committed
currently compiling cpu
kwinter213
committed
makefile experimentation
dpapp
committed
pushing data and text file
dpapp
committed
Merge branch 'master' into dpapp
David Papp
authored
Merge branch 'master' into dpapp
David Papp
authored
Merge pull request #3 from davpapp/dpapp
David Papp
authored
changed read file name
dpapp
committed
Revert "currently compiling cpu"
dpapp
committed
commiting these
dpapp
committed
merged
dpapp
committed
I put some stuff about getting data from files into memory, and it compiles, not sure if this is actually working or where to look for the output
rdiverdi
committed
fixed merge conflicts
rdiverdi
committed
fixed cpu
kwinter213
committed
Testing CPU
KaitlynKeil
committed
Fixed a little bit for ifetch branching
KaitlynKeil
committed
Adding the tex file
KaitlynKeil
committed
ALU AND EXEC DO THINGS GOOD
kwinter213
committed
stuff and ALU
kwinter213
committed

Commits on Nov 17, 2017

Trying to save my work
KaitlynKeil
committed
Merge branch 'master' of https://github.com/davpapp/Lab3
KaitlynKeil
committed
Fixed some register/timing issues
KaitlynKeil
committed
Added the initialization
KaitlynKeil
committed
Updating Rd/Rt, broke everything
KaitlynKeil
committed
Adding a clock edge back to register
KaitlynKeil
committed
Changed regfile to pos and neg edge clock
KaitlynKeil
committed
fixed a branching error and changed the memory back to write only on falling edge
rdiverdi
committed
working through some bugs
rdiverdi
committed

Commits on Nov 19, 2017

Trying to make things work and making things read on pos edge
KaitlynKeil
committed

Commits on Nov 28, 2017

added PDF of report
rdiverdi
committed