Changeset 369 in xtideuniversalbios for trunk/Assembly_Library

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.

Location:

trunk/Assembly_Library/Src

Files:

• AssemblyLibrary.asm (modified) (4 diffs)
• Display/CgaSnow.asm (modified) (6 diffs)
• Display/Display.asm (modified) (2 diffs)
• Display/DisplayCharOut.asm (modified) (7 diffs)
• Display/DisplayContext.asm (modified) (13 diffs)
• Display/DisplayCursor.asm (modified) (6 diffs)
• Display/DisplayFormat.asm (modified) (23 diffs)
• Display/DisplayFormatCompressed.asm (modified) (2 diffs)
• Display/DisplayPage.asm (modified) (3 diffs)
• Display/DisplayPrint.asm (modified) (20 diffs)
• Keyboard/Keyboard.asm (modified) (10 diffs)
• Menu/CharOutLineSplitter.asm (modified) (5 diffs)
• Menu/Menu.asm (modified) (1 diff)
• Menu/MenuAttributes.asm (modified) (3 diffs)
• Menu/MenuBorders.asm (modified) (19 diffs)
• Menu/MenuCharOut.asm (modified) (4 diffs)
• Menu/MenuEvent.asm (modified) (8 diffs)
• Menu/MenuInit.asm (modified) (10 diffs)
• Menu/MenuLocation.asm (modified) (6 diffs)
• Menu/MenuLoop.asm (modified) (14 diffs)
• Menu/MenuScrollbars.asm (modified) (16 diffs)
• Menu/MenuText.asm (modified) (16 diffs)
• Menu/MenuTime.asm (modified) (6 diffs)
• Serial/SerialServerScan.asm (modified) (2 diffs)
• String/Char.asm (modified) (11 diffs)
• String/String.asm (modified) (5 diffs)
• String/StringProcess.asm (modified) (5 diffs)
• Util/Size.asm (modified) (4 diffs)

trunk/Assembly_Library/Src/AssemblyLibrary.asm

@@ -7 +7 @@
 
 %ifdef INCLUDE_DISPLAY_LIBRARY
+  %ifndef DISPLAY_JUMP_ALIGN
+    %define DISPLAY_JUMP_ALIGN 1
+  %endif
     %include "CgaSnow.asm"
     %include "Display.asm"
@@ -29 +32 @@
 
 %ifdef INCLUDE_KEYBOARD_LIBRARY
+  %ifndef KEYBOARD_JUMP_ALIGN
+    %define KEYBOARD_JUMP_ALIGN 1
+  %endif        
     %include "Keyboard.asm"
 %endif
 
 %ifdef INCLUDE_MENU_LIBRARY
+  %ifndef MENU_JUMP_ALIGN
+    %define MENU_JUMP_ALIGN 1
+  %endif                
     %include "CharOutLineSplitter.asm"
     %include "Menu.asm"
@@ -61 +70 @@
 
 %ifdef INCLUDE_STRING_LIBRARY
+  %ifndef STRING_JUMP_ALIGN
+    %define STRING_JUMP_ALIGN 1
+  %endif                
     %include "Char.asm"
     %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
@@ -86 +98 @@
 
 %ifdef INCLUDE_UTIL_LIBRARY
+  %ifndef UTIL_SIZE_JUMP_ALIGN
+    %define UTIL_SIZE_JUMP_ALIGN 1
+  %endif        
     %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
         %include "Bit.asm"

trunk/Assembly_Library/Src/Display/CgaSnow.asm

@@ -15 +15 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 CgaSnow_IsCgaPresent:
     cmp     WORD [BDA.wVidPort], CGA_STATUS_REGISTER - OFFSET_TO_CGA_STATUS_REGISTER
@@ -25 +25 @@
     stc
     ret
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .CgaNotFound:
     clc
@@ -48 +48 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 CgaSnow_Stosb:
     call    LoadCgaStatusRegisterAddressToDXifCgaPresent
@@ -62 +62 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 CgaSnow_Stosw:
     push    bx
@@ -91 +91 @@
 ;       AX, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 CgaSnow_RepMovsb:
     call    LoadCgaStatusRegisterAddressToDXifCgaPresent
@@ -119 +119 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 LoadCgaStatusRegisterAddressToDXifCgaPresent:
     test    BYTE [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.bFlags], FLG_CONTEXT_CGA
     jz      SHORT .NoCgaDetected
     mov     dx, CGA_STATUS_REGISTER
-ALIGN JUMP_ALIGN, ret
+ALIGN DISPLAY_JUMP_ALIGN, ret
 .NoCgaDetected:
     ret

trunk/Assembly_Library/Src/Display/Display.asm

@@ -16 +16 @@
 ;       AX (unless used as a return register), DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 Display_FunctionFromDI:
     push    es
