Changeset 292 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Strings.asm


Ignore:
Timestamp:
Mar 3, 2012, 6:53:28 AM (13 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Small optimization, moved around some serial code to avoid a few jumps and unnecessary number of sectors check.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r285 r292  
    88; Section containing code
    99SECTION .text
    10 
    11 ; POST drive detection strings
    12 g_szRomAt:      db  "%s @ %x",LF,CR,NULL
    13 
    14 ; Boot loader strings
    15 g_szTryToBoot:          db  "Booting from %s %x",ANGLE_QUOTE_RIGHT,"%x",LF,CR,NULL
    16 g_szBootSectorNotFound: db  "Boot sector "
    17 g_szNotFound:           db  "not found",LF,CR,NULL
    18 g_szReadError:          db  "Error %x!",LF,CR,NULL
    19 
    20 g_szAddressingModes:
    21 g_szLCHS:       db  "L-CHS",NULL
    22 g_szPCHS:       db  "P-CHS",NULL
    23 g_szLBA28:      db  "LBA28",NULL
    24 g_szLBA48:      db  "LBA48",NULL
    25 g_szAddressingModes_Displacement equ (g_szPCHS - g_szAddressingModes)
    26 ;
    27 ; Ensure that addressing modes are correctly spaced in memory
    28 ;
    29 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
    30     %if g_szLCHS <> g_szAddressingModes
    31         %error "g_szAddressingModes Displacement Incorrect 1"
    32     %endif
    33     %if g_szPCHS <> g_szLCHS + g_szAddressingModes_Displacement
    34         %error "g_szAddressingModes Displacement Incorrect 2"
    35     %endif
    36     %if g_szLBA28 <> g_szPCHS + g_szAddressingModes_Displacement
    37         %error "g_szAddressingModes Displacement Incorrect 3"
    38     %endif
    39     %if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement
    40         %error "g_szAddressingModes Displacement Incorrect 4"
    41     %endif
    42 %endif
    43 
    44 g_szBusTypeValues:
    45 g_szBusTypeValues_8Dual:        db      "D8 ",NULL
    46 g_szBusTypeValues_8Reversed:    db      "X8 ",NULL
    47 g_szBusTypeValues_8Single:      db      "S8 ",NULL
    48 g_szBusTypeValues_16:           db      " 16",NULL
    49 g_szBusTypeValues_32:           db      " 32",NULL
    50 g_szBusTypeValues_Serial:       db      "SER",NULL
    51 g_szBusTypeValues_8MemMapped:   db      "M8 ",NULL
    52 g_szBusTypeValues_Displacement equ (g_szBusTypeValues_8Reversed - g_szBusTypeValues)
    53 ;
    54 ; Ensure that bus type strings are correctly spaced in memory
    55 ;
    56 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
    57     %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
    58         %error "g_szBusTypeValues Displacement Incorrect 1"
    59     %endif
    60     %if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
    61         %error "g_szBusTypeValues Displacement Incorrect 2"
    62     %endif
    63     %if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
    64         %error "g_szBusTypeValues Displacement Incorrect 3"
    65     %endif
    66     %if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement
    67         %error "g_szBusTypeValues Displacement Incorrect 4"
    68     %endif
    69     %if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
    70         %error "g_szBusTypeValues Displacement Incorrect 5"
    71     %endif
    72     %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
    73         %error "g_szBusTypeValues Displacement Incorrect 6"
    74     %endif
    75     %if g_szBusTypeValues_8MemMapped <> g_szBusTypeValues_Serial + g_szBusTypeValues_Displacement
    76         %error "g_szBusTypeValues Displacement Incorrect 7"
    77     %endif
    78 %endif
    79 
    80 g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
    81 
    82 g_szDashForZero:        db      "- ",NULL
    8310
    8411; Boot Menu Floppy Disk strings
    … …  
    14471    %endif
    14572%endif
     73
     74; POST drive detection strings
     75g_szRomAt:      db  "%s @ %x",LF,CR,NULL
     76
     77; Boot loader strings
     78g_szTryToBoot:          db  "Booting from %s %x",ANGLE_QUOTE_RIGHT,"%x",LF,CR,NULL
     79g_szBootSectorNotFound: db  "Boot sector "
     80g_szNotFound:           db  "not found",LF,CR,NULL
     81g_szReadError:          db  "Error %x!",LF,CR,NULL
     82
     83g_szAddressingModes:
     84g_szLCHS:       db  "L-CHS",NULL
     85g_szPCHS:       db  "P-CHS",NULL
     86g_szLBA28:      db  "LBA28",NULL
     87g_szLBA48:      db  "LBA48",NULL
     88g_szAddressingModes_Displacement equ (g_szPCHS - g_szAddressingModes)
     89;
     90; Ensure that addressing modes are correctly spaced in memory
     91;
     92%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
     93    %if g_szLCHS <> g_szAddressingModes
     94        %error "g_szAddressingModes Displacement Incorrect 1"
     95    %endif
     96    %if g_szPCHS <> g_szLCHS + g_szAddressingModes_Displacement
     97        %error "g_szAddressingModes Displacement Incorrect 2"
     98    %endif
     99    %if g_szLBA28 <> g_szPCHS + g_szAddressingModes_Displacement
     100        %error "g_szAddressingModes Displacement Incorrect 3"
     101    %endif
     102    %if g_szLBA48 <> g_szLBA28 + g_szAddressingModes_Displacement
     103        %error "g_szAddressingModes Displacement Incorrect 4"
     104    %endif
     105%endif
     106
     107g_szBusTypeValues:
     108g_szBusTypeValues_8Dual:        db      "D8 ",NULL
     109g_szBusTypeValues_8Reversed:    db      "X8 ",NULL
     110g_szBusTypeValues_8Single:      db      "S8 ",NULL
     111g_szBusTypeValues_16:           db      " 16",NULL
     112g_szBusTypeValues_32:           db      " 32",NULL
     113g_szBusTypeValues_Serial:       db      "SER",NULL
     114g_szBusTypeValues_8MemMapped:   db      "M8 ",NULL
     115g_szBusTypeValues_Displacement equ (g_szBusTypeValues_8Reversed - g_szBusTypeValues)
     116;
     117; Ensure that bus type strings are correctly spaced in memory
     118;
     119%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
     120    %if g_szBusTypeValues_8Dual <> g_szBusTypeValues
     121        %error "g_szBusTypeValues Displacement Incorrect 1"
     122    %endif
     123    %if g_szBusTypeValues_8Reversed <> g_szBusTypeValues + g_szBusTypeValues_Displacement
     124        %error "g_szBusTypeValues Displacement Incorrect 2"
     125    %endif
     126    %if g_szBusTypeValues_8Single <> g_szBusTypeValues_8Reversed + g_szBusTypeValues_Displacement
     127        %error "g_szBusTypeValues Displacement Incorrect 3"
     128    %endif
     129    %if g_szBusTypeValues_16 <> g_szBusTypeValues_8Single + g_szBusTypeValues_Displacement
     130        %error "g_szBusTypeValues Displacement Incorrect 4"
     131    %endif
     132    %if g_szBusTypeValues_32 <> g_szBusTypeValues_16 + g_szBusTypeValues_Displacement
     133        %error "g_szBusTypeValues Displacement Incorrect 5"
     134    %endif
     135    %if g_szBusTypeValues_Serial <> g_szBusTypeValues_32 + g_szBusTypeValues_Displacement
     136        %error "g_szBusTypeValues Displacement Incorrect 6"
     137    %endif
     138    %if g_szBusTypeValues_8MemMapped <> g_szBusTypeValues_Serial + g_szBusTypeValues_Displacement
     139        %error "g_szBusTypeValues Displacement Incorrect 7"
     140    %endif
     141%endif
     142
     143g_szSelectionTimeout:   db      DOUBLE_BOTTOM_LEFT_CORNER,DOUBLE_LEFT_HORIZONTAL_TO_SINGLE_VERTICAL,"%ASelection in %2-u s",NULL
     144
     145g_szDashForZero:        db      "- ",NULL
    146146
    147147; Boot menu bottom of screen strings
Note: See TracChangeset for help on using the changeset viewer.