fix core_id computation when coreMaskWidth = 0

rdementi · rdementi · commit 7f2ccb21c302 · 2025-12-03T15:00:49.000+01:00
Change-Id: I3181be791f517a15e4ca0a937b0ca4675419ea9f
diff --git a/src/topologyentry.h b/src/topologyentry.h
@@ -118,7 +118,7 @@ inline void fillEntry(TopologyEntry & entry, const uint32 & smtMaskWidth, const
 {
     DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id);
     entry.thread_id = smtMaskWidth ? extract_bits_32(apic_id, 0, smtMaskWidth - 1) : 0;
-    entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
+    entry.core_id = coreMaskWidth ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
     entry.socket_id = extract_bits_32(apic_id, smtMaskWidth + coreMaskWidth, 31);
     entry.tile_id = extract_bits_32(apic_id, l2CacheMaskShift, 31);
     entry.socket_unique_core_id = entry.core_id;

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ inline void fillEntry(TopologyEntry & entry, const uint32 & smtMaskWidth, const`
`118`	`118`	`{`
`119`	`119`	`DBG(1, "entry.os_id = ", entry.os_id, " apic_id = ", apic_id);`
`120`	`120`	`entry.thread_id = smtMaskWidth ? extract_bits_32(apic_id, 0, smtMaskWidth - 1) : 0;`
`121`		`- entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;`
	`121`	`+ entry.core_id = coreMaskWidth ? extract_bits_32(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;`
`122`	`122`	`entry.socket_id = extract_bits_32(apic_id, smtMaskWidth + coreMaskWidth, 31);`
`123`	`123`	`entry.tile_id = extract_bits_32(apic_id, l2CacheMaskShift, 31);`
`124`	`124`	`entry.socket_unique_core_id = entry.core_id;`