@@ -43 +43 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 Display_FormatNullTerminatedStringFromCSSI:
     pop     ax                  ; Discard return address to inside Display_FunctionFromDI

trunk/Assembly_Library/Src/Display/DisplayCharOut.asm

@@ -21 +21 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_TeletypeOutputWithAttribute:
     cmp     al, ' '                         ; Printable character?
@@ -28 +28 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_TeletypeOutput:
     cmp     al, ' '                         ; Printable character?
@@ -45 +45 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_BiosTeletypeOutput:
     push    ax
@@ -76 +76 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_Attribute:
     xchg    al, ah              ; Swap character and attribute
@@ -83 +83 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_Character:
     WAIT_RETRACE_IF_NECESSARY_THEN stosb
@@ -89 +89 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_CharacterWithAttribute:
     WAIT_RETRACE_IF_NECESSARY_THEN stosw
@@ -107 +107 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCharOut_WriteCharacterToBuffer:
     cmp     WORD [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCharOutParam], BYTE 0

trunk/Assembly_Library/Src/Display/DisplayContext.asm

@@ -14 +14 @@
 ;       AX, DX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_Initialize:
     mov     WORD [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.fnCharOut], DEFAULT_CHARACTER_OUTPUT
@@ -79 +79 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_SynchronizeToHardware:
     call    DisplayPage_SynchronizeToHardware
@@ -95 +95 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_Push:
     mov     di, ds                  ; Backup DS
@@ -121 +121 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_Pop:
     mov     di, ds                  ; Backup DS
@@ -154 +154 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_PrepareOffScreenBufferInESBXwithLengthInCX:
     push    ds
@@ -185 +185 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_SetCharacterPointerFromBXAX:
     mov     [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.fpCursorPosition], ax
@@ -205 +205 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_GetCharacterPointerToBXAX:
     mov     ax, [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.fpCursorPosition]
@@ -224 +224 @@
 ;       BL
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_SetCharOutputFunctionFromAXwithAttribFlagInBL:
     and     bl, FLG_CONTEXT_ATTRIBUTES
@@ -243 +243 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_SetCharacterAttributeFromAL:
     mov     [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.bAttribute], al
@@ -259 +259 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_SetCharacterOutputParameterFromAX:
     mov     [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCharOutParam], ax
@@ -275 +275 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS OR EXCLUDE_FROM_XTIDECFG  ; This is currently unused (dead code)
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_GetCharacterOutputParameterToDX:
     mov     dx, [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCharOutParam]
@@ -293 +293 @@
 ;--------------------------------------------------------------------
 %ifndef MODULE_STRINGS_COMPRESSED
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_GetCharacterOffsetToAXfromByteOffsetInAX:
     test    BYTE [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.bFlags], FLG_CONTEXT_ATTRIBUTES
@@ -313 +313 @@
 ;--------------------------------------------------------------------
 %ifndef MODULE_STRINGS_COMPRESSED
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayContext_GetByteOffsetToAXfromCharacterOffsetInAX:
     test    BYTE [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.bFlags], FLG_CONTEXT_ATTRIBUTES
     jz      SHORT ReturnOffsetInAX
     sal     ax, 1       ; WORD count to BYTE count
-ALIGN JUMP_ALIGN, ret
+ALIGN DISPLAY_JUMP_ALIGN, ret
 ReturnOffsetInAX:
     ret

trunk/Assembly_Library/Src/Display/DisplayCursor.asm

@@ -15 +15 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_SetShapeFromAX:
     mov     [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCursorShape], ax
@@ -32 +32 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_SetCoordinatesFromAX:
     xchg    dx, ax
@@ -57 +57 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_GetSoftwareCoordinatesToAX:
     mov     ax, [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.fpCursorPosition]
@@ -77 +77 @@
 ;       DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_GetHardwareCoordinatesToAX:
     push    cx
@@ -101 +101 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_SynchronizeShapeToHardware:
     mov     dx, [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCursorShape]
@@ -138 +138 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayCursor_SynchronizeCoordinatesToHardware:
     call    DisplayCursor_GetSoftwareCoordinatesToAX

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

trunk/Assembly_Library/Src/Display/DisplayFormatCompressed.asm

@@ -151 +151 @@
     ; fall through to DisplayFormat_ParseCharacters
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayFormat_ParseCharacters:
 ;
@@ -184 +184 @@
 
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayFormatCompressed_TranslatesAndFormats:
 ;

trunk/Assembly_Library/Src/Display/DisplayPage.asm

@@ -16 +16 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPage_SetFromAL:
     xor     ah, ah
@@ -35 +35 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPage_GetColumnsToALandRowsToAH:
     mov     al, [VIDEO_BDA.wColumns]        ; 40 or 80
