From 92b71dacb22d9149f015650305081e934f44c549 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 22 May 2025 13:50:27 +0100 Subject: [PATCH] develop/examples/cpuspeed: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden. --- .../examples/cpuspeed/{trunk => }/Tupfile.lua | 2 +- .../cpuspeed/{trunk => }/build_en.bat | 0 .../cpuspeed/{trunk => }/build_ru.bat | 0 .../cpuspeed/{trunk => }/cpuspeed.asm | 254 +++++++++--------- 4 files changed, 129 insertions(+), 127 deletions(-) rename programs/develop/examples/cpuspeed/{trunk => }/Tupfile.lua (79%) rename programs/develop/examples/cpuspeed/{trunk => }/build_en.bat (100%) rename programs/develop/examples/cpuspeed/{trunk => }/build_ru.bat (100%) rename programs/develop/examples/cpuspeed/{trunk => }/cpuspeed.asm (94%) diff --git a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua b/programs/develop/examples/cpuspeed/Tupfile.lua similarity index 79% rename from programs/develop/examples/cpuspeed/trunk/Tupfile.lua rename to programs/develop/examples/cpuspeed/Tupfile.lua index a2ce38990..831b0661a 100644 --- a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua +++ b/programs/develop/examples/cpuspeed/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/develop/examples/cpuspeed/trunk/build_en.bat b/programs/develop/examples/cpuspeed/build_en.bat similarity index 100% rename from programs/develop/examples/cpuspeed/trunk/build_en.bat rename to programs/develop/examples/cpuspeed/build_en.bat diff --git a/programs/develop/examples/cpuspeed/trunk/build_ru.bat b/programs/develop/examples/cpuspeed/build_ru.bat similarity index 100% rename from programs/develop/examples/cpuspeed/trunk/build_ru.bat rename to programs/develop/examples/cpuspeed/build_ru.bat diff --git a/programs/develop/examples/cpuspeed/trunk/cpuspeed.asm b/programs/develop/examples/cpuspeed/cpuspeed.asm similarity index 94% rename from programs/develop/examples/cpuspeed/trunk/cpuspeed.asm rename to programs/develop/examples/cpuspeed/cpuspeed.asm index b5393151b..e518f9052 100644 --- a/programs/develop/examples/cpuspeed/trunk/cpuspeed.asm +++ b/programs/develop/examples/cpuspeed/cpuspeed.asm @@ -1,126 +1,128 @@ -; -; CPU SPEED INDICATIOR -; -; Compile with FASM -; - - use32 - org 0x0 - - db 'MENUET01' ; 8 byte id - dd 0x01 ; header version - dd START ; start of code - dd I_END ; size of image - dd 0x1000 ; memory for app - dd 0x1000 ; esp - dd 0x0,0x0 ; I_Param , I_Icon - -include 'lang.inc' -include '..\..\..\..\macros.inc' - -START: ; start of execution - - mov eax,18 - mov ebx,5 - mcall - - xor edx,edx - mov ebx,1000000 - div ebx - mov ebx,10 - mov edi,text+19 - mov ecx,5 - newnum: - xor edx,edx - mov ebx,10 - div ebx - add dl,48 - mov [edi],dl - sub edi,1 - loop newnum - - mov eax,48 - mov ebx,3 - mov ecx,sc - mov edx,sizeof.system_colors - mcall - -red: - call draw_window ; at first, draw the window - -still: - - mov eax,10 ; wait here for event - mcall - - cmp eax,1 ; redraw request ? - jz red - cmp eax,2 ; key in buffer ? - jz key - cmp eax,3 ; button in buffer ? - jz button - - jmp still - - key: ; key - mov eax,2 ; just read it and ignore - mcall - jmp still - - button: ; button - mov eax,17 ; get id - mcall - - cmp ah,1 ; button id=1 ? - jnz still - or eax,-1 ; close this program - mcall - - -; ********************************************* -; ******* WINDOW DEFINITIONS AND DRAW ******** -; ********************************************* - - -draw_window: - - mov eax,12 ; function 12:tell os about windowdraw - mov ebx,1 ; 1, start of draw - mcall - - ; DRAW WINDOW - mov eax,0 ; function 0 : define and draw window - mov ebx,100*65536+200 ; [x start] *65536 + [x size] - mov ecx,100*65536+65 ; [y start] *65536 + [y size] - mov edx,[sc.work] ; color of work area RRGGBB,8->color glide - or edx,0x33000000 ; color of grab bar RRGGBB,8->color - mov edi,title ; WINDOW LABEL - mcall - - - mov ebx,20*65536+14 ; draw info text with function 4 - mov ecx,[sc.work_text] - mov edx,text - mov esi,24 - mov eax,4 - mcall - - mov eax,12 ; function 12:tell os about windowdraw - mov ebx,2 ; 2, end of draw - mcall - - ret - - -; DATA AREA - - -text: - db 'CPU RUNNING AT MHZ' - -title db 'CPU SPEED',0 - -I_END: - -sc system_colors - +; SPDX-License-Identifier: NOASSERTION +; + +; +; CPU SPEED INDICATIOR +; +; Compile with FASM +; + + use32 + org 0x0 + + db 'MENUET01' ; 8 byte id + dd 0x01 ; header version + dd START ; start of code + dd I_END ; size of image + dd 0x1000 ; memory for app + dd 0x1000 ; esp + dd 0x0,0x0 ; I_Param , I_Icon + +include 'lang.inc' +include '..\..\..\macros.inc' + +START: ; start of execution + + mov eax,18 + mov ebx,5 + mcall + + xor edx,edx + mov ebx,1000000 + div ebx + mov ebx,10 + mov edi,text+19 + mov ecx,5 + newnum: + xor edx,edx + mov ebx,10 + div ebx + add dl,48 + mov [edi],dl + sub edi,1 + loop newnum + + mov eax,48 + mov ebx,3 + mov ecx,sc + mov edx,sizeof.system_colors + mcall + +red: + call draw_window ; at first, draw the window + +still: + + mov eax,10 ; wait here for event + mcall + + cmp eax,1 ; redraw request ? + jz red + cmp eax,2 ; key in buffer ? + jz key + cmp eax,3 ; button in buffer ? + jz button + + jmp still + + key: ; key + mov eax,2 ; just read it and ignore + mcall + jmp still + + button: ; button + mov eax,17 ; get id + mcall + + cmp ah,1 ; button id=1 ? + jnz still + or eax,-1 ; close this program + mcall + + +; ********************************************* +; ******* WINDOW DEFINITIONS AND DRAW ******** +; ********************************************* + + +draw_window: + + mov eax,12 ; function 12:tell os about windowdraw + mov ebx,1 ; 1, start of draw + mcall + + ; DRAW WINDOW + mov eax,0 ; function 0 : define and draw window + mov ebx,100*65536+200 ; [x start] *65536 + [x size] + mov ecx,100*65536+65 ; [y start] *65536 + [y size] + mov edx,[sc.work] ; color of work area RRGGBB,8->color glide + or edx,0x33000000 ; color of grab bar RRGGBB,8->color + mov edi,title ; WINDOW LABEL + mcall + + + mov ebx,20*65536+14 ; draw info text with function 4 + mov ecx,[sc.work_text] + mov edx,text + mov esi,24 + mov eax,4 + mcall + + mov eax,12 ; function 12:tell os about windowdraw + mov ebx,2 ; 2, end of draw + mcall + + ret + + +; DATA AREA + + +text: + db 'CPU RUNNING AT MHZ' + +title db 'CPU SPEED',0 + +I_END: + +sc system_colors