chisel: Make code slightly more similar to master branch.
simulator: Fix decoding of two-register control flow instructions.