@@ -51 +51 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPage_SynchronizeToHardware:
     xor     dx, dx

trunk/Assembly_Library/Src/Display/DisplayPrint.asm

@@ -42 +42 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_FormattedNullTerminatedStringFromCSSI:
     push    bp
@@ -79 +79 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_SignedWordFromAXWithBaseInBX:
     test    ax, ax
@@ -106 +106 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_WordFromAXWithBaseInBX:
     push    cx
@@ -112 +112 @@
 
     xor     cx, cx
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .DivideLoop:
     xor     dx, dx              ; DX:AX now holds the integer
@@ -123 +123 @@
 PrintAllPushedDigits:
     mov     bx, g_rgcDigitToCharacter
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .PrintNextDigit:
     pop     ax                  ; Pop digit
@@ -149 +149 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDECFG   ; Not used in XTIDECFG
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_QWordFromSSBPwithBaseInBX:
     push    cx
@@ -156 +156 @@
     mov     cx, bx              ; CX = Integer base
     xor     bx, bx              ; BX = Character count
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .DivideLoop:
     call    Math_DivQWatSSBPbyCX; Divide by base
@@ -183 +183 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_CharacterBufferFromBXSIwithLengthInCX:
     jcxz    .NothingToPrintSinceZeroLength
@@ -189 +189 @@
     push    cx
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .PrintNextCharacter:
     mov     ds, bx
@@ -216 +216 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_ClearScreenWithCharInALandAttributeInAH:
     push    di
@@ -248 +248 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_ClearAreaWithHeightInAHandWidthInAL:
     push    si
@@ -259 +259 @@
     xor     cx, cx
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .ClearRowLoop:
     mov     cl, bl                          ; Area width now in CX
@@ -291 +291 @@
 ;       DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_RepeatCharacterFromALwithCountInCX:
     jcxz    .NothingToRepeat
     push    cx
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .RepeatCharacter:
     push    ax
@@ -324 +324 @@
 ;;; All strings in CSSI should go through the DisplayFormatCompressed code to be decoded.
 ;;;
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_NullTerminatedStringFromCSSI:
     push    bx
@@ -350 +350 @@
 ;--------------------------------------------------------------------
 %ifdef MODULE_STRINGS_COMPRESSED
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_Newline_FormatAdjustBP:
     inc     bp                  ; we didn't need a parameter after all, readjust BP
@@ -357 +357 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_Newline:
     mov     al, LF
@@ -376 +376 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_CharacterFromAL:
     test    al,al
@@ -396 +396 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 DisplayPrint_NullTerminatedStringFromBXSI:
     push    si
@@ -402 +402 @@
 
     xor     cx, cx
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .PrintNextCharacter:
     mov     ds, bx              ; String segment to DS
@@ -412 +412 @@
     jmp     SHORT .PrintNextCharacter
 
-ALIGN JUMP_ALIGN
+ALIGN DISPLAY_JUMP_ALIGN
 .EndOfString:
     pop     cx

trunk/Assembly_Library/Src/Keyboard/Keyboard.asm

@@ -21 +21 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_ReadUserInputtedWordWhilePrinting:
     push    ds
@@ -71 +71 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_ReadUserInputtedStringToESDIWhilePrinting:
     push    di
@@ -82 +82 @@
     dec     cx                                  ; Decrement buffer size for NULL
     cld
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 .GetCharacterFromUser:
     call    Keyboard_GetKeystrokeToAXandWaitIfNecessary ; Get ASCII to AL
@@ -121 +121 @@
 ;       AX, BX, SI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 .PrepareDisplayContextForKeyboardInput:
     pop     bx                  ; Pop return address to BX
@@ -150 +150 @@
 ;       AH
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 .ProcessControlCharacter:
     cmp     al, CR                              ; ENTER to terminate string?
@@ -193 +193 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_PrintBackspace:
     mov     al, BS
@@ -214 +214 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_PlayBellForUnwantedKeystroke:
     mov     al, BELL
@@ -230 +230 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_PrintInputtedCharacter:
     push    di
@@ -250 +250 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS   ; Only used when debugging
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_RemoveAllKeystrokesFromBuffer:
     call    Keyboard_GetKeystrokeToAX
@@ -272 +272 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_GetKeystrokeToAXandLeaveItToBuffer:
     mov     ah, CHECK_FOR_KEYSTROKE
     int     BIOS_KEYBOARD_INTERRUPT_16h
     ret
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_GetKeystrokeToAX:
     call    Keyboard_GetKeystrokeToAXandLeaveItToBuffer
     jz      SHORT Keyboard_GetKeystrokeToAXReturn
     ; Fall to Keyboard_GetKeystrokeToAXandWaitIfNecessary
