[v0.98] Print OS in debug mode. Closes #86

CONTRIBUTING.md

@@ -0,0 +1,51 @@
+# cpufetch contributing guidelines
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [Creating a pull request](#creating-a-pull-request)
+  - [Case 1: I found a bug in cpufetch](#case-1-i-found-a-bug-in-cpufetch)
+  - [Case 2: I have an idea for a new feature in cpufetch / I want to suggest a change in cpufetch](#case-2-i-have-an-idea-for-a-new-feature-in-cpufetch--i-want-to-suggest-a-change-in-cpufetch)
+  - [Case 3: I want to make changes to the Makefile](#case-3-i-want-to-make-changes-to-the-makefile)
+- [Creating an issue](#creating-an-issue)
+  - [cpufetch fails / crashes with a segmentation fault / ends without any output](#cpufetch-fails--crashes-with-a-segmentation-fault--ends-without-any-output)
+    - [Option 1 (best)](#option-1-best)
+    - [Option 2 (use this option if you can't work with option 1)](#option-2-use-this-option-if-you-cant-work-with-option-1)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+## Creating a pull request
+
+Thanks for your interest in contributing to cpufetch!
+
+What kind of contribution are you going to propose?
+
+### Case 1: I found a bug in cpufetch
+If you found a bug, please don't open a pull request; open an issue instead, even if you know the solution. I appreciate people finding bugs, but I generally prefer to fix them myself.
+
+### Case 2: I have an idea for a new feature in cpufetch / I want to suggest a change in cpufetch
+Great! Make a PR and make sure to explain how did you implement your new feature on the github conversation page.
+
+### Case 3: I want to make changes to the Makefile
+Don't open a pull request; open an issue instead and suggest your changes in the Makefile there. Except for extraordinary cases, I will not accept changes in the Makefile.
+
+## Creating an issue
+
+If you are going to report a bug or problem, always report the CPU model and OS. If possible, also paste the output of `cpufetch` and `cpufetch --debug`.
+
+### cpufetch fails / crashes with a segmentation fault / ends without any output
+You need to provide additional information in the github issue:
+
+#### Option 1 (best)
+1. Build cpufetch with debug symbols (`make clean; make debug`).
+2. Install valgrind (if it is not already installed)
+3. Run cpufetch with valgrind (`valgrind ./cpufetch`)
+4. Paste the complete output (preferably on a platform like pastebin)
+
+#### Option 2 (use this option if you can't work with option 1)
+1. Build cpufetch with debug symbols (`make clean; make debug`).
+2. Install gdb (if it is not already installed)
+3. Debug cpufetch with gdb (`gdb cpufetch`)
+3. Run cpufetch (just r inside gdb console)
+4. Paste the complete output (preferably on a platform like pastebin)

Makefile

@@ -1,8 +1,10 @@
-CXX=gcc
+CC ?= gcc
 
-CXXFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99
+CFLAGS+=-Wall -Wextra -pedantic -fstack-protector-all -pedantic -std=c99
 SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
 
+PREFIX ?= /usr
+
 SRC_COMMON=src/common/
 
 COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c
@@ -10,16 +12,16 @@ COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_C
 
 ifneq ($(OS),Windows_NT)
 	arch := $(shell uname -m)
-	ifeq ($(arch), x86_64)
+	ifeq ($(arch), $(filter $(arch), x86_64 i686))
 		SRC_DIR=src/x86/
 		SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
-		HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h 
-		CXXFLAGS += -DARCH_X86
+		HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h
+		CFLAGS += -DARCH_X86
 	else
 		SRC_DIR=src/arm/
 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
 		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
-		CXXFLAGS += -DARCH_ARM -Wno-unused-parameter
+		CFLAGS += -DARCH_ARM -Wno-unused-parameter
 	endif
 
 	OUTPUT=cpufetch
@@ -27,30 +29,36 @@ else
 	# Assume x86_64
 	SRC_DIR=src/x86/
 	SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
-	HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h 
-	CXXFLAGS += -DARCH_X86
+	HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h
+	CFLAGS += -DARCH_X86
 	SANITY_FLAGS += -Wno-pedantic-ms-format
 	OUTPUT=cpufetch.exe
 endif
 
+all: CFLAGS += -O3
 all: $(OUTPUT)
 
-debug: CXXFLAGS += -g -O0
+debug: CFLAGS += -g -O0
 debug: $(OUTPUT)
 
-release: CXXFLAGS += -static -O3
-release: $(OUTPUT)
+static: CFLAGS += -static -O3
+static: $(OUTPUT)
 
 $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
-	$(CXX) $(CXXFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
 
 run: $(OUTPUT)
 	./$(OUTPUT)
 
 clean:
-	@rm $(OUTPUT)
+	@rm -f $(OUTPUT)
 
 install: $(OUTPUT)
-	install -Dm755 "cpufetch"   "/usr/bin/cpufetch"
-	install -Dm644 "LICENSE"    "/usr/share/licenses/cpufetch-git/LICENSE"
-	install -Dm644 "cpufetch.8" "/usr/share/man/man8/cpufetch.8.gz"
+	install -Dm755 "cpufetch"   "$(DESTDIR)$(PREFIX)/bin/cpufetch"
+	install -Dm644 "LICENSE"    "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE"
+	install -Dm644 "cpufetch.1" "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1.gz"
+
+uninstall:
+	rm -f "$(DESTDIR)$(PREFIX)/bin/cpufetch"
+	rm -f "$(DESTDIR)$(PREFIX)/share/licenses/cpufetch-git/LICENSE"
+	rm -f "$(DESTDIR)$(PREFIX)/share/man/man1/cpufetch.1.gz"

README.md

@@ -1,35 +1,59 @@
-# cpufetch
+<p align="center"><img width=50% src="./pictures/cpufetch.png"></p>
+
+<div align="center">
+
+![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/Dr-Noob/cpufetch?label=cpufetch)
+[![GitHub Repo stars](https://img.shields.io/github/stars/Dr-Noob/cpufetch?color=4CC61F)](https://github.com/Dr-Noob/cpufetch/stargazers)
+[![GitHub issues](https://img.shields.io/github/issues/Dr-Noob/cpufetch)](https://github.com/Dr-Noob/cpufetch/issues)
+[![Packaging status](https://repology.org/badge/tiny-repos/cpufetch.svg)](https://repology.org/project/cpufetch/versions)
+[![License](https://img.shields.io/github/license/Dr-Noob/cpufetch?color=orange)](https://github.com/Dr-Noob/cpufetch/blob/master/LICENSE)
+
+<h4 align="center">Simple yet fancy CPU architecture fetching tool</h4>
+&nbsp;
 
-Simplistic yet fancy CPU architecture fetching tool
 ![cpu1](pictures/i9.png)
 
-### Platforms
-cpufetch currently supports x86_64 CPUs (both Intel and AMD) and ARM.
+</div>
+
+# Table of contents
+<!-- UPDATE with: doctoc --notitle README.md -->
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [1. Support](#1-support)
+- [2. Installation](#2-installation)
+  - [2.1 Available packages](#21-available-packages)
+  - [2.2 Building from source (Linux/Windows/macOS)](#22-building-from-source-linuxwindowsmacos)
+  - [2.3 Android](#23-android)
+- [3. Examples](#3-examples)
+  - [3.1 x86_64 CPUs](#31-x86_64-cpus)
+  - [3.2 ARM CPUs](#32-arm-cpus)
+- [4. Colors and style](#4-colors-and-style)
+- [5. Implementation](#5-implementation)
+- [6. Bugs or improvements](#6-bugs-or-improvements)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# 1. Support
+cpufetch supports x86, x86_64 (Intel and AMD) and ARM.
 
 | Platform  | x86_64                    | ARM                | Notes             |
 |:---------:|:------------------------:|:-------------------:|:-----------------:|
-| Linux     | :heavy_check_mark:        | :heavy_check_mark: | Prefered platform. <br> Experimental ARM support |
+| GNU/Linux | :heavy_check_mark:        | :heavy_check_mark: | Best support      |
 | Windows   | :heavy_check_mark:        | :x:                | Some information may be missing. <br> Colors will be used if supported |
-| Android   | :heavy_exclamation_mark:  | :heavy_check_mark: | Experimental ARM support |
-| macOS     | :heavy_check_mark:        | :x:                | Some information may be missing |
+| Android   | :heavy_exclamation_mark:  | :heavy_check_mark: | Some information may be missing. <br> Not tested under x86_64 |
+| macOS     | :heavy_check_mark:        | :x:                | Some information may be missing. <br> Apple M1 support may be added <br> in the future (see [#47](https://github.com/Dr-Noob/cpufetch/issues/47))|
 
-| Emoji                   | Meaning       |
-|:-----------------------:|:-------------:|
-|:heavy_check_mark:       | Supported     |
-|:x:                      | Not supported |
-|:heavy_exclamation_mark: | Not tested    |
+# 2. Installation
+## 2.1 Installing from a package
+Choose the right package for your operating system:
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/cpufetch.svg)](https://repology.org/project/cpufetch/versions)
 
-### Usage and installation
-#### Linux
-There is a cpufetch package available in Arch Linux ([cpufetch-git](https://aur.archlinux.org/packages/cpufetch-git)).
+If there is no available package for your OS, you can download the cpufetch binary from [the releases page](https://github.com/Dr-Noob/cpufetch/releases), or [build cpufetch from source](#22-building-from-source-linuxwindowsmacos) (see below).
 
-If you are in another distro, you can build `cpufetch` from source (see below)
-
-#### Windows
-In the [releases](https://github.com/Dr-Noob/cpufetch/releases) section you will find some cpufetch executables compiled for Windows. Just download and run it from Windows CMD.
-
-#### Building from source
+## 2.2 Building from source (Linux/Windows/macOS)
 Just clone the repo and use `make` to compile it
 
 ```
@@ -39,41 +63,49 @@ make
 ./cpufetch
 ```
 
-The Makefile is designed to work on both Linux and Windows.
+The Makefile is designed to work on Linux, Windows and macOS.
 
-### Examples
+## 2.3 Android
+1. Install `termux` app (terminal emulator)
+2. Run `pkg install -y git make clang` inside termux.
+3. Build from source normally:
+  - git clone https://github.com/Dr-Noob/cpufetch
+  - cd cpufetch
+  - make
+  - ./cpufetch
+
+# 3. Examples
 Here are more examples of how `cpufetch` looks on different CPUs.
 
-##### x86_64 CPUs
+## 3.1 x86_64 CPUs
 
 ![cpu2](pictures/epyc.png)
 
 ![cpu3](pictures/cascade_lake.png)
 
-##### ARM CPUs
+## 3.2 ARM CPUs
 
 ![cpu4](pictures/exynos.png)
 
 ![cpu5](pictures/snapdragon.png)
 
-### Colors and style
+# 4. Colors and style
 By default, `cpufetch` will print the CPU art with the system colorscheme. However, you can always set a custom color scheme, either
 specifying Intel or AMD, or specifying the colors in RGB format:
 
 ```
 ./cpufetch --color intel (default color for Intel)
-./cpufetch --color amd (default color for AND)
+./cpufetch --color amd (default color for AMD)
 ./cpufetch --color 239,90,45:210,200,200:100,200,45:0,200,200 (example)
 ```
 
 In the case of setting the colors using RGB, 4 colors must be given in with the format: ``[R,G,B:R,G,B:R,G,B:R,G,B]``. These colors correspond to CPU art color (2 colors) and for the text colors (following 2). Thus, you can customize all the colors.
 
-### Implementation
+# 5. Implementation
 
 See [cpufetch programming documentation](https://github.com/Dr-Noob/cpufetch/blob/master/doc/README.md).
 
-### Bugs or improvements
+# 6. Bugs or improvements
 There are many open issues in github (see [issues](https://github.com/Dr-Noob/cpufetch/issues)). Feel free to open a new one report an issue or propose any improvement in `cpufetch`
 
-### Testing
 I would like to thank [Gonzalocl](https://github.com/Gonzalocl) and [OdnetninI](https://github.com/OdnetninI) for their help, running `cpufetch` in many different CPUs they have access to, which makes it easier to debug and check the correctness of `cpufetch`.

cpufetch.1

@@ -0,0 +1,70 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.2.
+.TH CPUFETCH "1" "June 2021" "cpufetch v0.97 (x86_64 build)" "User Commands"
+.SH NAME
+cpufetch \- Simple yet fancy CPU architecture fetching tool
+.SH SYNOPSIS
+.B cpufetch
+[\fI\,OPTION\/\fR]...
+.SH DESCRIPTION
+Print detailed information about the CPU architecture. cpufetch displays information like the number of cores, microarchitecture, frequency, cache and peak performance. The program supports x86, x86_64 and ARM architectures and runs on GNU/Linux, Windows, Android and macOS (see https://github.com/Dr-Noob/cpufetch#1-support for more information)
+.SH OPTIONS
+.TP
+\fB\-c\fR, \fB\-\-color\fR
+Set the color scheme (by default, cpufetch uses the system color scheme)
+.TP
+\fB\-s\fR, \fB\-\-style\fR
+Set the style of CPU art
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Prints CPU model and cpuid levels (debug purposes)
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Prints extra information (if available) about how cpufetch tried fetching information
+.TP
+\fB\-r\fR, \fB\-\-raw\fR
+Prints raw cpuid data
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Prints this help and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Prints cpufetch version and exit
+.SH "COLORS:"
+.TP
+* "intel":
+Use Intel default color scheme
+.TP
+* "amd":
+Use AMD default color scheme
+.TP
+* "arm":
+Use ARM default color scheme
+.TP
+* custom:
+If color argument do not match "intel", "amd" or "arm", a custom scheme can be specified.
+4 colors must be given in RGB with the format: R,G,B:R,G,B:...The first 2 colors are the CPU art color and the next 2 colors are the text colors
+.SH "STYLES:"
+.TP
+* "fancy":
+Default style
+.TP
+* "retro":
+Old cpufetch style
+.TP
+* "legacy":
+Fallback style for terminals that do not support colors
+.SH "EXAMPLES:"
+Run cpufetch with Intel color scheme:
+.PP
+\&./cpufetch \fB\-\-color\fR intel
+.PP
+Run cpufetch with a custom color scheme:
+.PP
+\&./cpufetch \fB\-\-color\fR 239,90,45:210,200,200:100,200,45:0,200,200
+.SH "BUGS:"
+Report bugs to https://github.com/Dr\-Noob/cpufetch/issues
+.SH "NOTE:"
+Peak performance information is NOT accurate. cpufetch computes peak performance using the max frequency. However, to properly compute peak performance, you need to know the frequency of the CPU running AVX code, which is not be fetched by cpufetch since it depends on each specific CPU. For peak performance measurement see peakperf (https://github.com/Dr\-Noob/peakperf)
+.SH "AUTHOR:"
+Dr-Noob (https://github.com/Dr-Noob)
+

cpufetch.8

@@ -1,57 +0,0 @@
-.TH man 8 "1 Sep 2020" "0.7" "cpufetch man page"
-.SH NAME
-cpufetch \- Simplistic yet fancy CPU architecture fetching tool
-.SH SYNOPSIS
-cpufetch [--version] [--help] [--levels] [--style fancy|retro|legacy] [--color intel|amd|'R,G,B:R,G,B:R,G,B:R,G,B']
-.SH DESCRIPTION
-cpufetch will print CPU information, for which will query CPUID instructions and udev directories on Linux as a fallback method. Some of this features are:
-.IP \[bu] 2
-Name
-.IP \[bu]
-Frequency
-.IP \[bu]
-Number of cores (Physical and Logical)
-.IP \[bu]
-Cache sizes
-.IP \[bu]
-Theoretical peak performance in floating point operations per second (FLOP/s)
-.SH OPTIONS
-.TP
-\fB\-\-style\fR \f[I][intel|amd|R,G,B:R,G,B:R,G,B:R,G,B]\f[]
-Set the color scheme. By default, cpufetch uses the system color scheme. This option lets the user use different colors to print the CPU art:
-.IP \[bu]
-\fB"intel"\fR: Use intel color scheme
-.IP \[bu]
-\fB"amd"\fR: Use amd color scheme
-.IP \[bu]
-\fBcustom\fR: If color do not match "intel" or "amd", a custom scheme can be specified: 4 colors must be given in RGB with the format: R,G,B:R,G,B:... 
-             These colors correspond to CPU art color (2 colors) and for the text colors (following 2) 
-.TP
-\fB\-\-style\fR \f[I]STYLE\f[]
-Specify the style of ascii logo:
-.IP \[bu] 
-\fB"fancy"\fR:  Default style
-.IP \[bu]
-\fB"retro"\fR:  Old cpufetch style
-.IP \[bu]
-\fB"legacy"\fR: Fallback style for terminals that does not support colors
-.TP
-\fB\-\-levels\fR
-Prints CPUID levels and CPU name
-.TP
-\fB\-\-verbose\fR
-Prints extra information (if available) about how cpufetch tried fetching information
-.TP
-\fB\-\-help\fR
-Prints help
-.TP
-\fB\-\-version\fR
-Prints cpufetch version
-.SH BUGS
-Bugs should be posted on: https://github.com/Dr-Noob/cpufetch/issues
-.SH NOTES
-Peak performance information is NOT accurate. cpufetch computes peak performance using the max   
-frequency. However, to properly compute peak performance, you need to know the frequency of the  
-CPU running AVX code, which is not be fetched by cpufetch since it depends on each specific CPU.
-.SH AUTHOR
-Dr-Noob (https://github.com/Dr-Noob)

src/arm/soc.c

@@ -435,12 +435,21 @@ bool match_special(char* soc_name, struct system_on_chip* soc) {
     fill_soc(soc, "665", SOC_SNAPD_SM6125, 11);
     return true;
   }
-  
-  return false;  
+
+  // Snapdragon 730 reported as "Qualcomm Technologies, Inc. SDMMAGPIE"
+  if((tmp = strstr(soc_name, "SDMMAGPIE")) != NULL) {
+    fill_soc(soc, "730", SOC_SNAPD_SM7150_AA, 8);
+    return true;
+  }
+
+  return false;
 }
 
 struct system_on_chip* parse_soc_from_string(struct system_on_chip* soc) {
   char* raw_name = soc->raw_name;
+
+  if(match_special(raw_name, soc))
+    return soc;
   
   if (match_qualcomm(raw_name, soc))
     return soc;
@@ -454,10 +463,7 @@ struct system_on_chip* parse_soc_from_string(struct system_on_chip* soc) {
   if(match_hisilicon(raw_name, soc))
     return soc;
   
-  if(match_broadcom(raw_name, soc))
-    return soc;
-  
-  match_special(raw_name, soc);  
+  match_broadcom(raw_name, soc);
   
   return soc;
 }

src/arm/uarch.c

@@ -24,6 +24,10 @@ struct uarch {
 };
 
 enum {
+  ISA_ARMv6,
+  ISA_ARMv6_T2,
+  ISA_ARMv6_KZ,
+  ISA_ARMv6_K,
   ISA_ARMv7_A,
   ISA_ARMv8_A,
   ISA_ARMv8_A_AArch32,
@@ -36,8 +40,11 @@ enum {
   UARCH_UNKNOWN,
   // ARM
   UARCH_ARM7,
-  UARCH_ARM9,  
-  UARCH_ARM11,       // ARM 1136, ARM 1156, ARM 1176, or ARM 11MPCore.
+  UARCH_ARM9,
+  UARCH_ARM1136,
+  UARCH_ARM1156,
+  UARCH_ARM1176,
+  UARCH_ARM11MPCORE,
   UARCH_CORTEX_A5,  
   UARCH_CORTEX_A7,  
   UARCH_CORTEX_A8,    
@@ -98,6 +105,10 @@ enum {
 };
 
 static const ISA isas_uarch[] = {
+  [UARCH_ARM1136]      = ISA_ARMv6,
+  [UARCH_ARM1156]      = ISA_ARMv6_T2,
+  [UARCH_ARM1176]      = ISA_ARMv6_KZ,
+  [UARCH_ARM11MPCORE]  = ISA_ARMv6_K,
   [UARCH_CORTEX_A5]    = ISA_ARMv7_A,
   [UARCH_CORTEX_A7]    = ISA_ARMv7_A,
   [UARCH_CORTEX_A8]    = ISA_ARMv7_A,
@@ -143,6 +154,10 @@ static const ISA isas_uarch[] = {
 };
 
 static char* isas_string[] = {
+  [ISA_ARMv6]  = "ARMv6",
+  [ISA_ARMv6_T2] = "ARMv6T2",
+  [ISA_ARMv6_KZ] = "ARMv6KZ",
+  [ISA_ARMv6_K] = "ARMv6K",
   [ISA_ARMv7_A] = "ARMv7",
   [ISA_ARMv8_A] = "ARMv8",
   [ISA_ARMv8_A_AArch32] = "ARMv8 AArch32",
@@ -181,7 +196,7 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
   uint32_t p = midr_get_part(midr);
   uint32_t v = midr_get_variant(midr);
   uint32_t r = midr_get_revision(midr);
-  
+
   // ----------------------------------------------------------------------- //
   // IM: Implementer                                                         //
   // P:  Part                                                                //
@@ -189,7 +204,11 @@ struct uarch* get_uarch_from_midr(uint32_t midr, struct cpuInfo* cpu) {
   // R:  Revision                                                            //
   // ----------------------------------------------------------------------- //
   //                     IM   P      V   R                                   //
-  UARCH_START  
+  UARCH_START
+  CHECK_UARCH(arch, cpu, 'A', 0xB36, NA, NA, "ARM1136",               UARCH_ARM1136,      CPU_VENDOR_ARM)
+  CHECK_UARCH(arch, cpu, 'A', 0xB56, NA, NA, "ARM1156",               UARCH_ARM1156,      CPU_VENDOR_ARM)
+  CHECK_UARCH(arch, cpu, 'A', 0xB76, NA, NA, "ARM1176",               UARCH_ARM1176,      CPU_VENDOR_ARM)
+  CHECK_UARCH(arch, cpu, 'A', 0xB02, NA, NA, "ARM11 MPCore",          UARCH_ARM11MPCORE,  CPU_VENDOR_ARM)
   CHECK_UARCH(arch, cpu, 'A', 0xC05, NA, NA, "Cortex-A5",             UARCH_CORTEX_A5,    CPU_VENDOR_ARM)
   CHECK_UARCH(arch, cpu, 'A', 0xC07, NA, NA, "Cortex-A7",             UARCH_CORTEX_A7,    CPU_VENDOR_ARM)
   CHECK_UARCH(arch, cpu, 'A', 0xC08, NA, NA, "Cortex-A8",             UARCH_CORTEX_A8,    CPU_VENDOR_ARM)

src/arm/udev.c

@@ -18,25 +18,34 @@
 int get_ncores_from_cpuinfo() {
   // Examples:
   // 0-271
-  // 0-5
   // 0-7
+  // 0
+
   int filelen;
   char* buf;
   if((buf = read_file(_PATH_CPUS_PRESENT, &filelen)) == NULL) {
     perror("open");
-    return UNKNOWN;    
+    return UNKNOWN;
+  }
+
+  int ncores;
+  char* tmp1;
+  if((tmp1 = strstr(buf, "-")) == NULL) {
+    // file contains no - character, we assume that it contains 0,
+    // which means that the CPU contains only one core
+    return 1;
+  }
+  else {
+    tmp1++;
   }
-  
-  int ncores = 0;
-  char* tmp1 = strstr(buf, "-") + 1;
   char* tmp2 = strstr(buf, "\n");
   char ncores_str[filelen];
   memset(ncores_str, 0, sizeof(char) * filelen);
   memcpy(ncores_str, tmp1, tmp2-tmp1);
-  
+
   char* end;
   errno = 0;
-  ncores = strtol(ncores_str, &end, 10) + 1;  
+  ncores = strtol(ncores_str, &end, 10) + 1;
   if(errno != 0) {
     perror("strtol");
     return UNKNOWN;

src/common/args.c

@@ -17,24 +17,36 @@ static const char *SYTLES_STR_LIST[] = {
   [STYLE_INVALID] = NULL
 };
 
-enum {
-  ARG_CHAR_STYLE,
-  ARG_CHAR_COLOR,
-  ARG_CHAR_HELP,
-  ARG_CHAR_DEBUG,
-  ARG_CHAR_VERBOSE,
-  ARG_CHAR_VERSION
-};
-
 struct args_struct {
   bool debug_flag;
   bool help_flag;
+  bool raw_flag;
   bool verbose_flag;
   bool version_flag;
   STYLE style;
   struct colors* colors;
 };
 
+const char args_chr[] = {
+  /* [ARG_CHAR_STYLE]   = */ 's',
+  /* [ARG_CHAR_COLOR]   = */ 'c',
+  /* [ARG_CHAR_HELP]    = */ 'h',
+  /* [ARG_CHAR_RAW]     = */ 'r',
+  /* [ARG_CHAR_DEBUG]   = */ 'd',
+  /* [ARG_CHAR_VERBOSE] = */ 'v',
+  /* [ARG_CHAR_VERSION] = */ 'V',
+};
+
+const char *args_str[] = {
+  /* [ARG_CHAR_STYLE]   = */ "style",
+  /* [ARG_CHAR_COLOR]   = */ "color",
+  /* [ARG_CHAR_HELP]    = */ "help",
+  /* [ARG_CHAR_RAW]     = */ "raw",
+  /* [ARG_CHAR_DEBUG]   = */ "debug",
+  /* [ARG_CHAR_VERBOSE] = */ "verbose",
+  /* [ARG_CHAR_VERSION] = */ "version",
+};
+
 static struct args_struct args;
 
 STYLE get_style() {
@@ -57,10 +69,23 @@ bool show_debug() {
   return args.debug_flag;
 }
 
+bool show_raw() {
+  return args.raw_flag;    
+}
+
 bool verbose_enabled() {
   return args.verbose_flag;
 }
 
+int max_arg_str_length() {
+  int max_len = -1;
+  int len = sizeof(args_str) / sizeof(args_str[0]);
+  for(int i=0; i < len; i++) {
+    max_len = max(max_len, (int) strlen(args_str[i]));
+  }    
+  return max_len;
+}
+
 STYLE parse_style(char* style) {
   uint8_t i = 0;
   uint8_t styles_count = sizeof(SYTLES_STR_LIST) / sizeof(SYTLES_STR_LIST[0]);
@@ -158,94 +183,103 @@ bool parse_color(char* optarg_str, struct colors** cs) {
   return true;      
 }
 
+char* build_short_options() {
+  const char *c = args_chr;
+  int len = sizeof(args_chr) / sizeof(args_chr[0]);
+  char* str = (char *) malloc(sizeof(char) * (len*2 + 1));
+  memset(str, 0, sizeof(char) * (len*2 + 1));
+
+#ifdef ARCH_X86
+  sprintf(str, "%c:%c:%c%c%c%c%c",
+  c[ARG_STYLE], c[ARG_COLOR], c[ARG_HELP], c[ARG_RAW],
+  c[ARG_DEBUG], c[ARG_VERBOSE], c[ARG_VERSION]);
+#else
+  sprintf(str, "%c:%c:%c%c%c%c",
+  c[ARG_STYLE], c[ARG_COLOR], c[ARG_HELP],
+  c[ARG_DEBUG], c[ARG_VERBOSE], c[ARG_VERSION]);
+#endif
+
+  return str;
+}
+
 bool parse_args(int argc, char* argv[]) {
-  int c;
+  int opt;
   int option_index = 0;  
   opterr = 0;
 
   bool color_flag = false;
   args.debug_flag = false;
+  args.raw_flag = false;
   args.verbose_flag = false;
   args.help_flag = false;
   args.style = STYLE_EMPTY;
   args.colors = NULL;
 
-  static struct option long_options[] = {
-      {"style",    required_argument, 0, ARG_CHAR_STYLE   },
-      {"color",    required_argument, 0, ARG_CHAR_COLOR   },
-      {"help",     no_argument,       0, ARG_CHAR_HELP    },
-      {"debug",    no_argument,       0, ARG_CHAR_DEBUG   },
-      {"verbose",  no_argument,       0, ARG_CHAR_VERBOSE },
-      {"version",  no_argument,       0, ARG_CHAR_VERSION },
-      {0, 0, 0, 0}
+  const struct option long_options[] = {
+    {args_str[ARG_STYLE],   required_argument, 0, args_chr[ARG_STYLE]   },
+    {args_str[ARG_COLOR],   required_argument, 0, args_chr[ARG_COLOR]   },
+    {args_str[ARG_HELP],    no_argument,       0, args_chr[ARG_HELP]    },
+#ifdef ARCH_X86
+    {args_str[ARG_RAW],     no_argument,       0, args_chr[ARG_RAW]     },
+#endif
+    {args_str[ARG_DEBUG],   no_argument,       0, args_chr[ARG_DEBUG]   },
+    {args_str[ARG_VERBOSE], no_argument,       0, args_chr[ARG_VERBOSE] },
+    {args_str[ARG_VERSION], no_argument,       0, args_chr[ARG_VERSION] },
+    {0, 0, 0, 0}
   };
 
-  c = getopt_long(argc, argv, "", long_options, &option_index);
+  char* short_options = build_short_options();
+  opt = getopt_long(argc, argv, short_options, long_options, &option_index);
 
-  while (c != -1) {
-     if(c == ARG_CHAR_COLOR) {
-       if(color_flag) {
-         printErr("Color option specified more than once");
-         return false;
-       }
-       color_flag  = true;       
-       if(!parse_color(optarg, &args.colors)) {
-         printErr("Color parsing failed");
-         return false;
-       }
-     }
-     else if(c == ARG_CHAR_STYLE) {
-       if(args.style != STYLE_EMPTY) {
-         printErr("Style option specified more than once");
-         return false;
-       }
-       args.style = parse_style(optarg);
-       if(args.style == STYLE_INVALID) {
-         printErr("Invalid style '%s'",optarg);
-         return false;
-       }
-     }
-     else if(c == ARG_CHAR_HELP) {
-       if(args.help_flag) {
-         printErr("Help option specified more than once");
-         return false;
-       }
-       args.help_flag  = true;
-     }
-     else if(c == ARG_CHAR_VERBOSE) {
-       if(args.verbose_flag) {
-         printErr("Verbose option specified more than once");
-         return false;
-       }
-       args.verbose_flag  = true;
-     }
-     else if(c == ARG_CHAR_DEBUG) {
-       if(args.debug_flag) {
-         printErr("Debug option specified more than once");
-         return false;
-       }
-       args.debug_flag  = true;
-     }
-     else if (c == ARG_CHAR_VERSION) {
-       if(args.version_flag) {
-         printErr("Version option specified more than once");
-         return false;
-       }
-       args.version_flag = true;
-     }
-     else if(c == '?') {
-       printWarn("Invalid options");
-       args.help_flag  = true;
-       break;
-     }
-     else
-      printBug("Bug at line number %d in file %s", __LINE__, __FILE__);
+  while (!args.help_flag && !args.debug_flag && !args.version_flag && opt != -1) {
+    if(opt == args_chr[ARG_COLOR]) {
+      if(color_flag) {
+        printErr("Color option specified more than once");
+        return false;
+      }
+      color_flag  = true;       
+      if(!parse_color(optarg, &args.colors)) {
+        printErr("Color parsing failed");
+        return false;
+      }
+    }
+    else if(opt == args_chr[ARG_STYLE]) {
+      if(args.style != STYLE_EMPTY) {
+        printErr("Style option specified more than once");
+        return false;
+      }
+      args.style = parse_style(optarg);
+      if(args.style == STYLE_INVALID) {
+        printErr("Invalid style '%s'",optarg);
+        return false;
+      }
+      break;
+    }
+    else if(opt == args_chr[ARG_HELP]) {
+      args.help_flag  = true;
+    }
+    else if(opt == args_chr[ARG_RAW]) {
+       args.raw_flag  = true;
+    }
+    else if(opt == args_chr[ARG_VERBOSE]) {
+      args.verbose_flag  = true;
+    }
+    else if(opt == args_chr[ARG_DEBUG]) {
+      args.debug_flag  = true;
+    }
+    else if(opt == args_chr[ARG_VERSION]) {
+      args.version_flag = true;
+    }
+    else {    
+      printWarn("Invalid options");
+      args.help_flag  = true;
+    }
 
     option_index = 0;
-    c = getopt_long(argc, argv,"",long_options, &option_index);
+    opt = getopt_long(argc, argv, short_options, long_options, &option_index);
   }
 
-  if (optind < argc) {
+  if(optind < argc) {
     printWarn("Invalid options");
     args.help_flag  = true;
   }

src/common/args.h

@@ -26,10 +26,25 @@ enum {
   STYLE_INVALID
 };
 
+enum {
+  ARG_STYLE,
+  ARG_COLOR,
+  ARG_HELP,
+  ARG_RAW,
+  ARG_DEBUG,
+  ARG_VERBOSE,
+  ARG_VERSION
+};
+
+extern const char args_chr[];
+extern const char *args_str[];
+
 #include "printer.h"
 
+int max_arg_str_length();
 bool parse_args(int argc, char* argv[]);
 bool show_help();
+bool show_raw();
 bool show_debug();
 bool show_version();
 bool verbose_enabled();

src/common/ascii/amd.txt

@@ -1,19 +0,0 @@
-                                                             
-                                                             
-                                                             
-                                                             
-                                                             
-                                                             
-     ████      ███       ███   ████████        ▜███████████   
-    ██████     █████   █████   ███    ███       ▗▀▀▀▀▀▀▜███   
-   ███  ███    █████████████   ███      ██     ▐█      ▐███   
-  ███    ███   ███  ███  ███   ███      ██    ▟██      ▐███   
- ████████████  ███       ███   ███    ███    ████▄▄▄▄▄▄▝▜██   
- ███      ███  ███       ███   █████████     ████████▛   ██   
-                                                             
-                                                             
-                                                             
-                                                             
-                                                             
-                                                             
-                                                             

src/common/ascii/convert.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cat intel.txt | hexdump -vC | head -n-1 | cut -d' ' -f2- | cut -d'|' -f1 | tr '\n' ' ' | tr -s ' ' | tr ' ' ',' | sed "s/,/,0x/g"

src/common/ascii/intel.txt

@@ -1,19 +0,0 @@
-                          ▁▂▃▄▅▆▆▇▇███████▇▇▆▅▅▄▂▁           
-                    ▁▃▄▆▇▛▀▀▀▀▔▔▔         ▔▔▔▀▀▀██▇▅▃        
-                ▂▄▆█▀▀▔                           ▝▜██▅▁     
-               ▀▀▔                                  ▔▜██▖    
-           ▅▅▅                               ▆▆▆      ▜██▖   
-       ▁▅  ▀▀▀             ▐██▌              ███       ██▉   
-      ▄▛▘  ▄▄▄  ▗▄▄▄▄▄▄▃▁  ▐██▙▄▖  ▁▃▄▅▄▃    ███       ███   
-    ▗▟▛    ███  ▐██▀▀▀▜██▖ ▐██▛▀▘ ▟██▀▀▀██▖  ███      ▗██▊   
-    █▛     ███  ▐██   ▕██▌ ▐██▌  ▐██▂▂▂▂▂██  ███     ▗███▘   
-   ▐█▍     ███  ▐██   ▕██▌ ▐██▌  ▐██▛▀▀▀▀▀▀  ███    ▄██▛▘    
-   ██▏     ███  ▐██   ▕██▌ ▐██▌  ▝██▙▁ ▁▂▃   ███  ▅███▀      
-   ██▍     ▝██  ▐██   ▕██▌  ▀███▋ ▝▀█████▛   ▝▜█  █▀▔        
-   ▐█▙                               ▔▔▔                     
-    ▜█▙▖                                     ▁▂▄▖            
-     ▜██▆▃▁                             ▁▂▄▅▇███▌            
-      ▝▜███▇▅▄▃▂▁              ▁▁▂▃▄▅▆▇███████▀▀             
-        ▔▀▀████████▇▇▇▇▇▇▇▇▇▇███████████▛▀▀▔▔                
-            ▔▔▀▀▀▀█████████████▀▀▀▀▀▔▔▔                      
-                                                             

src/common/cpu.c

@@ -147,18 +147,18 @@ char* get_str_l3(struct cache* cach) {
 
 char* get_str_freq(struct frequency* freq) {
   //Max 3 digits and 3 for '(M/G)Hz' plus 1 for '\0'
-  uint32_t size = (4+3+1);
+  uint32_t size = (5+1+3+1);
   assert(strlen(STRING_UNKNOWN)+1 <= size);
   char* string = malloc(sizeof(char)*size);
   memset(string, 0, sizeof(char)*size);
-  
+
   if(freq->max == UNKNOWN_FREQ || freq->max < 0)
     snprintf(string,strlen(STRING_UNKNOWN)+1,STRING_UNKNOWN);
   else if(freq->max >= 1000)
-    snprintf(string,size,"%.2f"STRING_GIGAHERZ,(float)(freq->max)/1000);
+    snprintf(string,size,"%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);
   else
-    snprintf(string,size,"%d"STRING_MEGAHERZ,freq->max);
-  
+    snprintf(string,size,"%d "STRING_MEGAHERZ,freq->max);
+
   return string;
 }
 

src/common/cpu.h

@@ -119,6 +119,8 @@ struct cpuInfo {
   uint32_t maxLevels;
   // Max cpuids extended levels
   uint32_t maxExtendedLevels;
+  // Topology Extensions (AMD only)
+  bool topology_extensions;
 #elif ARCH_ARM
   // Main ID register
   uint32_t midr;

src/common/global.c

@@ -64,3 +64,7 @@ void set_log_level(bool verbose) {
   if(verbose) LOG_LEVEL = LOG_LEVEL_VERBOSE;
   else LOG_LEVEL = LOG_LEVEL_NORMAL;
 }
+
+int max(int a, int b) {
+  return a > b ? a : b;
+}

src/common/global.h

@@ -7,5 +7,6 @@ void set_log_level(bool verbose);
 void printWarn(const char *fmt, ...);
 void printErr(const char *fmt, ...);
 void printBug(const char *fmt, ...);
+int max(int a, int b);
 
 #endif

src/common/main.c

@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "args.h"
 #include "printer.h"
@@ -13,45 +14,76 @@
   #include "../arm/midr.h"
 #endif
 
-static const char* VERSION = "0.95";
-
-void print_help(char *argv[]) {
-  printf("Usage: %s [--version] [--help] [--debug] [--style \"fancy\"|\"retro\"|\"legacy\"] [--color \"intel\"|\"amd\"|'R,G,B:R,G,B:R,G,B:R,G,B']\n\n", argv[0]);
-
-  printf("Options: \n\
-  --color       Set the color scheme. By default, cpufetch uses the system color scheme. This option \n\
-                lets the user use different colors to print the CPU art:  \n\
-   * \"intel\":   Use Intel default color scheme \n\
-   * \"amd\":     Use AMD default color scheme \n\
-   * \"arm\":     Use ARM default color scheme \n\
-   * custom:    If color argument do not match \"Intel\", \"AMD\" or \"ARM\", a custom scheme can be specified: \n\
-                4 colors must be given in RGB with the format: R,G,B:R,G,B:... \n\
-                These colors correspond to CPU art color (2 colors) and for the text colors (following 2) \n\
-                For example: --color 239,90,45:210,200,200:100,200,45:0,200,200 \n\n\
-  --style       Set the style of CPU art: \n\
-    * \"fancy\":  Default style      \n\
-    * \"retro\":  Old cpufetch style \n\
-    * \"legacy\": Fallback style for terminals that does not support colors                       \n\n");
-
-#ifdef ARCH_X86
-  printf("  --debug       Prints CPU model and cpuid levels (debug purposes)\n\n");
-#elif ARCH_ARM
-  printf("  --debug       Prints main ID register values for all cores (debug purposes)\n\n");
+#ifdef __linux__
+  #ifdef __ANDROID__
+    static const char* OS_STR = "Android";
+  #else
+    static const char* OS_STR = "Linux";
+  #endif
+#elif _WIN32
+  static const char* OS_STR = "Windows";
+#elif defined __APPLE__ || __MACH__
+  static const char* OS_STR = "macOS";
+#else
+  static const char* OS_STR = "Unknown OS";
 #endif
 
-  printf("  --verbose     Prints extra information (if available) about how cpufetch tried fetching information\n\n\
-  --help        Prints this help and exit\n\n\
-  --version     Prints cpufetch version and exit\n\n\
-                                                   \n\
-NOTES: \n\
-  - Bugs or improvements should be submitted to: github.com/Dr-Noob/cpufetch/issues        \n\
-  - Peak performance information is NOT accurate. cpufetch computes peak performance using the max   \n\
-    frequency. However, to properly compute peak performance, you need to know the frequency of the  \n\
-    CPU running AVX code, which is not be fetched by cpufetch since it depends on each specific CPU. \n");
+static const char* VERSION = "0.98";
+
+void print_help(char *argv[]) {
+  const char **t = args_str;
+  const char *c = args_chr;  
+  int max_len = max_arg_str_length();
+
+  printf("Usage: %s [OPTION]...\n", argv[0]);
+  printf("Simple yet fancy CPU architecture fetching tool\n\n");
+
+  printf("Options: \n");
+  printf("  -%c, --%s %*s Set the color scheme (by default, cpufetch uses the system color scheme)\n", c[ARG_COLOR], t[ARG_COLOR], (int) (max_len-strlen(t[ARG_COLOR])), "");
+  printf("  -%c, --%s %*s Set the style of CPU art\n", c[ARG_STYLE], t[ARG_STYLE], (int) (max_len-strlen(t[ARG_STYLE])), "");
+#ifdef ARCH_X86
+  printf("  -%c, --%s %*s Prints CPU model and cpuid levels (debug purposes)\n", c[ARG_DEBUG], t[ARG_DEBUG], (int) (max_len-strlen(t[ARG_DEBUG])), "");
+#elif ARCH_ARM
+  printf("  -%c, --%s %*s Prints main ID register values for all cores (debug purposes)\n", c[ARG_DEBUG], t[ARG_DEBUG], (int) (max_len-strlen(t[ARG_DEBUG])), "");
+#endif
+  printf("  -%c, --%s %*s Prints extra information (if available) about how cpufetch tried fetching information\n", c[ARG_VERBOSE], t[ARG_VERBOSE], (int) (max_len-strlen(t[ARG_VERBOSE])), "");
+#ifdef ARCH_X86
+  printf("  -%c, --%s %*s Prints raw cpuid data\n", c[ARG_RAW], t[ARG_RAW], (int) (max_len-strlen(t[ARG_RAW])), "");
+#endif
+  printf("  -%c, --%s %*s Prints this help and exit\n", c[ARG_HELP], t[ARG_HELP], (int) (max_len-strlen(t[ARG_HELP])), "");
+  printf("  -%c, --%s %*s Prints cpufetch version and exit\n", c[ARG_VERSION], t[ARG_VERSION], (int) (max_len-strlen(t[ARG_VERSION])), "");
+  
+  printf("\nCOLORS: \n");
+  printf("  * \"intel\":     Use Intel default color scheme \n");
+  printf("  * \"amd\":       Use AMD default color scheme \n");
+  printf("  * \"arm\":       Use ARM default color scheme \n");
+  printf("  * custom:      If color argument do not match \"intel\", \"amd\" or \"arm\", a custom scheme can be specified.\n");
+  printf("                 4 colors must be given in RGB with the format: R,G,B:R,G,B:...\n");
+  printf("                 The first 2 colors are the CPU art color and the next 2 colors are the text colors\n");
+  
+  printf("\nSTYLES: \n");
+  printf("  * \"fancy\":     Default style\n");
+  printf("  * \"retro\":     Old cpufetch style\n");
+  printf("  * \"legacy\":    Fallback style for terminals that do not support colors\n");
+  
+  printf("\nEXAMPLES: \n");
+  printf("  Run cpufetch with Intel color scheme:\n");
+  printf("    ./cpufetch --color intel\n");
+  printf("  Run cpufetch with a custom color scheme:\n");
+  printf("    ./cpufetch --color 239,90,45:210,200,200:100,200,45:0,200,200\n");
+  
+  printf("\nBUGS: \n");
+  printf("    Report bugs to https://github.com/Dr-Noob/cpufetch/issues\n");
+  
+  printf("\nNOTE: \n");
+  printf("    Peak performance information is NOT accurate. cpufetch computes peak performance using the max\n");
+  printf("    frequency. However, to properly compute peak performance, you need to know the frequency of the\n");
+  printf("    CPU running AVX code, which is not be fetched by cpufetch since it depends on each specific CPU.\n");
+  printf("    For peak performance measurement see: https://github.com/Dr-Noob/peakperf\n");
 }
 
 void print_version() {
-  printf("cpufetch v%s (%s)\n",VERSION, ARCH_STR);
+  printf("cpufetch v%s (%s %s)\n",VERSION, OS_STR, ARCH_STR);
 }
 
 int main(int argc, char* argv[]) {
@@ -59,7 +91,6 @@ int main(int argc, char* argv[]) {
     return EXIT_FAILURE;
 
   if(show_help()) {
-    print_version();
     print_help(argv);
     return EXIT_SUCCESS;
   }
@@ -81,6 +112,17 @@ int main(int argc, char* argv[]) {
     return EXIT_SUCCESS;
   }
   
+  if(show_raw()) {
+  #ifdef ARCH_X86
+    print_version();
+    print_raw(cpu);
+    return EXIT_SUCCESS;
+  #else
+    printErr("raw option is valid only in x86_64");
+    return EXIT_FAILURE;
+  #endif
+  }
+  
   if(print_cpufetch(cpu, get_style(), get_colors()))
     return EXIT_SUCCESS;
   else

src/common/printer.c

@@ -105,7 +105,6 @@ struct attribute {
 
 struct ascii {
   char art[NUMBER_OF_LINES][LINE_SIZE+1];
-  unsigned char* art_unicode;
   char color1_ascii[100];
   char color2_ascii[100];
   char color1_text[100];
@@ -160,8 +159,8 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
 
 #ifdef ARCH_X86  
   if(art->vendor == CPU_VENDOR_INTEL) {
-    COL_FANCY_1 = COLOR_FG_CYAN;
-    COL_FANCY_2 = COLOR_FG_WHITE;
+    COL_FANCY_1 = COLOR_BG_CYAN;
+    COL_FANCY_2 = COLOR_BG_WHITE;
     COL_FANCY_3 = COLOR_FG_CYAN;
     COL_FANCY_4 = COLOR_FG_WHITE;
     art->ascii_chars[0] = '#';
@@ -228,6 +227,11 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
   art->ascii_chars[1] = '#';
 
   #ifdef _WIN32
+    // Old Windows do not define the flag
+    #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+      #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+    #endif
+
     HANDLE std_handle = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD console_mode;
 
@@ -263,12 +267,6 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
       if(cs != NULL) {
         COL_FANCY_1 = rgb_to_ansi(cs->c1, true, true);
         COL_FANCY_2 = rgb_to_ansi(cs->c2, true, true);
-        #ifdef ARCH_X86
-        if(art->vendor == CPU_VENDOR_INTEL) {
-          COL_FANCY_1 = rgb_to_ansi(cs->c1, false, true);
-          COL_FANCY_2 = rgb_to_ansi(cs->c2, false, true);
-        }
-        #endif
         COL_FANCY_3 = rgb_to_ansi(cs->c3, false, true);
         COL_FANCY_4 = rgb_to_ansi(cs->c4, false, true);
       }
@@ -310,11 +308,9 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
   }
 
   char tmp[NUMBER_OF_LINES * LINE_SIZE + 1];
-  art->art_unicode = NULL;
-
 #ifdef ARCH_X86  
   if(art->vendor == CPU_VENDOR_INTEL)
-    art->art_unicode = art_unicode_intel;
+    strcpy(tmp, INTEL_ASCII);
   else if(art->vendor == CPU_VENDOR_AMD)
     strcpy(tmp, AMD_ASCII);
   else
@@ -334,11 +330,8 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
     strcpy(tmp, ARM_ASCII);
 #endif
 
-  if(art->art_unicode != NULL) {
-    for(int i=0; i < NUMBER_OF_LINES; i++) {
-      memcpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE);
-    }
-  }
+  for(int i=0; i < NUMBER_OF_LINES; i++)
+    memcpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE);
 
   return art;
 }
@@ -359,26 +352,24 @@ uint32_t longest_attribute_length(struct ascii* art) {
 
 #ifdef ARCH_X86
 void print_algorithm_intel(struct ascii* art, int n, bool* flag) {
-  *flag = false;
-  int start = -1;
-  for(int i=0, newlines=0; newlines < n; i++) {
-    if(art->art_unicode[i] == '\n') {
-      newlines++;
-      start = i;
-    }
-  }
-
-  for(int i=start+1, x=0; art->art_unicode[i] != '\n'; i++, x++) {
-    if(art->art_unicode[i] == ' ') {
-      printf(" ");
+  for(int i=0; i < LINE_SIZE; i++) {
+    if(*flag) {
+      if(art->art[n][i] == ' ') {
+        *flag = false;
+        printf("%s%c%s", art->color2_ascii, art->ascii_chars[1], art->reset);
+      }
+      else {
+        printf("%s%c%s", art->color1_ascii, art->ascii_chars[0], art->reset);
+      }
     }
     else {
-      printf("%s", art->color1_ascii);
-      printf("%c", art->art_unicode[i]);
-      printf("%c", art->art_unicode[i + 1]);
-      printf("%c", art->art_unicode[i + 2]);
-      printf("%s", COLOR_RESET);
-      i += 2;
+      if(art->art[n][i] != ' ' && art->art[n][i] != '\0') {
+        *flag = true;
+        printf("%c",' ');
+      }
+      else {
+        printf("%c",' ');
+      }
     }
   }
 }

src/common/udev.c

@@ -32,17 +32,11 @@ long get_freq_from_file(char* path, bool hv_present) {
   int filelen;
   char* buf;
   if((buf = read_file(path, &filelen)) == NULL) {
-    #ifdef ARCH_X86
-      if(hv_present) {
-        printWarn("Could not open '%s'", path);
-      }
-      else {
-        perror("open");
-        printBug("Could not open '%s'", path);            
-      }
-    #elif ARCH_ARM
-      printWarn("Could not open '%s'", path); 
-    #endif
+    if(hv_present)
+      printWarn("Could not open '%s' (HV is present)", path);
+    else
+      printWarn("Could not open '%s'", path);
+
     return UNKNOWN_FREQ;
   }
 

src/x86/apic.c

@@ -1,10 +1,11 @@
 #ifdef _WIN32
-#include <windows.h>
+  #define NOMINMAX
+  #include <windows.h>
 #elif defined __linux__
-#define _GNU_SOURCE
-#include <sched.h>
+  #define _GNU_SOURCE
+  #include <sched.h>
 #elif defined __APPLE__
-#define UNUSED(x) (void)(x)
+  #define UNUSED(x) (void)(x)
 #endif
 
 #include <stdlib.h>
@@ -318,7 +319,22 @@ bool get_topology_from_apic(struct cpuInfo* cpu, struct topology* topo) {
   uint32_t* apic_smt = malloc(sizeof(uint32_t) * topo->total_cores);
   uint32_t** cache_smt_id_apic = malloc(sizeof(uint32_t*) * topo->total_cores);
   uint32_t** cache_id_apic = malloc(sizeof(uint32_t*) * topo->total_cores);
-  bool x2apic_id = cpu->maxLevels >= 0x0000000B;
+  bool x2apic_id;
+
+  if(cpu->maxLevels >= 0x0000000B) {
+    uint32_t eax = 0x0000000B;
+    uint32_t ebx = 0;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+
+    cpuid(&eax, &ebx, &ecx, &edx);
+
+    if(ebx == 0) x2apic_id = false;
+    else x2apic_id = true;
+  }
+  else {
+    x2apic_id = false;
+  }
   
   for(int i=0; i < topo->total_cores; i++) {
     cache_smt_id_apic[i] = malloc(sizeof(uint32_t) * (topo->cach->max_cache_level));

src/x86/apic.h

@@ -17,4 +17,8 @@ struct apic {
 bool get_topology_from_apic(struct cpuInfo* cpu, struct topology* topo);
 uint32_t is_smt_enabled_amd(struct topology* topo);
 
+#ifndef __APPLE__
+bool bind_to_cpu(int cpu_id);
+#endif
+
 #endif

src/x86/cpuid.c

@@ -1,4 +1,5 @@
 #ifdef _WIN32
+  #define NOMINMAX
   #include <windows.h>
 #else
   #include "../common/udev.h"
@@ -309,16 +310,26 @@ struct cpuInfo* get_cpu_info() {
     printWarn("Can't read cpu name from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000004, cpu->maxExtendedLevels);        
   }
   
+  cpu->topology_extensions = false;
+  if(cpu->cpu_vendor == CPU_VENDOR_AMD && cpu->maxExtendedLevels >= 0x80000001) {
+    eax = 0x80000001;
+    cpuid(&eax, &ebx, &ecx, &edx);      
+    cpu->topology_extensions = (ecx >> 22) & 1;
+  }
+  
   cpu->arch = get_cpu_uarch(cpu);
   cpu->freq = get_frequency_info(cpu);
   cpu->cach = get_cache_info(cpu);
   cpu->topo = get_topology_info(cpu, cpu->cach);
-  
+
+  if(cpu->cach == NULL || cpu->topo == NULL) {
+    return NULL;
+  }
   return cpu;
 }
 
 bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {    
-  if(cpu->maxExtendedLevels >= 0x8000001D) {  
+  if(cpu->maxExtendedLevels >= 0x8000001D && cpu->topology_extensions) {  
     uint32_t i, eax, ebx, ecx, edx, num_sharing_cache, cache_type, cache_level;
     
     i = 0;
@@ -361,13 +372,12 @@ bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {
               topo->cach->L3->num_caches = topo->logical_cores / num_sharing_cache;
             }
             else {
-              printBug("Found unified cache at level %d (expected == 2 or 3)", cache_level);
-              return false;
+              printWarn("Found unknown unified cache at level %d", cache_level);
             }
             break;
           
-          default: // Unknown Type Cache
-            printBug("Unknown Type Cache found at ID %d", i);
+          default: // Unknown cache type
+            printBug("Unknown cache type %d with level %d found at i=%d", cache_type, cache_level, i);
             return false; 
         }   
       }
@@ -376,7 +386,7 @@ bool get_cache_topology_amd(struct cpuInfo* cpu, struct topology* topo) {
     } while (cache_type > 0);        
   }
   else {
-    printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X). Guessing cache sizes", 0x8000001D, cpu->maxExtendedLevels); 
+    printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X and topology_extensions=%s). Guessing cache topology", 0x8000001D, cpu->maxExtendedLevels, cpu->topology_extensions ? "true" : "false"); 
     topo->cach->L1i->num_caches = topo->physical_cores;
     topo->cach->L1d->num_caches = topo->physical_cores;
     
@@ -424,7 +434,7 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach) {
         get_topology_from_apic(cpu, topo);
       }
       else {                
-        printErr("Can't read topology information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000001, cpu->maxLevels); 
+        printWarn("Can't read topology information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000001, cpu->maxLevels); 
         topo->physical_cores = 1;
         topo->logical_cores = 1;
         topo->smt_available = 1;
@@ -437,18 +447,18 @@ struct topology* get_topology_info(struct cpuInfo* cpu, struct cache* cach) {
         cpuid(&eax, &ebx, &ecx, &edx);        
         topo->logical_cores = (ecx & 0xFF) + 1;
  
-        if (cpu->maxExtendedLevels >= 0x8000001E) {
+        if (cpu->maxExtendedLevels >= 0x8000001E && cpu->topology_extensions) {
           eax = 0x8000001E;  
           cpuid(&eax, &ebx, &ecx, &edx);
           topo->smt_supported = ((ebx >> 8) & 0x03) + 1;          
         }
         else {
-          printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x8000001E, cpu->maxExtendedLevels); 
+          printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X and topology_extensions=%s)", 0x8000001E, cpu->maxExtendedLevels, cpu->topology_extensions ? "true" : "false"); 
           topo->smt_supported = 1;       
         }        
       }
       else {
-        printErr("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000008, cpu->maxExtendedLevels); 
+        printWarn("Can't read topology information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", 0x80000008, cpu->maxExtendedLevels); 
         topo->physical_cores = 1;
         topo->logical_cores = 1;
         topo->smt_supported = 1;         
@@ -570,13 +580,13 @@ struct cache* get_cache_info_general(struct cache* cach, uint32_t level) {
             cach->L3->exists = true;
           }
           else {
-            printBug("Found unified cache at level %d (expected == 2 or 3)", cache_level);
-            return NULL;
+            printWarn("Found unknown unified cache at level %d (size is %d bytes)", cache_level, cache_total_size);
+            cach->max_cache_level--;
           }
           break;
           
-        default: // Unknown Type Cache
-          printBug("Unknown Type Cache found at ID %d", i);
+        default: // Unknown cache type
+          printBug("Unknown cache type %d with level %d found at i=%d", cache_type, cache_level, i);
           return NULL;                  
       }
     }    
@@ -599,7 +609,7 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
   if(cpu->cpu_vendor == CPU_VENDOR_INTEL) {
     level = 0x00000004;    
     if(cpu->maxLevels < level) {
-      printErr("Can't read cache information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", level, cpu->maxLevels);    
+      printWarn("Can't read cache information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", level, cpu->maxLevels);    
       return NULL;
     }
     else {
@@ -608,11 +618,11 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
   }
   else {
     level = 0x8000001D;
-    if(cpu->maxExtendedLevels < level) {
-      printWarn("Can't read cache information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X)", level, cpu->maxExtendedLevels);
+    if(cpu->maxExtendedLevels < level || !cpu->topology_extensions) {
+      printWarn("Can't read cache information from cpuid (needed extended level is 0x%.8X, max is 0x%.8X and topology_extensions=%s)", level, cpu->maxExtendedLevels, cpu->topology_extensions ? "true" : "false"); 
       level = 0x80000006;
       if(cpu->maxExtendedLevels < level) {
-        printErr("Can't read cache information from cpuid using old method (needed extended level is 0x%.8X, max is 0x%.8X)", level, cpu->maxExtendedLevels);    
+        printWarn("Can't read cache information from cpuid using old method (needed extended level is 0x%.8X, max is 0x%.8X)", level, cpu->maxExtendedLevels);
         return NULL;
       }
       printWarn("Fallback to old method using 0x%.8X and 0x%.8X", level-1, level);
@@ -622,36 +632,7 @@ struct cache* get_cache_info(struct cpuInfo* cpu) {
       cach = get_cache_info_general(cach, level);    
     }
   }
-  
-  // Sanity checks. If we read values greater than this, they can't be valid ones
-  // The values were chosen by me
-  if(cach->L1i->size > 64 * 1024) {
-    printBug("Invalid L1i size: %dKB", cach->L1i->size/1024);
-    return NULL;
-  }
-  if(cach->L1d->size > 64 * 1024) {
-    printBug("Invalid L1d size: %dKB", cach->L1d->size/1024);
-    return NULL;
-  }
-  if(cach->L2->exists) {
-    if(cach->L3->exists && cach->L2->size > 2 * 1048576) {
-      printBug("Invalid L2 size: %dMB", cach->L2->size/(1048576));
-      return NULL;
-    }
-    else if(cach->L2->size > 100 * 1048576) {
-      printBug("Invalid L2 size: %dMB", cach->L2->size/(1048576));
-      return NULL;
-    }
-  }
-  if(cach->L3->exists && cach->L3->size > 100 * 1048576) {
-    printBug("Invalid L3 size: %dMB", cach->L3->size/(1048576));
-    return NULL;
-  }
-  if(!cach->L2->exists) {
-    printBug("Could not find L2 cache");
-    return NULL;    
-  }
-  
+
   return cach;
 }
 
@@ -659,31 +640,17 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
   struct frequency* freq = malloc(sizeof(struct frequency));
   
   if(cpu->maxLevels < 0x00000016) {
-    #ifdef _WIN32
-      if(cpu->hv->present) {
-        printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000016, cpu->maxLevels);
-      }
-      else {
-        printErr("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000016, cpu->maxLevels);    
-      }
-      freq->base = UNKNOWN_FREQ;
-      freq->max = UNKNOWN_FREQ;
-    #elif defined __APPLE__
-      printErr("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000016, cpu->maxLevels);
+    #if defined (_WIN32) || defined (__APPLE__)
+      printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X)", 0x00000016, cpu->maxLevels);
       freq->base = UNKNOWN_FREQ;
       freq->max = UNKNOWN_FREQ;
     #else
       printWarn("Can't read frequency information from cpuid (needed level is 0x%.8X, max is 0x%.8X). Using udev", 0x00000016, cpu->maxLevels);
       freq->base = UNKNOWN_FREQ;
       freq->max = get_max_freq_from_file(0, cpu->hv->present);
-      
+
       if(freq->max == 0) {
-        if(cpu->hv->present) {
-          printWarn("Read max CPU frequency and got 0 MHz");
-        }
-        else {
-          printBug("Read max CPU frequency and got 0 MHz");    
-        }
+        printWarn("Read max CPU frequency from udev and got 0 MHz");
         freq->max = UNKNOWN_FREQ;
       }
     #endif
@@ -693,32 +660,27 @@ struct frequency* get_frequency_info(struct cpuInfo* cpu) {
     uint32_t ebx = 0;
     uint32_t ecx = 0;
     uint32_t edx = 0;
-    
+
     cpuid(&eax, &ebx, &ecx, &edx);
-    
+
     freq->base = eax;
-    freq->max = ebx;    
-    
+    freq->max = ebx;
+
     if(freq->base == 0) {
-      if(cpu->hv->present) {
-        printWarn("Read base CPU frequency and got 0 MHz");
-      }
-      else {
-        printBug("Read base CPU frequency and got 0 MHz");    
-      }
+      printWarn("Read base CPU frequency from CPUID and got 0 MHz");
       freq->base = UNKNOWN_FREQ;
     }
     if(freq->max == 0) {
-      if(cpu->hv->present) {
-        printWarn("Read max CPU frequency and got 0 MHz");
+      printWarn("Read max CPU frequency from CPUID and got 0 MHz. Using udev");
+      freq->max = get_max_freq_from_file(0, cpu->hv->present);
+
+      if(freq->max == 0) {
+        printWarn("Read max CPU frequency from udev and got 0 MHz");
+        freq->max = UNKNOWN_FREQ;
       }
-      else {
-        printBug("Read max CPU frequency and got 0 MHz");    
-      }
-      freq->max = UNKNOWN_FREQ;
     }
   }
-  
+
   return freq;
 }
 
@@ -903,14 +865,102 @@ void print_debug(struct cpuInfo* cpu) {
   cpuid(&eax, &ebx, &ecx, &edx);
   
   printf("%s\n", cpu->cpu_name);
-  if(cpu->hv->present) printf("- Hypervisor: %s\n", cpu->hv->hv_name);
+  if(cpu->hv->present) {
+    printf("- Hypervisor: %s\n", cpu->hv->hv_name);
+  }
   printf("- Max standard level: 0x%.8X\n", cpu->maxLevels);
   printf("- Max extended level: 0x%.8X\n", cpu->maxExtendedLevels);
+  if(cpu->cpu_vendor == CPU_VENDOR_AMD) {
+    printf("- AMD topology extensions: %d\n", cpu->topology_extensions);    
+  }
   printf("- CPUID dump: 0x%.8X\n", eax);
 
   free_cpuinfo_struct(cpu);
 }
 
+// TODO: Query HV and Xeon Phi levels
+void print_raw(struct cpuInfo* cpu) {
+  uint32_t eax;
+  uint32_t ebx;
+  uint32_t ecx;
+  uint32_t edx;
+  printf("%s\n\n", cpu->cpu_name);
+  printf("  CPUID leaf sub   EAX        EBX        ECX        EDX       \n");
+  printf("--------------------------------------------------------------\n");
+  
+  for(int c=0; c < cpu->topo->total_cores; c++) {
+    #ifndef __APPLE__
+    if(!bind_to_cpu(c)) {
+      printErr("Failed binding to CPU %d", c);
+      return;
+    }
+    #endif
+    
+    printf("CPU %d:\n", c);    
+    
+    for(uint32_t reg=0x00000000; reg <= cpu->maxLevels; reg++) {
+      if(reg == 0x00000004) {
+        for(uint32_t reg2=0x00000000; reg2 < cpu->cach->max_cache_level; reg2++) {
+          eax = reg;
+          ebx = 0;
+          ecx = reg2;
+          edx = 0;
+      
+          cpuid(&eax, &ebx, &ecx, &edx);
+      
+          printf("  0x%.8X 0x%.2X: 0x%.8X 0x%.8X 0x%.8X 0x%.8X\n", reg, reg2, eax, ebx, ecx, edx);
+        }
+      }
+      else if(reg == 0x0000000B) {
+        for(uint32_t reg2=0x00000000; reg2 < cpu->topo->smt_supported; reg2++) {
+          eax = reg;
+          ebx = 0;
+          ecx = reg2;
+          edx = 0;
+      
+          cpuid(&eax, &ebx, &ecx, &edx);
+      
+          printf("  0x%.8X 0x%.2X: 0x%.8X 0x%.8X 0x%.8X 0x%.8X\n", reg, reg2, eax, ebx, ecx, edx);
+        }
+      }
+      else {
+        eax = reg;
+        ebx = 0;
+        ecx = 0;
+        edx = 0;
+      
+        cpuid(&eax, &ebx, &ecx, &edx);
+      
+        printf("  0x%.8X 0x%.2X: 0x%.8X 0x%.8X 0x%.8X 0x%.8X\n", reg, 0x00, eax, ebx, ecx, edx);    
+      }
+    }
+    for(uint32_t reg=0x80000000; reg <= cpu->maxExtendedLevels; reg++) {
+      if(reg == 0x8000001D) {
+        for(uint32_t reg2=0x00000000; reg2 < cpu->cach->max_cache_level; reg2++) {
+          eax = reg;
+          ebx = 0;
+          ecx = reg2;
+          edx = 0;
+      
+          cpuid(&eax, &ebx, &ecx, &edx);
+      
+          printf("  0x%.8X 0x%.2X: 0x%.8X 0x%.8X 0x%.8X 0x%.8X\n", reg, reg2, eax, ebx, ecx, edx);
+        }
+      }
+      else {
+        eax = reg;
+        ebx = 0;
+        ecx = 0;
+        edx = 0;
+      
+        cpuid(&eax, &ebx, &ecx, &edx);
+      
+        printf("  0x%.8X 0x%.2X: 0x%.8X 0x%.8X 0x%.8X 0x%.8X\n", reg, 0x00, eax, ebx, ecx, edx);
+      }
+    }
+  }
+}
+
 void free_topo_struct(struct topology* topo) {
   free(topo->apic->cache_select_mask);
   free(topo->apic->cache_id_apic);

src/x86/cpuid.h

@@ -15,6 +15,7 @@ char* get_str_topology(struct cpuInfo* cpu, struct topology* topo, bool dual_soc
 char* get_str_peak_performance(struct cpuInfo* cpu, struct topology* topo, int64_t freq);
 
 void print_debug(struct cpuInfo* cpu);
+void print_raw(struct cpuInfo* cpu);
 
 void free_topo_struct(struct topology* topo);
 

src/x86/uarch.c

@@ -38,6 +38,8 @@
 
 typedef uint32_t MICROARCH;
 
+#define STRING_UNKNOWN    "Unknown"
+
 // Data not available
 #define NA                   -1
 
@@ -65,6 +67,7 @@ enum {
   UARCH_AIRMONT,
   UARCH_KABY_LAKE,
   UARCH_COMET_LAKE,
+  UARCH_ROCKET_LAKE,
   UARCH_AMBER_LAKE,
   UARCH_WHISKEY_LAKE,
   UARCH_SKYLAKE,
@@ -233,6 +236,7 @@ struct uarch* get_uarch_from_cpuid_intel(uint32_t ef, uint32_t f, uint32_t em, u
   CHECK_UARCH(arch, 0,  6,  9, 14, 13, "Coffee Lake",     UARCH_COFFE_LAKE,       14)
   CHECK_UARCH(arch, 0,  6, 10,  5, NA, "Comet Lake",      UARCH_COMET_LAKE,       14) // wikichip
   CHECK_UARCH(arch, 0,  6, 10,  6, NA, "Comet Lake",      UARCH_COMET_LAKE,       14) // instlatx64.atw.hu (i7-10710U)
+  CHECK_UARCH(arch, 0,  6, 10,  7, NA, "Rocket Lake",     UARCH_ROCKET_LAKE,      14) // instlatx64.atw.hu (i7-11700K)
   CHECK_UARCH(arch, 0, 11,  0,  0, NA, "Knights Ferry",   UARCH_KNIGHTS_FERRY,    45) // found only on en.wikichip.org
   CHECK_UARCH(arch, 0, 11,  0,  1, NA, "Knights Corner",  UARCH_KNIGHTS_CORNER,   22)
   CHECK_UARCH(arch, 0, 15,  0,  0, NA, "Willamette",      UARCH_WILLAMETTE,      180)
@@ -367,6 +371,7 @@ bool is_knights_landing(struct cpuInfo* cpu) {
 
 int get_number_of_vpus(struct cpuInfo* cpu) {  
   switch(cpu->arch->uarch) {
+      // Intel
       case UARCH_HASWELL:
       case UARCH_BROADWELL:
           
@@ -374,6 +379,7 @@ int get_number_of_vpus(struct cpuInfo* cpu) {
       case UARCH_CASCADE_LAKE:                    
       case UARCH_KABY_LAKE:
       case UARCH_COMET_LAKE:
+      case UARCH_ROCKET_LAKE:
       case UARCH_AMBER_LAKE:
       case UARCH_WHISKEY_LAKE:
       case UARCH_COFFE_LAKE:
@@ -384,7 +390,7 @@ int get_number_of_vpus(struct cpuInfo* cpu) {
           
       case UARCH_ICE_LAKE:   
           
-      // Right now is just a guess!
+      // AMD
       case UARCH_ZEN2:
       case UARCH_ZEN3:    
         return 2;
@@ -398,14 +404,23 @@ char* get_str_uarch(struct cpuInfo* cpu) {
 }
 
 char* get_str_process(struct cpuInfo* cpu) {
-  char* str = malloc(sizeof(char) * (4+2+1));
-  uint32_t process = cpu->arch->process;
-  
-  if(process > 100)    
+  char* str = malloc(sizeof(char) * (strlen(STRING_UNKNOWN)+1));
+  int32_t process = cpu->arch->process;
+
+  if(process == UNK) {
+    snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
+  }
+  else if(process > 100) {
     sprintf(str, "%.2fum", (double)process/100);
-  else
+  }
+  else if(process > 0){
     sprintf(str, "%dnm", process);
-  
+  }
+  else {
+    snprintf(str, strlen(STRING_UNKNOWN)+1, STRING_UNKNOWN);
+    printBug("Found invalid process: '%d'", process);
+  }
+
   return str;
 }