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

     xor edx, edx
     mov eax, [total1]
     mov ebx, 10000
     div ebx
     mov [ost], eax    ; example 160049
-    mov eax, [total]
+    mov ecx, [total]
-    imul eax, 100
+    imul ecx, 100
-    mov [sot], eax    ;  example 160000
-    mov eax, [ost]
+    neg  ecx
-    sub eax, [sot]
+    add  ecx, eax
-    mov [sot], eax    ; example 49
+    mov [sot], ecx    ; example 49
 ;------------
 cpu:		      ;is CPUID supported?
   pushfd	      ;push original EFLAGS
   pop eax	      ;get original EFLAGS
   mov ebx, eax	      ;save original EFLAGS
 ; for various vendors we should later use different methods
 ;Decoding cache L1 and L2 for Intel
-  cmp [smallvendor], 'ntel'
   jne cpu1     ;is not Intel
-  je .detec
+  cmp ecx, 'ntel'
-.detec:
+  jne cpu1     ;is not Intel
 ;Starting L1, L2, L3 caches detection (Intel made it VERY HARD)
 mov eax, 2
-cpuid
+mov eax, 2
+cpuid
-mov [che], al	     ; number of calls
-multik:
-dec [che]
-.eaxl:
-test  eax, $80000000 ;    Test bit 31
-jnz   .ebxl	     ;    <> 0 =>invalid values
+mov [che], al	     ; number of calls
-shr eax, 8
+multik:
-call decodecache
-shr eax, 8
+.eaxl:
-call decodecache
+test  eax, eax       ;    Test bit 31
-shr eax, 8
-call decodecache
-.ebxl:
-test  ebx, $80000000
-jnz   .ecxl
-mov eax, ebx
-call decodecache
+js    .ebxl	     ;    <> 0 =>invalid values
-shr eax, 8
+call decodecache24
-call decodecache
+.ebxl:
-shr eax, 8
+test  ebx, ebx
-call decodecache
+js    .ecxl
-shr eax, 8
-call decodecache
-.ecxl:
-test  ecx, $80000000
-jnz   .edxl
-mov eax, ecx
-call decodecache
+mov eax, ebx
-shr eax, 8
+call decodecache32
-call decodecache
+.ecxl:
-shr eax, 8
+test  ecx, ecx
-call decodecache
+js    .edxl
-shr eax, 8
-call decodecache
-.edxl:
-test  edx, $80000000
-jnz   cpu1
-mov eax, edx
-call decodecache
+mov eax, ecx
-shr eax, 8
+call decodecache32
-call decodecache
+.edxl:
-shr eax, 8
+test  edx, edx
     xor eax, eax
     inc eax	  ; eax=1
     cpuid
-mov ecx, eax
-and ecx,00000F00h ;   get CPU family
+mov ecx, eax
+shr ecx,8	  ;   shift it to the correct position
-shr ecx,8	  ;   shift it to the correct position
+and ecx,0000000Fh ;   get CPU family
 mov dword[f],ecx
 mov ecx, eax
+mov ecx, eax
-and ecx,000000F0h ;    get CPU model
+shr ecx,4
-shr ecx,4
+and ecx,0000000Fh ;    get CPU model
 mov dword[m],ecx
 ;=======================================================
 cmp dword[smallvendor], 'cAMD'
 jz maybe_athlon
-cmp dword[smallvendor], 'ntel'
-jz detect_it
+cmp dword[smallvendor], 'ntel'
-jmp no_full   ; if not AMD or Intel
+jnz no_full   ; if not AMD or Intel
 detect_it:
 maybe_athlon:
 mov eax, 0x80000001		  ; CPUID ext. function 0x80000001
 cpuid
-mov ecx, eax
-and ecx,00000F00h ;   get CPU family
+mov ecx, eax
+shr ecx,8	  ;   shift it to the correct position
-shr ecx,8	  ;   shift it to the correct position
+and ecx,0000000Fh ;   get CPU family
 mov dword[ef],ecx
 mov ecx, eax
+mov ecx, eax
-and ecx,000000F0h ;    get CPU model
+shr ecx,4
-shr ecx,4
+and ecx,0000000Fh ;    get CPU model
 mov dword[em],ecx
 fut:
-call decode_sse3
-;-
-    call decode_extended
-    mov   eax,$80000000
-    cpuid
+call decode_sse3
-    mov   [extc], eax  ; max number of calls
+;-
-  test	eax, $80000000 ;// Test bit 31
-  jz .noname
+    call decode_extended
-  cmp  eax,$80000003
+mov  dword [myname], $612F6E
   ja .mynameis
-  jmp .noname
+        cmp     [extc], $80000003
     cpuid
     mov   [myname+32],eax
     mov   [myname+36],ebx
     mov   [myname+40],ecx
     mov   [myname+44],edx
-    jmp   red
-.noname:
-mov  dword [myname], $612F6E
 .noname:
-red:
-xor ecx, ecx
-xor eax, eax
-xor edx, edx
-xor ebx, ebx
+red:
 ;mov byte [multiplier], 115;     ; for testing
-call multipl			      ; get multiplier
-mov byte [multiplier], cl
+call multipl			      ; get multiplier
-xor eax, eax
+mov byte [multiplier], cl
-xor ebx, ebx
+mov   dword [freqbb], 0
-xor ecx, ecx
+mov   dword [freqll], 0
 xor edx, edx
 mov   ebx, dword [multiplier]
