WebSVN – Kolibri OS – Diff – /programs/system/cpuid/trunk/CPUID.ASM

 ;******************************************************************************
-; project name:  CPUID                                                        *
+; project name:  CPUID							      *
-; platform:      KolibriOS, x86 (IA-32), x86-64 achitectures                  *
+; platform:	 KolibriOS, x86 (IA-32), x86-64 achitectures		      *
-; compiler:      flat assembler 1.70.03                                       *
+; compiler:	 flat assembler 1.70.03 				      *
-; version:       2.28                                                         *
+; version:	 2.29							      *
-; last update:   23rd October 2013                                            *
+; last update:	 12 October 2014					      *
-; maintained by: Sergey Kuzmin aka Wildwest                                   *
+; maintained by: Sergey Kuzmin aka Wildwest				      *
-; e-mail:        kuzmin_serg@list.ru                                          *
+; e-mail:	 kuzmin_serg@list.ru					      *
-; site:          http://coolthemes.narod.ru/files.html                        *
+; site: 	 http://coolthemes.narod.ru/files.html			      *
-; license:       Copyright 2004-2013 Sergey Kuzmin and co-authors             *
+; license:	 Copyright 2004-2014 Sergey Kuzmin and co-authors	      *
-;                Rules:                                                       *
+;		 Rules: 						      *
-;                1)you can use pieces of code in your project, but should     *
+;		 1)you can use pieces of code in your project, but should     *
-;                mention the original author (include copyright notice);      *
+;		 mention the original author (include copyright notice);      *
-;                2)if you modify CPUID (improve, port, translate, etc) send   *
+;		 2)if you modify CPUID (improve, port, translate,  etc) send   *
-;                your changes to the maintainer or make about post changes    *
+;		 your changes to the maintainer or make about post changes    *
   dd	 START
   dd	 I_END
   dd U_END+4096
   dd U_END+4096
   dd	 0x0
-  dd	 0x0
+  dd	 path
-include 'lang.inc'                              ; language support
+include 'lang.inc'				; language support
-include '..\..\..\macros.inc' ; useful macroses
+include 'macros.inc' ; useful macroses
 include 'draw.inc'
-include 'brand.inc'           ;Brand ID decoding
+include 'brand.inc'	      ;Brand ID decoding
-include 'caches.inc'          ;(L1 and L2 cashes decoding for Intel)
+include 'caches.inc'	      ;(L1 and L2 cashes decoding for Intel)
-include 'multipli.inc'        ;(multiplier decoding)
+include 'multipli.inc'	      ;(multiplier decoding)
+include 'features.inc'	      ;(features decoding)
-include 'features.inc'        ;(features decoding)
+;include 'gif2img.inc'	      ;macros to convert gif to img
+include 'rsatest.inc'
+include 'variable.inc'
+include 'load_lib.mac'
+@use_library
+START:			;
+	mcall	68,11
+	mcall	66,1,1
+load_libraries l_libs_start,end_l_libs
+;-----------------------------------------------------------------------------
+;OpenDialog     initialisation
+	push	dword OpenDialog_data
+	call	[OpenDialog_Init]
+	mov	edi,filename_area
+	mov	esi,start_temp_file_name
+	call	copy_file_name_path
-include 'rsatest.inc'
-include 'variable.inc'
+;-----------------------------------------------------------------------------
 	mcall	68,12,4096*8 ; 16 Kb - I hope this will be enough for store of data
 	mov	[store_text_area_start],eax
 START:			;   LET'S GO!!!
 mov ecx, eax	      ; get Extended model
 shr ecx,16	      ;shift it to the correct position
 and ecx, 0000000Fh
+shl ecx, 4
-shl ecx, 4
+mov dword[newpc],ecx	 ;  this value for old pc=0 and for new pc>0
 add ecx, [m]
 mov dword[em],ecx     ;  effective    model
 and ecx,0000000Fh ;    get CPU model
 mov dword[em],ecx
 fut:
+call decode_sse3_5
-call decode_sse3
+;call decode_sse3_5
 ;-
+    call decode_extended
+    mov   eax,$80000000
+    cpuid
+    mov   [extc], eax  ; max number of calls
-    call decode_extended
+  test	eax, $80000000 ;// Test bit 31
+  jz .noname
-mov  dword [myname], $612F6E
+  cmp  eax,$80000003
   ja .mynameis
-        cmp     [extc], $80000003
+  jmp .noname
         jbe     .noname
 .mynameis:
     cpuid
     mov   [myname+32],eax
     mov   [myname+36],ebx
     mov   [myname+40],ecx
     mov   [myname+44],edx
+    jmp   red
 .noname:
 red:
+;mov byte [multiplier], 115;     ; for testing
-;mov byte [multiplier], 115;     ; for testing
+call decode_sse3
 call multipl			      ; get multiplier
 output:
-   call draw_window    ;     Draw window
-typedetect:
-        mov     edx, t1
-        cmp     [t], 00b
-        jz      @f
-        mov     edx, t2
-        cmp     [t], 01b
-        jz      @f
-        mov     edx, t3
-        cmp     [t], 11b
-        jz      @f
-        mov     edx, t4
-@@:
-        mov     ebx, 290*65536 + 250
+   call draw_window    ;     Draw window
         mov     ecx, 0x80000000
-        mcall   4
+;HRERE
 ; Rise Technology - "RiseRiseRise"
 ; SiS - "SiS SiS SiS "
 ; Transmeta - "GenuineTMx86"       +
 ; National Semiconductor - "Geode by NSC"
 ; Vortex - "Vortex86 SoC"       + initial support
-  cmp dword[smallvendor], 'ntel'
+  cmp dword[smallvendor], 'ntel'   ;1
   jz Intel
-  cmp dword[smallvendor], 'cAMD'
+  cmp dword[smallvendor], 'cAMD'   ;2
   jz AMD
-  cmp dword[smallvendor], 'tead'
+  cmp dword[smallvendor], 'tead'   ;3
   jz Cyrix
-  cmp dword[smallvendor], 'auls'
+  cmp dword[smallvendor], 'auls'    ;4
   jz Centaur
-  cmp dword[smallvendor], 'Mx86'
+  cmp dword[smallvendor], 'Mx86'    ;5
   jz Transmeta
-  cmp dword[smallvendor], ' SoC'
+  cmp dword[smallvendor], ' SoC'    ;6
   jz Vortex
 ; cmp ecx, 'UMC '
 ; jz .UMC
 ; cmp ecx, ' NSC'
 ; jz .NSC
 ; jmp Other   ;  I don't know what to do with you...
 Other:
 Text 75,70,0x00000000,other, otherlen-other
+mov esi, other
+mov edi, [saveproc]
+call concatname
     jmp MMXtest
 ;-------------------------
+AMD:
-AMD:
+;-------------------------------------------------------------------------------
+Text 15, 190,0x00000000,cache, cachelen-cache
-Text 15, 190,0x00000000,cache, cachelen-cache
+Text 75,70,,AMDn, AMDnlen-AMDn
 mov esi, AMDnNew
-Text 75,70,,AMDn, AMDnlen-AMDn
+mov edi, saveproc
 call concatname
+	mov	esi, amd
-	mov	esi, amd
+	call	load_gif
-	call	load_gif
+PutImage 135,107,201,49,img_area+8
-PutImage 135,107,201,49,img_area+8
+MOV [codeN], 2
 ;         place   size
 pop ecx
 shr ecx, 16
+mov [L2],ecx
+movzx edx, dl ;not sure
+mov [linel3], eax
+mov eax, edx
+and eax,00FF0000h
+shr eax, 16
+mov [wayl3], eax
+shr edx, 24
-mov [L2],ecx
+mov [L3], edx
     cmp [f], $5
     jz .fiv
     cmp [f], $6
     jz .si
+    cmp [f], $F
+    jz fif
+    cmp [f], $10   ;family 16, 010h,
+    jz ten
     cmp [f], $F
     jz fif
 .fiv:	 ;     Family=5
-        mov     [micron], 50
+	mov	[micron], 50
-        mov     edx, A50
+	mov	edx, A50
 @@:
-        Text    100,70,0x80000000
+	Text	100,70,0x80000000
-        jmp     MMXtest
+	jmp	MMXtest
 A6:
-;        mov     [FRS], 266  ;!!!!!!
+;mov     [FRS], 266  ;!!!!!!
-;        Number  315,90,0,3,dword [FRS],0x000000; MHz
+;Number  315,90,0,3,dword [FRS],0x000000; MHz
-        call    newrating; !!!!
+	call	newrating; !!!!
         Text    245,70,0x00000000,pr, prlen-pr
 	Text	245,70,0x00000000,pr, prlen-pr
-        Number  310,70,0,4,dword [rating],0x000000
+	Number	310,70,0,4,dword [rating],0x000000
-        mov     edx, At6
+	mov	edx, At6
-        jmp     @b
+	jmp	@b
 A8:
 A8:
 ;        mov     [FRS], 266	;!!!!!!
 fif:  ;  AMD-64    Family=15
 ;here is a need to rewrite detection of AMD F-th family according to "Revision Guide for
