yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-08-04 04:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Introduce X86CPUTopoInfo structure for argument simplification

Browse source 
In order to simplify arguments of function, introduce a new struct
named X86CPUTopoInfo.

Backports commit ed256144cd6f0ca2ff59fc3fc8dca547506f433b from qemu
This commit is contained in:
Chen Fan 2018-02-23 10:58:36 -05:00 committed by Lioncash
parent 576f1752a6
commit d0621f1852
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
qemu/target-i386/topology.h
View file

@ -47,6 +47,12 @@
*/ */
typedef uint32_t apic_id_t; typedef uint32_t apic_id_t;
typedef struct X86CPUTopoInfo {
unsigned pkg_id;
unsigned core_id;
unsigned smt_id;
} X86CPUTopoInfo;
/* Return the bit width needed for 'count' IDs /* Return the bit width needed for 'count' IDs
*/ */
static unsigned apicid_bitwidth_for_count(unsigned count) static unsigned apicid_bitwidth_for_count(unsigned count)
@ -92,13 +98,11 @@ static inline unsigned apicid_pkg_offset(unsigned nr_cores, unsigned nr_threads)
*/ */
static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores, static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores,
unsigned nr_threads, unsigned nr_threads,
unsigned pkg_id, const X86CPUTopoInfo *topo)
unsigned core_id,
unsigned smt_id)
{ {
return (pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) | return (topo->pkg_id << apicid_pkg_offset(nr_cores, nr_threads)) |
(core_id << apicid_core_offset(nr_cores, nr_threads)) | (topo->core_id << apicid_core_offset(nr_cores, nr_threads)) |
smt_id; topo->smt_id;
} }
/* Calculate thread/core/package IDs for a specific topology, /* Calculate thread/core/package IDs for a specific topology,
@ -107,14 +111,12 @@ static inline apic_id_t apicid_from_topo_ids(unsigned nr_cores,
static inline void x86_topo_ids_from_idx(unsigned nr_cores, static inline void x86_topo_ids_from_idx(unsigned nr_cores,
unsigned nr_threads, unsigned nr_threads,
unsigned cpu_index, unsigned cpu_index,
unsigned *pkg_id, X86CPUTopoInfo *topo)
unsigned *core_id,
unsigned *smt_id)
{ {
unsigned core_index = cpu_index / nr_threads; unsigned core_index = cpu_index / nr_threads;
*smt_id = cpu_index % nr_threads; topo->smt_id = cpu_index % nr_threads;
*core_id = core_index % nr_cores; topo->core_id = core_index % nr_cores;
*pkg_id = core_index / nr_cores; topo->pkg_id = core_index / nr_cores;
} }
/* Make APIC ID for the CPU 'cpu_index' /* Make APIC ID for the CPU 'cpu_index'
@ -125,10 +127,9 @@ static inline apic_id_t x86_apicid_from_cpu_idx(unsigned nr_cores,
unsigned nr_threads, unsigned nr_threads,
unsigned cpu_index) unsigned cpu_index)
{ {
unsigned pkg_id, core_id, smt_id; X86CPUTopoInfo topo;
x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, x86_topo_ids_from_idx(nr_cores, nr_threads, cpu_index, &topo);
&pkg_id, &core_id, &smt_id); return apicid_from_topo_ids(nr_cores, nr_threads, &topo);
return apicid_from_topo_ids(nr_cores, nr_threads, pkg_id, core_id, smt_id);
} }
#endif /* TARGET_I386_TOPOLOGY_H */ #endif /* TARGET_I386_TOPOLOGY_H */