-cmp dword[multiplier], 0
-jz contin
-calc:
-mov eax,dword [ost]   ; example 166474
-imul eax, 10	      ; example 1664740
-mov  ebx, dword [multiplier]   ; get system clock (if multiplier detected)
-div ebx
-mov dword [freqbb], eax  ;  16647
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
-xor edx, edx
-mov eax,dword [ost]  ;example  166474
-mov  ebx,10
-div  ebx	     ;example  16647
+test  ebx, ebx
+jz output
-mov dword [temp], eax
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
-xor edx, edx
-mov eax, dword [temp]
-mov  ebx, dword [multiplier]
-div ebx 		       ; example 166
-imul eax, 100
-mov  dword[freqll], eax  ; example 16600
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
-xor edx, edx
-mov eax, dword[freqbb]; example  16647
-sub eax, dword[freqll];  example   16600
-mov dword[freqll], eax	  ;example  47
 calc:
 xor eax, eax
-xor ebx, ebx
+mov eax,dword [ost]   ; example 166474
+imul eax, 10	      ; example 1664740
-xor ecx, ecx
-xor edx, edx
 xor edx,edx
-mov eax,dword [freqbb]; example 16647
-mov  ebx, 100
+div ebx               ; get system clock (if multiplier detected)
 div ebx
-mov dword [freqbb], eax  ; example 166
+xor edx, edx                    ; example eax=16647
 mov ebx, 100
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
-xor edx, edx
-    mov eax,dword[multiplier]  ; example 115
-    mov  ebx,10
-    div  ebx
-    mov dword[multb], eax  ;   example 11
-    imul eax, 10
-    mov dword[multa], eax    ;  example 110
+div ebx
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
-xor edx, edx
-    mov eax, dword[multiplier]
-    sub eax, dword[multa]
-    mov dword[multa], eax    ; example 5
-xor eax, eax
-xor ebx, ebx
-xor ecx, ecx
+mov dword [freqbb], eax         ; example 166
-xor edx, edx
+mov dword [freqll], edx         ; example 47
-jmp output
+xor edx, edx
     mov eax,dword[multiplier]  ; example 115
-contin:
+    mov  ebx,10
+    div  ebx
-mov   dword [freqbb], 0
-mov   dword [freqll], 0
     mov dword[multb], eax  ;   example 11
-output:
+    mov dword[multa], edx    ; example 5
-   call draw_window    ;     Draw window
-typedetect:
+output:
-cmp [t], 00b
+   call draw_window    ;     Draw window
-jne t2d
-Text 290,250,0x00000000,t1, t1len-t1
-jmp PROCCORE
+typedetect:
+        mov     edx, t1
+        cmp     [t], 00b
-t2d:
+        jz      @f
-cmp [t], 01b
+        mov     edx, t2
-jne t3d
+        cmp     [t], 01b
-Text 290,250,0x00000000,t2, t2len-t2
+        jz      @f
 ;  jz .Rise
 ; cmp ecx, 'SiS '
 ; jz .SiS
 ; cmp ecx, ' NSC'
 ; jz .NSC
-  jmp Other   ;  I don't know what to do with you...
+; jmp Other   ;  I don't know what to do with you...
 Other:
 Text 75,70,0x00000000,other, otherlen-other
     jmp MMXtest
 ;-------------------------
 AMD:
 Text 15, 190,0x00000000,cache, cachelen-cache
-Text 75,70,0x00000000,AMDn, AMDnlen-AMDn
+Text 75,70,,AMDn, AMDnlen-AMDn
 ; Relax, man. AMD made PRETTY SIMPLE cache detection routine
 ;CACHE1:
 mov eax, 80000005h
     cpuid
-mov eax, ecx
-;shl eax, 24
-;shr eax, 24
-and eax,000000FFh ;
+movzx eax, cl
 mov [lineld], eax
 mov eax, ecx
 shr ecx, 24
 mov [L1d], ecx
-mov eax, edx
-;shl eax, 24
 ;shr eax, 24
-and eax,000000FFh ;
+movzx eax, dl
 mov [lineli], eax
 ;CACHE2:
 mov eax, 80000006h
     cpuid
-mov eax, ecx
-;and eax,000000FFh ;
 shl eax, 24
-shr eax, 24
+movzx eax, cl
-mov dword[linel2], eax
+mov dword[linel2], eax
-mov eax, ecx
-shl eax, 16
-shr eax, 28
-cmp eax, 0010b
-je way2
-cmp eax, 0100b
+push ecx
-je way4
-cmp eax, 0110b
+shr ecx, 12+1
-je way8
-cmp eax, 1000b
-je way16
-jmp to_next
-way2:
-mov dword[wayl2], 2
-jmp to_next
-way4:
-mov dword[wayl2], 4
-jmp to_next
-way8:
-mov dword[wayl2], 8
-jmp to_next
+and ecx, 0x7
-way16:
-mov dword[wayl2], 16
-jmp to_next
+mov eax, 1
 shl eax, cl
 mov dword [wayl2], eax
-to_next:
+pop ecx
     cmp [f], $6
     jz .si
     cmp [f], $F
     jz fif
 .fiv:	 ;     Family=5