-;AMD AthlonTM 64 and  AMD OpteronTM  Processors" 25759.pdf
+;AMD AthlonTM 64 and  AMD OpteronTM  Processors" 25759.pdf
-; checking sse3 for new AMD's is needed
-    cmp [m],$1	; Dual-core Opteron
+   cmp [m],$1	;Dual-core Opteron
-    jz .AF1
+    jz   AF1.
-    cmp [m],$3	; Toledo 1024 0.09   // Manchester     ||Windsor Dual Core not supported
+   cmp [m],$3	;Toledo 1024 0.09
-    jz .AF3
+    jz  AF3.
-    cmp [m],$4	;Athlon 64 Mobile Athlon 64 FX  ClawHammer (1024) 0.13
+   cmp [m],$4	;Athlon 64 Mobile Athlon 64 FX  ClawHammer (1024) 0.13
-    jz .AF4
+    jz AF4.
-    cmp [m],$5	; Opteron     Athlon 64 FX 0.13 (1024)
+   cmp [m],$5	;Opteron Athlon 64 FX 0.13 (1024)
-    jz .AF5
+    jz AF5.
-    cmp [m],$7	;Athlon 64 Athlon 64 FX  Clawhammer(1024) 0.13   Sledgehammer(1024)  0.13  // SSE3+ SanDiego(1024)
+   cmp [m],$7	;Athlon 64 Athlon 64 FX  Clawhammer(1024) 0.13   Sledgehammer(1024)  0.13  // SSE3+ SanDiego(1024)
-    jz .AF7
+    jz AF7.
-   cmp [m],$8 ; Athlon 64 Mobile Athlon 64 FX ClawHammer (1024) 0.13
+   cmp [m],$8   ;Athlon 64 Mobile Athlon 64 FX ClawHammer (1024) 0.13
-    jz .AF8
+    jz AF8.
-   cmp [m],$B ; Athlon 64
+   cmp [m],$B   ;Athlon 64
-    jz .AFB
+    jz AFB.
-   cmp [m],$C ;Athlon 64 Newcastle(512) 0.13  Sempron> Paris (256)   0.13  |SSE3+ Sempron >  Palermo FC0 0.09  // (Venice)
+   cmp [m],$C   ;Athlon 64 Newcastle(512) 0.13  Sempron> Paris (256)   0.13  |SSE3+ Sempron >  Palermo FC0 0.09  // (Venice)
-    jz .AFC
+    jz AFC.
-   cmp [m],$E  ; Athlon 64    //
+   cmp [m],$E   ;Athlon 64
-    jz .AFE
+    jz AFE.
-   cmp [m],$F ; Athlon 64 Winchester(512) |SSE3+ SanDiego(1024)  Venice (512)  Palermo (256) 0.09
+   cmp [m],$F   ;Athlon 64 Winchester(512) |SSE3+ SanDiego(1024)  Venice (512)  Palermo (256) 0.09
+    jz AFF.
+    jmp next_generation
+ten:      ;family = 10h
+cmp [m],$2
+   jz AB23.
+cmp [m], $8
+   jz AB83.
+cmp [m], $9
+  jz AB9.
+cmp [m], $2
+  jz AB8check2.
+AB8check2.:
+cmp [s],03h
+    jz AB8right2.
+cmp [m],$2
+  jz athlonCheck
+athlonCheck:
+cmp [s],03h
+    jz athlonKuma
+cmp [m], $5
+ jz AB4.
+cmp [m],$1
+   jz AB1.
+cmp [m],$4
+    jz AB8check.
+AB8check.:
+cmp [s],02h
+    jz ABC2.
+cmp [s],01h
+     jz ABC3.
+cmp [m], $9
+    jz AB6.
+cmp [m], $2
+    jz AB8check.
+cmp [m], 06h
+      jz ABM.
+athlonKuma:
+      mov [micron], 65
+      Text 100,70,0x00000000,AthlonKuma, AthlonKumalen-AthlonKuma
+      mov esi, AthlonKuma
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB23.:
+      mov [micron], 65
+      Text 100,70,0x00000000,AB23, AB23len-AB23
+      mov esi, AB23
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB83.:
+      mov [micron], 65
+      Text 100,70,0x00000000,AB83, AB83len-AB83
+      mov esi, AB83
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB9.:
+      mov [micron], 65
+      Text 100,70,0x00000000,AB9, AB9len-AB9
+      mov esi, AB9
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB8right2.:
+       mov [micron], 65
+      Text 100,70,0x00000000,AB8right2, AB8right2len-AB8right2
+      mov esi, AB8right2
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB4.:
+      mov [micron], 45
+      Text 100,70,0x00000000,AB4, AB4len-AB4
+      mov esi, AB4
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB1.:
+      mov [micron], 65
+      Text 100,70,0x00000000,AB1, AB1len-AB1
+      mov esi, AB1
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+ABC2.:
+      mov [micron], 45
+      Text 100,70,0x00000000,ABC2, ABC2len-ABC2
+      mov esi, ABC2
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+AB6.:
+      mov [micron], 45
+      Text 100,70,0x00000000,AB6, AB6len-AB6
+      mov esi, AB6
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+ABC3.:
+      mov [micron], 45
+      Text 100,70,0x00000000,ABC3, ABC3len-ABC3
+      mov esi, ABC3
+      mov edi, saveproc + 0x4
+      call concatname
+      jmp MMXtest
+ABM.:
+      mov [micron], 45
+      Text 100,70,0x00000000,ABM2, ABM2len-ABM
+      mov esi, ABM2
+      mov edi, saveproc + 0x4
+      call concatname
-    jz .AFF
+      jmp MMXtest
     jmp next_generation
-.AF1:
+AF1.:
+    mov [micron], 09  ;?
+    Text 100,70,0x00000000,AF1, AF1len-AF1
+    mov esi, AF1
-    mov [micron], 09  ;?
+    mov edi, saveproc + 0x4
-    Text 100,70,0x00000000,AF1, AF1len-AF1
+    call concatname
     jmp MMXtest
-.AF3:
+AF3.:
+    mov [micron], 09
+    Text 100,70,0x00000000,AF3, AF3len-AF3
+    mov esi, AF3
-    mov [micron], 09
+    mov edi, saveproc + 0x4
-    Text 100,70,0x00000000,AF3, AF3len-AF3
+    call concatname
     jmp MMXtest
-.AF4:
+AF4.:
+    mov [micron], 13
+    Text 100,70,0x00000000,AF4, AF4len-AF4
+    mov esi, AF4
-    mov [micron], 13
+    mov edi, saveproc + 0x4
-    Text 100,70,0x00000000,AF4, AF4len-AF4
+    call concatname
     jmp MMXtest
-.AF5:
+AF5.:
     mov [micron], 13
+    Text 100,70,0x00000000,AF5, AF5len-AF5
-    Text 100,70,0x00000000,AF5, AF5len-AF5
+    jmp MMXtest
     jmp MMXtest
-.AF7:
+AF7.:
+    mov [micron], 13
+    Text 100,70,0x00000000,AF5, AF5len-AF5
+    mov esi, AF5
-    mov [micron], 13
+    mov edi, saveproc + 0x4
+    call concatname
-    Text 100,70,0x00000000,AF5, AF5len-AF5
+    jmp MMXtest
     jmp MMXtest
-.AF8:
+AF8.:
+   mov [micron], 13
+   Text 100,70,0x00000000,AF4, AF4len-AF4
+   mov esi, AF4
-   mov [micron], 13
+    mov edi, saveproc + 0x4
+    call concatname
-   Text 100,70,0x00000000,AF4, AF4len-AF4  ; AF4, AF5len-AF4
+   jmp MMXtest
    jmp MMXtest
-.AFB:
+AFB.:
+    mov [micron], 13
+    Text 100,70,0x00000000,AF4, AF4len-AF4
+    mov esi, AF4
-    mov [micron], 13
+    mov edi, saveproc + 0x4
-Text 100,70,0x00000000,AF4, AF4len-AF4
+    call concatname
  jmp MMXtest
-.AFC:
+AFC.:
 cmp [L2], 512
-je .AFCn
+je AFC.n
 cmp [sse3sup], 1
+je AFC.npal
+AFC.npar:  ; paris
-je .AFCnpal
+    mov [micron], 13
+    Text 100,70,0x00000000,AFCs, AFCslen-AFCs
-.AFCnpar:  ; paris
+    mov esi, AFCs
-    mov [micron], 13
+    mov edi, saveproc + 0x4
+    call concatname
+    jmp MMXtest
-    Text 100,70,0x00000000,AFCs, AFCslen-AFCs
+AFC.npal: ; palermo
-    jmp MMXtest
+    mov [micron], 9
     Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp
-.AFCnpal: ; palermo
+    mov esi, AFCsp
+    mov edi, saveproc + 0x4
+    call concatname
+    jmp MMXtest
     mov [micron], 9
-    Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp
+AFC.n: ;newcastle
-    jmp MMXtest
+    mov [micron], 13
+    Text 100,70,0x00000000,AFC, AFClen-AFC
-.AFCn: ;newcastle
+    mov esi, AFC
-    mov [micron], 13
+    mov edi, saveproc + 0x4
-    Text 100,70,0x00000000,AFC, AFClen-AFC
+    call concatname
 cmp [L2], 256
 jz .AFp
 .AFs:
+Text 100,70,0x00000000,AFS, AFSlen-AFS
+ mov esi, AFS
+ mov edi, saveproc + 0x4
-Text 100,70,0x00000000,AFS, AFSlen-AFS
+ call concatname
  jmp MMXtest
+.AFd:
+Text 100,70,0x00000000,AFV, AFVlen-AFV
+mov esi, AFV
-.AFd:
+    mov edi, saveproc + 0x4
-Text 100,70,0x00000000,AFV, AFVlen-AFV
+    call concatname
  jmp MMXtest
+.AFp:
+Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp
 mov esi, AFCsp
-.AFp:
+    mov edi, saveproc + 0x4
-Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp
+    call concatname
+ jmp MMXtest
- jmp MMXtest
+;-----------------------------------------------
-;-----------------------------------------------
+Intel:
+mov [codeN], $1
+Text 75,70,0x00000000,Inteln, Intelnlen-Inteln
-Intel:
+	mov esi, IntelnNew
-Text 75,70,0x00000000,Inteln, Intelnlen-Inteln
+	mov edi, saveproc
 	call concatname
-	mov	esi, intel
-	call	load_gif
-PutImage 135,107,201,49,img_area+8
+	mov	esi, intel
-;PutImage 125,107,201,49,img_area+8
+	call	load_gif
-;         place   size
+PutImage 135,107,201,49,img_area+8
 det:
     cmp [f], $5
-    jz .five
+    jz five
     cmp [f], $6
-    jz .six
+    jz six
     cmp [f], $7
-    jz .sev
+    jz sev
     cmp [f], $F
-    jz .fift
+    jz fift
     jz .I7
     cmp [m],$8
     jz .I8
 .I0:
 Text 110,70,0x00000000,P50, P50len-P50
+    mov esi, P50
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 80
  jmp MMXtest
 .I1:
 Text 110,70,0x00000000,P5, P5len-P5
+mov esi, P5
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 50
  jmp MMXtest
 .I2:
 Text 110,70,0x00000000,P54C, P54Clen-P54C
+mov esi, P54C
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 50
  jmp MMXtest
 .I3:
 Text 110,70,0x00000000,P54T, P54Tlen-P54T
+mov esi, P54T
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 50
  jmp MMXtest
 .I4:
 Text 110,70,0x00000000,P55C, P55Clen-P55C
+mov esi, P55C
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 35
  jmp MMXtest
 .I7:
 Text 110,70,0x00000000,P54C, P54Clen-P54C
+mov esi, P54C
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 8
    mov [L1i], 8
    mov [L2], 256
    mov [micron], 35
  jmp MMXtest
 .I8:
 Text 110,70,0x00000000,P55C, P55Clen-P55C
+mov esi, P55C
+    mov edi, saveproc + 0x6
+    call concatname
    mov [L1d], 16
    mov [L1i], 16
    mov [L2], 256
    mov [micron], 35
- jmp MMXtest
+   jmp MMXtest
-.six:		   ;Family=6
+six:		  ;Family=6
+Text 15, 190,0x00000000,cache, cachelen-cache
+cmp [newpc],$0
-Text 15, 190,0x00000000,cache, cachelen-cache
+jnz NEWintel
     cmp [m],$0
     jz .I60
    cmp [m],$F
     jz .I6F
 .I60:
     mov [micron], 50
-Text 110,70,0x00000000,P60, P60len-P60
+    Text 110,70,0x00000000,P60, P60len-P60
+    mov esi, P60
+    mov edi, saveproc + 0x6
+    call concatname
- jmp MMXtest
+    jmp MMXtest
 .I61:
     mov [micron], 35
