Fix MMX Flags

i-nex · Jan 16, 2014 · 4278cf0 · 4278cf0
1 parent d714b3e
commit 4278cf0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/cpu.c b/cpu.c
@@ -41,11 +41,6 @@ int main(void)
 	printf("	\"MARK_TSC\": \"%llu\",\n", mark.tsc);
 	printf("	\"MARK_SYS_CLOCK\": \"%llu\",\n", mark.sys_clock);
 	printf("			\"Flags\": {\n");
-	printf("			\"0\": {\n");
-	printf("					\"VALUE\": %s \n", data.flags[CPU_FEATURE_MMX] ? "1 ," : "0 ,");
-	printf("					\"NAME\": \"CPU_FEATURE_MMX\",\n");
-	printf("					\"DESC\": \"MMX instruction set supported\"\n");
-	printf("			},\n");
 	printf("			\"1\": {\n");
 	printf("					\"VALUE\": %s \n", data.flags[CPU_FEATURE_MMXEXT] ? "1 ," : "0 ,");
 	printf("					\"NAME\": \"CPU_FEATURE_MMXEXT\",\n");
@@ -507,10 +502,15 @@ int main(void)
 	printf("					\"DESC\": \"Hyper-threading supported (but might be disabled)\"\n");
 	printf("			},\n");
 	printf("			\"93\": {\n");
+	printf("					\"VALUE\": %s \n", data.flags[CPU_FEATURE_MMX] ? "1 ," : "0 ,");
+	printf("					\"NAME\": \"CPU_FEATURE_MMX\",\n");
+	printf("					\"DESC\": \"MMX instruction set supported\"\n");
+	printf("			},\n");
+	printf("			\"94\": {\n");
 	printf("					\"VALUE\": %s \n", data.flags[CPU_FEATURE_FPU] ? "1 ," : "0 ,");
 	printf("					\"NAME\": \"CPU_FEATURE_FPU\",\n");
 	printf("					\"DESC\": \"Floating point unit\"\n");
-	printf("	}\n");
+	printf("			}\n");
 	printf("	},\n");
 	printf("	\"L1_DATA_CACHE\": \"%d\",\n", data.l1_data_cache);
 	printf("	\"L1_INSTRUCTION_CACHE\": \"%d\",\n", data.l1_instruction_cache);

diff --git a/src/i-nex/.settings b/src/i-nex/.settings
@@ -24,11 +24,10 @@ SearchComment=False
 SearchString=True
 
 [OpenFile]
-Active=1
 File[1]=".src/Finfosys.form"
 File[2]=".src/Global.class:199.7"
 File[3]=".src/About.form"
-File[4]=".src/About.class:21.35"
+File[4]=".src/About.class:51.27"
 File[5]=".src/battery.module:136.82"
 File[6]=".src/Disk_Drives.module:2.19"
 File[7]=".src/ScreenShot.form"
@@ -49,7 +48,8 @@ File[21]=".src/net.module:2.19"
 File[22]="Data/report-ng.sh:5.3"
 File[23]=".src/Distribution_Detect.module:22.34"
 File[24]=".src/FFlags.module:2.19"
-File[25]=".src/Finfosys.class:93.14"
+Active=25
+File[25]=".src/Finfosys.class:81.29"
 File[26]=".src/FDF.form"
 File[27]=".src/FDF.class:2.19"
 File[28]=".src/FNET_R_T.form"

diff --git a/src/i-nex/.src/Finfosys.class b/src/i-nex/.src/Finfosys.class
@@ -14,8 +14,8 @@
 '
 ' You should have received a copy of the GNU General Public License
 ' along with this program. If not, see <http://www.gnu.org/licenses/>.
-Private ToolButton[94] As ToolButton
-Private Label[94] As Label  ' Dim the array of controls
+Private ToolButton[95] As ToolButton
+Private Label[95] As Label  ' Dim the array of controls
 Private YESNO As Picture
 Public AllowLog As Boolean
 Public sLine As String
@@ -51,7 +51,6 @@ Public Sub Form_Open()
   Label206.Text = "CPU Clock Measure:  " & DATAT["CPU_CLOCK_MEASURE"]
   Label207.Text = "Mark TSC:  " & DATAT["MARK_TSC"]
   Label208.Text = "Mark SYS Clock:  " & DATAT["MARK_SYS_CLOCK"]