-ALIGN JUMP_ALIGN
+ALIGN KEYBOARD_JUMP_ALIGN
 Keyboard_GetKeystrokeToAXandWaitIfNecessary:
     xor     ah, ah                      ; GET_KEYSTROKE

trunk/Assembly_Library/Src/Menu/CharOutLineSplitter.asm

@@ -14 +14 @@
 ;       AX, DX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 CharOutLineSplitter_PrepareForPrintingTextLines:
     ; Get first text line column offset to DX
@@ -41 +41 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 CharOutLineSplitter_GetFirstBorderLineColumnOffsetToAX:
     call    MenuLocation_GetTitleBordersTopLeftCoordinatesToAX
@@ -60 +60 @@
 ;       DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 CharOutLineSplitter_IsCursorAtTheEndOfTextLine:
     push    ax
@@ -86 +86 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 CharOutLineSplitter_MovePartialWordToNewTextLine:
     push    si
@@ -106 +106 @@
     mov     cx, di
     mov     si, di
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ScanNextCharacter:     ; Space will always be found since one comes after border
     dec     si

trunk/Assembly_Library/Src/Menu/Menu.asm

@@ -17 +17 @@
 ;       AX (unless used as a return register), DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 Menu_FunctionFromDI:
     push    si

trunk/Assembly_Library/Src/Menu/MenuAttributes.asm

@@ -28 +28 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuAttribute_SetToDisplayContextFromTypeInSI:
     call    MenuAttribute_GetToAXfromTypeInSI
@@ -44 +44 @@
 ;       SI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuAttribute_GetToAXfromTypeInSI:
     push    ds
@@ -59 +59 @@
     jmp     SHORT .LoadAttributeAndReturn
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .LoadMonoAttribute:
     add     si, .rgcMonochromeAttributes
     jmp     SHORT .LoadAttributeAndReturn
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .LoadColorAttribute:
     add     si, .rgcColorAttributes

trunk/Assembly_Library/Src/Menu/MenuBorders.asm

@@ -22 +22 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_RefreshAll:
 %ifndef USE_186
@@ -52 +52 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_RedrawBottomBorderLine:
     call    MenuBorders_AdjustDisplayContextForDrawingBorders
@@ -71 +71 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_RefreshItemBorders:
     call    MenuBorders_AdjustDisplayContextForDrawingBorders
@@ -91 +91 @@
 ;       AX, BX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_AdjustDisplayContextForDrawingBorders:
     mov     bl, ATTRIBUTES_ARE_USED
@@ -116 +116 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_GetNumberOfMiddleCharactersToDX:
     eMOVZX  dx, [bp+MENUINIT.bWidth]
@@ -133 +133 @@
 ;       AX, BX, CX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 RefreshTitleBorders:
     call    DrawTopBorderLine
@@ -149 +149 @@
 ;       AX, BX, CX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 RefreshInformationBorders:
     call    DrawSeparationBorderLine
@@ -165 +165 @@
 ;       AX, BX, CX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 RefreshItemBorders:
     call    DrawSeparationBorderLine
@@ -184 +184 @@
 DrawTextBorderLinesByCXtimes:
     jcxz    .NoBorderLinesToDraw
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .DrawBordersWithFunctionInBX:
     call    DrawTextBorderLine
@@ -207 +207 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawTopBorderLine:
     mov     si, g_rgbTopBorderCharacters
@@ -213 +213 @@
     jmp     SHORT PrintNewlineToEndBorderLine
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawSeparationBorderLine:
     mov     si, g_rgbSeparationBorderCharacters
     jmp     SHORT PrintBorderCharactersFromCSSIandShadowCharacter
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawBottomBorderLine:
     mov     si, g_rgbBottomBorderCharacters
@@ -231 +231 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawBottomShadowLine:
     CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
@@ -243 +243 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawTextBorderLine:
     mov     si, g_rgbTextBorderCharacters
@@ -259 +259 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrintBorderCharactersFromCSSIandShadowCharacter:
     call    PrintBorderCharactersFromCSSI
@@ -277 +277 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrintNewlineToEndBorderLine:
     CALL_DISPLAY_LIBRARY PrintNewlineCharacters
@@ -293 +293 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrintShadowCharactersByDXtimes:
     CALL_DISPLAY_LIBRARY PushDisplayContext
@@ -323 +323 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrintBorderCharactersFromCSSI:
     cs lodsb        ; Load from [cs:si+BORDER_CHARS.cLeft] to AL
@@ -346 +346 @@
 ;       AX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_PrintSingleBorderCharacterFromAL:
     CALL_DISPLAY_LIBRARY PrintCharacterFromAL
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuBorders_PrintMultipleBorderCharactersFromAL:
     push    cx
@@ -369 +369 @@
 ;       AX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawTimeoutCounterString:
     call    MenuTime_GetTimeoutSecondsLeftToAX