-Text 110,70,0x00000000,P61, P61len-P61
+    Text 110,70,0x00000000,P61, P61len-P61
+    mov esi, P61
+    mov edi, saveproc + 0x6
+    call concatname
- jmp MMXtest
+    jmp MMXtest
 .I63:
     mov [micron], 28
-Text 110,70,0x00000000,P63, P63len-P63
+    Text 110,70,0x00000000,P63, P63len-P63
+    mov esi, P63
+    mov edi, saveproc + 0x6
+    call concatname
- jmp MMXtest
+    jmp MMXtest
 .I65:
     mov [micron], 25
     cmp [L2], 0
     jne .pp65  ; Pentium
-Text 110,70,0x00000000,P65c, P65clen-P65c
+    Text 110,70,0x00000000,P65c, P65clen-P65c
+    mov esi, P65c
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .pp65:
-Text 110,70,0x00000000,P65, P65len-P65
+    Text 110,70,0x00000000,P65, P65len-P65
+    mov esi, P65
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I66:
     mov [micron], 25
 Text 110,70,0x00000000,P66, P66len-P66
+mov esi, P66
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I67:
     mov [micron], 25
 Text 110,70,0x00000000,P67, P67len-P67 ;but if SSE4.1 supported then it is Intel Core (Penryn)
+    mov esi, P67
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I68:
     mov [micron], 18
     cmp [L2], 128
     jne .pp68  ; Pentium
 Text 110,70,0x00000000,P68c, P68clen-P68c
+mov esi, P68c
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
  .pp68:
 Text 110,70,0x00000000,P68, P68len-P68
+mov esi, P68
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I69:
     mov [micron], 13
 Text 110,70,0x00000000,P69 , P69len-P69
+mov esi, P69
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I6A:
     mov [micron], 18
 Text 110,70,0x00000000,P6A, P6Alen-P6A ;but if SSE4.2 supported then it is Intel Core (Nehalem)
+    mov esi, P6A
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I6B:
     mov [micron], 13
     cmp [L2], 256
     jne .pp6B  ; Pentium
 Text 110,70,0x00000000,P6Bc, P6Bclen-P6Bc
+mov esi, P6Bc
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .pp6B:
 Text 110,70,0x00000000,P6B, P6Blen-P6B
+mov esi, P6B
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I6D:
     mov [micron], 9
 Text 110,70,0x00000000,P6D, P6Dlen-P6D
+mov esi, P6D
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I6E:
     mov [micron], 6
 Text 110,70,0x00000000,P6E, P6Elen-P6E
+mov esi, P6E
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .I6F:
     mov [micron], 6
 Text 110,70,0x00000000,P6F, P6Flen-P6F
+mov esi, P6F
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 ;06Ex - Pentium M Yonah 0.065
+;06Fx - Pentium D Conroe 0.065, Xeon Woodcrest, Celeron D AllenDale, Core 2 Kentsfield
+NEWintel:
+   cmp [em],$3A   ;IvyBridge
+    jz I3A
+   cmp [em],$2A   ;SandyBridge
+    jz I2A
+   cmp [em],$2D  ;SandyBridge-E/EN/EP
+    jz I2D
+   cmp [em],$25   ;Arrandale/Clarksdale
+    jz I25
+   cmp [em],$2C   ;Gulftown/Westmere-EP
+    jz I2C        ;westmere-EP stepping B1 -> micron 0.032
+   cmp [em],$2F   ;Westmere-EX
+    jz I2F
+   cmp [em],$1E   ;Clarksfield/Lynnfield/Jasper Forest
+    jz I1E
+   cmp [em],$1A   ;Bloomfield/Nehalem-EP
+    jz I1A
+   cmp [em],$2E   ;Nehalem-EX
+    jz I2E
+   cmp [em],$17   ;Yorkfield/Wolfdale/Penryn/Harpertown (DP)
+    jz I17
+   cmp [em],$1D   ;Dunnington (MP)
+    jz I1D
+   cmp [em],$0F   ;Clovertown/Kentsfield/Conroe/Merom/Woodcrest
+    jz I0F
+   cmp [em],$16   ;Merom Conroe
+    jz I16
+   cmp [em],$06   ;Cedar Mill/Presler
+    jz I06
+   cmp [em],$03   ;Nocona Irwindale / Prescott
+    jz I03
+   cmp [em],$04   ;NoconaIrwindale / Prescott
+    jz I03
+   cmp [em],$0D   ;Dothan
+    jz I0D
+   cmp [em],$36   ;Cedarview
+    jz I36
+   cmp [em],$26   ;Lincroft
+    jz I26
+   cmp [em],$1C   ;Pineview/Silverthorne
+    jz I1C
+Inewunknown:
+    jmp MMXtest
+I3A:
+mov [micron], 32
+;Text 110,70,0x00000000,P3A, P3Alen-P3A
+mov [cname], P3A
+mov esi, P3A
+mov edi, saveproc + 0x10
+call concatname
+jmp MMXtest
+I2A:
+mov [micron], 32
+;Text 110,70,0x00000000,P2A, P2Alen-P2A
+mov [cname], P2A
+mov esi, P2A
+mov edi, saveproc + 0x10
+call concatname
+jmp MMXtest
+I2D:
+mov [micron], 32
+;Text 110,70,0x00000000,P2D, P2Dlen-P2D
+mov [cname], P2D
+mov esi, P2D
+mov edi,saveproc + 0x10
+call concatname
+jmp MMXtest
+I25:
+mov [micron], 32
+;Text 110,70,0x00000000,P25, P25len-P25
+mov [cname], P25  ;P25
+mov esi, P25
+mov edi, saveproc + 0x10  ;12
+call concatname
+jmp MMXtest
+I2C:
+mov [micron], 32
+;Text 110,70,0x00000000,P2C, P2Clen-P2C
+mov [cname], P2C
+mov esi, P2C
+mov edi,saveproc + 0x10
+call concatname
+    jmp MMXtest
+I2F:
+mov [micron], 32
+;Text 110,70,0x00000000,P2F, P2Flen-P2F
+mov [cname], P2F
+mov esi, P2F
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I1E:
+mov [micron], 32
+;Text 110,70,0x00000000,P1E, P1Elen-P1E
+mov [cname], P1E
+mov esi, P1E
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I1A:
+mov [micron], 45
+;Text 110,70,0x00000000,P1A, P1Alen-P1A
+mov [cname], P1A
+mov esi, P1A
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I2E:
+mov [micron], 45
+;Text 110,70,0x00000000,P2E, P2Elen-P2E
+mov [cname], P2E
+mov esi, P2E
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I17:
-;06Fx - Pentium D Conroe 0.065, Xeon Woodcrest, Celeron D AllenDale, Core 2 Kentsfield
+mov [micron], 45
+;Text 110,70,0x00000000,P17, P17len-P17
+mov [cname], P17
+mov esi, P17
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I1D:
+mov [micron], 45
+;Text 110,70,0x00000000,P1D, P1Dlen-P1D
+mov [cname], P1D
+mov esi, P1D
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I0F:
+mov [micron], 65
+;Text 110,70,0x00000000,P0F, P0Flen-P0F
+mov [cname], P0F
+mov esi, P0F
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I16:
+mov [micron], 65
+;Text 110,70,0x00000000,P16, P16len-P16
+mov [cname], P16
+mov esi, P16
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I06:
+mov [micron], 32
+;Text 110,70,0x00000000,P06, P06len-P06
+mov [cname], P06
+mov esi, P06
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I03:
+mov [micron], 32
+;Text 110,70,0x00000000,P03, P03len-P03
+mov [cname], P03
+mov esi, P03
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I0D:
+mov [micron], 32
+;Text 110,70,0x00000000,P0D, P0Dlen-P0D
+mov [cname], P0D
+mov esi, P0D
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I36:
+mov [micron], 32
+;Text 110,70,0x00000000,P36, P36len-P36
+mov [cname], P36
+mov esi, P36
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I26:
+mov [micron], 32
+;Text 110,70,0x00000000,P26, P26len-P26
+mov [cname], P26
+mov esi, P26
+mov edi, saveproc + 0x10
+call concatname
+    jmp MMXtest
+I1C:
+mov [micron], 32
+;Text 110,70,0x00000000,P1C, P1Clen-P1C
+mov [cname], P1C
+mov esi, P1C
+mov edi, saveproc + 0x10
+call concatname
-.sev:	 ;Family=7
+    jmp MMXtest
+;;;;;;;;;;;;;;;;;;;
-.IS0:
+sev:	;Family=7
 .IS0:
+Text 15, 190,0x00000000,cache, cachelen-cache
+mov [micron], 18
-Text 15, 190,0x00000000,cache, cachelen-cache ;?
+Text 110,70,0x00000000,PS0, PS0len-PS0
+mov esi, PS0
-    mov [micron], 18
+mov edi, saveproc + 0x6
-Text 110,70,0x00000000,PS0, PS0len-PS0
+call concatname
  jmp MMXtest
 .IF0:
     mov [micron], 18
     cmp [L2], 128
     jne .ppF0  ; Pentium
 Text 110,70,0x00000000,PF0c, PF0clen-PF0c
+mov esi, PF0c
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .ppF0:
 Text 110,70,0x00000000,PF0, PF0len-PF0
+mov esi, PF0
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .IF1:
     mov [micron], 18
     cmp [L2], 128
     je .IF0;jne.ppF1  ; Pentium
   ;  mov   esi,PF0clen-PF0c
   ;  mcall
   ;jmp MMXtest
 ;.ppF1:
 Text 110,70,0x00000000,PF0, PF0len-PF0
+mov esi, PF0
+    mov edi, saveproc + 0x6
+    call concatname
  jmp MMXtest
 .IF2:
     mov [micron], 13
     cmp [L2], 128
     jne .ppF2  ; Pentium
 Text 110,70,0x00000000,PF2c, PF2clen-PF2c
+mov esi, PF2c
+    mov edi, saveproc + 0x6
+    call concatname
  jmp MMXtest
 .ppF2:
 Text 110,70,0x00000000,PF2, PF2len-PF2
+mov esi, PF2
+    mov edi, saveproc + 0x6
+    call concatname
  jmp MMXtest
 .IF3:
     mov [micron], 09
     cmp [L2], 256
     jne .ppF3  ; Pentium
 Text 110,70,0x00000000,PF3c, PF3clen-PF3c
+mov esi, PF3c
+    mov edi, saveproc + 0x6
+    call concatname
  jmp MMXtest
 .ppF3:
 Text 110,70,0x00000000,PF3, PF3len-PF3
+mov esi, PF3
+    mov edi, saveproc + 0x6
+    call concatname
  jmp MMXtest
 .IF5:
     mov [micron], 09
     cmp [L2], 512
     jae .ppF5  ; Pentium
+Text 110,70,0x00000000,PF5c, PF5clen-PF5c
+mov esi, PF5c
+    mov edi, saveproc + 0x6
-Text 110,70,0x00000000,PF5c, PF5clen-PF5c
+    call concatname
  jmp MMXtest
 .ppF5:
