diff --git a/programs/develop/fast_call_test/debug.inc b/programs/debug.inc similarity index 100% rename from programs/develop/fast_call_test/debug.inc rename to programs/debug.inc diff --git a/programs/develop/fast_call_test/MACROS.INC b/programs/develop/fast_call_test/macros.inc similarity index 100% rename from programs/develop/fast_call_test/MACROS.INC rename to programs/develop/fast_call_test/macros.inc diff --git a/programs/develop/fast_call_test/test.ASM b/programs/develop/fast_call_test/test.ASM index d6f457002c..30e6de2e5b 100644 --- a/programs/develop/fast_call_test/test.ASM +++ b/programs/develop/fast_call_test/test.ASM @@ -15,7 +15,7 @@ org 0x0 dd 0x0, 0x0 include 'macros.inc' -include 'debug.inc' +include '../../debug.inc' START: print 'Please wait' ; ÷åðåç áûñòðûé âûçîâ (SYSENTER) @@ -113,4 +113,4 @@ test3: mov ebx, 0x100000 mcall -1 ;--------------------------------------------- old_tsc: dd 0, 0 -I_END: \ No newline at end of file +I_END: diff --git a/programs/games/megamaze/trunk/debug.inc b/programs/games/megamaze/trunk/debug.inc deleted file mode 100644 index 1f43e064a7..0000000000 --- a/programs/games/megamaze/trunk/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/games/megamaze/trunk/GIF_LITE.INC b/programs/games/megamaze/trunk/gif_lite.inc similarity index 100% rename from programs/games/megamaze/trunk/GIF_LITE.INC rename to programs/games/megamaze/trunk/gif_lite.inc diff --git a/programs/games/megamaze/trunk/MACROS.INC b/programs/games/megamaze/trunk/macros.inc similarity index 100% rename from programs/games/megamaze/trunk/MACROS.INC rename to programs/games/megamaze/trunk/macros.inc diff --git a/programs/games/megamaze/trunk/megamaze.asm b/programs/games/megamaze/trunk/megamaze.asm index ac20e78a67..7ab9fba8c4 100644 --- a/programs/games/megamaze/trunk/megamaze.asm +++ b/programs/games/megamaze/trunk/megamaze.asm @@ -25,9 +25,9 @@ macro icall lbl dd stack_end ; esp dd 0x0 , 0x0 ; I_Param , I_Icon lang fix ru -include "MACROS.INC" +include "macros.inc" purge mov -;include "DEBUG.INC" +;include "../../../debug.inc" COLOR_ORDER equ MENUETOS include 'gif_lite.inc' diff --git a/programs/games/megamaze/trunk/tam.INC b/programs/games/megamaze/trunk/tam.inc similarity index 100% rename from programs/games/megamaze/trunk/tam.INC rename to programs/games/megamaze/trunk/tam.inc diff --git a/programs/media/gifview/trunk/debug.inc b/programs/media/gifview/trunk/debug.inc deleted file mode 100644 index 1f09ebef9b..0000000000 --- a/programs/media/gifview/trunk/debug.inc +++ /dev/null @@ -1,131 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - mcall - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - - -macro newline -{ - dps <13,10> -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/media/midamp/trunk/debug.inc b/programs/media/midamp/trunk/debug.inc deleted file mode 100644 index 6e760e190a..0000000000 --- a/programs/media/midamp/trunk/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - mcall - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/media/midamp/trunk/midamp.asm b/programs/media/midamp/trunk/midamp.asm index 1f9b4de473..59b1b838b4 100644 --- a/programs/media/midamp/trunk/midamp.asm +++ b/programs/media/midamp/trunk/midamp.asm @@ -73,7 +73,7 @@ include '../../../develop/libraries/box_lib/load_lib.mac' lang fix en ;purge mov -include 'debug.inc' +include '../../../debug.inc' ;include 'dlg.inc' include 'playlist.inc' include 'gif_lite.inc' @@ -510,4 +510,4 @@ dir_table: rb 32+304 workarea: rb 120*1024 -I_END: \ No newline at end of file +I_END: diff --git a/programs/network/downloader/trunk/debug.inc b/programs/network/downloader/trunk/debug.inc deleted file mode 100644 index 1f43e064a7..0000000000 --- a/programs/network/downloader/trunk/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/network/downloader/trunk/downloader.asm b/programs/network/downloader/trunk/downloader.asm index 1c428d2ef4..0e5f4cb112 100644 --- a/programs/network/downloader/trunk/downloader.asm +++ b/programs/network/downloader/trunk/downloader.asm @@ -49,7 +49,7 @@ include '../../../proc32.inc' include '../../../develop/libraries/box_lib/load_lib.mac' include '../../../develop/libraries/box_lib/trunk/box_lib.mac' include 'dll.inc' -include 'debug.inc' +include '../../../debug.inc' URLMAXLEN equ 256 ; maximum length of url string @@ -1631,4 +1631,4 @@ align 4 stacktop: ;--------------------------------------------------------------------- I_END: -;--------------------------------------------------------------------- \ No newline at end of file +;--------------------------------------------------------------------- diff --git a/programs/network/icq/trunk/CMDIPC.INC b/programs/network/icq/trunk/cmdipc.inc similarity index 100% rename from programs/network/icq/trunk/CMDIPC.INC rename to programs/network/icq/trunk/cmdipc.inc diff --git a/programs/network/icq/trunk/debug.inc b/programs/network/icq/trunk/debug.inc deleted file mode 100644 index 1f43e064a7..0000000000 --- a/programs/network/icq/trunk/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/network/icq/trunk/EDITBOX.INC b/programs/network/icq/trunk/editbox.inc similarity index 100% rename from programs/network/icq/trunk/EDITBOX.INC rename to programs/network/icq/trunk/editbox.inc diff --git a/programs/network/icq/trunk/ki.asm b/programs/network/icq/trunk/ki.asm index 0f5a65d5fe..64f588e92f 100644 --- a/programs/network/icq/trunk/ki.asm +++ b/programs/network/icq/trunk/ki.asm @@ -6,15 +6,15 @@ include "lang.inc" -include "MACROS.INC" +include "macros.inc" ;purge mov ;include "ASCL9/ascl.inc" -;include "debug.inc" +;include "../../../debug.inc" include "editbox.inc" MEOS_APP_START -;include "debug.inc" +;include "../../../debug.inc" include "2000.inc" include "comp.inc" ;include "fsio.inc" diff --git a/programs/network/icq/trunk/lang.inc b/programs/network/icq/trunk/lang.inc index 30c0149bd9..7a62d6c0b0 100644 --- a/programs/network/icq/trunk/lang.inc +++ b/programs/network/icq/trunk/lang.inc @@ -1 +1 @@ -lang fix ru \ No newline at end of file +lang fix en diff --git a/programs/other/archer/trunk/@RCHER.ASM b/programs/other/archer/trunk/@RCHER.ASM index ea3bc7ba28..d5708e1e83 100644 --- a/programs/other/archer/trunk/@RCHER.ASM +++ b/programs/other/archer/trunk/@RCHER.ASM @@ -79,7 +79,7 @@ end if ;{ include "..\..\..\macros.inc" ; purge mov - include "..\..\debug.inc" + include "..\..\..\debug.inc" include 'dump.inc' ;} end if @@ -158,7 +158,7 @@ again: Newline xor eax,eax ; and [Flags],STAY_MODE - and [CRC32],eax + and [_CRC32_],eax and [IDATsize],eax mov [Adler32],1 call OpenFile @@ -282,7 +282,7 @@ again: push esi ecx call UCRC Msg 11 - mov eax,[CRC32] + mov eax,[_CRC32_] mov edx,36 cmp eax,[CRC_check] je .crcok diff --git a/programs/other/archer/trunk/data.inc b/programs/other/archer/trunk/data.inc index 3526e00429..a507020bbe 100644 --- a/programs/other/archer/trunk/data.inc +++ b/programs/other/archer/trunk/data.inc @@ -121,7 +121,7 @@ arc_base dd ? outp dd ? unp_size dd ? CRC_check dd ? -CRC32 dd ? +_CRC32_ dd ? CRC32table rd 256 Adler32 dd ? child dd ? diff --git a/programs/other/archer/trunk/deflate.inc b/programs/other/archer/trunk/deflate.inc index fef982d85c..fb16b85b2c 100644 --- a/programs/other/archer/trunk/deflate.inc +++ b/programs/other/archer/trunk/deflate.inc @@ -562,14 +562,14 @@ makeCRC: UCRC: ; in: esi - data to calculate CRC ; ecx - its length -; [CRC32] - previous CRC32 -; out: [CRC32]- partial CRC32 (no pre- & post-conditioning!) +; [_CRC32_] - previous CRC32 +; out: [_CRC32_]- partial CRC32 (no pre- & post-conditioning!) pusha cmp dword[CRC32table+4],0x77073096 je .tbl_rdy call makeCRC .tbl_rdy: - mov eax,[CRC32] + mov eax,[_CRC32_] not eax .m1: movzx ebx,al @@ -579,7 +579,7 @@ UCRC: inc esi loop .m1 not eax - mov [CRC32],eax + mov [_CRC32_],eax popa ret diff --git a/programs/other/archer/trunk/parser.inc b/programs/other/archer/trunk/parser.inc index 335273d2f3..ad3531abeb 100644 --- a/programs/other/archer/trunk/parser.inc +++ b/programs/other/archer/trunk/parser.inc @@ -469,9 +469,9 @@ UKeys: mov byte[esi],al mov ecx,1 push dword[ebx] - pop [CRC32] + pop [_CRC32_] call UCRC - push [CRC32] + push [_CRC32_] pop dword[ebx] mov eax,[ebx] and eax,0xff @@ -482,9 +482,9 @@ UKeys: shr eax,24 mov byte[esi],al push dword[ebx+8] - pop [CRC32] + pop [_CRC32_] call UCRC - push [CRC32] + push [_CRC32_] pop dword[ebx+8] popa ret diff --git a/programs/other/debug.inc b/programs/other/debug.inc deleted file mode 100644 index 243a49bee6..0000000000 --- a/programs/other/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - mcall - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - mcall - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/other/fft/FHT4A.asm b/programs/other/fft/FHT4A.asm index 5b7d3dbeb6..037f0340b4 100644 --- a/programs/other/fft/FHT4A.asm +++ b/programs/other/fft/FHT4A.asm @@ -24,7 +24,7 @@ use32 dd 0x0 , 0x0 ; I_Param , I_Icon include '../../macros.inc' -include '../debug.inc' +include '../../debug.inc' include 'fht4code.asm' diff --git a/programs/other/rtfread/trunk/rtfread.asm b/programs/other/rtfread/trunk/rtfread.asm index 7917690b0d..d73d97eb38 100644 --- a/programs/other/rtfread/trunk/rtfread.asm +++ b/programs/other/rtfread/trunk/rtfread.asm @@ -69,7 +69,7 @@ include '../../../develop/libraries/box_lib/load_lib.mac' @use_library -;include '../../debug.inc' +;include '../../../debug.inc' if ~ RENDER eq PIX TOP=TOP+4 diff --git a/programs/system/board/trunk/board.asm b/programs/system/board/trunk/board.asm index f4ccc33467..6c340642dd 100644 --- a/programs/system/board/trunk/board.asm +++ b/programs/system/board/trunk/board.asm @@ -19,7 +19,7 @@ include 'lang.inc' dd mem ; esp dd filename , 0x0 ; I_Param , I_Icon include '../../../macros.inc' -include 'debug.inc' +include '../../../debug.inc' purge newline MAXSTRINGS = 16 TMP = 80*(MAXSTRINGS+1) diff --git a/programs/system/board/trunk/debug.inc b/programs/system/board/trunk/debug.inc deleted file mode 100644 index f58479019a..0000000000 --- a/programs/system/board/trunk/debug.inc +++ /dev/null @@ -1,131 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - - -macro newline -{ - dps <13,10> -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/system/cropflat/cropflat.asm b/programs/system/cropflat/cropflat.asm index d9eb177959..eeae0c681d 100644 --- a/programs/system/cropflat/cropflat.asm +++ b/programs/system/cropflat/cropflat.asm @@ -43,7 +43,7 @@ dd 0x0 include '../../macros.inc' -;include 'debug.inc' +;include '../../debug.inc' ;------------------------------------------------------------------------------ START: mcall 14 @@ -171,4 +171,4 @@ align 4 stack_top: ;------------------------------------------------------------------------------ I_END: -;------------------------------------------------------------------------------ \ No newline at end of file +;------------------------------------------------------------------------------ diff --git a/programs/system/cropflat/debug.inc b/programs/system/cropflat/debug.inc deleted file mode 100644 index 15ea290d3b..0000000000 --- a/programs/system/cropflat/debug.inc +++ /dev/null @@ -1,147 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline_1 -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/system/icon/trunk/debug.inc b/programs/system/icon/trunk/debug.inc deleted file mode 100644 index 15ea290d3b..0000000000 --- a/programs/system/icon/trunk/debug.inc +++ /dev/null @@ -1,147 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline_1 -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/system/icon/trunk/icon.asm b/programs/system/icon/trunk/icon.asm index 3174576011..cf6ff3cec0 100644 --- a/programs/system/icon/trunk/icon.asm +++ b/programs/system/icon/trunk/icon.asm @@ -82,7 +82,7 @@ ICON_STRIP equ '/rd/1/iconstrp.png' include 'lang.inc' include '../../../macros.inc' include '../../../develop/libraries/box_lib/load_lib.mac' -;include 'debug.inc' +;include '../../../debug.inc' ;------------------------------------------------------------------------------ @use_library ;use load lib macros ;------------------------------------------------------------------------------ diff --git a/programs/system/menu/trunk/debug.inc b/programs/system/menu/trunk/debug.inc deleted file mode 100644 index 1f43e064a7..0000000000 --- a/programs/system/menu/trunk/debug.inc +++ /dev/null @@ -1,137 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index afff582681..a9c8332192 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -41,7 +41,7 @@ ;------------------------------------------------------------------------------ include "lang.inc" include "..\..\..\macros.inc" -;include "DEBUG.INC" ; debug macros +;include "../../../debug.inc" ; debug macros ;------------------------------------------------------------------------------ align 4 conversion_ASCII_to_HEX: @@ -948,4 +948,4 @@ align 4 stack_area: ;------------------------------------------------------------------------------ mem_end: -;------------------------------------------------------------------------------ \ No newline at end of file +;------------------------------------------------------------------------------ diff --git a/programs/system/panel/trunk/@PANEL.ASM b/programs/system/panel/trunk/@PANEL.ASM index 82cce8fc63..68c1994dc0 100644 --- a/programs/system/panel/trunk/@PANEL.ASM +++ b/programs/system/panel/trunk/@PANEL.ASM @@ -63,7 +63,7 @@ include 'lang.inc' include '../../../macros.inc' include '../../../proc32.inc' -;include 'debug.inc' +;include '../../../debug.inc' include 'MOI.INC' ;à áª« ¤ª¨ ª« ¢¨ âãàë include '../../../develop/libraries/box_lib/load_lib.mac' @use_library ;use load lib macros diff --git a/programs/system/panel/trunk/debug.inc b/programs/system/panel/trunk/debug.inc deleted file mode 100644 index 15ea290d3b..0000000000 --- a/programs/system/panel/trunk/debug.inc +++ /dev/null @@ -1,147 +0,0 @@ -macro debug_print str -{ - local ..string, ..label - - jmp ..label - ..string db str,0 - ..label: - - pushf - pushad - mov edx,..string - call debug_outstr - popad - popf -} - -dps fix debug_print - -macro debug_print_dec arg -{ - pushf - pushad - if ~arg eq eax - mov eax,arg - end if - call debug_outdec - popad - popf -} - -dpd fix debug_print_dec - -;--------------------------------- -debug_outdec: ;(eax - num, edi-str) - push 10 ;2 - pop ecx ;1 - push -'0' ;2 - .l0: - xor edx,edx ;2 - div ecx ;2 - push edx ;1 - test eax,eax ;2 - jnz .l0 ;2 - .l1: - pop eax ;1 - add al,'0' ;2 - call debug_outchar ; stosb - jnz .l1 ;2 - ret ;1 -;--------------------------------- - -debug_outchar: ; al - char - pushf - pushad - mov cl,al - mov eax,63 - mov ebx,1 - int 0x40 - popad - popf -ret - -debug_outstr: - mov eax,63 - mov ebx,1 - @@: - mov cl,[edx] - test cl,cl - jz @f - int 40h - inc edx - jmp @b - @@: - ret - -_debug_crlf db 13, 10, 0 - -macro newline_1 -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro newline -{ - pushf - pushad - mov edx, _debug_crlf - call debug_outstr - popad - popf -} - -macro print message -{ - dps message - newline -} - -macro pregs -{ - dps "EAX: " - dpd eax - dps " EBX: " - dpd ebx - newline - dps "ECX: " - dpd ecx - dps " EDX: " - dpd edx - newline -} - -macro debug_print_hex arg -{ - pushf - pushad - if ~arg eq eax - mov eax, arg - end if - call debug_outhex - popad - popf -} -dph fix debug_print_hex - -debug_outhex: - ; eax - number - mov edx, 8 - .new_char: - rol eax, 4 - movzx ecx, al - and cl, 0x0f - mov cl, [__hexdigits + ecx] - pushad - mcall 63, 1 - popad - dec edx - jnz .new_char -ret - -__hexdigits: - db '0123456789ABCDEF' \ No newline at end of file