move instr to simplify sm
Merge branch 'master' into josa
rtl encoder working