trunk/Assembly_Library/Src/Menu/MenuCharOut.asm

@@ -21 +21 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuCharOut_MenuTeletypeOutputWithAutomaticLineChange:
     call    CharOutLineSplitter_IsCursorAtTheEndOfTextLine
@@ -30 +30 @@
     ; Fall to MenuCharOut_MenuTextTeletypeOutputWithAttribute
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuCharOut_MenuTeletypeOutput:
     cmp     al, CR
@@ -51 +51 @@
 ;       AX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuCharOut_PrintLFCRandAdjustOffsetForStartOfLine:
     mov     al, LF
@@ -57 +57 @@
     ; Fall to PrintCRandAdjustOffsetForStartOfLine
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrintCRandAdjustOffsetForStartOfLine:
     mov     al, CR

trunk/Assembly_Library/Src/Menu/MenuEvent.asm

@@ -16 +16 @@
 ;       AX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_InitializeMenuinit:
     push    ss
@@ -35 +35 @@
 ;       AX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_ExitMenu:
     mov     bl, MENUEVENT_ExitMenu
@@ -52 +52 @@
 ;       AX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_IdleProcessing:
     mov     bl, MENUEVENT_IdleProcessing
@@ -70 +70 @@
 ;       AX, CX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_RefreshTitle:
     mov     bl, MENUEVENT_RefreshTitle
@@ -93 +93 @@
 ;       AX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_RefreshItemFromCX:
     mov     bl, MENUEVENT_RefreshItemFromCX
@@ -109 +109 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_HighlightItemFromCX:
     mov     dx, cx
@@ -136 +136 @@
 ;       AX, BX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_KeyStrokeInAX:
     mov     bl, MENUEVENT_KeyStrokeInAX
@@ -171 +171 @@
 ;       BX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuEvent_SendFromBX:
     push    es

trunk/Assembly_Library/Src/Menu/MenuInit.asm

@@ -15 +15 @@
 ;       All except segments
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_DisplayMenuWithHandlerInBXandUserDataInDXAX:
     push    es
@@ -49 +49 @@
 ;       All, except SS:BP
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_EnterMenuWithHandlerInBXandUserDataInDXAX:
     mov     [bp+MENU.fnEventHandler], bx
@@ -76 +76 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_RefreshMenuWindow:
     call    MenuBorders_RefreshAll          ; Draw borders
@@ -94 +94 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_CloseMenuIfExitEventAllows:
     call    MenuEvent_ExitMenu
@@ -111 +111 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_CloseMenuWindow:
     or      BYTE [bp+MENU.bFlags], FLG_MENU_EXIT
@@ -127 +127 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_HighlightItemFromAX:
     sub     ax, [bp+MENUINIT.wHighlightedItem]
@@ -142 +142 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_GetHighlightedItemToAX:
     mov     ax, [bp+MENUINIT.wHighlightedItem]
@@ -162 +162 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_SetTitleHeightFromAL:
     mov     [bp+MENUINIT.bTitleLines], al
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_SetInformationHeightFromAL:
     mov     [bp+MENUINIT.bInfoLines], al
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_SetTotalItemsFromAX:
     mov     [bp+MENUINIT.wItems], ax
@@ -191 +191 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_SetUserDataFromDSSI:
     mov     [bp+MENU.dwUserData], si
@@ -197 +197 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuInit_GetUserDataToDSSI:
     lds     si, [bp+MENU.dwUserData]

trunk/Assembly_Library/Src/Menu/MenuLocation.asm

@@ -16 +16 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_GetTextCoordinatesToAXforItemInAX:
     sub     ax, [bp+MENU.wFirstVisibleItem]     ; Item to line
@@ -42 +42 @@
     jmp     SHORT AddItemBordersTopLeftCoordinatesToAX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_GetTitleTextTopLeftCoordinatesToAX:
     mov     ax, (MENU_TEXT_ROW_OFFSET<<8) | MENU_TEXT_COLUMN_OFFSET
@@ -50 +50 @@
     jmp     SHORT MenuLocation_AddTitleBordersTopLeftCoordinatesToAX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_GetInformationTextTopLeftCoordinatesToAX:
     mov     ax, (MENU_TEXT_ROW_OFFSET<<8) | MENU_TEXT_COLUMN_OFFSET
     jmp     SHORT AddInformationBordersTopLeftCoordinatesToAX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_GetBottomBordersTopLeftCoordinatesToAX:
     xor     ax, ax
@@ -77 +77 @@
     stc                         ; Compensate for Information top border
     adc     ah, [bp+MENUINIT.bInfoLines]
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 AddInformationBordersTopLeftCoordinatesToAX:
     push    cx