-
   Label209.Text = "L1 Data:  " & DATAT["L1_DATA_CACHE"]
   Label210.Text = "L1 Instr:  " & DATAT["L1_INSTRUCTION_CACHE"]
   Label211.Text = "L2 Cache:  " & DATAT["L2_CACHE"]
@@ -63,50 +62,36 @@ Public Sub Form_Open()
   Label217.Text = "L2 Cacheline:  " & DATAT["L2_CACHELINE"]
   Label218.Text = "L3 Cacheline:  " & DATAT["L3_CACHELINE"]
   Label219.Text = "SSE Size:  " & DATAT["SSE_SIZE"]
-  'btnClose.Tooltip = ("Quit")
-  'Me.Center4
-  For i = 1 To 93
-    Label[i] = New Label(ScrollView1) As "Labelgroup"    ' Create a new button in the array and store it in an action group
+
+  For i = 1 To 94
+    Label[i] = New Label(ScrollView1)
     With Label[i]
-      '.X = (i - Int((i - 1) / 3) * 3) * 60 - 30
-      '.Y = Int((i - 1) / 3) * 60 + 170
       .X = 2
       .Y = 215 + Int(i * 20)
       .Width = 440
       .Height = 21
-      .Border = 3
+      .Border = Border.Raised
       .Padding = 3
       .Tooltip = DATAT["Flags"][i]["NAME"]
       .Text = DATAT["Flags"][i]["DESC"]
     End With
   Next
-  For i = 1 To 93
-    ToolButton[i] = New ToolButton(ScrollView1) As "ToolButtongroup"    ' Create a new button in the array and store it in an action group
+  For i = 1 To 94
+    ToolButton[i] = New ToolButton(ScrollView1)
     If DATAT["Flags"][i]["VALUE"] = 1 Then
      YESNO = Picture["Data/check_true.png"]
     Else
      YESNO = Picture["Data/check_false.png"]
     Endif
     With ToolButton[i]
-      '.X = (i - Int((i - 1) / 3) * 3) * 60 - 30
-      '.Y = Int((i - 1) / 3) * 60 + 170
       .X = 420
       .Y = 215 + Int(i * 20)
       .Width = 21
       .Height = 21
       .Picture = YESNO
       .Tooltip = DATAT["Flags"][i]["VALUE"]
-      End With
+    End With
   Next
-  ' For z = 0 To 93
-  '  If DATAT["Flags"][z]["VALUE"] = 1 Then
-  '   GDF = "True"
-  '   ListView1.Add(z + 17, DATAT["Flags"][z]["NAME"] & " " & GDF & " " & DATAT["Flags"][z]["DESC"])
-  '  Else
-  '   GDF = "False"
-  '   ListView1.Add(z + 17, DATAT["Flags"][z]["NAME"] & " " & GDF & " " & DATAT["Flags"][z]["DESC"])
-  '  Endif
-  ' Next
   If User.Name = "root" Then
     Message.Error(("Running as root is not allowed!\n " & User.Home & ""))
   Endif

diff --git a/src/i-nex/.src/Finfosys.form b/src/i-nex/.src/Finfosys.form
@@ -527,66 +527,77 @@
         }
         { Label209 Label
           Move(2,133,147,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label209")
           Border = Border.Raised
         }
         { Label210 Label
           Move(2,154,147,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label210")
           Border = Border.Raised
         }
         { Label211 Label
           Move(2,175,147,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label211")
           Border = Border.Raised
         }
         { Label212 Label
           Move(2,196,147,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label212")
           Border = Border.Raised
         }
         { Label213 Label
           Move(147,133,140,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label213")
           Border = Border.Raised
         }
         { Label214 Label
           Move(147,154,140,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label214")
           Border = Border.Raised
         }
         { Label215 Label
           Move(147,175,140,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label215")
           Border = Border.Raised
         }
         { Label216 Label
           Move(287,133,154,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label216")
           Border = Border.Raised
         }
         { Label217 Label
           Move(287,154,154,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label217")
           Border = Border.Raised
         }
         { Label218 Label
           Move(287,175,154,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label218")
           Border = Border.Raised
         }
         { Label219 Label
           Move(147,196,294,21)
+          Font = Font["Bold,8"]
           Padding = 3
           Text = ("Label219")
           Border = Border.Raised