71,74d70
< public:
<
< typedef TheISA::RegIndex RegIndex;
<
155c151
< * register class (e.g., rename()) take unified register indices,
---
> * register class (e.g., rename()) take register ids,
157c153
< * take relative register indices. See http://gem5.org/Register_Indexing.
---
> * take register indices.
182d177
< typedef TheISA::RegIndex RegIndex;
200,201c195,196
< * the specified architectural register. This version takes a
< * unified flattened architectural register index and calls the
---
> * the specified architectural register. This version takes a
> * flattened architectural register id and calls the
203c198
< * @param arch_reg The unified architectural register index to remap.
---
> * @param arch_reg The architectural register index to remap.
207c202
< RenameInfo rename(RegIndex arch_reg);
---
> RenameInfo rename(RegId arch_reg);
210c205
< * Perform rename() on an integer register, given a relative
---
> * Perform rename() on an integer register, given a
221c216
< * Perform rename() on a floating-point register, given a relative
---
> * Perform rename() on a floating-point register, given a
232c227
< * Perform rename() on a condition-code register, given a relative
---
> * Perform rename() on a condition-code register, given a
243c238
< * Perform rename() on a misc register, given a relative
---
> * Perform rename() on a misc register, given a
259c254
< * This version takes a unified flattened architectural register index
---
> * This version takes a flattened architectural register id
261c256
< * @param arch_reg The unified architectural register to look up.
---
> * @param arch_reg The architectural register to look up.
264c259
< PhysRegIndex lookup(RegIndex arch_reg) const;
---
> PhysRegIndex lookup(RegId arch_reg) const;
267c262
< * Perform lookup() on an integer register, given a relative
---
> * Perform lookup() on an integer register, given a
278c273
< * Perform lookup() on a floating-point register, given a relative
---
> * Perform lookup() on a floating-point register, given a
289c284
< * Perform lookup() on a condition-code register, given a relative
---
> * Perform lookup() on a condition-code register, given a
314c309
< * unified flattened architectural register index and calls the
---
> * flattened architectural register id and calls the
316c311
< * @param arch_reg The unified architectural register to remap.
---
> * @param arch_reg The architectural register to remap.
319c314
< void setEntry(RegIndex arch_reg, PhysRegIndex phys_reg);
---
> void setEntry(RegId arch_reg, PhysRegIndex phys_reg);
322c317
< * Perform setEntry() on an integer register, given a relative
---
> * Perform setEntry() on an integer register, given a
332c327
< * Perform setEntry() on a floating-point register, given a relative
---
> * Perform setEntry() on a floating-point register, given a
342c337
< * Perform setEntry() on a condition-code register, given a relative
---
> * Perform setEntry() on a condition-code register, given a