@@ -84 +84 @@
     add     ah, cl
     pop     cx
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 AddItemBordersTopLeftCoordinatesToAX:
     stc                         ; Compensate for Title top border
     adc     ah, [bp+MENUINIT.bTitleLines]
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_AddTitleBordersTopLeftCoordinatesToAX:
     push    di
@@ -112 +112 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLocation_GetMaxTextLineLengthToAX:
     eMOVZX  ax, [bp+MENUINIT.bWidth]

trunk/Assembly_Library/Src/Menu/MenuLoop.asm

@@ -14 +14 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLoop_Enter:
     call    KeystrokeProcessing
@@ -36 +36 @@
 ;       All, except SS:BP
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 KeystrokeProcessing:
     call    Keyboard_GetKeystrokeToAX
@@ -43 +43 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 TimeoutProcessing:
     call    MenuTime_UpdateSelectionTimeout
@@ -62 +62 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 ProcessKeystrokeFromAX:
     xchg    cx, ax
@@ -85 +85 @@
 ;       BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ProcessMenuSystemKeystrokeFromAX:
     cmp     al, ESC
@@ -96 +96 @@
     ret     ; Return with CF cleared since keystroke not processed
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .LeaveMenuWithoutSelectingItem:
     call    MenuEvent_ExitMenu
@@ -106 +106 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .SelectItem:
     mov     cx, [bp+MENUINIT.wHighlightedItem]
@@ -128 +128 @@
 ;       BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuLoop_ProcessScrollingKeysFromAX:
     xchg    ah, al
@@ -148 +148 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ChangeToPreviousPage:
     call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
@@ -157 +157 @@
     jge     SHORT .MoveHighlightedItemByAX  ; No rotation for PgUp
     ; Fall to .SelectFirstItem
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .SelectFirstItem:
     mov     ax, [bp+MENUINIT.wHighlightedItem]
@@ -163 +163 @@
     jmp     SHORT .MoveHighlightedItemByAX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ChangeToNextPage:
     call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
@@ -172 +172 @@
     jb      SHORT .MoveHighlightedItemByAX  ; No rotation for PgDn
     ; Fall to .SelectLastItem
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .SelectLastItem:
     stc
@@ -179 +179 @@
     jmp     SHORT .MoveHighlightedItemByAX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .DecrementSelectedItem:
     mov     ax, -1
@@ -185 +185 @@
 .IncrementSelectedItem:
     mov     al, 1   ; AH is already 0
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .MoveHighlightedItemByAX:
     call    MenuScrollbars_MoveHighlightedItemByAX

trunk/Assembly_Library/Src/Menu/MenuScrollbars.asm

@@ -15 +15 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_AreScrollbarsNeeded:
     xchg    ax, cx
@@ -34 +34 @@
 ;       AH, CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_GetScrollCharacterToALForLineInDI:
     call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
@@ -45 +45 @@
     call    .GetLastThumbLineToAX
     cmp     ax, di              ; After last thumb line?
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ReturnTrackCharacter:
     mov     al, SCROLL_TRACK_CHARACTER
     jb      SHORT .Return
     mov     al, SCROLL_THUMB_CHARACTER
-ALIGN JUMP_ALIGN, ret
+ALIGN MENU_JUMP_ALIGN, ret
 .Return:
     ret
@@ -64 +64 @@
 ;       CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .GetLastThumbLineToAX:
     call    MenuScrollbars_GetLastVisibleItemOnPageToAX
@@ -80 +80 @@
 ;       CX, DX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .CalculateFirstOrLastThumbLineToAX:
     mul     cx
@@ -97 +97 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_MoveHighlightedItemByAX:
     mov     cx, [bp+MENUINIT.wHighlightedItem]
@@ -120 +120 @@
     jae     SHORT .ScrollPageForNewItemInCX
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .RotateNegativeItemInCX:
     add     cx, dx
@@ -135 +135 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ScrollPageForNewItemInCX:
     call    MenuScrollbars_IsItemInCXonVisiblePage
@@ -154 +154 @@
     cwd     ; This won't work if MaxFirstVisibleItem > 32767
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .DXisPositive:
     cmp     ax, dx
@@ -160 +160 @@
     xchg    dx, ax
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .AXisLessThanDX:
     mov     [bp+MENU.wFirstVisibleItem], ax
     call    MenuText_RefreshAllItems
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .HighlightNewItemOnCX:
     jmp     MenuEvent_HighlightItemFromCX
@@ -181 +181 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_IsItemInCXonVisiblePage:
     cmp     [bp+MENU.wFirstVisibleItem], cx
@@ -190 +190 @@
     ja      SHORT .ItemIsNotVisible
     stc     ; Item is visible
-ALIGN JUMP_ALIGN, ret
+ALIGN MENU_JUMP_ALIGN, ret
 .ItemIsNotVisible:
     ret
