522a523,527
>
> src_reg_constructor = '\n\t_srcRegIdx[_numSrcRegs++] = RegId(%s, %s);'
> dst_reg_constructor = '\n\t_destRegIdx[_numDestRegs++] = RegId(%s, %s);'
>
>
523a529,530
> reg_class = 'IntRegClass'
>
535c542
< c_src = '\n\t_srcRegIdx[_numSrcRegs++] = %s;' % (self.reg_spec)
---
> c_src = src_reg_constructor % (self.reg_class, self.reg_spec)
541,542c548
< c_dest = '\n\t_destRegIdx[_numDestRegs++] = %s;' % \
< (self.reg_spec)
---
> c_dest = dst_reg_constructor % (self.reg_class, self.reg_spec)
594a601,602
> reg_class = 'FloatRegClass'
>
606,607c614
< c_src = '\n\t_srcRegIdx[_numSrcRegs++] = %s + FP_Reg_Base;' % \
< (self.reg_spec)
---
> c_src = src_reg_constructor % (self.reg_class, self.reg_spec)
610,612c617
< c_dest = \
< '\n\t_destRegIdx[_numDestRegs++] = %s + FP_Reg_Base;' % \
< (self.reg_spec)
---
> c_dest = dst_reg_constructor % (self.reg_class, self.reg_spec)
656a662,663
> reg_class = 'CCRegClass'
>
668,669c675
< c_src = '\n\t_srcRegIdx[_numSrcRegs++] = %s + CC_Reg_Base;' % \
< (self.reg_spec)
---
> c_src = src_reg_constructor % (self.reg_class, self.reg_spec)
675,677c681
< c_dest = \
< '\n\t_destRegIdx[_numDestRegs++] = %s + CC_Reg_Base;' % \
< (self.reg_spec)
---
> c_dest = dst_reg_constructor % (self.reg_class, self.reg_spec)
729a734,735
> reg_class = 'MiscRegClass'
>
741,743c747
< c_src = \
< '\n\t_srcRegIdx[_numSrcRegs++] = %s + Misc_Reg_Base;' % \
< (self.reg_spec)
---
> c_src = src_reg_constructor % (self.reg_class, self.reg_spec)
746,748c750
< c_dest = \
< '\n\t_destRegIdx[_numDestRegs++] = %s + Misc_Reg_Base;' % \
< (self.reg_spec)
---
> c_dest = dst_reg_constructor % (self.reg_class, self.reg_spec)