+        mov     [micron], 50
+        mov     edx, A50
-    cmp [m],$0
+        cmp     [m], $0
-    jz .A50
+        jz      @f
+        mov     [micron], 35
+        mov     edx, A51
-    cmp [m],$1
+        cmp     [m], $1
-    jz .A51
+        jz      @f
+        mov     edx, A52
-    cmp [m],$2
+        cmp     [m], $2
-    jz .A52
+        jz      @f
+        mov     edx, A53
-    cmp [m],$3
+        cmp     [m], $3
-    jz .A53
+        jz      @f
+        mov     [micron], 30
+        mov     edx, A56
-    cmp [m],$6
+        cmp     [m], $6
-    jz .A56
+        jz      @f
+        mov     [micron], 25
+        mov     edx, A57
-    cmp [m],$7
+        cmp     [m], $7
-    jz .A57
+        jz      @f
+        mov     edx, A58
-    cmp [m],$8
+        cmp     [m], $8
-    jz .A58
+        jz      @f
+        mov     edx, A59
-    cmp [m],$9
+        cmp     [m], $9
-    jz .A59
-    cmp [m],$D
-    jz .A5D
+        jz      @f
-.A50:
-    mov [micron], 50   ; 0.35?
-Text 100,70,0x00000000,A50, A50len-A50
-    jmp MMXtest
-.A51:
-    mov [micron], 35
-Text 100,70,0x00000000,A51, A51len-A51
-    jmp MMXtest
-.A52:
-    mov [micron], 35
-Text 100,70,0x00000000,A52, A52len-A52
-    jmp MMXtest
-.A53:
-    mov [micron], 35
-Text 100,70,0x00000000,A53, A53len-A53
-    jmp MMXtest
-.A56:
-    mov [micron], 30
-Text 100,70,0x00000000,A56, A56len-A56
-    jmp MMXtest
-.A57:
-    mov [micron], 25
-Text 100,70,0x00000000,A57, A57len-A57
-    jmp MMXtest
-.A58:
-    mov [micron], 25
-Text 100,70,0x00000000,A58, A58len-A58
-    jmp MMXtest
-.A59:
-    mov [micron], 25
-Text 100,70,0x00000000,A59, A59len-A59
-    jmp MMXtest
-.A5D:
-    mov [micron], 18
+        mov     [micron], 18
-Text 100,70,0x00000000,A5D, A5Dlen-A5D
+        mov     edx, A5D
-    jmp MMXtest
+@@:
-.si:   ;    Family=6
+        jmp     @f
+.si:   ;    Family=6
+        mov     [micron], 25
         mov     edx, At1
-    cmp [m],$1
+        cmp     [m], $1
+        jz      @f
+        mov     [micron], 18
-    jz A1
+        mov     edx, At2
-    cmp [m],$2
+        cmp     [m], $2
+        jz      @f
-    jz A2
+        mov     edx, At3
-    cmp [m],$3
+        cmp     [m], $3
+        jz      @f
-    jz A3
+        mov     edx, At4
-    cmp [m],$4
+        cmp     [m], $4
-    jz A4
+        jz      @f
-    cmp [m],$6
+        cmp     [m], $6
+        jz      A6
+        mov     [micron], 13
-    jz A6
+        mov     edx, At7
-    cmp [m],$7
+        cmp     [m], $7
-    jz A7
+        jz      @f
-    cmp [m],$8
+        cmp     [m], $8
-    jz A8
+        jz      A8
-    cmp [m],$A
-    jz AA
+        jmp     AA
-A1:
-    mov [micron], 25
-Text 100,70,0x00000000,At1, At1len-At1
- jmp MMXtest
-A2:
-    mov [micron], 18
-Text 100,70,0x00000000,At2, At2len-At2
- jmp MMXtest
-A3:
-    mov [micron], 18
+@@:
- Text 100,70,0x00000000,At3, At3len-At3
- jmp MMXtest
-A4:
-    mov [micron], 18
-Text 100,70,0x00000000,At4, At4len-At4
+        Text    100,70,0x80000000
- jmp MMXtest
+        jmp     MMXtest
-A6:
- mov [micron], 18
- Text 100,70,0x00000000,At6, At6len-At6
 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; !!!!
-Text 245,70,0x00000000,pr, prlen-pr
+        call    newrating; !!!!
- Number 310,70,0,4,dword [rating],0x000000
- jmp MMXtest
+        Text    245,70,0x00000000,pr, prlen-pr
-A7:
     mov [micron], 13
-Text 100,70,0x00000000,At7, At7len-At7
+        Number  310,70,0,4,dword [rating],0x000000
- jmp MMXtest
         mov     edx, At6
-A8:
+        jmp     @b
- mov [micron], 13
 mov [FRS], 266	;!!!!!!
 A8:
    Number 315,90,0,3,dword [FRS],0x000000; MHz
+        mov     [FRS], 266	;!!!!!!
         Number  315,90,0,3,dword [FRS],0x000000; MHz
- cmp [L2], 256
- jl .App  ; Applebred
+        cmp     [L2], 256
-Text 100,70,0x00000000,At8, At8len-At8
+        jl      .App  ; Applebred
 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
-jmp MMXtest
+        mov     edx, At8
+        jmp     @b
+.App:
         mov     edx, At8a
- .App:
-Text 100,70,0x00000000,At8a, At8alen-At8a
+        jmp     @b
+AA:
-jmp MMXtest
-AA:
- mov [micron], 13
 mov [FRS], 333; !!!!
-Text 245,70,0x00000000,pr, prlen-pr
+        mov     [FRS], 333; !!!!
         Text    245,70,0x00000000,pr, prlen-pr
     mov [micron], 25 ;35?
     mov [L1i], 32
     mov [L1d], 32
     mov [L2], 512
 Text 75,70,0x00000000,Centaurn, Centaurnlen-Centaurn
+    mov edx,C65
-Text 100,70,0x00000000,C65, C65len-C65
+    mov esi,C65len-C65
-    jmp MMXtest
+    jmp OutProcName
 ;---------------------
 Centaur:
 ; cache detection routine
 ;CACHE1:
 mov eax, 80000005h
     cpuid
-mov eax, ecx
-and eax,000000FFh ;
+movzx eax, cl
 mov [lineld], eax
-mov eax, ecx
+mov eax, ecx
-and eax,00FF0000h
+shr eax, 16
-shr eax, 16
+and eax,000000FFh
 mov [wayld], eax
-shr ecx, 24
-mov [L1d], ecx
 shr ecx, 24
-mov eax, edx
+mov [L1d], ecx
 and eax,000000FFh ;