@@ -204 +204 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_GetLastVisibleItemOnPageToAX:
     xchg    cx, ax
@@ -223 +223 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_GetActualVisibleItemsOnPageToCX:
     call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
@@ -229 +229 @@
     jb      SHORT .Return
     mov     cx, [bp+MENUINIT.wItems]
-ALIGN JUMP_ALIGN, ret
+ALIGN MENU_JUMP_ALIGN, ret
 .Return:
     ret
@@ -243 +243 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuScrollbars_GetMaxVisibleItemsOnPageToCX:
     eMOVZX  cx, [bp+MENUINIT.bHeight]

trunk/Assembly_Library/Src/Menu/MenuText.asm

@@ -16 +16 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_ClearTitleArea:
     CALL_DISPLAY_LIBRARY PushDisplayContext     ; Save cursor coordinates
@@ -24 +24 @@
 %endif
         
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_ClearInformationArea:
     CALL_DISPLAY_LIBRARY PushDisplayContext     ; Save cursor coordinates
@@ -50 +50 @@
 ;       AX, BX, CX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_RefreshTitle:
     cmp     BYTE [bp+MENUINIT.bTitleLines], 0
@@ -57 +57 @@
     jmp     MenuEvent_RefreshTitle
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_RefreshInformation:
     cmp     BYTE [bp+MENUINIT.bInfoLines], 0
@@ -74 +74 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PrepareToDrawTitleArea:
     mov     si, ATTRIBUTE_CHARS.cTitle
@@ -80 +80 @@
     jmp     SHORT FinishPreparationsToDrawTitleOrInformationArea
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_PrepareToDrawInformationArea:
     mov     si, ATTRIBUTE_CHARS.cInformation
@@ -98 +98 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_RefreshAllItems:
     push    cx
@@ -104 +104 @@
     call    MenuScrollbars_GetActualVisibleItemsOnPageToCX
     mov     ax, [bp+MENU.wFirstVisibleItem]
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .ItemRefreshLoop:
     call    MenuText_RefreshItemFromAX
@@ -124 +124 @@
 ;       BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_RefreshItemFromAX:
     push    cx
@@ -151 +151 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuText_AdjustDisplayContextForDrawingItemFromCX:
     mov     ax, cx
@@ -171 +171 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 AdjustDisplayContextForDrawingTextsAtCoordsInAXwithAttrTypeInSIandCharOutFunctionInDX:
     CALL_DISPLAY_LIBRARY SetCursorCoordinatesFromAX
@@ -192 +192 @@
 ;       AX, BX, DX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 ClearPreviousItem:
     CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
@@ -217 +217 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 GetItemTextAttributeTypeToSIforItemInCX:
     mov     si, ATTRIBUTE_CHARS.cItem
@@ -226 +226 @@
     jne     SHORT .ReturnAttributeTypeInSI
     sub     si, BYTE ATTRIBUTE_CHARS.cItem - ATTRIBUTE_CHARS.cHighlightedItem
-ALIGN JUMP_ALIGN, ret
+ALIGN MENU_JUMP_ALIGN, ret
 .ReturnAttributeTypeInSI:
     ret
@@ -241 +241 @@
 ;       AX, CX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 DrawScrollbarCharacterForItemInCXifNecessary:
     call    MenuScrollbars_AreScrollbarsNeeded
@@ -247 +247 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .DrawScrollbarCharacter:
     call    MenuBorders_AdjustDisplayContextForDrawingBorders

trunk/Assembly_Library/Src/Menu/MenuTime.asm

@@ -15 +15 @@
 ;       AX, BX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuTime_StartSelectionTimeoutWithTicksInAX:
     push    ds
@@ -34 +34 @@
 ;       AX, BX, DX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuTime_StopSelectionTimeout:
     test    BYTE [bp+MENU.bFlags], FLG_MENU_TIMEOUT_COUNTDOWN
@@ -52 +52 @@
 ;       AX, BX, SI, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuTime_UpdateSelectionTimeout:
     test    BYTE [bp+MENU.bFlags], FLG_MENU_TIMEOUT_COUNTDOWN
@@ -66 +66 @@
     ret
 
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 .RedrawSinceNoTimeout:
     call    MenuBorders_RedrawBottomBorderLine
@@ -84 +84 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 MenuTime_GetTimeoutSecondsLeftToAX:
     push    ds
@@ -117 +117 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN MENU_JUMP_ALIGN
 PointDSBXtoTimeoutCounter:
     push    ss

trunk/Assembly_Library/Src/Serial/SerialServerScan.asm

@@ -25 +25 @@
 ;       AL, BX, CX, DX, DI
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 SerialServerScan_ScanForServer:     
         mov     cx, 1           ; one sector, not scanning (default)