+Text 110,70,0x00000000,PF5, PF5len-PF5
+mov esi, PF5
+    mov edi, saveproc + 0x6
-Text 110,70,0x00000000,PF5, PF5len-PF5
+    call concatname
  jmp MMXtest
  .IF6:
     mov [micron], 06  ; 065
     cmp [L2], 512
+    ja .ppF6  ; Pentium
+Text 110,70,0x00000000,PF6c, PF6clen-PF6c
+mov esi, PF6c
-    ja .ppF6  ; Pentium
+    mov edi, saveproc + 0x6
-Text 110,70,0x00000000,PF6c, PF6clen-PF6c
+    call concatname
  jmp MMXtest
+.ppF6:
+Text 110,70,0x00000000,PF6, PF6len-PF6
+mov esi, PF6
-.ppF6:
+    mov edi, saveproc + 0x6
-Text 110,70,0x00000000,PF6, PF6len-PF6
+    call concatname
  jmp MMXtest
+ next_generation:
 Text 110,70,0x00000000,NG, NGlen-NG
 mov esi, NG
- next_generation:
+    mov edi, saveproc + 0x6
+    call concatname
-Text 110,70,0x00000000,NG, NGlen-NG
+  jmp MMXtest
-  jmp MMXtest
+;----------------------------------
-;----------------------------------
+Cyrix:
 Cyrix:
-Text 15, 190,0x00000000,cache, cachelen-cache
+mov [codeN], 3
 Text 15, 190,0x00000000,cache, cachelen-cache
 	mov	esi, cyrix
-	call	load_gif
+	mov	esi, cyrix
-PutImage 135,107,201,49,img_area+8
+	call	load_gif
     mov [micron], 50 ;35?
     mov [L1i], 8
     mov [L1d], 8
     mov [L2], 512
 Text 75,70,0x00000000,Cyrixn, Cyrixnlen-Cyrixn
+mov esi, Cyrixn
+    mov edi, saveproc
+    call concatname
 Text 110,70,0x00000000,C52, C52len-C52
+mov esi, C52
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .C54:
     mov [micron], 50
     mov [L1i], 8
     mov [L1d], 8
     mov [L2], 512
 Text 75,70,0x00000000,Cyrixn, Cyrixnlen-Cyrixn
+mov esi, Cyrixn
+    mov edi, saveproc
+    call concatname
 Text 110,70,0x00000000,C54, C54len-C54
+mov esi, C54
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .sixx:	   ;Family=6
    cmp [m],$0
     mov [micron], 25
     mov [L1i], 32
     mov [L1d], 32
     mov [L2], 512
 Text 75,70,0x00000000,Cyrixn, Cyrixnlen-Cyrixn
+mov esi, Cyrixn
+    mov edi, saveproc
+    call concatname
 Text 110,70,0x00000000,C60, C60len-C60
+mov esi, C60
+    mov edi, saveproc + 0x6
+    call concatname
     jmp MMXtest
 .C65:
     mov [micron], 25 ;35?
     mov [L1i], 32
     mov [L1d], 32
     mov [L2], 512
 Text 75,70,0x00000000,Centaurn, Centaurnlen-Centaurn
+mov esi, Centaurn
+    mov edi, saveproc
+    call concatname
     mov edx,C65
     mov esi,C65len-C65
     jmp OutProcName
 ;---------------------
 Centaur:
 shr ecx, 24
 mov [L1d], ecx
 shr edx, 24
 mov [L1i], edx
 ; cache detection routine
 ;CACHE1:
 mov eax, 80000005h
 PutImage 135,107,201,49,img_area+8
 ;PutImage 125,107,201,49,img_area+8
 ;         place   size
+Text 75,70,0x00000000,IDTn, IDTnlen-IDTn
+mov esi, IDTn
+    mov edi, saveproc + 0x4
-Text 75,70,0x00000000,IDTn, IDTnlen-IDTn
+    call concatname
     cmp [m],$4
     jz .V54
     cmp [m],$8
     jz .V58
 sixC:	;Family=6
 	mov	esi, via
 	call	load_gif
-PutImage 135,107,201,49,img_area+8
-;PutImage 125,107,201,49,img_area+8
+PutImage 135,107,201,49,img_area+8
 ;         place   size
+Text 75,70,0x00000000,Centaurn, Centaurnlen-Centaurn
+mov esi, Centaurn
     mov edi, saveproc
-Text 75,70,0x00000000,Centaurn, Centaurnlen-Centaurn
+    call concatname
     cmp [m],$6
     jz .V66
     cmp [m],$7
 Transmeta:
 Text 15, 190,0x00000000,cache, cachelen-cache
+Text 75,70,,Tranmsmetan, Tranmsmetanlen-Tranmsmetan
+mov esi, Tranmsmetan
     mov edi, saveproc
-Text 75,70,,Tranmsmetan, Tranmsmetanlen-Tranmsmetan
+    call concatname
-	mov	esi, transmeta
-	call	load_gif
-PutImage 135,107,201,49,img_area+8
+	mov	esi, transmeta
-;PutImage 125,107,201,49,img_area+8
+	call	load_gif
-;         place   size
+PutImage 135,107,201,49,img_area+8
     mov [L2], 256
     mov [wayl2], 4
     mov [wayli], 4
     mov [wayld], 4
 Text 75,70,0x00000000,Vortexn, Vortexnlen-Vortexn
+mov esi, Vortexn
+    mov edi, saveproc
+    call concatname
 ;Text 110,70,0x00000000,V54, V54len-V54
     jmp MMXtest
    mov	dword [HTTn+ 9],  $6F6E
    mov	dword [HTT+ 6],  $6F6E
-TEXTOUT:
-Text 15,110,0x00000000,fam, famlen-fam
-Text 15,130,,mode, modelen-mode
-Text 15,150,,step, steplen-step
-;--------L1  L2
-Number 75,170,0,3,dword [L1d],0x000000;
-Number 75,190,,,dword [L1i]
-Number 41,210,0,4,dword[L2]
-Number 35,230,0,5,dword[L3]
-;-----------Features
-Number 258,50,0,2,dword [micron]  ; micron
+TEXTOUT:
-Text 275,290,0x00000000,HTT, HTTlen-HTT
-Text 275,310,,sse3, sse3len-sse3
-Text 15,70,,name, namelen-name
+Text 275,290,0x00000000,HTT, HTTlen-HTT
 Text 275,310,,sse3, sse3len-sse3
 Text 15,290,,MMXs, MMXslen-MMXs
 Text 15,310,,SSE, SSElen-SSE
 Text 95,310,,SSE2, SSE2len-SSE2
+;-------------------
-    Number 140,170,0,2,dword [wayld],0x000000
+TEST3DNOW:
-    Number 218,170,,,dword [lineld]
+  xor edx, edx
-    Number 140,190,,,dword [wayli]
+  cmp [smallvendor], 'ntel'
-    Number 218,190,,,dword [lineli]
+;  je @f  ;recent change
+jne .t
+.t:
+  mov	eax, $80000001 ;// Setup extended function 8000_0001h
+  cpuid
+  test	edx, $80000000 ;// Test bit 31
+  jnz	.XIT
-    Number 140,210,,,dword [wayl2]
+.NOEXTENDED: ;// 3DNow! technology is supported
-    Number 218,210,,,dword [linel2]
    mov	dword [now+ 9], $6F6E
-    Number 140,230,,,dword [wayl3]
+   jmp TEST3DNOWP
+.XIT:
+   mov	dword [now+ 9],  $736579
-    Number 218,230,,,dword [linel3]
+   jmp TEST3DNOWP
-;-------------------
-TEST3DNOW:
+TEST3DNOWP:
-  xor edx, edx
   cmp [smallvendor], 'ntel'
+  je .NOEXTENDEDP
-  je @f
+.tp:
   mov	eax, $80000001 ;// Setup extended function 8000_0001h
+  cpuid
-  cpuid
+test	edx, $40000000 ;// Test bit 30
   jnz	.XITP  ;// 3DNow! technology is supported
 @@:
-  mov   eax, now+9
+.NOEXTENDEDP:
-  add   edx, edx
+   mov	dword [nowp+ 9], $6F6E
-  call  write_yes_no_cf
+   jmp TESTMMXP
 .XITP:
-  mov   eax, nowp+9
+   mov	dword [nowp+ 9],  $736579
-  add   edx, edx
+   jmp TESTMMXP
    mov	dword [mmxp+ 7],  $736579
    mov	dword [MMXPi+ 8],  $736579
 text3d:
-Text 175,290,0x00000000,now, nowlen-now
+Text 15,330,0x00000000,now, nowlen-now
-Text 175,310,,nowp, nowplen-nowp
+Text 95,330,,nowp, nowplen-nowp
 Text 95,290,,mmxp, mmxplen-mmxp
+jmp still
 jmp still
 ;--------------------------
-;--------------------------
+NO_CPUID:
-NO_CPUID:
+ mov [nocpuid], 1
 ; waiting for events
 event_wait:
     ;================_RAM_==============
-  Number 200,340,0,4,dword [ram_size_a],0xFFFFFF
+  Number 200,350,0,4,dword [ram_size_a],0xFFFFFF ;Number 200,340,0,4,dword [ram_size_a],0xFFFFFF
   shr eax, 10
   mov [ram_size_t], eax
-  Text 115,340,0x00000000,ram, ramlen-ram
-  Text 300,340,,mb, mblen-mb
   Text 115,350,0x00000000,ram, ramlen-ram
-  Number 200,340,0,4,dword [ram_size_a],0x000000
+  Number 200,350,0,4,dword [ram_size_a],0x000000
   Number 270,350,,,dword [ram_size_t]
   Number 270,340,,,dword [ram_size_t]
 ;==============================
 	mov	eax,23	     ; function 23 - event wait
-	mov	eax,23	     ; function 23 - event wait
+	mov	ebx,50	     ; wait for 0.5 second
-	mov	ebx,50	     ; wait for 0.5 second
+	mcall
 	mcall
     cmp  eax,1		;
     cmp  ah,1		;  = 1 ?
     je	close		; close
     cmp  ah,2		;  = 2 ?
-    je	thread_start	;
-			;
-;    cmp  ah,3		;  = 3 ?
-    jne  still
+    je	thread_start	;
+    cmp  ah, 3
-;vybor:
+    je call_OpenDialog
-; Number 310,70,0,4,dword [rating],0xFFFFFF ;
-; Number 315,90,0,3,dword [FRS]; MHz
-;cmp [FRS], 266
+     mov	eax,11	     ; function 23 - event wait
-;jz .s1
-;cmp [FRS], 333
-;jz .s2
-;cmp [FRS], 400
+   mov  ebx,1
-;jz .s3
+   mcall
-;.s1:
-;mov [FRS], 333
-;.rating:;
+   mov	eax,15	     ; function 23 - event wait
-;call newrating
-; Number 310,70,0,4,dword [rating],0x000000
-; Number 315,90,0,3,dword [FRS]; MHz
-;jmp  still
-;
-;.s2:
-;mov [FRS], 400
-;jmp .rating
+   mov  ebx,3
    mcall
 ;.s3:
     mov  [num_win2],0	;
     or	 eax,-1 	;
