From 2347820b2213ee830686e4d34069f8f8d2a68fe2 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Thu, 14 Mar 2024 21:48:59 +0000 Subject: [PATCH] [vm/cpuid] Fix number of info bytes printed. Bug: https://github.com/flutter/flutter/issues/140138 Change-Id: I2624451c8ef5e6f7af7a1855fc16a976cfe6dad3 TEST=manually Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/357743 Reviewed-by: Ryan Macnak Commit-Queue: Alexander Aprelev --- runtime/vm/cpuid.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/runtime/vm/cpuid.cc b/runtime/vm/cpuid.cc index f1463bf43bc..b9bcd3603e0 100644 --- a/runtime/vm/cpuid.cc +++ b/runtime/vm/cpuid.cc @@ -42,11 +42,12 @@ static void GetCpuId(int32_t level, uint32_t info[4]) { } void CpuId::Init() { - uint32_t info[4] = {static_cast(-1)}; + const int info_length = 4; + uint32_t info[info_length] = {static_cast(-1)}; GetCpuId(0, info); if (FLAG_trace_cpuid) { - for (intptr_t i = 0; i < 3; i++) { + for (intptr_t i = 0; i < info_length; i++) { OS::PrintErr("cpuid(0) info[%" Pd "]: %0x\n", i, info[i]); } } @@ -64,7 +65,7 @@ void CpuId::Init() { GetCpuId(1, info); if (FLAG_trace_cpuid) { - for (intptr_t i = 0; i < 3; i++) { + for (intptr_t i = 0; i < info_length; i++) { OS::PrintErr("cpuid(1) info[%" Pd "]: %0x\n", i, info[i]); } } @@ -79,7 +80,7 @@ void CpuId::Init() { GetCpuId(0x80000001, info); if (FLAG_trace_cpuid) { - for (intptr_t i = 0; i < 3; i++) { + for (intptr_t i = 0; i < info_length; i++) { OS::PrintErr("cpuid(0x80000001) info[%" Pd "]: %0x\n", i, info[i]); } } @@ -95,7 +96,7 @@ void CpuId::Init() { for (uint32_t i = 0; i < 2; i++) { GetCpuId(0x80000002U + i, info); if (FLAG_trace_cpuid) { - for (intptr_t j = 0; j < 3; j++) { + for (intptr_t j = 0; j < info_length; j++) { OS::PrintErr("cpuid(0x80000002U + %u) info[%" Pd "]: %0x\n", i, j, info[j]); }