96,98c96,98
< uint8_t _scale, RegIndex _index, RegIndex _base,
< uint64_t _disp, uint8_t _segment,
< RegIndex _data,
---
> uint8_t _scale, InstRegIndex _index, InstRegIndex _base,
> uint64_t _disp, InstRegIndex _segment,
> InstRegIndex _data,
104,106c104,106
< scale(_scale), index(_index), base(_base),
< disp(_disp), segment(_segment),
< data(_data),
---
> scale(_scale), index(_index.idx), base(_base.idx),
> disp(_disp), segment(_segment.idx),
> data(_data.idx),
108c108
< memFlags(_memFlags | _segment)
---
> memFlags(_memFlags | _segment.idx)
109a110
> assert(_segment.idx < NUM_SEGMENTREGS);