From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 110569 invoked by alias); 7 Oct 2019 19:55:36 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 110554 invoked by uid 9996); 7 Oct 2019 19:55:35 -0000 Date: Mon, 07 Oct 2019 19:55:00 -0000 Message-ID: <20191007195535.110553.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] fhandler_proc.cc(format_proc_cpuinfo): add microcode X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/master X-Git-Oldrev: 9682c25bb32df1428e4469b457034e87f199a3c8 X-Git-Newrev: b8ccc22762285dac75261d2beae778e6c460ce71 X-SW-Source: 2019-q4/txt/msg00006.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b8ccc22762285dac75261d2beae778e6c460ce71 commit b8ccc22762285dac75261d2beae778e6c460ce71 Author: Brian Inglis Date: Mon Oct 7 10:23:03 2019 -0600 fhandler_proc.cc(format_proc_cpuinfo): add microcode Add microcode from Windows registry Update Revision REG_BINARY. Diff: --- winsup/cygwin/fhandler_proc.cc | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 8c290d2..51bbdc4 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -687,16 +687,30 @@ format_proc_cpuinfo (void *, char *&destbuf) yield (); DWORD cpu_mhz = 0; - RTL_QUERY_REGISTRY_TABLE tab[2] = { - { NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOSTRING, - L"~Mhz", &cpu_mhz, REG_NONE, NULL, 0 }, - { NULL, 0, NULL, NULL, 0, NULL, 0 } - }; + union + { + LONG uc_len; /* -max size of buffer before call */ + char uc_microcode[16]; + } uc; + RTL_QUERY_REGISTRY_TABLE tab[3] = + { + { NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOSTRING, + L"~Mhz", &cpu_mhz, REG_NONE, NULL, 0 }, + { NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOSTRING, + L"Update Revision", &uc, REG_NONE, NULL, 0 }, + { NULL, 0, NULL, NULL, 0, NULL, 0 } + }; + + memset (&uc, 0, sizeof (uc.uc_microcode)); + uc.uc_len = -16; /* -max size of microcode buffer */ RtlQueryRegistryValues (RTL_REGISTRY_ABSOLUTE, cpu_key, tab, NULL, NULL); cpu_mhz = ((cpu_mhz - 1) / 10 + 1) * 10; /* round up to multiple of 10 */ DWORD bogomips = cpu_mhz * 2; /* bogomips is double cpu MHz since MMX */ + long long microcode = 0; /* at least 8 bytes for AMD */ + memcpy (µcode, &uc, sizeof (microcode)); + bufptr += __small_sprintf (bufptr, "processor\t: %d\n", cpu_number); uint32_t maxf, vendor_id[4], unused; @@ -789,11 +803,13 @@ format_proc_cpuinfo (void *, char *&destbuf) "model\t\t: %d\n" "model name\t: %s\n" "stepping\t: %d\n" + "microcode\t: 0x%x\n" "cpu MHz\t\t: %d.000\n", family, model, in_buf.s + strspn (in_buf.s, " "), stepping, + microcode, cpu_mhz); if (cache_size >= 0)