+movzx eax, dl
 mov [lineli], eax
 mov eax, edx
     jmp vl2old	; if not then old identification
 vn:
     cmp [m],$9
     jl vl2old
 ; else  new
-mov eax, ecx
+movzx eax, cl
-shl eax, 24
-shr eax, 24
 mov dword[linel2], eax
 mov eax, ecx
 shl eax, 16
 mov [L2],ecx
-vl2old:
 mov eax, ecx
-shl eax, 24
+vl2old:
-shr eax, 24
+movzx eax, cl
 mov dword[linel2], eax
     jz .V58
     cmp [m],$9
     jz .V59
 .V54:
    mov [micron], 35
+   mov edx,V54
-Text 100,70,0x00000000,V54, V54len-V54
+   mov esi,V54len-V54
-    jmp MMXtest
+    jmp OutProcName
 .V58:
     mov [micron], 25
+    mov edx,V58
-Text 100,70,0x00000000,V58, V58len-V58
+    mov esi,V58len-V58
-    jmp MMXtest
+    jmp OutProcName
 .V59:
     mov [micron], 25
+    mov edx,V59
-Text 100,70,0x00000000,V59, V59len-V59
+    mov esi,V59len-V59
-    jmp MMXtest
+    jmp OutProcName
 sixC:	;Family=6
     jz .V69
     cmp [m],$A
     jz .V6A
 .V66:
    mov [micron], 18 ; 25?
+   mov edx,V66
-Text 100,70,0x00000000,V66, V66len-V66
+   mov esi,V66len-V66
-    jmp MMXtest
+    jmp OutProcName
 .V67:
     mov [micron], 15
+    mov edx,V67
-Text 100,70,0x00000000,V67, V67len-V67
+    mov esi,V67len-V67
-    jmp MMXtest
+    jmp OutProcName
 .V68:
     mov [micron], 13
+    mov edx,V68
-Text 100,70,0x00000000,V68, V68len-V68
+    mov esi,V68len-V68
-    jmp MMXtest
+    jmp OutProcName
 .V69:
    mov [micron], 13
+   mov edx,V69
-Text 100,70,0x00000000,V69, V69len-V69
+   mov esi,V69len-V69
-    jmp MMXtest
+   jmp OutProcName
 .V6A:
    mov [micron], 9
+   mov edx,VA
-Text 100,70,0x00000000,VA, VAlen-VA
+   mov esi,VAlen-VA
-    jmp MMXtest
+   jmp OutProcName
 ;-----------
 Transmeta:
 Text 15, 190,0x00000000,cache, cachelen-cache
-Text 75,70,0x00000000,Tranmsmetan, Tranmsmetanlen-Tranmsmetan
+Text 75,70,,Tranmsmetan, Tranmsmetanlen-Tranmsmetan
 	mov	esi, transmeta
 ; cache detection routine - it is the same as for AMD (almost)
 ;CACHE1:
 mov eax, 80000005h
     cpuid
-mov eax, ecx
-and eax,000000FFh ;
+movzx eax, cl
 mov [lineld], eax
 mov eax, ecx
+mov eax, ecx
-and eax,00FF0000h
+shr eax,16
-shr eax, 16
+and eax,000000FFh
 mov [wayld], eax
-shr ecx, 24
 mov [L1d], ecx
 shr ecx, 24
-mov eax, edx
 mov [L1d], ecx
-and eax,000000FFh ;
+movzx eax, dl
 mov [lineli], eax
 mov eax, edx
-and eax,00FF0000h
+shr eax, 16
-shr eax, 16
+and eax,000000FFh
-mov [wayli], eax
-shr edx, 24
+mov [wayli], eax
 mov [L1i], edx
 shr edx, 24
 mov [L1i], edx
     jz .fivt
     cmp [f], $F
     jz .fift
 .fivt:	  ;     Family=5
-    mov [micron], 13 ; ?
+    mov edx,T5
-Text 140,70,0x00000000,T5, T5len-T5
+    mov esi,T5len-T5
-    jmp MMXtest
+    jmp @f
+.fift:	  ;     Family=F
+    mov edx,TF
     mov esi,TFlen-TF
-.fift:	  ;     Family=F
+@@:
     mov [micron], 13 ;
+    Text 140,70,0
+    jmp MMXtest
-Text 140,70,0x00000000,TF, TFlen-TF
+OutProcName:
-    jmp MMXtest
+        Text    100,70,0
       xor eax,eax
       inc eax
       cpuid
 HTTtest:
   test	edx, $10000000; ;Test bit 28
-  jnz	.EL   ;HTT technology is supported
   jz .ELN
-.EL:
+.EL:   ;HTT technology is supported
-   and ebx,00FF0000h ; numbers of logical processors
-   shr ebx,16 ;        shift it to the correct position
+   and ebx,00FF0000h ; numbers of logical processors
-   cmp ebx, 1
+   cmp ebx, 1 shl 16
    ;   mov [number_of_log_cpus], ebx
    je .ELN  ; HHT not enabled (Celeron)
    mov	dword [HTTn+9], $736579
    mov	dword [HTT+ 6], $736579
    jmp TEXTOUT
 .ELN:
    mov	dword [HTTn+ 9],  $6F6E
-   mov	dword [HTT+ 6],  $6F6E
+   mov	dword [HTTn+ 9],  $6F6E
-   jmp	TEXTOUT
+   mov	dword [HTT+ 6],  $6F6E
 TEXTOUT:
 Text 15,110,0x00000000,fam, famlen-fam
-Text 15,130,0x00000000,mode, modelen-mode
+Text 15,130,,mode, modelen-mode
-Text 15,150,0x00000000,step, steplen-step
+Text 15,150,,step, steplen-step
 ;--------L1  L2
 Number 75,170,0,3,dword [L1d],0x000000;
