From 9ab8d4e49adc6199e627a5c62b82aa989179c69a Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 25 May 2025 15:06:16 +0100 Subject: [PATCH] develop/libraries/utils: Post-SVN tidy - Move source code from `trunk` into root directory. - Update ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden. --- .../libraries/utils/{trunk => }/Tupfile.lua | 0 .../libraries/utils/{trunk => }/_atof.inc | 0 .../libraries/utils/{trunk => }/_ftoa.inc | 0 .../libraries/utils/{trunk => }/_rand.inc | 0 .../libraries/utils/{trunk => }/build.bat | 0 .../utils/{trunk => }/example/demo.asm | 0 .../libraries/utils/{trunk => }/utils.asm | 130 +++++++++--------- 7 files changed, 66 insertions(+), 64 deletions(-) rename programs/develop/libraries/utils/{trunk => }/Tupfile.lua (100%) rename programs/develop/libraries/utils/{trunk => }/_atof.inc (100%) rename programs/develop/libraries/utils/{trunk => }/_ftoa.inc (100%) rename programs/develop/libraries/utils/{trunk => }/_rand.inc (100%) rename programs/develop/libraries/utils/{trunk => }/build.bat (100%) rename programs/develop/libraries/utils/{trunk => }/example/demo.asm (100%) rename programs/develop/libraries/utils/{trunk => }/utils.asm (96%) diff --git a/programs/develop/libraries/utils/trunk/Tupfile.lua b/programs/develop/libraries/utils/Tupfile.lua similarity index 100% rename from programs/develop/libraries/utils/trunk/Tupfile.lua rename to programs/develop/libraries/utils/Tupfile.lua diff --git a/programs/develop/libraries/utils/trunk/_atof.inc b/programs/develop/libraries/utils/_atof.inc similarity index 100% rename from programs/develop/libraries/utils/trunk/_atof.inc rename to programs/develop/libraries/utils/_atof.inc diff --git a/programs/develop/libraries/utils/trunk/_ftoa.inc b/programs/develop/libraries/utils/_ftoa.inc similarity index 100% rename from programs/develop/libraries/utils/trunk/_ftoa.inc rename to programs/develop/libraries/utils/_ftoa.inc diff --git a/programs/develop/libraries/utils/trunk/_rand.inc b/programs/develop/libraries/utils/_rand.inc similarity index 100% rename from programs/develop/libraries/utils/trunk/_rand.inc rename to programs/develop/libraries/utils/_rand.inc diff --git a/programs/develop/libraries/utils/trunk/build.bat b/programs/develop/libraries/utils/build.bat similarity index 100% rename from programs/develop/libraries/utils/trunk/build.bat rename to programs/develop/libraries/utils/build.bat diff --git a/programs/develop/libraries/utils/trunk/example/demo.asm b/programs/develop/libraries/utils/example/demo.asm similarity index 100% rename from programs/develop/libraries/utils/trunk/example/demo.asm rename to programs/develop/libraries/utils/example/demo.asm diff --git a/programs/develop/libraries/utils/trunk/utils.asm b/programs/develop/libraries/utils/utils.asm similarity index 96% rename from programs/develop/libraries/utils/trunk/utils.asm rename to programs/develop/libraries/utils/utils.asm index 831392c57..bd9068e9f 100644 --- a/programs/develop/libraries/utils/trunk/utils.asm +++ b/programs/develop/libraries/utils/utils.asm @@ -1,64 +1,66 @@ -;-----------------------------------------------------------------------------+ -; Library "utils" (c) Sergei Steshin (Akyltist) | -;-----------------------------------------------------------------------------+ -; Charset:DOS-866 Font:Courier New Size:9pt | -; compiler: FASM 1.69.31 | -; version: 0.1.0 | -; last update: 31/03/2014 | -; e-mail: dr.steshin@gmail.com | -; license: BSD | -;-----------------------------------------------------------------------------+ - -format MS COFF - -public EXPORTS - -section '.flat' code readable writable align 16 - -include '../../../../proc32.inc' -include '_ftoa.inc' -include '_atof.inc' -include '_rand.inc' - - -;-----------------------------------------------------------------------------+ -; float to ascii string | -;-----------------------------------------------------------------------------+ -ftoa: ; - mov ebx, dword [esp+4] ; out string - mov eax, dword [esp+8] ; in value - stdcall FloatToString,eax,ebx ; - ret 8 ; - - -;-----------------------------------------------------------------------------+ -; ascii string to float | -;-----------------------------------------------------------------------------+ -atof: ; - mov ebx, dword [esp+4] ; out <- value - mov eax, dword [esp+8] ; in -> string - stdcall string2float,eax,ebx ; - ret 8 ; - - -;-----------------------------------------------------------------------------+ -; returns a random integer in the range [ 0...99999 ] | -;-----------------------------------------------------------------------------+ -random: ; - call _random ; out <- eax random - ret ; - -;=============================================================================; -align 16 -EXPORTS: - dd szFtoa , ftoa - dd szAtof , atof - dd szRandom , random - dd 0 , 0 - - szFtoa db 'ftoa' ,0 - szAtof db 'atof' ,0 - szRandom db 'random' ,0 - -section '.data' data readable writable align 16 - +; SPDX-License-Identifier: NOASSERTION +; + +;-----------------------------------------------------------------------------+ +; Library "utils" (c) Sergei Steshin (Akyltist) | +;-----------------------------------------------------------------------------+ +; Charset:DOS-866 Font:Courier New Size:9pt | +; compiler: FASM 1.69.31 | +; version: 0.1.0 | +; last update: 31/03/2014 | +; e-mail: dr.steshin@gmail.com | +; license: BSD | +;-----------------------------------------------------------------------------+ + +format MS COFF + +public EXPORTS + +section '.flat' code readable writable align 16 + +include '../../../proc32.inc' +include '_ftoa.inc' +include '_atof.inc' +include '_rand.inc' + + +;-----------------------------------------------------------------------------+ +; float to ascii string | +;-----------------------------------------------------------------------------+ +ftoa: ; + mov ebx, dword [esp+4] ; out string + mov eax, dword [esp+8] ; in value + stdcall FloatToString,eax,ebx ; + ret 8 ; + + +;-----------------------------------------------------------------------------+ +; ascii string to float | +;-----------------------------------------------------------------------------+ +atof: ; + mov ebx, dword [esp+4] ; out <- value + mov eax, dword [esp+8] ; in -> string + stdcall string2float,eax,ebx ; + ret 8 ; + + +;-----------------------------------------------------------------------------+ +; returns a random integer in the range [ 0...99999 ] | +;-----------------------------------------------------------------------------+ +random: ; + call _random ; out <- eax random + ret ; + +;=============================================================================; +align 16 +EXPORTS: + dd szFtoa , ftoa + dd szAtof , atof + dd szRandom , random + dd 0 , 0 + + szFtoa db 'ftoa' ,0 + szAtof db 'atof' ,0 + szRandom db 'random' ,0 + +section '.data' data readable writable align 16