Changeset 7042c60 for libcfa/src/device

Timestamp:

Apr 25, 2024, 3:48:17 PM (21 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

eb7586e

Parents:

cf191ac (diff), 55c97e4 (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:

resolve conflict

File:

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

libcfa/src/device/cpu.cfa

@@ -239 +239 @@
 // Returns a 2D array of instances of size [cpu count][cache levels]
 // where cache level doesn't include instruction caches
-raw_cache_instance ** build_raw_cache_table(unsigned cpus_c, idx_range_t cpus, unsigned idxs, unsigned cache_levels)
-{
+raw_cache_instance ** build_raw_cache_table(unsigned cpus_c, idx_range_t cpus, unsigned idxs, unsigned cache_levels) {
         raw_cache_instance ** raw = alloc(cpus_c, '\0'`fill);