[v0.99][X86] Improve CPU abbreviate code

src/common/cpu.c

@@ -34,9 +34,11 @@ int64_t get_freq(struct frequency* freq) {
 
 #if defined(ARCH_X86) || defined(ARCH_PPC)
 char* get_str_cpu_name(struct cpuInfo* cpu, bool fcpuname) {
-  if(cpu->cpu_vendor == CPU_VENDOR_INTEL && !fcpuname) {
-    abbreviate_intel_cpu_name(&cpu->cpu_name);
+  #ifdef ARCH_X86
+  if(!fcpuname) {
+    return get_str_cpu_name_abbreviated(cpu);
   }
+  #endif
   return cpu->cpu_name;
 }
 

src/common/global.c

@@ -73,6 +73,19 @@ int max(int a, int b) {
   return a > b ? a : b;
 }
 
+char *strremove(char *str, const char *sub) {
+  char *p, *q, *r;
+  if (*sub && (q = r = strstr(str, sub)) != NULL) {
+    size_t len = strlen(sub);
+    while ((r = strstr(p = r + len, sub)) != NULL) {
+      memmove(q, p, r - p);
+      q += r - p;
+    }
+    memmove(q, p, strlen(p) + 1);
+  }
+  return str;
+}
+
 void* emalloc(size_t size) {
   void* ptr = malloc(size);
 

src/common/global.h

@@ -11,6 +11,7 @@ void printWarn(const char *fmt, ...);
 void printErr(const char *fmt, ...);
 void printBug(const char *fmt, ...);
 int max(int a, int b);
+char *strremove(char *str, const char *sub);
 void* emalloc(size_t size);
 void* ecalloc(size_t nmemb, size_t size);