+    mcall
     mcall
+draw_window_2:
     ;call prepare_text_area
 draw_window_2:
     mov  eax,12 		   ; function 12:tell os about windowdraw
     mov  ebx,1h 		    ; 1, start of draw
     mcall
 Window 250,250,420,520, 0x33FFFFFF, 0x805080d0, standard  ;460
-  Window 250,250,420,390, 0x33FFFFFF, 0x805080d0, standard
-	  ; place size
-Text 15, 10,0x00000000, STDCA, STDCAlen-STDCA
+; place size
 Text 215, 10,, EXTCA, EXTCAlen-EXTCA
-Number 135,10,1*256,8,dword [stdc],0x000000
+Text 15, 10,0x00000000, STDCA, STDCAlen-STDCA
 ;---------------
 DrawLine 0,  410, 185,185,0x8080FF  ;10
 mov   eax,$80000000
 cpuid
-;mov eax, $03020101   for test of reaction
+;mov eax, $03020101  \A0for test of reaction
 test eax, eax
 js  goooddd
 Text 15,255,,EST, ESTlen-EST
 Text 15,275,,TM2, TM2len-TM2
 Text 15,295,,VMX, VMXlen-VMX
 Text 15,315,,SVM, SVMlen-SVM
+Text 15,355,0x00000000,SMX, SMXlen-SMX
+Text 15,335,0x00000000,PAGE, PAGElen-PAGE
+Text 15,375,0x00000000,MIS, MISlen-MIS
+Text 115,355,0x00000000,WDT, WDTlen-WDT
 Text 115,195,,CNXT_ID, CNXT_IDlen-CNXT_ID
 Text 115,215,,CX16, CX16len-CX16
 Text 115,235,,ETPRD, ETPRDlen-ETPRD
 Text 115,255,,SYS, SYSlen-SYS
 Text 115,275,,LAF, LAFlen-LAF
 Text 115,295,,SSSE3, SSSE3len-SSSE3
+Text 115,315,,MCR8, MCR8len-MCR8
+Text 115,335,0x00000000,EAS, EASlen-EAS
+Text 115,375,0x00000000,DNP, DNPlen-DNP
-Text 115,315,,MCR8, MCR8len-MCR8
+Text 315,375,0x00000000,SSE5, SSE5len-SSE5
 Text 215,195,,MP, MPlen-MP
 Text 215,215,,NX, NXlen-NX
 Text 215,235,,MMXPi, MMXPilen-MMXPi
 Text 215,255,,MMXn, MMXnlen-MMXn
+Text 215,275,,FXSRn, FXSRnlen-FXSRn
+Text 215,295,,DCA,DCAlen-DCA
+Text 315,295,0x00000000,SSE41,SSE41len-SSE41
+Text 215,335,0x00000000,x2APIC,x2APIClen-x2APIC
-Text 215,275,,FXSRn, FXSRnlen-FXSRn
+Text 215,355,0x00000000,ABM,ABMlen-ABM
-Text 215,295,,DCA,DCAlen-DCA
+Text 215,375,0x00000000,OSVW,OSVWlen-OSVW
 Text 315,195,,FFXSR, FFXSRlen-FFXSR
 Text 315,215,,TSCP, TSCPlen-TSCP
 Text 315,235,,LM, LMlen-LM
-Text 315,255,,DNo, DNolen-DNo
+Text 315,255,,DNo, DNolen-DNo
+Text 315,275,,DN, DNlen-DN
+Text 215,315,,CMPL, CMPLlen-CMPL
+Text 315,315,0x00000000,SS42,SS42len-SS42
-Text 315,275,,DN, DNlen-DN
+Text 315,335,0x00000000,PPCNT,PPCNTlen-PPCNT
-Text 315,295,,CMPL, CMPLlen-CMPL
+Text 315,295,0x00000000,SSE4A,SSE4Alen-SSE4A
+Text 315,355,0x00000000,SKINIT_,SKINIT_len-SKINIT_
+too:
+DrawLine 10,  400, 430,430,0x8080FF  ;10
+Text 15,415,0x00000000,speed, speedlen-speed
+Text 130,415,,kbpersec, kbperseclen-kbpersec
+DrawLine 10, 80, 400, 400, 0x8080FF
+ Text 90,400,0x80000000,performancestr, 0
+DrawLine 322, 400, 400, 400, 0x8080FF
+DrawLine 10, 10, 400, 490, 0x8080FF
-too:
+DrawLine 400, 400, 400, 490, 0x8080FF
+DrawLine 10, 400, 490, 490, 0x8080FF
+	      ; your proc
+		Text 20,415,0x808080FF,currentcpu, 0
+		Number 170,415,0,5,dword [iter],0x000000       ; + 15
+		;Text 115,370,,kbpersec, kbperseclen-kbpersec  ;+ 355
+		mov eax, dword[iter]
+		;mov ebx, 100
+		;mul ebx
+		add eax, 215
+		mov word[linelen], ax	; need to store it as drawline corrupts eax
+		DrawLine 215,  [linelen], 416,416,0x8080FF  ;10 + 355 , 357
+		DrawLine 215,  [linelen], 417,417,0x8080FF  ;10
+		DrawLine 215,  [linelen], 418,418,0x8080FF  ;10
+	;;;	DrawLine 20,  390, 371,371,0x8080FF  ;10
+		; sample proc 1
+		Text 20,435,0x80000000,samplename1,0	   ; 10 + 40 + 40 +40 + 380
+		Number 170,435,0,5,dword [samplespeed1],0x000000;   ; 25 + 40 + 40 +40 + 380
+		;Text 115,470,0,kbpersec, kbperseclen-kbpersec	; 25 + 40 + 40 +40 + 380
+		mov eax, dword[samplespeed1]
+		add eax, 215
+		mov dword[linelen], eax   ; need to store it as drawline corrupts eax
+		DrawLine 215,  [linelen], 436,436,0x8080FF  ;27+40 + 40 +40  + 380
+		DrawLine 215,  [linelen], 437,437,0x8080FF  ;10
+		DrawLine 215,  [linelen], 438,438,0x8080FF  ;10
+		; sample proc 2
+		Text 20,455,0x80000000,samplename2,0	 ; 10 + 40 + 350
+		Number 170,455,0,5,dword [samplespeed2],0x000000;   ; 25 + 40 + 350
+		;Text 115,410,0,kbpersec, kbperseclen-kbpersec	; 25 + 40 + 350
+		mov eax, dword[samplespeed2]
+		add eax, 215
+		mov dword[linelen], eax   ; need to store it as drawline corrupts eax
+		DrawLine 215,  [linelen], 456,456,0x8080FF  ;27+40 + 355
+		DrawLine 215,  [linelen], 457,457,0x8080FF  ;10
+		DrawLine 215,  [linelen], 458,458,0x8080FF  ;10
+	       ; sample proc 3
+		Text 20,475,0x80000000,samplename3,0	 ; 10 + 40 + 40 + 38
+		Number 170,475,0,5,dword [samplespeed3],0x000000;   ; 25 + 40 + 40 + 355
+		;Text 115,440,0,kbpersec, kbperseclen-kbpersec	; 25 + 40 + 40 + 380
-DrawLine 0,  410, 335,335,0x8080FF  ;10
+		mov eax, dword[samplespeed3]
 		add eax, 215
-Text 15,350,0x00000000,speed, speedlen-speed
+		mov dword[linelen], eax   ; need to store it as drawline corrupts eax
-Text 130,350,,kbpersec, kbperseclen-kbpersec
+		DrawLine 215,  [linelen], 476,476,0x8080FF  ;27+40 + 40
+		DrawLine 215,  [linelen], 477,477,0x8080FF  ;10
+		DrawLine 215,  [linelen], 478,478,0x8080FF  ;10
+    mov  eax,12
+    mov  ebx,2h
+    mcall
+    ret
+linelen  dd 0
 currentcpu db 'Current CPU',0
-Number 95,350,0,5,dword [iter],0x000000; RSA test results
+samplename1 db 'Intel Core i5 CPU', 0x000000    ; not real results!
 samplespeed1 dd 62
-    mov  eax,12
+samplename2 db 'Intel Core i3 CPU', 0
-    mov  ebx,2h
+samplespeed2 dd 48
-    mcall
+samplename3 db 'Intel Pentium Dual CPU', 0
+samplespeed3 dd 35
-    ret
+performancestr db 'PERFORMANCE (KB/S in RSA test 256 bit)',0
+ptsstring db ''
 num_win2 db 0
 ;   *******  main window *******
 draw_window:
+   mov eax,12
+   mov	ebx,1h
+   mcall
+ Window 150,150,350,430, 0x34FFFFFF, 0x805080d0, title
+	  ; place size
+   Button 15,345,92,23,2+0x40000000,0x03FFFFFF ; button "press for more"
    mov eax,12
-   mov	ebx,1h
+	mov	esi, knopka
-   mcall
+	mov	edi, img_area2
  	call	load_gif2
-  Window 150,150,350,385, 0x34FFFFFF, 0x805080d0, title
-	  ; place size
+PutImage 15,345,93,24,img_area2+8 ; image "press for more"
+;         place   size
-  Button 15,330,92,23,2+0x40000000,0x03FFFFFF   ;  button "press for more"
-	mov	esi, knopka
+  Button 15,380,92,23,3+0x40000000,0x03FFFFFF ; button "save"
 	mov	edi, img_area2
-	call	load_gif2
+	mov	esi, knopka2
-PutImage 15,330,93,24,img_area2+8   ; image "press for more"
+	mov	edi, img_area3
-;         place   size
+	call	load_gif2
   PutImage 15,380,93,24,img_area3+8   ; image "save"
-    mov  eax,12
+;         place   size
     mov  ebx,2h
