Libcpuid instruction fixes

i-nex · Jul 15, 2014 · 0d781f9 · 0d781f9
1 parent 8d7c318
commit 0d781f9
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/I-Nex/i-nex/.src/Finfosys.class b/I-Nex/i-nex/.src/Finfosys.class
@@ -131,6 +131,9 @@ Public Sub Form_Open()
                       .Font.Size = 8
                       .Tooltip = DATAT["Flags"][i]["NAME"]
                       .Text = DATAT["Flags"][i]["DESC"]
+                      If DATAT["Flags"][i]["NAME"] = "CPU_FEATURE_RESERVED" Then
+                       .Visible = False
+                      Endif
                   End With
                   With ToolButton[i]
                            .X = 420
@@ -139,6 +142,9 @@ Public Sub Form_Open()
                            .Height = 21
                            .Picture = YESNO
                            .Tooltip = DATAT["Flags"][i]["VALUE"]
+                           If DATAT["Flags"][i]["NAME"] = "CPU_FEATURE_RESERVED" Then
+                           .Visible = False
+                           Endif
                   End With
                   With Button[i]
                        .X = 400
@@ -163,6 +169,9 @@ Public Sub Form_Open()
                           .Foreground = 6
                           .Alignment = Align.Center
                           .Text = DATAT["Flags"][i]["FEATURE"]
+                          If DATAT["Flags"][i]["NAME"] = "CPU_FEATURE_RESERVED" Then
+                          .Visible = False
+                          Endif
                   End With
   Next
 

diff --git a/JSON/i-nex-cpuid.c b/JSON/i-nex-cpuid.c
@@ -817,7 +817,7 @@ int main(void)
 	  printf("			},\n");
 	} else {
 	  printf("			\"92\": {\n");
-	  printf("					\"VALUE\": 0 \n");
+	  printf("					\"VALUE\": 0 ,\n");
 	  printf("					\"NAME\": \"CPU_FEATURE_RESERVED\",\n");
 	  printf("					\"FEATURE\": \"Reserved space\",\n");
 	  printf("					\"WEBSITE\": \"Reserved space\",\n");
@@ -840,6 +840,7 @@ int main(void)
 	printf("					\"WEBSITE\": \"http://en.wikipedia.org/wiki/Memory_type_range_register\",\n");
 	printf("					\"HAVEWEBSITE\": 1 ,\n");
 	printf("					\"DESC\": \"Memory type range registers\"\n");
+	if (data.vendor == VENDOR_AMD) {
 	printf("			},\n");
 	printf("			\"95\": {\n");
 	printf("					\"VALUE\": %s \n", data.flags[CPU_FEATURE_CPB] ? "1 ," : "0 ,");
@@ -872,6 +873,40 @@ int main(void)
 	printf("					\"WEBSITE\": \"\",\n");
 	printf("					\"HAVEWEBSITE\": 0 ,\n");
 	printf("					\"DESC\": \"Processor accumulator\"\n");
+	} else {
+	printf("			},\n");
+	printf("			\"95\": {\n");
+	printf("					\"VALUE\": 0 ,\n");
+	printf("					\"NAME\": \"CPU_FEATURE_RESERVED\",\n");
+	printf("					\"FEATURE\": \"Reserved space\",\n");
+	printf("					\"WEBSITE\": \"Reserved space\",\n");
+	printf("					\"HAVEWEBSITE\": 0 ,\n");
+	printf("					\"DESC\": \"Reserved space\"\n");
+	printf("			},\n");
+	printf("			\"96\": {\n");
+	printf("					\"VALUE\": 0 ,\n");
+	printf("					\"NAME\": \"CPU_FEATURE_RESERVED\",\n");
+	printf("					\"FEATURE\": \"Reserved space\",\n");
+	printf("					\"WEBSITE\": \"Reserved space\",\n");
+	printf("					\"HAVEWEBSITE\": 0 ,\n");
+	printf("					\"DESC\": \"Reserved space\"\n");
+	printf("			},\n");
+	printf("			\"97\": {\n");
+	printf("					\"VALUE\": 0 ,\n");
+	printf("					\"NAME\": \"CPU_FEATURE_RESERVED\",\n");
+	printf("					\"FEATURE\": \"Reserved space\",\n");
+	printf("					\"WEBSITE\": \"Reserved space\",\n");
+	printf("					\"HAVEWEBSITE\": 0 ,\n");
+	printf("					\"DESC\": \"Reserved space\"\n");
+	printf("			},\n");
+	printf("			\"98\": {\n");
+	printf("					\"VALUE\": 0 ,\n");
+	printf("					\"NAME\": \"CPU_FEATURE_RESERVED\",\n");
+	printf("					\"FEATURE\": \"Reserved space\",\n");
+	printf("					\"WEBSITE\": \"Reserved space\",\n");
+	printf("					\"HAVEWEBSITE\": 0 ,\n");
+	printf("					\"DESC\": \"Reserved space\"\n");
+	}
 	printf("			}\n");
 	printf("	},\n");
 	printf("	\"L1_DATA_CACHE\": \"%d\",\n", data.l1_data_cache);