From 07aab9f5f6fb9ddd601c319d7e36895745435a55 Mon Sep 17 00:00:00 2001 From: heavyiron Date: Mon, 21 May 2007 15:23:13 +0000 Subject: [PATCH] CPUID 2.21 from Wildwest git-svn-id: svn://kolibrios.org@515 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/cpuid/trunk/CPUID.ASM | 66 +++++++++++++------------ programs/system/cpuid/trunk/HISTORY.TXT | 28 +++++++---- programs/system/cpuid/trunk/README.TXT | 16 ++++-- 3 files changed, 64 insertions(+), 46 deletions(-) diff --git a/programs/system/cpuid/trunk/CPUID.ASM b/programs/system/cpuid/trunk/CPUID.ASM index 3a3ddc31f1..4329e332d4 100644 --- a/programs/system/cpuid/trunk/CPUID.ASM +++ b/programs/system/cpuid/trunk/CPUID.ASM @@ -2,8 +2,8 @@ ; project name: CPUID * ; target platform: KolibriOS, x86 (IA-32), x86-64 achitectures * ; compiler: flat assembler 1.67.21 * -; version: 2.18 * -; last update: 1st April 2007 1st 2nd 3rd 4th * +; version: 2.21 * +; last update: 18th May 2007 1st 2nd 3rd 4th 5th 6th 7th 8th 9th * ; maintained by: Sergey Kuzmin aka Wildwest * ; e-mail: kuzmin_serg@list.ru * ; site: http://coolthemes.narod.ru/files.html * @@ -457,7 +457,7 @@ Text 75,70,0x00000000,AMDn, AMDnlen-AMDn mov esi, amd call load_gif -PutImage 135,97,201,49,img_area+8 +PutImage 135,107,201,49,img_area+8 ; place size ; Relax, man. AMD made PRETTY SIMPLE cache detection routine @@ -739,33 +739,33 @@ fif: ; AMD-64 Family=15 jz .AFC cmp [m],$E ; Athlon 64 // 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 .AF1: mov [micron], 09 ;? -Text 100,70,0x00000000,AF1, AF1len-AF1 - jmp MMXtest + Text 100,70,0x00000000,AF1, AF1len-AF1 + jmp MMXtest .AF3: mov [micron], 09 -Text 100,70,0x00000000,AF3, AF3len-AF3 - jmp MMXtest + Text 100,70,0x00000000,AF3, AF3len-AF3 + jmp MMXtest .AF4: mov [micron], 13 -Text 100,70,0x00000000,AF4, AF4len-AF4 - jmp MMXtest + Text 100,70,0x00000000,AF4, AF4len-AF4 + jmp MMXtest .AF5: mov [micron], 13 -Text 100,70,0x00000000,AF5, AF5len-AF5 - jmp MMXtest + Text 100,70,0x00000000,AF5, AF5len-AF5 + jmp MMXtest .AF7: mov [micron], 13 -Text 100,70,0x00000000,AF5, AF5len-AF5 - jmp MMXtest + Text 100,70,0x00000000,AF5, AF5len-AF5 + jmp MMXtest .AF8: - mov [micron], 13 -Text 100,70,0x00000000,AF4, AF5len-AF4 - jmp MMXtest + mov [micron], 13 + Text 100,70,0x00000000,AF4, AF4len-AF4 ; AF4, AF5len-AF4 + jmp MMXtest .AFB: mov [micron], 13 Text 100,70,0x00000000,AF4, AF4len-AF4 @@ -780,21 +780,20 @@ je .AFCnpal .AFCnpar: ; paris mov [micron], 13 - Text 100,70,0x00000000,AFCs, AFCslen-AFCs - jmp MMXtest + Text 100,70,0x00000000,AFCs, AFCslen-AFCs + jmp MMXtest .AFCnpal: ; palermo mov [micron], 9 - Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp - jmp MMXtest - + Text 100,70,0x00000000,AFCsp, AFCsplen-AFCsp + jmp MMXtest .AFCn: ;newcastle mov [micron], 13 - Text 100,70,0x00000000,AFC, AFClen-AFC - jmp MMXtest + Text 100,70,0x00000000,AFC, AFClen-AFC + jmp MMXtest - .AFE: ; error in cpu +.AFE: ; error in cpu jmp .AFC .AFF: @@ -832,7 +831,8 @@ Text 75,70,0x00000000,Inteln, Intelnlen-Inteln mov esi, intel call load_gif -PutImage 125,107,201,49,img_area+8 +PutImage 135,107,201,49,img_area+8 +;PutImage 125,107,201,49,img_area+8 ; place size det: @@ -1113,7 +1113,8 @@ Text 15, 190,0x00000000,cache, cachelen-cache mov esi, cyrix call load_gif -PutImage 130,127,201,49,img_area+8 +PutImage 135,107,201,49,img_area+8 +;PutImage 130,127,201,49,img_area+8 ; place size cmp [f], $5 @@ -1264,7 +1265,8 @@ fivC: ;Family=5 mov esi, idt call load_gif -PutImage 125,107,201,49,img_area+8 +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 @@ -1291,7 +1293,8 @@ sixC: ;Family=6 mov esi, via call load_gif -PutImage 125,107,201,49,img_area+8 +PutImage 135,107,201,49,img_area+8 +;PutImage 125,107,201,49,img_area+8 ; place size Text 75,70,0x00000000,Centaurn, Centaurnlen-Centaurn @@ -1334,7 +1337,8 @@ Text 75,70,0x00000000,Tranmsmetan, Tranmsmetanlen-Tranmsmetan mov esi, transmeta call load_gif -PutImage 125,107,201,49,img_area+8 +PutImage 135,107,201,49,img_area+8 +;PutImage 125,107,201,49,img_area+8 ; place size ; cache detection routine - it is the same as for AMD (almost) @@ -1978,7 +1982,7 @@ load_gif2: ; DATA AREA -title db 'CPUID 2.2 by S.Kuzmin & the KolibriOS team',0 +title db 'CPUID 2.21 by S.Kuzmin & the KolibriOS team',0 tsum: db 'Frequency: . MHz' diff --git a/programs/system/cpuid/trunk/HISTORY.TXT b/programs/system/cpuid/trunk/HISTORY.TXT index bd92219a72..5881ca4792 100644 --- a/programs/system/cpuid/trunk/HISTORY.TXT +++ b/programs/system/cpuid/trunk/HISTORY.TXT @@ -1,11 +1,10 @@ ;****************************************************************************** ; project name: CPUID ; target platform: KolibriOS, x86 (IA-32), x86-64 achitectures -; compability: probably some functions would work in MenuetOS 32 and MenuetOS 64, may be even in Miraculix; -; CPUID works in MS Windows by means of emulator KlbrInWin from Diamond (http://diamondz.land.ru) +; compability: CPUID works in MS Windows by means of emulator KlbrInWin from Diamond (http://diamondz.land.ru) ; compiler: flat assembler 1.67.21 -; version: 2.2 -; last update: 5st April 2007 +; version: 2.21 +; last update: 18th May 2007 ; maintained by: Sergey Kuzmin aka Wildwest ; e-mail: kuzmin_serg@list.ru ; site: http://coolthemes.narod.ru/files.html @@ -37,11 +36,22 @@ ; newest AMD/Intel codename detection ;****************************************************************************** ;HISTORY: -;3.0: CPUID 01/04/2007 (not finished) +;3.0: CPUID 18/05/2007 (not finished) +;Authors: Sergey Kuzmin aka Wildwest +;Features: +; (+) fixed typo, which makes selection of incorrect codename for AMD F8x CPU's; +;Known issues: Sempron marked as AthlonXP +; second window doesn't closed when you close main window +;----------------------------------------------------------------------------- +;2.2: CPUID 01/05/2007 ;Authors: Sergey Kuzmin aka Wildwest ; Iliya Mikhailov aka Ghost ; /^S0rG^\ +; Pavel Rymovskiy aka Heavyiron +; Leency ;Features: +; (+) creative work by Leency - logos now much better and they take less size; +; (+) changes from Heavyiron: client-relative drawing, title with function 0. It means the end of compatibility with MenuetOS! ; (+) real-time RAM monitoring (previous versions showed changed amount of available RAM only at redraw event or CPUID window activation); ; (+) fixed address of LAHF feature, added detection of CMPL, SVM, MOVCR8 technologies for AMD; ; (+) fixed L2 cache size detection for VIA (they changed format from 8 bits to 16 bits several years ago); @@ -49,8 +59,6 @@ ; (++) more info about caches for VIA and Transmeta; ; (+) added detection of DCA, SSSE3, VMX technologies for Intel; ; (+) updated multiplier detection for AMD and Intel (thanks a lot to Ghost); -; (+) client-relative drawing, title with function 0 -; It means end of capability with MenuetOS! ;Known issues: Sempron marked as AthlonXP ; second window doesn't closed when you close main window ;----------------------------------------------------------------------------- @@ -70,7 +78,7 @@ ; second window doesn't closed when you close main window ;----------------------------------------------------------------------------- ;2.0: CPUID 31/10/2006 -;Authors: Sergey Kuzmin aka Wildwest +;Authors: Sergey Kuzmin aka Wildwest ; Eugeniy Grechnikov aka Diamond ; Iliya Mikhailov aka Ghost ;Features: @@ -103,7 +111,7 @@ ;Known issues: Sempron is not supported (marked as AthlonXP) ;----------------------------------------------------------------------------- ;1.0: CPUID 26/09/2005 -;Authors: Sergey Kuzmin aka Wildwest +;Authors: Sergey Kuzmin aka Wildwest ; Marat Zakiyanov aka Mario79 ; Andrey Halyavin aka halyavin ;Features: @@ -128,7 +136,7 @@ ;Known issues: Sempron is not supported (marked as AthlonXP) ;----------------------------------------------------------------------------- ;0.9: CPUID 24/01/2005 -;Authors: Sergey Kuzmin aka Wildwest +;Authors: Sergey Kuzmin aka Wildwest ; Madis Kalme aka Madis731 ; Jeffrey Amelynck aka Profkid ;Features: diff --git a/programs/system/cpuid/trunk/README.TXT b/programs/system/cpuid/trunk/README.TXT index 79beeb2958..cd639a03ad 100644 --- a/programs/system/cpuid/trunk/README.TXT +++ b/programs/system/cpuid/trunk/README.TXT @@ -5,7 +5,7 @@ ENGLISH Hi! My name is Sergey Kuzmin aka Wildwest. This is one of the mostly famous program for KolibriOS/MenuetOS. I called it CPUID. CPUID talks with you CPU and show log. -Current version is 2.17 and you can use it on your own risk without any warranty. +Current version is 2.21 and you can use it on your own risk without any warranty. E-mail me (kuzmin_serg@list.ru) if you have some problems or suggestions. All righs on this program are mine, except parts of code written by other developers. @@ -29,13 +29,17 @@ People from international KolibriOS/MenuetOS team help me and I wish to mention Eugeniy Grechnikov (Russia) for great code clean-up and optimization; - Iliya Mikhailov (Russia) for piece of code from his great GMON. + Iliya Mikhailov (Russia) for piece of code from his great GMON; + + Pavel Rymovskiy (Belarus) and Leency (Ukraine) for their work, which enhance look & feel of CPUID. Also I want to thank folks which help me by testing and suggestions - Sonny, Smiddy and all the RU-Team. Please, test it and e-mail me screenshot. +The CPUID thread with announcements and discussion is at http://meos.sysbin.com/viewtopic.php?t=594 + Bye... @@ -44,7 +48,7 @@ RUSSIAN Привет! Меня зовут Сергей Кузьмин aka Wildwest. Это одна из самых известных программ для KolibriOS/MenuetOS. Она называется CPUID и показывает результаты идентификации процессора. -Это версия 2.17 и ВЫ можете её использовать на свой собственный риск безо всяких гарантий. +Это версия 2.21 и ВЫ можете её использовать на свой собственный риск безо всяких гарантий. Если будут какие-то проблемы или предложения, то напишите мне (kuzmin_serg@list.ru). Все права на программу принадлежат мне, кроме прав на части, написанных остальными разработчиками. @@ -68,14 +72,16 @@ RUSSIAN Евгения Гречникова (Россия) за чистку кода и оптимизацию; - Илью Михайлова (Россия) за кусок кода из его замечательной программы GMON. + Илью Михайлова (Россия) за кусок кода из его замечательной программы GMON; + + Павла Рымовского (Белоруссия) и Leency (Украина) за работу, спосособствовавшую улучшению внешнего вида CPUID. Также я хочу поблагодарить людей, помогавших мне тестированием и предложениями - Sonny, Smiddy и всю "советскую команду" KolibriOS/MenuetOS . Пожалуйста, протестируйте программу и пришлите мне скриншот по e-mail. -До встреч на форумах( http://meos.sysbin.com, http://board.flatassembler.net/forum.php?f=12). +До встреч на форуме(http://meos.sysbin.com/viewtopic.php?t=594).