Fix register mapping in macro assembler