modify src/emulator/Makefile to generate instr-data.c (missed rm)
Merge branch 'master-clean'