update 1204

update 1204
Merge remote-tracking branch 'origin/master'

Conflicts:
	src-P6/ALU.v
	src-P6/CMP.v
	src-P6/DM.v
	src-P6/MUL_DIV.v
	src-P6/P6.xise
	src-P6/_xmsgs/pn_parser.xmsgs
	src-P6/head.v
	src-P6/iseconfig/P6.projectmgr
	src-P6/mips.v