Changeset 78 in xtideuniversalbios for trunk/Configurator/Src/Libraries/string.asm

Timestamp:

Jan 5, 2011, 7:36:41 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to old configurator:

• Optimizations by Krille

File:

• trunk/Configurator/Src/Libraries/string.asm (modified) (6 diffs)

trunk/Configurator/Src/Libraries/string.asm

@@ -2 +2 @@
 ; Project name  :   String library
 ; Created date  :   7.10.2009
-; Last update   :   20.12.2009
+; Last update   :   4.1.2011
 ; Author        :   Tomi Tilli,
-;               :   Krille (optimizations)
+;               :   Krister Nordvall (optimizations)
 ; Description   :   ASM library to work as Standard C String and Character.
 
@@ -130 +130 @@
 String_IsHexDigit:
     call    String_IsAlphaNum   ; Is alphabetic letter or digit?
-    jc      .CheckHex           ;  If so, jump to check A...F
-    ret
-.CheckHex:
+    jnc     .ExitStrIsHexDigit  ; If it is, check A...F. If not, exit
     push    ax                  ; Store character
     call    String_ToLower      ; Convert to lower case letter
     cmp     al, 'f'+1           ; Last valid hex alphanumeric?
     pop     ax                  ; Restore character
+
+.ExitStrIsHexDigit:
     ret
 
@@ -165 +165 @@
     mov     ah, al              ; Copy char to AH
     call    String_IsDigit      ; Is '0'...'9'?
-    jc      .ConvertDigit       ;  If so, jump to convert
+    jnc     .CheckForAlpha      ; If not, check for alphabetic letter
+    sub     al, '0'             ; Convert char to integer
+    jmp     .FinalizeAXAndCheckBase
+
+.CheckForAlpha:
     call    String_IsAlpha      ; Is alphabetic letter?
-    jnc     .RetFalse           ;  If not, return FALSE
+    jnc     .JustRet            ; If not, return FALSE
     call    String_ToLower      ; Convert to lower case
+    sub     al, 'a'-10          ; From char to integer: a=10, b=11...
+
+.FinalizeAXAndCheckBase:
     xchg    al, ah              ; Converted char to AH
-    sub     ah, 'a'-10          ; From char to integer: a=10, b=11...
     cmp     ah, cl              ; Belongs to base?
-    jae     .RetFalse           ; If not, return FALSE
-    stc                         ; Set CF since belongs to base
-    ret
-ALIGN JUMP_ALIGN
-.ConvertDigit:
-    sub     ah, '0'             ; Convert char to integer
-    cmp     ah, cl              ; Belongs to base?
-    jae     .RetFalse           ; If not, return FALSE
-    stc                         ; Set CF since belongs to base
-    ret
-ALIGN JUMP_ALIGN
-.RetFalse:
-    clc                         ; Clear CF since char doesn't belong to b
+
+.JustRet:                       ; CF now reflects TRUE/FALSE so just return
     ret
 %endif
@@ -324 +319 @@
     jnz     .CharLoop           ; Loop while characters left
 
-    mov     ax, bx              ; Copy loword to AX
+    stc                         ; Set CF since success
+.RetFalse:  ; If we jumped to here no CLC is needed to reflect a FALSE condition
+    mov     ax, bx              ; Copy loword to AX (may be incomplete)
     pop     bx                  ; Restore BX
     pop     di                  ; Restore DI
     pop     si                  ; Restore SI
     pop     ds                  ; Restore DS
-    stc                         ; Set CF since success
-    ret
-ALIGN JUMP_ALIGN
-.RetFalse:
-    mov     ax, bx              ; Copy (likely incomplete) loword to AX
-    pop     bx                  ; Restore BX
-    pop     di                  ; Restore DI
-    pop     si                  ; Restore SI
-    pop     ds                  ; Restore DS
-    clc                         ; Clear CF since error
     ret
 %endif
@@ -448 +435 @@
 ALIGN JUMP_ALIGN
 .Str2NotFound:
-    xor     bx, bx              ; Zero BX
+    xor     bx, bx              ; Zero BX and clear CF
     pop     si                  ; Restore SI
     pop     cx                  ; Restore CX
-    clc                         ; Clear CF since str2 was not found
     ret
 %endif
@@ -578 +564 @@
 ALIGN JUMP_ALIGN
 .ConvComplete:
-    mov     ax, bx              ; Copy loword to AX
+    stc                         ; Set CF since success
+ALIGN JUMP_ALIGN
+.RetFalse:  ; If we jumped to here no CLC is needed to reflect a FALSE condition
+    mov     ax, bx              ; Copy loword to AX (may be incomplete)
     pop     bx                  ; Restore BX
     pop     si                  ; Restore SI
     pop     ds                  ; Restore DS
-    stc                         ; Set CF since success
-    ret
-ALIGN JUMP_ALIGN
-.RetFalse:
-    mov     ax, bx              ; Copy (likely incomplete) loword to AX
-    pop     bx                  ; Restore BX
-    pop     si                  ; Restore SI
-    pop     ds                  ; Restore DS
-    clc                         ; Clear CF since error
     ret
 %endif