61c61
< for (int i = 0; i < MachineType_base_count(type); i++) {
---
> for (NodeID i = 0; i < MachineType_base_count(type); i++) {
70c70
< int num_bits)
---
> int num_bits, int cluster_id = 0)
74,75c74,77
< return mach;
< mach.num = addr.bitSelect(low_bit, low_bit + num_bits - 1);
---
> mach.num = cluster_id;
> else
> mach.num = addr.bitSelect(low_bit, low_bit + num_bits - 1)
> + (1 << num_bits) * cluster_id;