Adopt GDB sim changes

Just a few clean ups (insn name changes), and whitespace changes to align with GDB simulator.