From 5736af21d876e4db4af38620cf55b1fb564e995c Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Fri, 20 Aug 2010 23:29:50 +0000 Subject: [PATCH] revert changes in libini+libio from rev. 1573 git-svn-id: svn://kolibrios.org@1574 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../develop/libraries/libs-dev/libini/libini_p.asm | 14 +++----------- .../develop/libraries/libs-dev/libio/libio.asm | 6 +++--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/programs/develop/libraries/libs-dev/libini/libini_p.asm b/programs/develop/libraries/libs-dev/libini/libini_p.asm index 2590526af2..db6f2737ed 100644 --- a/programs/develop/libraries/libs-dev/libini/libini_p.asm +++ b/programs/develop/libraries/libs-dev/libini/libini_p.asm @@ -81,14 +81,12 @@ proc libini._.get_char _f ;///////////////////////////////////////////////////// ;;------------------------------------------------------------------------------------------------;; ;< --- TBD --- ;; ;;================================================================================================;; - push ecx mov ecx, [_f] dec [ecx + IniFile.cnt] jns @f stdcall libini._.preload_block, [_f] dec [ecx + IniFile.cnt] @@: lodsb - pop ecx ret endp @@ -101,7 +99,6 @@ proc libini._.skip_nonblanks _f ;/////////////////////////////////////////////// ;;------------------------------------------------------------------------------------------------;; ;< --- TBD --- ;; ;;================================================================================================;; - push ecx mov ecx, [_f] @@: stdcall libini._.get_char, [_f] cmp al, 32 @@ -117,7 +114,6 @@ proc libini._.skip_nonblanks _f ;/////////////////////////////////////////////// stdcall libini._.skip_line, [_f] jmp @b @@: stdcall libini._.unget_char, [_f] - pop ecx ret endp @@ -130,7 +126,6 @@ proc libini._.skip_spaces _f ;////////////////////////////////////////////////// ;;------------------------------------------------------------------------------------------------;; ;< --- TBD --- ;; ;;================================================================================================;; - push ecx mov ecx, [_f] @@: stdcall libini._.get_char, [_f] cmp al, 32 @@ -138,7 +133,6 @@ proc libini._.skip_spaces _f ;////////////////////////////////////////////////// cmp al, 9 je @b @@: stdcall libini._.unget_char, [_f] - pop ecx ret endp @@ -151,7 +145,6 @@ proc libini._.skip_line _f ;//////////////////////////////////////////////////// ;;------------------------------------------------------------------------------------------------;; ;< --- TBD --- ;; ;;================================================================================================;; - push ecx mov ecx, [_f] @@: stdcall libini._.get_char, [_f] or al, al @@ -161,7 +154,6 @@ proc libini._.skip_line _f ;//////////////////////////////////////////////////// cmp al, 10 jne @b @@: stdcall libini._.unget_char, [_f] - pop ecx ret endp @@ -433,7 +425,7 @@ proc libini._.find_section _f, _sec_name ;////////////////////////////////////// ;< eax = -1 (fail) / 0 (ok) ;; ;< [_f.pos] = new cursor position (right after ']' char if eax = 0, at the end of file otherwise) ;; ;;================================================================================================;; - push ebx ecx edi + push ebx edi mov ecx, [_f] invoke file.seek, [ecx + IniFile.fh], 0, SEEK_SET @@ -469,12 +461,12 @@ proc libini._.find_section _f, _sec_name ;////////////////////////////////////// @@: cmp byte[edi], 0 jne .next_section - pop edi ecx ebx + pop edi ebx xor eax, eax ret .exit_error: - pop edi ecx ebx + pop edi ebx or eax, -1 ret endp diff --git a/programs/develop/libraries/libs-dev/libio/libio.asm b/programs/develop/libraries/libs-dev/libio/libio.asm index 4e5df36372..f4d9fe7f92 100644 --- a/programs/develop/libraries/libs-dev/libio/libio.asm +++ b/programs/develop/libraries/libs-dev/libio/libio.asm @@ -179,7 +179,7 @@ locals loc_buf rb 40 endl - push ebx ecx esi edi + push ebx esi edi xor ebx, ebx invoke mem.alloc, sizeof.InternalFileInfo @@ -212,7 +212,7 @@ endl jne .exit_error.ex @@: mov eax, ebx - pop edi esi ecx ebx + pop edi esi ebx ret .exit_error.ex: @@ -233,7 +233,7 @@ endl .exit_error: invoke mem.free, ebx xor eax, eax - pop edi esi ecx ebx + pop edi esi ebx ret endp