Merge branch 'master' of github.com:ucb-bar/riscv-isa-sim into confprec