Changeset 141 in xtideuniversalbios for trunk

Timestamp:

Mar 14, 2011, 3:49:50 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to Assembly Library:

• Some inlining in Size.asm.
• File Dialog can now enter in subdirectories starting with number.

Location:

trunk/Assembly_Library

Files:

• Inc/BiosFunctions.inc (modified) (2 diffs)
• Src/Menu/Dialog/DialogFile.asm (modified) (2 diffs)
• Src/Util/Size.asm (modified) (2 diffs)

trunk/Assembly_Library/Inc/BiosFunctions.inc

@@ -1 @@
-; File name     :   BiosFunctions.inc
 ; Project name  :   AssemblyLibrary
-; Created date  :   25.6.2010
-; Last update   :   24.7.2010
-; Author        :   Tomi Tilli
 ; Description   :   Defines for BIOS functions.
 %ifndef BIOS_FUNCTIONS_INC
@@ -15 +11 @@
 
 ; BIOS video functions
+SET_VIDEO_MODE                  EQU     00h
 SET_TEXT_MODE_CURSOR_SHAPE      EQU     01h
 SET_CURSOR_POSITION             EQU     02h

trunk/Assembly_Library/Src/Menu/Dialog/DialogFile.asm

@@ -498 +498 @@
     call    Char_IsUpperCaseLetterInAL
     jc      SHORT .ParseAndChangeToSubdirInDSSI
+    call    Char_IsDecimalDigitInAL
+    jc      SHORT .ParseAndChangeToSubdirInDSSI ; Assume subdir and check for errors
     ; Fall to .ParseAndSelectFileFromDSSI
 
@@ -550 +552 @@
 .ChangeDirectoryToDSSI:
     call    Directory_ChangeToPathFromDSSI
+    jc      SHORT .ParseAndSelectFileFromDSSI   ; Must have been a file starting with number
     ; Fall to RefreshFilesToDisplay
 

trunk/Assembly_Library/Src/Util/Size.asm

@@ -43 +43 @@
     cmp     ax, 10000               ; 5 digits needed?
     jae     SHORT Size_DivideSizeInBXDXAXby1024andIncrementMagnitudeInCX
+    add     sp, BYTE 2              ; Clean return address from stack
+    xchg    si, cx                  ; CX = Remainder (0...1023), SI = Magnitude
 
-    add     sp, BYTE 2              ; Clean return address from stack
-    call    Size_ConvertMagnitudeRemainderInSItoTenths
-    call    Size_GetMagnitudeCharacterToDLfromMagnitudeInCX
-    mov     cx, si
+    ; Convert remainder to tenths
+    xchg    bx, ax                  ; Store AX
+    mov     ax, 10
+    mul     cx                      ; DX:AX = remainder * 10
+    eSHR_IM ax, 10                  ; Divide AX by 1024
+    xchg    cx, ax                  ; CX = tenths
+    xchg    ax, bx
+
+    ; Convert magnitude to character
+    mov     dl, [cs:si+.rgbMagnitudeToChar]
 
     pop     si
     ret
+.rgbMagnitudeToChar:    db  " kMGTP"
+
 
 ;--------------------------------------------------------------------
@@ -98 +108 @@
     rcr     ax, 1                   ; ...kiB
     ret
-
-
-;--------------------------------------------------------------------
-; Size_ConvertMagnitudeRemainderInSItoTenths
-;   Parameters:
-;       SI:         Remainder from last magnitude division (0...1023)
-;   Returns:
-;       SI:         Tenths
-;   Corrupts registers:
-;       DX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-Size_ConvertMagnitudeRemainderInSItoTenths:
-    push    ax
-
-    mov     ax, 10
-    mul     si                  ; DX:AX = remainder * 10
-    eSHR_IM ax, 10              ; Divide AX by 1024
-    xchg    si, ax              ; SI = tenths
-
-    pop     ax
-    ret
-
-
-;--------------------------------------------------------------------
-; Size_GetMagnitudeCharacterToDLfromMagnitudeInCX
-;   Parameters:
-;       CX:     Magnitude in BYTE_MULTIPLES
-;   Returns:
-;       DL:     Magnitude character
-;   Corrupts registers:
-;       BX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-Size_GetMagnitudeCharacterToDLfromMagnitudeInCX:
-    mov     bx, cx
-    mov     dl, [cs:bx+.rgbMagnitudeToChar]
-    ret
-ALIGN WORD_ALIGN
-.rgbMagnitudeToChar:    db  " kMGTP"