-Number 75,190,0,3,dword [L1i],0x000000;
+Number 75,190,,,dword [L1i]
-Number 41,210,0,4,dword[L2],0x000000;
+Number 41,210,0,4,dword[L2]
-Number 35,230,0,5,dword[L3],0x000000;
+Number 35,230,0,5,dword[L3]
 ;-----------Features
-Number 258,50,0,2,dword [micron],0x000000  ; micron
+Number 258,50,0,2,dword [micron]  ; micron
 Text 275,290,0x00000000,HTT, HTTlen-HTT
-Text 275,310,0x00000000,sse3, sse3len-sse3
+Text 275,310,,sse3, sse3len-sse3
-Text 15,70,0x00000000,name, namelen-name
+Text 15,70,,name, namelen-name
-Text 15,290,0x00000000,MMXs, MMXslen-MMXs
+Text 15,290,,MMXs, MMXslen-MMXs
-Text 15,310,0x00000000,SSE, SSElen-SSE
+Text 15,310,,SSE, SSElen-SSE
-Text 95,310,0x00000000,SSE2, SSE2len-SSE2
+Text 95,310,,SSE2, SSE2len-SSE2
     Number 140,170,0,2,dword [wayld],0x000000
-    Number 218,170,0,2,dword [lineld],0x000000
+    Number 140,170,0,2,dword [wayld],0x000000
+    Number 218,170,,,dword [lineld]
-    Number 140,190,0,2,dword [wayli],0x000000
-    Number 218,190,0,2,dword [lineli],0x000000
+    Number 140,190,,,dword [wayli]
-    Number 140,210,0,2,dword [wayl2],0x000000
-    Number 218,210,0,2,dword [linel2],0x000000
-    Number 140,230,0,2,dword [wayl3],0x000000
-    Number 218,230,0,2,dword [linel3],0x000000
-    jmp TEST3DNOW
-;-------------------
-TEST3DNOW:
-  cmp [smallvendor], 'ntel'
-  je .NOEXTENDED
-  jne .t
-.t:
-  mov	eax, $80000001 ;// Setup extended function 8000_0001h
-  cpuid
-  test	edx, $80000000 ;// Test bit 31
-  jnz	.XIT
     Number 218,190,,,dword [lineli]
 .NOEXTENDED: ;// 3DNow! technology is supported
+    Number 140,210,,,dword [wayl2]
-   mov	dword [now+ 9], $6F6E
+    Number 218,210,,,dword [linel2]
-   jmp TEST3DNOWP
+    Number 140,230,,,dword [wayl3]
-.XIT:
+    Number 218,230,,,dword [linel3]
-   mov	dword [now+ 9],  $736579
-   jmp TEST3DNOWP
+;-------------------
-TEST3DNOWP:
+TEST3DNOW:
-  cmp [smallvendor], 'ntel'
   je .NOEXTENDEDP
   xor edx, edx
-.tp:
+  cmp [smallvendor], 'ntel'
+  je @f
-  mov	eax, $80000001 ;// Setup extended function 8000_0001h
-  cpuid
+  mov	eax, $80000001 ;// Setup extended function 8000_0001h
   cpuid
   test	edx, $40000000 ;// Test bit 30
-  jnz	.XITP  ;// 3DNow! technology is supported
+@@:
    mov	dword [MMXPi+ 8], $6F6E
    jmp text3d
 XITM:
    mov	dword [mmxp+ 7],  $736579
    mov	dword [MMXPi+ 8],  $736579
-   jmp text3d
 text3d:
 Text 175,290,0x00000000,now, nowlen-now
-Text 175,310,0x00000000,nowp, nowplen-nowp
+Text 175,310,,nowp, nowplen-nowp
-Text 95,290,0x00000000,mmxp, mmxplen-mmxp
+Text 95,290,,mmxp, mmxplen-mmxp
 jmp still
 ;--------------------------
-NO_CPUID:
+;--------------------------
- Text 15,50,0x00000000,oblom, oblomlen-oblom
+NO_CPUID:
- jmp FREEZE
+ Text 15,50,0x00000000,oblom, oblomlen-oblom
   shr eax, 10
   mov [ram_size_t], eax
   Text 115,340,0x00000000,ram, ramlen-ram
-  Text 115,340,0x00000000,ram, ramlen-ram
+  Text 300,340,,mb, mblen-mb
   Number 200,340,0,4,dword [ram_size_a],0x000000
   Number 200,340,0,4,dword [ram_size_a],0x000000
   Number 270,340,0,4,dword [ram_size_t],0x000000
     je	 key		;  key
     cmp  eax,3		;
     je	 button 	;  button
     jmp  still		;
   key:			;
-    mov  eax,2		;
     mcall		;
     jmp  still		;
   button:		;
     mov  eax,17 	;
     mcall		;
     cmp  ah,2		;  = 2 ?
     je	thread_start	;
+			;
-    cmp  ah,3		;  = 3 ?
-    je	vybor		; vybor
+    cmp  ah,3		;  = 3 ?
-    jne  noclose
     jne  still
     jmp     event_wait
 vybor:
  Number 310,70,0,4,dword [rating],0xFFFFFF ;
- Number 315,90,0,3,dword [FRS],0xFFFFFF; MHz
+ Number 315,90,0,3,dword [FRS]; MHz
 cmp [FRS], 266
 jz .s1
 cmp [FRS], 333
+jz .s2
-jz .s2
+cmp [FRS], 400
-cmp [FRS], 400
+jz .s3
-jz .s3
 .s1:
