diff options
| author | Marat Dukhan <maratek@gmail.com> | 2018-03-18 00:29:39 -0700 |
|---|---|---|
| committer | Marat Dukhan <maratek@gmail.com> | 2018-03-18 00:29:39 -0700 |
| commit | 290006082ca0522887773ba9e9830cc229dd0d0e (patch) | |
| tree | e68b549d69d7c2a784a0fa5cc89d558ae0f738b6 /src | |
| parent | d51d39562ddd560bf2b9da324f423be8068c53b4 (diff) | |
| download | cpuinfo-290006082ca0522887773ba9e9830cc229dd0d0e.tar.gz | |
Fix small issues in x86 initialization code
Diffstat (limited to 'src')
| -rw-r--r-- | src/x86/linux/init.c | 3 | ||||
| -rw-r--r-- | src/x86/windows/init.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/x86/linux/init.c b/src/x86/linux/init.c index eff9339..b54f533 100644 --- a/src/x86/linux/init.c +++ b/src/x86/linux/init.c @@ -236,10 +236,11 @@ void cpuinfo_x86_linux_init(void) { } packages = calloc(packages_count, sizeof(struct cpuinfo_package)); if (packages == NULL) { - cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" cores", + cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" physical packages", packages_count * sizeof(struct cpuinfo_package), packages_count); goto cleanup; } + if (l1i_count != 0) { l1i = calloc(l1i_count, sizeof(struct cpuinfo_cache)); if (l1i == NULL) { diff --git a/src/x86/windows/init.c b/src/x86/windows/init.c index 7767944..40bc25a 100644 --- a/src/x86/windows/init.c +++ b/src/x86/windows/init.c @@ -286,7 +286,7 @@ BOOL CALLBACK cpuinfo_x86_windows_init(PINIT_ONCE init_once, PVOID parameter, PV packages = HeapAlloc(heap, HEAP_ZERO_MEMORY, packages_count * sizeof(struct cpuinfo_package)); if (packages == NULL) { - cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" packages", + cpuinfo_log_error("failed to allocate %zu bytes for descriptions of %"PRIu32" physical packages", packages_count * sizeof(struct cpuinfo_package), packages_count); goto cleanup; } @@ -300,7 +300,7 @@ BOOL CALLBACK cpuinfo_x86_windows_init(PINIT_ONCE init_once, PVOID parameter, PV (struct cpuinfo_core*) ((uintptr_t) cores + (uintptr_t) processor->core); processor->core = core; struct cpuinfo_package* package = - (struct cpuinfo_package*) ((uintptr_t)packages + (uintptr_t)processor->package); + (struct cpuinfo_package*) ((uintptr_t) packages + (uintptr_t) processor->package); processor->package = package; /* This can be overwritten by lower-index processors on the same package */ |