Changeset 10 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Libraries/menu

Timestamp:

May 25, 2010, 5:03:06 PM (15 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Now assembles with Yasm

Location:

trunk/XTIDE_Universal_BIOS/Src/Libraries/menu

Files:

• menudraw.asm (modified) (7 diffs)
• menuloop.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Libraries/menu/menudraw.asm

@@ -2 +2 @@
 ; Project name  :   Menu library
 ; Created date  :   9.11.2009
-; Last update   :   21.1.2010
+; Last update   :   25.5.2010
 ; Author        :   Tomi Tilli
 ; Description   :   ASM library to menu system.
@@ -288 +288 @@
     xor     dx, dx                          ; Zero DX
     call    MenuCrsr_PointNfoBrdr           ; Set cursor
-    cmp     BYTE [bp+MENUVARS.bInfoH], 0    ; Any info strings?
-    jz      MenuDraw_BottomBorder           ;  If not, draw bottom border
-    test    BYTE [bp+MENUVARS.bFlags], FLG_MNU_HIDENFO
-    jnz     MenuDraw_BottomBorder           ; Draw bottom border if info is hidden
+    eMOVZX  cx, BYTE [bp+MENUVARS.bInfoH]   ; Load number of info strings
+    test    BYTE [bp+MENUVARS.bFlags], FLG_MNU_HIDENFO  ; Information hidden?
+    jnz     SHORT .JumpToBottomBorder
+    test    cx, cx                          ; Any info strings?
+    jz      SHORT MenuDraw_BottomBorder
+    push    cx
     call    MenuDraw_MiddleBorder           ; Draw middle border
     call    MenuDraw_NewlineBrdr            ; Change line
-    eMOVZX  cx, BYTE [bp+MENUVARS.bInfoH]   ; Load number of info strings
+    pop     cx
 ALIGN JUMP_ALIGN
 .LineLoop:
@@ -302 +304 @@
     pop     cx
     loop    .LineLoop
-    jmp     MenuDraw_BottomBorder
-    
+ALIGN JUMP_ALIGN
+.JumpToBottomBorder:
+    jmp     SHORT MenuDraw_BottomBorder
+
 ALIGN JUMP_ALIGN
 MenuDraw_Timeout:
@@ -309 +313 @@
     call    MenuCrsr_PointNfoBrdr           ; Set cursor
     mov     ch, [bp+MENUVARS.bInfoH]        ; Load info str count to CH
-    test    ch, ch                          ; Any info strings?
-    jz      MenuDraw_BottomBorder           ;  If not, draw bottom border
+    and     cx, 0FF00h                      ; Any info strings? (clears CL)
+    jz      SHORT MenuDraw_BottomBorder     ;  If not, draw bottom border
     inc     ch                              ; Increment for info top border
-    xor     cl, cl                          ; Zero X coordinate
     call    MenuCrsr_Move                   ; Move cursor
-    jmp     MenuDraw_BottomBorder
+    jmp     SHORT MenuDraw_BottomBorder
 
 ALIGN JUMP_ALIGN
 MenuDraw_ItemBorders:
-    cmp     WORD [bp+MENUVARS.wItemCnt], 0  ; Any items?
-    jz      .Return                         ;  If not, return
+    cmp     WORD [bp+MENUVARS.wItemCnt], BYTE 0 ; Any items?
+    jz      SHORT .Return                   ;  If not, return
     xor     dx, dx                          ; Zero DX
     call    MenuCrsr_PointItemBrdr          ; Set cursor
@@ -354 +357 @@
     mov     bl, B_H
     mov     dh, B_TR
-    jmp     MenuDraw_BorderChars
+    jmp     SHORT MenuDraw_BorderChars
     
 ALIGN JUMP_ALIGN
@@ -361 +364 @@
     mov     bl, ' '
     mov     dh, B_V
-    jmp     MenuDraw_BorderChars
+    jmp     SHORT MenuDraw_BorderChars
 
 ALIGN JUMP_ALIGN
@@ -368 +371 @@
     mov     bh, B_V
     mov     bl, ' '
-    jmp     MenuDraw_BorderChars
+    jmp     SHORT MenuDraw_BorderChars
 
 ALIGN JUMP_ALIGN

trunk/XTIDE_Universal_BIOS/Src/Libraries/menu/menuloop.asm

@@ -2 +2 @@
 ; Project name  :   Menu library
 ; Created date  :   11.11.2009
-; Last update   :   10.12.2009
+; Last update   :   25.5.2010
 ; Author        :   Tomi Tilli
 ; Description   :   ASM library to menu system.
@@ -193 +193 @@
     mov     [bp+MENUVARS.wItemSel], ax      ; Store new index
     cmp     ax, [bp+MENUVARS.wItemTop]      ; Need to scroll?
-    jae     .DrawSelection                  ;  If not, go to draw selection
+    jb      SHORT .ScrollUp
+    jmp     .DrawSelection                  ;  If not, go to draw selection
+ALIGN JUMP_ALIGN
+.ScrollUp:
     dec     WORD [bp+MENUVARS.wItemTop]     ; Scroll
     jmp     .ScrollMenu
@@ -222 +225 @@
     add     bx, [bp+MENUVARS.wItemTop]      ; BX to one past last visible index
     cmp     ax, bx                          ; Need to scroll?
-    jb      .DrawSelection                  ;  If not, go to draw selection
+    jae     .ScrollDown
+    jmp     .DrawSelection
+ALIGN JUMP_ALIGN
+.ScrollDown:
     inc     WORD [bp+MENUVARS.wItemTop]     ; Scroll
     jmp     .ScrollMenu
@@ -236 +242 @@
     jmp     .ScrollMenu
 %endif
+
+    ; HOME pressed
+ALIGN JUMP_ALIGN
+.KeyHome:
+    xor     ax, ax
+    mov     [bp+MENUVARS.wItemSel], ax
+    mov     [bp+MENUVARS.wItemTop], ax
+    jmp     .ScrollMenu
+
+    ; END pressed
+ALIGN JUMP_ALIGN
+.KeyEnd:
+    mov     ax, [bp+MENUVARS.wItemCnt]      ; Load number if menuitems
+    mov     bx, ax                          ; Copy menuitem count to BX
+    dec     ax                              ; Decrement for last index
+    mov     [bp+MENUVARS.wItemSel], ax      ; Store new selection
+    sub     bl, [bp+MENUVARS.bVisCnt]       ; BX to first menuitem to draw
+    sbb     bh, 0
+    mov     [bp+MENUVARS.wItemTop], bx      ; Store first menuitem to draw
+    jnc     .ScrollMenu 
+    mov     WORD [bp+MENUVARS.wItemTop], 0  ; Overflow, start with 0
+    jmp     .ScrollMenu
 
     ; PGUP pressed
@@ -262 +290 @@
     mov     [bp+MENUVARS.wItemSel], ax
     mov     [bp+MENUVARS.wItemTop], ax
-    jmp     .ScrollMenu
-
-    ; HOME pressed
-ALIGN JUMP_ALIGN
-.KeyHome:
-    xor     ax, ax
-    mov     [bp+MENUVARS.wItemSel], ax
-    mov     [bp+MENUVARS.wItemTop], ax
-    jmp     .ScrollMenu
-
-    ; END pressed
-ALIGN JUMP_ALIGN
-.KeyEnd:
-    mov     ax, [bp+MENUVARS.wItemCnt]      ; Load number if menuitems
-    mov     bx, ax                          ; Copy menuitem count to BX
-    dec     ax                              ; Decrement for last index
-    mov     [bp+MENUVARS.wItemSel], ax      ; Store new selection
-    sub     bl, [bp+MENUVARS.bVisCnt]       ; BX to first menuitem to draw
-    sbb     bh, 0
-    mov     [bp+MENUVARS.wItemTop], bx      ; Store first menuitem to draw
-    jnc     .ScrollMenu 
-    mov     WORD [bp+MENUVARS.wItemTop], 0  ; Overflow, start with 0
     ; Fall to .ScrollMenu