-    mcall
+    mov  eax,12
+    mov  ebx,2h
+    mcall
+    Text 130,270,0x00000000,instruct, instructlen-instruct
+    DrawLine  10,  330, 340,340,0x8080FF
+    DrawLine 330,  330, 275,340;,0x8080FF
+    DrawLine  10,   10, 275,340;,0x8080FF
+    DrawLine  10,  125, 275,275;,0x8080FF
+    DrawLine 230,  330, 275,275;,0x8080FF
+  cmp dword[smallvendor], 'cAMD'
+  jne cont
+  cmp [f], $6
+  jne cont
+;   Button 240,85,69,15,3,0x030000FF  ;  button for rating
+;    Text 245,90,0x00FFFFFF,FR, FRlen-FR ; text at button
+   call newrating; !!!!
+     cont:
+    Text 15,50,0x00000000,tsum, tsumlen-tsum   ;
+;Number 82,50,0,4,dword [total],0x000000; MHz
+    mov esi, total
+    mov edi, tsum + 0xB  ;0xA
+    call savenumber
+    ;Number 110,50,0,2,dword [sot]; KHz
+    mov esi, sot
+    mov edi, tsum + 0x10
+    call savenumber
+    ;Number 75,110,1*256,1,dword [f],0x000000 ;
+    mov esi, f
+    mov edi, fam + 0x8     ;0x9
+    call savenumber
+    ;Number 75,130,,,dword [m]
+    mov esi, m
+    mov edi, mode + 0x7
+    call savenumber
+    ;Number 75,150,,,dword [s]
+    mov esi, s
+    mov edi, step + 0xa   ;0x9
+    call savenumber
+    ;Number 110,110,1*256,2,dword [ef]
+    mov esi, ef
+    mov edi, fam + 0xE    ;0x9
+    call savenumber
+    ;Number 110,130,,,dword [em]
+    mov esi, em
+    mov edi, mode + 0xE   ;0xD
+    call savenumber
+    mov esi, multb
+    mov edi, multil + 0xB
+    call savenumber
+    ;Number 105,30,0,1,dword [multa]
+    mov esi, multa
+    mov edi, multil + 0xf
+    call savenumber
+    ;Number 140,170,0,2,dword [wayld],0x000000
+    mov esi, wayld
+    mov edi, cache2 + 0x14   ;0x14
+    call savenumber
+   ;Number 218,170,,,dword [lineld]
+    mov esi, lineld
+    mov edi, cache2 + 0x21
+    call savenumber
+    ;Number 140,190,,,dword [wayli]
+    mov esi, wayli
+    mov edi, cache + 0x14
+    call savenumber
+    ;Number 218,190,,,dword [lineli]
+    mov esi, lineli
+    mov edi, cache + 0x21
+    call savenumber
+    ;Number 140,210,,,dword [wayl2]
+    mov esi, wayl2
+    mov edi, cache3 + 0x14
+    call savenumber
+    ;Number 218,210,,,dword [linel2]
+    mov esi, linel2
+    mov edi, cache3 + 0x21
+    call savenumber
+    ;Number 140,230,,,dword [wayl3]
+    mov esi, wayl3
+    mov edi, cache4 + 0x14
+    call savenumber
+    ;Number 218,230,,,dword [linel3]
+    mov esi, linel3
+    mov edi, cache4 + 0x21
+    call savenumber
+    mov esi, L1d
+    mov edi, cache2 + 0xa
+    call savenumber
+;Number 75,190,,,dword [ L1i]
+    mov esi, L1i
+    mov edi, cache + 0xa
+    call savenumber
+;Number 41,210,0,4,dword[L2]
+    mov esi, L2
-    Text 130,270,0x00000000,instruct, instructlen-instruct
+    mov edi, cache3 + 0x4    ;0x3
+    call savenumber
     DrawLine  10,  330, 325,325,0x8080FF
-    DrawLine 330,  330, 275,325;,0x8080FF
-    DrawLine  10,   10, 275,325;,0x8080FF
+;Number 35,230,0,5,dword[L3]
-    DrawLine  10,  125, 275,275;,0x8080FF
+    mov esi, L3
+    mov edi, cache4 + 0x4   ;0x3
+    call savenumber
-    DrawLine 230,  330, 275,275;,0x8080FF
+;-----------Features
+;Number 258,50,0,2,dword [micron]  ; micron
+    mov esi, micron
+    mov edi, tech + 0xE
+    call savenumber
+    mov esi, stdc
+    mov edi, STDCA + 0x14
+    call savenumber
+;Number 335,10,,,dword [extc],
+    mov esi, extc
+    mov edi, EXTCA + 0x14
+    call savenumber
+    Text 15,90,,cpuname, cpunamelen-cpuname;
+    Text 255,250,,typen, typenlen-typen
-  cmp dword[smallvendor], 'cAMD'
+    Text 175, 50,,tech, techlen-tech;
-  jne cont
-  cmp [f], $6
+   red2:
-  jne cont
+    ;;;;;;;;;;;;;;;;;;;;;;;;
+    goon:
+    call decodebrand
+   typedetect:
+	mov	edx, t1
+	cmp	[t], 00b
+	jz	@f
+	mov	edx, t2
+	cmp	[t], 01b
+	jz	@f
+	mov	edx, t3
+	cmp	[t], 11b
+	jz	@f
+	mov	edx, t4
+@@:
+	mov	ebx, 290*65536 + 250
+	mov	ecx, 0x80000000
+	mcall	4
+    Text 15,250,,brandid, brandidlen-brandid
+    Text 15,110,0x00000000,fam, famlen-fam
+    Text 15,130,0x00000000,mode, modelen-mode
+    Text 15,150,0x00000000,step, steplen-step
+    Text 275,290,0x00000000,HTT, HTTlen-HTT
+    Text 275,310,,sse3, sse3len-sse3
-;   Button 240,85,69,15,3,0x030000FF  ;  button for rating
+    Text 175,290,0x00000000,SSE41, SSE41len-SSE41
+    Text 175,310,0x00000000,SSE42, SSE42len-SSE42
-;    Text 245,90,0x00FFFFFF,FR, FRlen-FR ; text at button
+    Text 175,330,0x00000000,SSE5, SSE5len-SSE5
    call newrating; !!!!
     Text 15,70,,name, namelen-name
-     cont:
+    Text 15,290,,MMXs, MMXslen-MMXs
+    Text 15,310,,SSE, SSElen-SSE
+    Text 95,310,,SSE2, SSE2len-SSE2
+    Text 95,290,,mmxp, mmxplen-mmxp
+    Text 15,330,0x00000000,now, nowlen-now
+    Text 95,330,,nowp, nowplen-nowp
+    Text 115,350,0x00000000,ram, ramlen-ram
+    Number 200,350,0,4,dword [ram_size_a],0x000000
+    Number 270,350,0,4,dword [ram_size_t]
+    Text 300,350,0x00000000,mb, mblen-mb
+    Text 15, 190,0x00000000,cache, cachelen-cache
+    Text 15,170,0x00000000,cache2, cache2len-cache2
+    Text 15,210,,cache3, cache3len-cache3
+    Text 15,230,,cache4, cache4len-cache4
+    Text 110,70,0x00000000,dword[cname], 40
+    call	load_gif
+    cmp [nomultiplier], $1
+    je nomultip
+Text   15,30,0x00000000,multil2, multil2len-multil2
+Text   175,30,0x00000000,freql2, freql2len-freql2
+Number 85,30,0,2,dword [multb],0x000000;
+Number 105,30,0,1,dword [multa]
+Number 259,30,0,4,dword [freqbb]
+Number 289,30,0,2,dword [freqll]
+     JumpForCodename:
+    cmp [codeN], $1
+    je codeNIntel
+    cmp [codeN], $2
+    je codeNAMD
+    cmp [codeN], $3
+    je codeNCyrix
+    cmp [codeN], $4
+    je codeNCentaur
+    cmp [codeN],$5
+    je codeNTransmeta
+    cmp [codeN], $6
+    je codeNVortex
+codeNIntel:
+Text 75,70,0x00000000,Inteln, Intelnlen-Inteln
+mov	esi, intel
+call	load_gif
+PutImage 135,107,201,49,img_area+8
+jmp nnn
+codeNAMD:
+Text 75,70,,AMDn, AMDnlen-AMDn
+mov	esi, amd
+call	load_gif
+PutImage 135,107,201,49,img_area+8
+jmp nnn
+codeNCyrix:
+Text 75,70,0x00000000,Cyrixn, Cyrixnlen-Cyrixn
+mov	esi, cyrix
+call	load_gif
+PutImage 135,107,201,49,img_area+8
+jmp nnn
+codeNCentaur:
-    Text 15,50,0x00000000,tsum, tsumlen-tsum   ;
+Text 75,70,0x00000000,IDTn, IDTnlen-IDTn
-    Text 15,90,,cpuname, cpunamelen-cpuname;
+mov	esi, idt
-    Text 255,250,,typen, typenlen-typen;
+call	load_gif
-    Text 175, 50,,tech, techlen-tech;
+PutImage 135,107,201,49,img_area+8
     repe scasb
     dec  edi
     mov  esi,mynamelen
     sub  esi,edi
     Text 105, 10, 0x00000000, edi, esi
-;    Text 105,20,0x00000000,myname, mynamelen-myname
 ;-
 Text 15,250,,brandid, brandidlen-brandid