@@ -117 +116 @@
 ;       AL, BX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
 SerialServerScan_CheckForServer_PortAndBaudInDX:
         push    bp              ; setup fake SerialServer_Command

trunk/Assembly_Library/Src/String/Char.asm

@@ -35 +35 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_IsLowerCaseLetterInAL:
     IS_BETWEEN_IMMEDIATES al, 'a', 'z'
@@ -51 +51 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_IsUpperCaseLetterInAL:
     IS_BETWEEN_IMMEDIATES al, 'A', 'Z'
@@ -69 +69 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_IsHexadecimalDigitInAL:
     call    Char_IsDecimalDigitInAL
@@ -89 +89 @@
 ;--------------------------------------------------------------------
 %ifndef MODULE_STRINGS_COMPRESSED
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_IsDecimalDigitInAL:
     IS_BETWEEN_IMMEDIATES al, '0', '9'
@@ -108 +108 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_ConvertIntegerToALfromDigitInALwithBaseInBX:
     push    dx
@@ -119 +119 @@
     jbe     SHORT .ConvertToDecimalDigit
     sub     al, 'a'-'0'-10          ; Convert to hexadecimal integer
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 .ConvertToDecimalDigit:
     sub     al, '0'                 ; Convert to decimal integer
@@ -137 +137 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_CharIsValid:
     stc
@@ -143 +143 @@
 %endif
 
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_CharIsNotValid:
     clc
@@ -159 +159 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_ALtoLowerCaseLetter:
     call    Char_IsUpperCaseLetterInAL  ; Is upper case character?
@@ -174 +174 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_ALtoUpperCaseLetter:
     call    Char_IsLowerCaseLetterInAL  ; Is lower case character?
@@ -205 +205 @@
 ;--------------------------------------------------------------------
 %ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 Char_GetFilterFunctionToDXforNumericBaseInBX:
     mov     dx, Char_IsDecimalDigitInAL

trunk/Assembly_Library/Src/String/String.asm

@@ -15 +15 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 String_ConvertDSSItoLowerCase:
     push    dx
@@ -42 +42 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 String_ConvertWordToAXfromStringInDSSIwithBaseInBX:
     push    di
@@ -68 +68 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 String_CopyDSSItoESDIandGetLengthToCX:
     push    ax
 
     xor     cx, cx
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 .CopyNextCharacter:
     lodsb                       ; Load from DS:SI to AL
@@ -82 +82 @@
     jmp     SHORT .CopyNextCharacter
 
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 .EndOfString:
     pop     ax
@@ -97 +97 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 String_GetLengthFromDSSItoCX:
     push    ax

trunk/Assembly_Library/Src/String/StringProcess.asm

@@ -33 +33 @@
 ;       Nothing (processing function can corrupt BX,DI,ES)
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 StringProcess_DSSIwithFunctionInDX:
     push    si
@@ -39 +39 @@
 
     xor     cx, cx
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 .ProcessNextCharacter:
     lodsb
@@ -48 +48 @@
     jnc     SHORT .ProcessNextCharacter
 
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 .EndOfString:
     pop     ax
@@ -65 +65 @@
 ;       AL
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 StringProcess_ConvertToLowerCase:
     call    Char_ALtoLowerCaseLetter
@@ -84 +84 @@
 ;       AX
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN STRING_JUMP_ALIGN
 StringProcess_ConvertToWordInDIWithBaseInBX:
     call    Char_ConvertIntegerToALfromDigitInALwithBaseInBX

trunk/Assembly_Library/Src/Util/Size.asm

@@ -30 +30 @@
 ;       BX, DH
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN UTIL_SIZE_JUMP_ALIGN
 Size_GetSizeToAXAndCharToDLfromBXDXAXwithMagnitudeInCX:
 %ifndef USE_186     ; If 8086/8088
@@ -37 +37 @@
     push    si
 
-ALIGN JUMP_ALIGN
+ALIGN UTIL_SIZE_JUMP_ALIGN
 .MagnitudeConversionLoop:
     ePUSH_T di, .MagnitudeConversionLoop; DI corrupted only on 8086/8088 build
@@ -80 +80 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN UTIL_SIZE_JUMP_ALIGN
 Size_DivideSizeInBXDXAXby1024andIncrementMagnitudeInCX:
     push    cx
     xor     si, si                  ; Zero remainder
     mov     cl, 10                  ; Divide by 1024
-ALIGN JUMP_ALIGN
+ALIGN UTIL_SIZE_JUMP_ALIGN
 .ShiftLoop:
     call    Size_DivideBXDXAXbyTwo
@@ -107 +107 @@
 ;       Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
+ALIGN UTIL_SIZE_JUMP_ALIGN
 Size_ConvertSectorCountInBXDXAXtoKiB:
 Size_DivideBXDXAXbyTwo: