Changeset 12c1eef for libcfa/src/device/cpu.cfa

Timestamp:

Jan 19, 2022, 2:36:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

97c215f

Parents:

5235d49 (diff), 6a33e40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/device/cpu.cfa (modified) (1 diff)

libcfa/src/device/cpu.cfa

@@ -427 +427 @@
                         unsigned c = pairings[i].cpu;
                         unsigned llc_id = pairings[i].id;
-                        unsigned width = maps[llc_id].raw->width;
                         unsigned start = maps[llc_id].start;
-                        unsigned self  = start + (maps[llc_id].count++);
-                        entries[c].count = width;
+                        entries[c].count = maps[llc_id].raw->width;
                         entries[c].start = start;
-                        entries[c].self  = self;
+                        entries[c].self  = start + (maps[llc_id].count++);
+                        entries[c].cache = llc_id;
                 }