-    ret 		;
-load_gif:
+    ret 		;
-        mov     edi, img_area
-load_gif2:
+call_OpenDialog:
-COLOR_ORDER equ MENUETOS
+    mov     [OpenDialog_data.type],1	    ; Save
+    push    dword OpenDialog_data
+    call    [OpenDialog_Start]
-include 'gif_lite.inc'        ; parse GIF files
+    cmp     [OpenDialog_data.status],2	    ; OpenDialog does not start
+    je	    .save_file_default_path
+    cmp     [OpenDialog_data.status],1
+    jne     still
+    call    store_data
+    jmp     still
+.save_file_default_path:
+     mov     edi,file_name
+     mov     esi,file_default_path
+     call    copy_file_name_path
+     call    store_data
+     jmp     still
+copy_file_name_path:
+	xor	eax,eax
+	cld
+@@:
+	lodsb
+	stosb
+	test	eax,eax
+	jnz	@r
+	ret
+;-----------------------------------------------------------------------------
-; DATA AREA
+prepare_text_area:
+	mov	edi,[store_text_area_start]
+	push	edi
-title	 db   'CPUID 2.28 by S.Kuzmin & the KolibriOS team',0
+	mov	ecx,4096
+	mov	eax,dword '    '
+	cld
+	rep	stosd
+	pop	edi
+	mov	[store_text_area_end], edi
+	mov esi,title
+	call addstring
+	mov esi, stm
+	call addstring
+	mov esi, myname
+	call addstring
+   cmp [nomultiplier], $1
+	je noMult
+	jne detMulti
+	 ;jne detFreq
+	detMulti:
+	mov esi,multil
+	call addstring
-tsum:
+	jmp detFreq
+	detFreq:
+	mov esi, freql
-if lang eq it
+	call addstring
+	noMult:
+	mov esi,multi3
+	call addstring
+	mov esi,freql3
+	call addstring
-                db 'Frequenza:     .   MHz'
+	mov esi, tech
+	call addstring
-else
+	mov esi, saveproc
+	call addstring
+	mov esi, cpuname
-                db 'Frequency:     .   MHz'
+	call addstring
+	mov esi, fam
+	call addstring
+	mov esi, mode
+	call addstring
+	mov esi, step
+	call addstring
+	mov esi, cache2
-end if
+	call addstring
+	mov esi, cache
+	call addstring
+	mov esi, cache3
+	call addstring
+	mov esi, cache4
+	call addstring
+	mov esi, brandid
+	call addstring
+	mov esi, MMXs
+	call addstring
+	mov esi, mmxp
+	call addstring
-tsumlen:
+	mov esi, now
+	call addstring
+	mov esi, HTT
+	call addstring
+	mov esi, SSE
+	call addstring
+	mov esi, SSE41
+	call addstring
+	mov esi, SSE42
+	call addstring
-total dd 0x0
+	mov esi, SSE5
+	call addstring
+	mov esi, SSE2
+	call addstring
-total1 dd 0x0
+	mov esi, nowp
+	call addstring
-rating dd 0x0
+	mov esi, sse3
+	call addstring
+	mov esi, standard
+	call addstring
+	mov esi, STDCA
+	call addstring
+	mov esi, EXTCA
+	call addstring
-rat dd 0x0  ;
+	mov esi, FPU
+	call addstring
+	mov esi, VME
+	call addstring
+	mov esi, DE
+	call addstring
+	mov esi, PSE
+	call addstring
+	mov esi, TSC
+	call addstring
-ram:
+	mov esi, MSR
+	call addstring
-if lang eq it
+	mov esi, PAE
+	call addstring
+	mov esi, MCE
-                db 'RAM libera:        su'
+	call addstring
+	mov esi, CX8
+	call addstring
+	mov esi, APIC
+	call addstring
+	mov esi, Res
+	call addstring
+	mov esi, SEP
-else
+	call addstring
+	mov esi, MTRR
+	call addstring
+	mov esi, PGE
+	call addstring
+	mov esi, MCA
+	call addstring
-                db 'Available RAM:     out of'
+	mov esi, CMOV
+	call addstring
+	mov esi, PAT
+	call addstring
-end if
+	mov esi, PSE36
+	call addstring
+	mov esi, PSNUM
+	call addstring
+	mov esi, CLFLUSHn
+	call addstring
+	mov esi, Res
+	call addstring
+	mov esi, DTS
+	call addstring
+	mov esi, ACPI
+	call addstring
+	mov esi, MMX
-ramlen:
+	call addstring
+	mov esi, FXSR
+	call addstring
+	mov esi, SSE
+	call addstring
+	mov esi, SSn
+	call addstring
+	mov esi, HTT
+	call addstring
-NEF:
+	mov esi, TM
+	call addstring
+	mov esi, IA64
+	call addstring
-db 'EXTENDED FEATURES ARE NOT AVAILABLE'
+	mov esi, PBE
+	call addstring
-NEFlen:
+	mov esi, SS3
+	call addstring
+	mov esi, CNXT_ID
+	call addstring
+	mov esi, MP
+	call addstring
+	mov esi, FFXSR
+	call addstring
+	mov esi, MON
+	call addstring
+	mov esi, CX16
+	call addstring
+	mov esi, NX
+	call addstring
+	mov esi, TSCP
+	call addstring
+	mov esi, DS_CPL
+	call addstring
+	mov esi, ETPRD
+	call addstring
+	mov esi, MMXPi
+	call addstring
+	mov esi, LM
+	call addstring
+	mov esi, EST
+	call addstring
+	mov esi, SYS
+	call addstring
+	mov esi, MMXn
+	call addstring
+	mov esi, DNo
+	call addstring
+	mov esi, TM2
+	call addstring
-mb :
+	mov esi, LAF
+	call addstring
+	mov esi, FFXSR
+	call addstring
+	mov esi, DN
+	call addstring
+	mov esi, VMX
+	call addstring
+	mov esi, SSSE3
+	call addstring
+	mov esi, DCA
+	call addstring
+	mov esi, CMPL
-db 'MB'
+	call addstring
-mblen:
+	mov esi, SVM
+	call addstring
+	mov esi, MCR8
+	call addstring
+	mov esi, SMX
+	call addstring
+	mov esi, x2APIC
+	call addstring
+	mov esi, PPCNT
+	call addstring
+	mov esi, PAGE
+	call addstring
+	mov esi, EAS
+	call addstring
+	mov esi, ABM
+	call addstring
+  mov esi, MIS
+  call addstring
+  mov  esi,OSVW
+  call addstring
+  mov esi,SKINIT_
+  call addstring
+  mov esi, WDT
+  call addstring
+	ret
+addstring:
+	mov edi, [store_text_area_end]
+	xor eax, eax
+	xor ecx, ecx
+	cld
+@@:
+	lodsb
+	stosb
+	inc	[store_text_area_end]
+	cmp	[esi], byte 0x0
+	jnz	@r
+	mov	al,0Ah
+	stosb
+	mov	[store_text_area_end],edi
+	xor	edi,edi
+	xor	esi, esi
+ret
+savenumber:
+	xor eax, eax
+	cld
+	lodsw
+	call numbertostring
+	xor esi, esi
+	xor edi, edi
+ret
+savestring:
+	xor eax, eax
+	cld
+	lodsw
+	;call numbertostring
+	xor esi, esi
+	xor edi, edi
+ret
+numbertostring:
+	mov bx, 10
+	xor cx, cx
+@@m1:
+	xor dx, dx
+	div bx
+	push dx
+	inc cx
+	test ax, ax
+	jnz @@m1
+@@m2:
+	 pop ax
+	 add al, '0'
+	 stosb
+	 loop @@m2
+ret
+concatname:
+	;mov edi, [saveproc]
+	xor eax, eax
+	xor ecx, ecx
+	cld
+@@:
+	lodsb
+	stosb
+	cmp	[esi], byte 0x0
+	jnz	@r
+	xor	edi,edi
+	xor	esi, esi
+ret
+store_data:
+	call prepare_text_area
+	mov	eax,[store_text_area_start]
+	mov	[fileinfo.return],eax
+	mov	ebx,[store_text_area_end]
+	sub	ebx,eax
+	inc	ebx
+	mov	[fileinfo.size],ebx
+	mcall	70,fileinfo
+ret
-;logcpus :
 load_gif:
-;db 'Number of logical CPU:'
+	mov	edi, img_area
+load_gif2:
+COLOR_ORDER equ MENUETOS
+include 'gif_lite.inc'	      ; parse GIF files
-;logcpuslen:
+; DATA AREA
+title	 db   'CPUID 2.29 by S.Kuzmin & the KolibriOS team',0
+stm:
+   db 'Internal name:', 0
+stmlen:
+SS42:
+    db 'SSE4.2:       ',0
 SS42len:
-speed :
+SMX:
+    db 'SMX:       ',0
-if lang eq it
+SMXlen:
+x2APIC:
+    db 'x2APIC:       '
+x2APIClen:
+PPCNT:
+    db 'POPCNT:          '
+PPCNTlen:
+PAGE:
+    db 'Page1Gb:     '
 PAGElen:
                 db 'Performance'
 EAS:
-else
+    db 'EAS:                       ',0
 EASlen:
-                db 'PERFORMANCE:'
 newLabel:
-end if
     db '3DNP:                       ',0
 newLabellen:
-speedlen:
+ABM:
+    db 'ABM:      '
 ABMlen:
-kbpersec:
+SSE4A:
+    db 'SSE4A:       '
+SSE4Alen:
-db 'KB/SEC'
+MIS:
+    db 'MIS:      ',0
+MISlen:
-kbperseclen:
+DNP:
+    db '3DNP:       '
+DNPlen:
+OSVW:
+    db 'OSVW:       ',0
+OSVWlen:
-instruct:
+SKINIT_:
+    db 'SKINIT:          ',0
+SKINIT_len:
-if lang eq it
+WDT:
+    db 'WDT:            ',0
-                db 'Set istruzioni'
+WDTlen:
-else
+saveproc:
+   db '                                                   ',0
-                db 'Instruction sets'
+multil:
+  db 'Multiplier:   .          ', 0
+multillen:
+multil2:
+  db 'Multiplier              .'
+multil2len:
+multi3:
+  db 'Multiplier: n/a',0
+multi3len:
+freql:
+  db 'System clock:     .   MHz', 0
+freqllen:
+freql2:
+  db 'System clock            .   MHz'
+freql2len:
+freql3:
+  db 'System clock: n/a '
 end if
 freql3len:
 tsum:
+    db 'Frequency:     .    MHz  ',0
+tsumlen:
-instructlen:
+tech:
+    db 'Technology: 0.   micron ', 0
-standard    db 'Standard and Extended features plus Performance test',0
+techlen:
+name:
+if lang eq it
-;FR:
+    db 'Codename:',0
-;    db 'Choose FSB:'
+else
-;FRlen:
+    db 'CODENAME:',0
+end if
+namelen:
+vendorname:
-STDCA:
+if lang eq it
-    db 'Highest STD call is         '
+     db 'Vendor CPU              ', 0
-STDCAlen:
+else
+     db 'CPU VENDOR:             ', 0
+end if
+vendornamelen:
+cpuname:
+if lang eq it
+     db 'Vendor CPU              ', 0
+else
+     db 'CPU VENDOR:             ', 0
+end if
+cpunamelen:
+fam:
+if lang eq it
+     db 'Famiglia:   std   ext', 0
+else
+     db 'FAMILY:   std   ext', 0
+end if
 famlen:
-EXTCA:
 mode:
+if lang eq it
+      db 'Modello:    std    ext', 0
+else
     db 'Highest EXT call is         h'
+      db 'MODEL:    std    ext', 0
 EXTCAlen:
+end if
+modelen:
+step:
 if lang eq it
        db 'Stepping:        ', 0
 brandid:
+else
     db 'Brand:'
        db 'STEPPING:        ', 0
-brandidlen:
 end if
+steplen:
 oblom:
 cache:
-if lang eq it
     db 'L1(inst):     KB       -way set     -byte line size',0
-                db 'CPUID non e disponibile'
-else
-                db 'SORRY, CPUID IS NOT AVAILABLE'
-end if
+cachelen:
 oblomlen:
 cache2:
-other:
      db 'L1(data):     KB       -way set     -byte line size',0
-if lang eq it
-                db 'Questo vendor non e supportato'
+cache2len:
-else
-                db 'SORRY, THIS VENDOR IS NOT SUPPORTED YET'
+cache3:
+    db 'L2:      KB            -way set     -byte line size',0
+cache3len:
+cache4:
+   db 'L3:      KB            -way set     -byte line size',0
+cache4len:
+brandid:
-end if
+    db 'Brand:', 0
 brandidlen:
-otherlen:
+MMXs:
-cpuname:
+    db 'MMX:         ',0
-if lang eq it
-                db 'Vendor CPU              '
+MMXslen:
 ;----------Intel
 P50:
-db 'P5 A-step'
+db 'P5 A-step',0
 P50len:
 P5:
-db 'P5'
+db 'P5',0
 P5len:
 P54T:
-db 'P24T Overdrive'
+db 'P24T Overdrive',0
 P54Tlen:
 P54C:
-db 'P54C'
+db 'P54C',0
 P54Clen:
 P55C:
-db 'P55C (with MMX)'
+db 'P55C (with MMX)',0
 P55Clen:
 ; ---
 P60:
-db 'Pentium Pro A-step'
+db 'Pentium Pro A-step',0
 P60len:
 P61:
-db 'Pentium Pro'
+db 'Pentium Pro',0
 P61len:
 P63:
-db 'Pentium II (Klamath)'
+db 'Pentium II (Klamath)',0
 P63len:
 P65:
