Changeset 369 in xtideuniversalbios for trunk/Assembly_Library/Src/Display/DisplayFormat.asm

Timestamp:

Mar 29, 2012, 9:29:28 AM (12 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Removed align directives for initalization code and added define for align in boot-time calls to the assembly library (defaulting to 1), resulting in a significant savings for the AT and 386 builds. Fixed a bug with switch command line handling in the serial server. Put in CR characters in licesnse.txt, so that it properly displays on Windows. In the configurator, added default values for user supplied CHS and LBA values, defaulting to values within range when those features are enabled. Updated the copyright message in the configurator as the literal word Copyright is important.

File:

• trunk/Assembly_Library/Src/Display/DisplayFormat.asm (modified) (23 diffs)

trunk/Assembly_Library/Src/Display/DisplayFormat.asm

@@ -18 +18 @@
 ;       AX, BX, CX, DX, BP
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayFormat_ParseCharacters:
     call    ReadCharacterAndTestForNull
@@ -69 +69 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 ParsePlaceholderSizeDigitFromALtoCX:
     mov     [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.fpCursorPosition], di
@@ -90 +90 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 ReadCharacterAndTestForNull:
     cs lodsb                                ; Load from CS:SI to AL
@@ -106 +106 @@
 ;       AX, BX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 GetFormatSpecifierParserToAX:
     mov     bx, .rgcFormatCharToLookupIndex
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .CheckForNextSpecifierParser:
     cmp     al, [cs:bx]
@@ -118 +118 @@
     mov     ax, c_FormatCharacter
     ret
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .ConvertIndexToFunctionOffset:
     sub     bx, .rgcFormatCharToLookupIndex
@@ -171 +171 @@
 ;       AX, BX, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 PrependOrAppendSpaces:
     mov     ax, di
@@ -210 +210 @@
 ;       AX, BX, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .PrependWithSpaces:
     xchg    ax, cx
@@ -248 +248 @@
 ;       AX, CX, DX, SI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .ReverseCopyCXbytesFromESSItoESDI:
     test    BYTE [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.bFlags], FLG_CONTEXT_ATTRIBUTES
@@ -256 +256 @@
     dec     di                  ; Point to preceeding character instead of attribute
     ret
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .CopyWithoutDisplayProcessing:
     eSEG_STR rep, es, movsb
@@ -271 +271 @@
 ;   Corrupts registers:
 ;       AX, CX, DX
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .ReversePrintAXspacesStartingFromESDI:
     call    DisplayContext_GetCharacterOffsetToAXfromByteOffsetInAX
@@ -292 +292 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 a_FormatAttributeForNextCharacter:
     mov     bl, [bp]
@@ -307 +307 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 A_FormatAttributeForRemainingString:
     mov     al, [bp]
@@ -314 +314 @@
 
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 d_FormatSignedDecimalWord:
     mov     ax, [bp]
@@ -321 +321 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 u_FormatUnsignedDecimalWord:
     mov     ax, [bp]
@@ -327 +327 @@
     jmp     DisplayPrint_WordFromAXWithBaseInBX
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 x_FormatHexadecimalWord:
     mov     ax, [bp]
@@ -335 +335 @@
     jmp     DisplayPrint_CharacterFromAL
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 I_FormatDashForZero:
     mov     ax, [bp]
@@ -343 +343 @@
 ;;; fall-through
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 s_FormatStringFromSegmentCS:
     push    si
@@ -367 +367 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 z_FormatStringFromSegmentZero:
     xchg    si, [bp]
@@ -376 +376 @@
 
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 S_FormatStringFromFarPointer:
     mov     bx, [bp-2]
@@ -387 +387 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 c_FormatCharacter:
     mov     al, [bp]
@@ -393 +393 @@
 
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 t_FormatRepeatCharacter:
     push    cx
@@ -404 +404 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 percent_FormatPercent:
     mov     al, '%'
@@ -410 +410 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 PrepareToPrependParameterWithSpaces:
     neg     cx
     ; Fall to PrepareToAppendSpacesAfterParameter
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 PrepareToAppendSpacesAfterParameter:
     add     sp, BYTE 2              ; Remove return offset