-.s1:
+mov [FRS], 333
-mov [FRS], 333
+.rating:
-call newrating
- Number 310,70,0,4,dword [rating],0x000000
- Number 315,90,0,3,dword [FRS],0x000000; MHz
-jmp  still
-.s2:
+call newrating
-mov [FRS], 400
+ Number 310,70,0,4,dword [rating],0x000000
-call newrating
- Number 310,70,0,4,dword [rating],0x000000
-   Number 315,90,0,3,dword [FRS],0x000000; MHz
-jmp  still
+ Number 315,90,0,3,dword [FRS]; MHz
-.s3:
-mov [FRS], 266
-call newrating
 jmp  still
  Number 310,70,0,4,dword [rating],0x000000
 .s2:
     cmp  [num_win2],0
     jne  still
-;================================================RSA test
-  call init_test   ; start RSA code
-  call module_test
   jmp somewhere
+;================================================RSA test
- module_test:
+;test rsa coding speed
-;test rsa coding speed
+        call    init_test
 ;length of module - 256 bit
   mov  eax,26
   mov  ebx,9
   mcall
-  add  eax,100 ;test lasts 1 second.
-  push eax
+  add  eax,100 ;test lasts 1 second.
-.loop:
+  push eax
-  mov  ecx,4 ;do 4 iterations
+.loop:
-  push ecx   ;this reduces number of calls mcall.
+  push 4     ;do 4 iterations - this reduces number of calls mcall.
 .loop1:
   call rsa_test   ;this procedure change all registers
   mcall
   cmp  eax,dword [esp]	 ;Is time changed?
   jl   .loop
   pop  eax
   shr  dword [iter],4 ;[iter] - speed in Kb/sec. (every iteration codes 64 bytes)
-  ret
-   somewhere:
-;======================================================================
 CreateTread window_2,thread2_esp
-    jmp  still
+  jmp  still
 window_2:
     mov  [num_win2],1
     je	 button_2	;  button_2
     jmp  still_2	;
   key_2:		;
-    mov  eax,2		;   2
+  key_2:		;
     mcall		;
     jmp  still_2	;
   button_2:		;
     mov  eax,17 	; 17
     mcall		;
     cmp  ah,1		; = 1 ?
-    jne  noclose_2	; noclose
-    mov  [num_win2],0	;
-    or	 eax,-1 	;
+    jne  still_2	; noclose
     mcall
     mov  [num_win2],0	;
   noclose_2:
     or	 eax,-1 	;
-    jmp  still_2	;
+    mcall
 draw_window_2:
     mov  eax,12 		   ; function 12:tell os about windowdraw
     mov  ebx,1h 		    ; 1, start of draw
     mcall
   Window 250,250,420,390, 0x33FFFFFF, 0x805080d0, standard
 	  ; place size
 Text 15, 10,0x00000000, STDCA, STDCAlen-STDCA
-Text 215, 10,0x00000000, EXTCA, EXTCAlen-EXTCA
+Text 215, 10,, EXTCA, EXTCAlen-EXTCA
 Number 135,10,1*256,8,dword [stdc],0x000000
-Number 335,10,1*256,8,dword [extc],0x000000
+Number 335,10,,,dword [extc],
 Text 15, 30,0x00000000, FPU, FPUlen-FPU
-Text 115, 30,0x00000000, VME, VMElen-VME
+Text 115, 30,, VME, VMElen-VME
-Text 215, 30,0x00000000, DE,  DElen-DE
+Text 215, 30,, DE,  DElen-DE
-Text 315, 30,0x00000000, PSE, PSElen-PSE
+Text 315, 30,, PSE, PSElen-PSE
-Text 15, 50,0x00000000,TSC, TSClen-TSC
+Text 15, 50,,TSC, TSClen-TSC
-Text 115, 50,0x00000000,MSR, MSRlen-MSR
+Text 115,50,,MSR, MSRlen-MSR
-Text 215,50,0x00000000,PAE, PAElen-PAE
+Text 215,50,,PAE, PAElen-PAE
-Text 315,50,0x00000000,MCE, MCElen-MCE
+Text 315,50,,MCE, MCElen-MCE
-Text 15,70,0x00000000,CX8, CX8len-CX8
+Text 15,70,,CX8, CX8len-CX8
-Text 115,70,0x00000000,APIC, APIClen-APIC
+Text 115,70,,APIC, APIClen-APIC
-Text 215,70,0x00000000,Res, Reslen-Res
+Text 215,70,,Res, Reslen-Res
-Text 315,70,0x00000000,SEP, SEPlen-SEP
+Text 315,70,,SEP, SEPlen-SEP
-Text 15,90,0x00000000,MTRR, MTRRlen-MTRR
+Text 15,90,,MTRR, MTRRlen-MTRR
-Text 115,90,0x00000000,PGE, PGElen-PGE
+Text 115,90,,PGE, PGElen-PGE
-Text 215,90,0x00000000,MCA, MCAlen-MCA
+Text 215,90,,MCA, MCAlen-MCA
-Text 315,90,0x00000000,CMOV, CMOVlen-CMOV
+Text 315,90,,CMOV, CMOVlen-CMOV
-Text 15,110,0x00000000,PAT, PATlen-PAT
+Text 15,110,,PAT, PATlen-PAT
-Text 115,110,0x00000000,PSE36, PSE36len-PSE36
+Text 115,110,,PSE36, PSE36len-PSE36
-Text 215,110,0x00000000,PSNUM, PSNUMlen-PSNUM
+Text 215,110,,PSNUM, PSNUMlen-PSNUM
-Text 315,110,0x00000000,CLFLUSHn, CLFLUSHnlen-CLFLUSHn
+Text 315,110,,CLFLUSHn, CLFLUSHnlen-CLFLUSHn
-Text 15,130,0x00000000,Res, Reslen-Res
+Text 15,130,,Res, Reslen-Res
-Text 115,130,0x00000000,DTS, DTSlen-DTS
+Text 115,130,,DTS, DTSlen-DTS
-Text 215,130,0x00000000,ACPI, ACPIlen-ACPI
+Text 215,130,,ACPI, ACPIlen-ACPI
-Text 315,130,0x00000000,MMX, MMXlen-MMX
+Text 315,130,,MMX, MMXlen-MMX
-Text 15,150,0x00000000,FXSR, FXSRlen-FXSR
+Text 15,150,,FXSR, FXSRlen-FXSR
-Text 115,150,0x00000000,SSE, SSElen-SSE
+Text 115,150,,SSE, SSElen-SSE
-Text  215,150,0x00000000,SSE2, SSE2len-SSE2
+Text  215,150,,SSE2, SSE2len-SSE2
-Text 315,150,0x00000000,SSn, SSnlen-SSn
+Text 315,150,,SSn, SSnlen-SSn
-Text 15,170,0x00000000,HTT, HTTnlen-HTTn
+Text 15,170,,HTT, HTTnlen-HTTn
-Text 115,170,0x00000000,TM, TMlen-TM
+Text 115,170,,TM, TMlen-TM
-Text 215,170,0x00000000,IA64, IA64len-IA64
+Text 215,170,,IA64, IA64len-IA64
-Text 315,170,0x00000000,PBE, PBElen-PBE
+Text 315,170,,PBE, PBElen-PBE
 ;---------------
 DrawLine 0,  410, 185,185,0x8080FF  ;10
 mov   eax,$80000000
 cpuid
 ;mov eax, $03020101   for test of reaction