-db 'Pentium II (Deschutes)'
+db 'Pentium II (Deschutes)',0
 P65len:
 P66:
-db 'Celeron (Medocino)'
+db 'Celeron (Medocino)',0
 P66len:
 P67:
-db 'Pentium III (Katmai)'
+db 'Pentium III (Katmai)',0
 P67len:
 P68:
-db 'Pentium III (Coppermine)'
+db 'Pentium III (Coppermine)',0
 P68len:
 P69:
-db 'Pentium M (Banias)'
+db 'Pentium M (Banias)',0
 P69len:
 P6A:
-db 'Pentium III Xeon (Cascades)'
+db 'Pentium III Xeon (Cascades)',0
 P6Alen:
 P6B:
-db 'Pentium III (Tualatin)'
+db 'Pentium III (Tualatin)',0
 P6Blen:
 P6D:
-db 'Pentium M (Dothan)'
+db 'Pentium M (Dothan)',0
 P6Dlen:
+P6E:
+db 'Pentium M (Yonah)/ Core',0
+P6Elen:
+P6F:
+db 'Pentium D (Conroe)/ Core 2 (Kentsfield)',0
+P6Flen:
+;---
+PS0:
+db 'Itanium (IA-64)',0
+PS0len:
+;------------
+PF0:
+db 'Pentium 4 (Willamete)',0
+PF0len:
+PF2:
+db 'Pentium 4 (Northwood)',0
+PF2len:
+PF3:
+db 'Pentium 4 (Prescott)',0
+PF3len:
+PF5:
+db 'Pentium 4 (Tejas)',0
+PF5len:
+PF6:
+db 'Pentium 4 (Presler)',0
+PF6len:
+;----------------Intel Celerons
+P65c:
+db 'Celeron (Covington)',0
+P65clen:
+P68c:
+db 'Celeron (Coppermine)',0
+P68clen:
+P6Bc:
+db 'Celeron (Tualatin)',0
+P6Bclen:
+PF0c:
+db 'Celeron (Willamete)',0
+PF0clen:
+PF2c:
+db 'Celeron (Northwood)',0
+PF2clen:
+PF3c:
+db 'Celeron (Prescott)',0
-P6E:
+PF3clen:
-db 'Pentium M (Yonah)/ Core'
+PF5c:
-Ata     db 'AthlonXP (Barton)',0
+Ata	db 'AthlonXP (Barton)',0
-Atat    db 'AthlonXP (Thorton)',0
+Atat	db 'AthlonXP (Thorton)',0
+;-------------------
+AthlonKuma:
+db 'AMD Athlon 7750 Black Edition',0
+AthlonKumalen:
+AB23:
+db 'Opteron 2300-series',0
+AB23len:
+AB83:
+db 'Opteron 8300-series',0
+AB83len:
+AB9:
+db 'Phenom X4',0
+AB9len:
+AB8right2:
+db 'Phenom X3',0
+AB8right2len:
+AB4:
+db 'Athlon X2',0
+AB4len:
+AB1:
+db 'Sempron',0
+AB1len:
+ABC2:
+db 'Opteron (Shanghai) 2387',0
+ABC2len:
+AB6:
+db 'Opteron (Magny-Cours)',0
+AB6len:
+ABC3:
+db 'Opteron (Shanghai) 8300 series',0
+ABC3len:
+ABM2:
+db 'Turion II ',0
+ABM2len:
-;-------------------
+;---
 AF1:
-db 'Dual-core Opteron'
+db 'Dual-core Opteron',0
 AF1len:
 AF3:
-db 'Athlon 64 (Toledo)'
+db 'Athlon 64 (Toledo)',0
 AF3len:
+AF3len:
 AF4:
-db 'Athlon 64 (ClawHammer)'
+AF4:
-AF4len:
+db 'Athlon 64 (ClawHammer)',0
 AF5:
+AF4len:
 db 'Opteron/Athlon 64 FX (SledgeHammer)'
-AF5len:
+AF5:
 db 'Opteron/Athlon 64 FX (SledgeHammer)',0
 AFC:
+AF5len:
 db 'Athlon 64 (Newcastle)'
-AFClen:
+AFC:
 db 'Athlon 64 (Newcastle)',0
-AFF:
+AFClen:
 db 'Athlon 64 (Winchester)'
+AFF:
 AFFlen:
 db 'Athlon 64 (Winchester)',0
 AFFlen:
 AFS:
-db 'Athlon 64 (San Diego)'
+AFS:
-AFSlen:
+db 'Athlon 64 (San Diego)',0
 AFSlen:
-AFV:
 AFV:
 db 'Athlon 64 (Venice)'
+db 'Athlon 64 (Venice)',0
 AFVlen:
 AFVlen:
 AFCs:
-db 'Sempron (Paris)'
+db 'Sempron (Paris)',0
 AFCslen:
 AFCsp:
-db 'Sempron (Palermo)'
+db 'Sempron (Palermo)',0
 AFCsplen:
 ;---------Cyrix
 C52:
-db '6x86 M1'
+db '6x86 M1',0
 C52len:
-C54:
-db 'MediaGX'
-C54len:
-C60:
-db '6x86MX M2'
-C60len:
-C65:
-db 'C3 (Cyrix M2)' ;?
-C65len:
-;--------IDT
 C54:
 V54:
 db 'MediaGX',0
-coppercoeff     db       50, 30, 40, 20, 55, 35,  45, 25,  35, 70, 80, 60, 20, 75, 15, 65, 90, 110, 120, 20, 95, 115, 85, 25, 35, 70,  80, 100,  20, 75,  15, 105
+coppercoeff	db	 50, 30, 40, 20, 55, 35,  45, 25,  35, 70, 80, 60, 20, 75, 15, 65, 90, 110, 120, 20, 95, 115, 85, 25, 35, 70,  80, 100,  20, 75,  15, 105
-tualatcoeff     db      120, 35, 35, 40, 55, 35, 115, 35, 160, 70, 80, 60, 40, 75, 35, 65, 90, 110,  35, 35, 95,  35, 85, 35, 35, 35, 130, 100, 140, 35, 150, 105
 tualatcoeff	db	120, 35, 35, 40, 55, 35, 115, 35, 160, 70, 80, 60, 40, 75, 35, 65, 90, 110,  35, 35, 95,  35, 85, 35, 35, 35, 130, 100, 140, 35, 150, 105
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-rb 201*49*3+8      ; image resolution (bits to reserve)
+rb 201*49*3+8	   ; image resolution (bits to reserve)
-img_area2:         ; image is going to be unpacked to here
+img_area2:	   ; image is going to be unpacked to here
+rb 93*24*3+8	   ; image resolution (bits to reserve)
+img_area3:	   ; image is going to be unpacked to here
+rb 93*24*3+8	   ; image resolution (bits to reserve)
-rb 93*24*3+8       ; image resolution (bits to reserve)
+gif_hash_area:
+rd 4096+1	   ;hash area size for unpacking gif
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+system_dir_ProcLib	db '/sys/lib/proc_lib.obj',0
+err_message_found_lib2	db 'proc_lib.obj - Not found!',0
+err_message_import2	db 'proc_lib.obj - Wrong import!',0
+head_f_i:
+head_f_l	db 'error',0
+;---------------------------------------------------------------------
+l_libs_start:
+library02  l_libs system_dir_ProcLib+9, path, library_path, system_dir_ProcLib, \
+err_message_found_lib2, head_f_l, ProcLib_import, err_message_import2, head_f_i
+end_l_libs:
+;---------------------------------------------------------------------
+align 4
+ProcLib_import:
+OpenDialog_Init 	dd aOpenDialog_Init
+OpenDialog_Start	dd aOpenDialog_Start
+;OpenDialog__Version    dd aOpenDialog_Version
+	dd	0
+	dd	0
+aOpenDialog_Init	db 'OpenDialog_init',0
+aOpenDialog_Start	db 'OpenDialog_start',0
+;aOpenDialog_Version    db 'Version_OpenDialog',0
+;---------------------------------------------------------------------
+align 4
+OpenDialog_data:
+.type			dd 0
+.procinfo		dd Proc_Info	;+4
+.com_area_name		dd communication_area_name	;+8
+.com_area		dd 0	;+12
+.opendir_pach		dd temp_dir_pach	;+16
+.dir_default_pach	dd communication_area_default_pach	;+20
+.start_path		dd open_dialog_path	;+24
+.draw_window		dd draw_window	;+28
+.status 		dd 0	;+32
+.openfile_pach		dd file_name	;+36
+.filename_area		dd filename_area	;+40
+.filter_area		dd Filter
+.x:
+.x_size 		dw 420 ;+48 ; Window X size
+.x_start		dw 10 ;+50 ; Window X position
+.y:
+.y_size 		dw 320 ;+52 ; Window y size
+.y_start		dw 10 ;+54 ; Window Y position
+communication_area_name:
+	db 'FFFFFFFF_open_dialog',0
+open_dialog_path:
+	db '/sys/File Managers/opendial',0
+communication_area_default_pach:
+	db '/sys',0
+Filter:
+dd	Filter.end - Filter.1
+.1:
+db	'TXT',0
+db	'LOG',0
+.end:
+dd	0
+file_default_path:
+	db '/sys/'
+start_temp_file_name:
+	db 'CPUID.txt',0
+;---------------------------------------------------------------------
+align	4
+fileinfo:
+.subfunction	dd 2
+.Offset 	dd 0
+.Offset_1	dd 0
+.size		dd 4096
+.return 	dd 0
+		db 0
+.name:		dd file_name
+store_text_area_start	dd ?
+store_text_area_end	dd ?
+store_text_size 	dd ?
+;---------------------------------------------------------------------
+library_path:
+	rb 4096
+;---------------------------------------------------------------------
+path:
+	rb 4096
+;---------------------------------------------------------------------
+temp_dir_pach:
+	rb 4096
+;---------------------------------------------------------------------
+file_name:
+	rb 4096
+;---------------------------------------------------------------------
+file_name_1:
+	rb 4096
+;---------------------------------------------------------------------
+filename_area:
+	rb 256
+;---------------------------------------------------------------------
+	rb 4096
 stacktop:
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;---------------------------------------------------------------------
 Proc_Info	process_information
 IncludeUGlobals
 multa dd ?
-multb dd ?
 multb dd ?
 micron dd ?
+brand dd ?
-brand dd ?
+newpc  dd ?
 freqsel db ?
+sse3sup db ?
+sse41sup dd ?
 sse42sup dd ?
-sse3sup db ?
+sse5sup dd ?
 wayl3 dd ?
-linel3 dd ?
-;number_of_log_cpus dd ?
+linel3 dd ?
 che db ? ; numbers of calls for Intel caches detection
-che db ? ; numbers of calls for Intel caches detection
+cname dd ?
 codeN dd ?
   thread2_stack_area rb 64
   thread2_esp = $
+U_END:

Subversion Repositories Kolibri OS

(root)/programs/system/cpuid/trunk/CPUID.ASM – Rev 4862 → 6483