-test eax, 80000000h
+test eax, eax
-jnz goooddd
+js  goooddd
 baaadd:
 Text 95,235,0x00000000,NEF, NEFlen-NEF
 jmp too
 goooddd:
 Text 15,195,0x00000000,SS3, SS3len-SS3
-Text 15,215,0x00000000,MON, MONlen-MON
+Text 15,215,,MON, MONlen-MON
-Text 15,235,0x00000000,DS_CPL, DS_CPLlen-DS_CPL
+Text 15,235,,DS_CPL, DS_CPLlen-DS_CPL
-Text 15,255,0x00000000,EST, ESTlen-EST
+Text 15,255,,EST, ESTlen-EST
-Text 15,275,0x00000000,TM2, TM2len-TM2
+Text 15,275,,TM2, TM2len-TM2
-Text 15,295,0x00000000,VMX, VMXlen-VMX
+Text 15,295,,VMX, VMXlen-VMX
-Text 15,315,0x00000000,SVM, SVMlen-SVM
+Text 15,315,,SVM, SVMlen-SVM
-Text 115,195,0x00000000,CNXT_ID, CNXT_IDlen-CNXT_ID
+Text 115,195,,CNXT_ID, CNXT_IDlen-CNXT_ID
-Text 115,215,0x00000000,CX16, CX16len-CX16
+Text 115,215,,CX16, CX16len-CX16
-Text 115,235,0x00000000,ETPRD, ETPRDlen-ETPRD
+Text 115,235,,ETPRD, ETPRDlen-ETPRD
-Text 115,255,0x00000000,SYS, SYSlen-SYS
+Text 115,255,,SYS, SYSlen-SYS
-Text 115,275,0x00000000,LAF, LAFlen-LAF
+Text 115,275,,LAF, LAFlen-LAF
-Text 115,295,0x00000000,SSSE3, SSSE3len-SSSE3
+Text 115,295,,SSSE3, SSSE3len-SSSE3
-Text 115,315,0x00000000,MCR8, MCR8len-MCR8
+Text 115,315,,MCR8, MCR8len-MCR8
-Text 215,195,0x00000000,MP, MPlen-MP
+Text 215,195,,MP, MPlen-MP
-Text 215,215,0x00000000,NX, NXlen-NX
+Text 215,215,,NX, NXlen-NX
-Text 215,235,0x00000000,MMXPi, MMXPilen-MMXPi
+Text 215,235,,MMXPi, MMXPilen-MMXPi
-Text 215,255,0x00000000,MMXn, MMXnlen-MMXn
+Text 215,255,,MMXn, MMXnlen-MMXn
-Text 215,275,0x00000000,FXSRn, FXSRnlen-FXSRn
+Text 215,275,,FXSRn, FXSRnlen-FXSRn
     mcall
     Text 130,270,0x00000000,instruct, instructlen-instruct
     DrawLine  10,  330, 325,325,0x8080FF
-    DrawLine 330,  330, 275,325,0x8080FF
+    DrawLine 330,  330, 275,325;,0x8080FF
-    DrawLine  10,   10, 275,325,0x8080FF
+    DrawLine  10,   10, 275,325;,0x8080FF
-    DrawLine  10,  125, 275,275,0x8080FF
+    DrawLine  10,  125, 275,275;,0x8080FF
-    DrawLine 230,  330, 275,275,0x8080FF
+    DrawLine 230,  330, 275,275;,0x8080FF
   cmp dword[smallvendor], 'cAMD'
-  jne cont
-  cmp [f], $6
   jne cont
   cmp [f], $6
      cont:
     Text 15,50,0x00000000,tsum, tsumlen-tsum   ;
-    Text 15,90,0x00000000,cpuname, cpunamelen-cpuname;
+    Text 15,90,,cpuname, cpunamelen-cpuname;
-    Text 255,250,0x00000000,typen, typenlen-typen;
+    Text 255,250,,typen, typenlen-typen;
-    Text 175, 50,0x00000000,tech, techlen-tech;
+    Text 175, 50,,tech, techlen-tech;
     Number 82,50,0,4,dword [total],0x000000; MHz
-    Number 110,50,0,2,dword [sot],0x000000; KHz
+    Number 110,50,0,2,dword [sot]; KHz
     Text 15,170,0x00000000,cache2, cache2len-cache2
-    Text 15,210,0x00000000,cache3, cache3len-cache3
+    Text 15,210,,cache3, cache3len-cache3
-    Text 15,230,0x00000000,cache4, cache4len-cache4
+    Text 15,230,,cache4, cache4len-cache4
     Number 75,110,1*256,1,dword [f],0x000000 ;
-    Number 75,110,1*256,1,dword [f],0x000000 ;
+    Number 75,130,,,dword [m]
-    Number 75,130,1*256,1,dword [m],0x000000;
-    Number 75,150,1*256,1,dword [s],0x000000;
+    Number 75,150,,,dword [s]
-    Number 110,110,1*256,2,dword [ef],0x000000 ;
-    Number 110,130,1*256,2,dword [em],0x000000;
+    Number 110,110,1*256,2,dword [ef]
     Number 110,130,,,dword [em]
 Text   15,30,0x00000000,multil, multillen-multil
     mov  esi,mynamelen
     sub  esi,edi
     Text 105, 10, 0x00000000, edi, esi
 ;    Text 105,20,0x00000000,myname, mynamelen-myname
 ;-
-Text 15,250,0x00000000,brandid, brandidlen-brandid
+Text 15,250,,brandid, brandidlen-brandid
     ret 		;
 load_gif:
 	mov	edi, img_area
 load_gif2:
 	gif2img esi,edi
-	ret
+;	ret
     db '3DNOW!+:         '
 nowplen:
-;-Type
+;-Type
-t1:
-    db 'OEM'
-t1len:
-t2:
-    db 'Overdrive'
-t2len:
+t1      db      'OEM',0
-t3:
-    db 'Dual'
-t3len:
+t2      db      'Overdrive',0
-t4:
-    db 'Unknown'
+t3      db      'Dual',0
-t4len:
+t4      db      'Unknown',0
 ;----------Intel
 PF5clen:
 PF6c:
 db 'Celeron D (Presler)'
 PF6clen:
 ;---------AMD
-A50:
-db 'K5 (PR75, PR90, PR100)'
+A50     db 'K5 (PR75, PR90, PR100)',0
-A50len:
-A51:
-db '5k86 (PR120, PR133)'
+A51     db '5k86 (PR120, PR133)',0
-A51len:
-A52:
-db '5k86 (PR166)'
+A52     db '5k86 (PR166)',0
-A52len:
-A53:
-db '5k86 (PR200)'
+A53     db '5k86 (PR200)',0
-A53len:
-A56:
-db 'K6'
+A56     db 'K6',0
-A56len:
-A57:
-db 'K6'
+A57     db 'K6',0
-A57len:
-A58:
-db 'K6-2'
+A58     db 'K6-2',0
-A58len:
-A59:
-db 'K6-III'
+A59     db 'K6-III',0
-A59len:
-A5D:
-db 'K6-2+ or K6-III+'
+A5D     db 'K6-2+ or K6-III+',0
-A5Dlen:
 ;-------------------
-At1:
-db 'Athlon'
+At1     db 'Athlon',0
-At1len:
-At2:
-db 'Athlon'
+At2     db 'Athlon',0
-At2len:
-At3:
-db 'Duron (Spitfire)'
+At3     db 'Duron (Spitfire)',0
-At3len:
-At4:
-db 'Athlon (Thunderbird)'
+At4     db 'Athlon (Thunderbird)',0
-At4len:
-At6:
-db 'AthlonXP (Palomino)'
+At6     db 'AthlonXP (Palomino)',0
-At6len:
-At7:
-db 'Duron (Morgan)'
+At7     db 'Duron (Morgan)',0
-At7len:
-At8:
-db 'AthlonXP (Thoroughbred)'
+At8     db 'AthlonXP (Thoroughbred)',0
-At8len:
-At8a:
-db 'Duron (Applebred)'
+At8a    db 'Duron (Applebred)',0
-At8alen:
-Ata:
-db 'AthlonXP (Barton)'
+Ata     db 'AthlonXP (Barton)',0
-Atalen:
-Atat:
-db 'AthlonXP (Thorton)'
+Atat    db 'AthlonXP (Thorton)',0
-Atatlen:
 ;-------------------
 AF1:
 db 'Dual-core Opteron'
 AF1len:
 AF3:
 athloncoef3	db	45, 50, 40, 55, 25, 30, 60, 35
 p4coef		db	160, 170, 180, 190, 200, 210, 220, 230, 80, 90, 100, 110, 120, 130, 140, 150	; Pentium 4 (Willamete)
 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
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
 ;  include images and unpacking- and hasharea
+;
 rd 4096+1	   ;hash area size for unpacking gif
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+I_END:
+; RSA test data
+align 4
+  num1 rd 40
+  num2 rd 40
+  num3 rd 40
+  iter rd 1
+  openkey rd 1
+; GIF unpacker data
+    globalColor dd ?
+    img_count dd ?
+    cur_info dd ?	 ; image table pointer
+    codesize dd ?
+    compsize dd ?
+    bit_count dd ?
+    CC dd ?
+    EOI dd ?
+    Palette dd ?
+    block_ofs dd ?
+    table_ptr dd ?
 I_END:
 ost dd ?
 sot dd ?
 f dd ?
 L1d  dd ?
 L1i  dd ?
 L2   dd ?
 L3   dd ?
 micron dd ?
-sse3sup dd ?
 brand dd ?
 ram_size_a dd ?
 ram_size_t dd ?
 stdc dd ?
 extc dd ?
 FRS dd ?
 freqsel db ?
 sse3sup db ?
 temp dd ?

Subversion Repositories Kolibri OS

(root)/programs/system/cpuid/trunk/CPUID.ASM @ 551 – Rev 515 → 532