Changeset 525 in xtideuniversalbios for trunk/Assembly_Library

Timestamp:

Mar 14, 2013, 9:45:07 PM (12 years ago)

Author:

krille_n_@…

google:author:

krille_n_@hotmail.com

Message:

Changes:

• Made some improvements to the stack switching in Int13h.asm.
• Added a tail-call optimized variant of the CALL_MENU_LIBRARY macro (JMP_MENU_LIBRARY).
• Other optimizations and fixes.

Location:

trunk/Assembly_Library

Files:

• Inc/Menu.inc (modified) (2 diffs)
• Src/Menu/Dialog/DialogFile.asm (modified) (1 diff)

trunk/Assembly_Library/Inc/Menu.inc

@@ -5 +5 @@
 
 ;--------------------------------------------------------------------
-; Menu Library users need to use this macro since it will provide
+; Menu Library users need to use these macros since it will provide
 ; compatibility with future library versions.
 ;
 ; CALL_MENU_LIBRARY
+; JMP_MENU_LIBRARY
 ;   Parameters:
 ;       %1:         Function to call (functionName from MENU_LIB)
@@ -21 +22 @@
     %ifidn %1, CloseMenuIfExitEventAllows
         call    MenuInit_CloseMenuIfExitEventAllows
-
     %elifidn %1, Close
         call    MenuInit_CloseMenuWindow
-
     %elifidn %1, SetUserDataFromDSSI
         call    MenuInit_SetUserDataFromDSSI
-
     %elifidn %1, GetUserDataToDSSI
         call    MenuInit_GetUserDataToDSSI
-
     %elifidn %1, SetTitleHeightFromAL
         call    MenuInit_SetTitleHeightFromAL
-
     %elifidn %1, GetHighlightedItemToAX
         call    MenuInit_GetHighlightedItemToAX
-
     %elifidn %1, SetTotalItemsFromAX
         call    MenuInit_SetTotalItemsFromAX
-
     %elifidn %1, SetInformationHeightFromAL
         call    MenuInit_SetInformationHeightFromAL
-
     %elifidn %1, SetTimeoutValueFromAX
         call    MenuTime_SetSelectionTimeoutValueFromAX
-
     %else
         mov     di, %1
         call    Menu_FunctionFromDI
+    %endif
+%endmacro
+
+%macro JMP_MENU_LIBRARY 1
+    %ifidn %1, CloseMenuIfExitEventAllows
+        jmp     MenuInit_CloseMenuIfExitEventAllows
+    %elifidn %1, Close
+        jmp     MenuInit_CloseMenuWindow
+    %elifidn %1, SetUserDataFromDSSI
+        jmp     MenuInit_SetUserDataFromDSSI
+    %elifidn %1, GetUserDataToDSSI
+        jmp     MenuInit_GetUserDataToDSSI
+    %elifidn %1, SetTitleHeightFromAL
+        jmp     MenuInit_SetTitleHeightFromAL
+    %elifidn %1, GetHighlightedItemToAX
+        jmp     MenuInit_GetHighlightedItemToAX
+    %elifidn %1, SetTotalItemsFromAX
+        jmp     MenuInit_SetTotalItemsFromAX
+    %elifidn %1, SetInformationHeightFromAL
+        jmp     MenuInit_SetInformationHeightFromAL
+    %elifidn %1, SetTimeoutValueFromAX
+        jmp     MenuTime_SetSelectionTimeoutValueFromAX
+    %else
+        mov     di, %1
+        jmp     Menu_FunctionFromDI
     %endif
 %endmacro

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

@@ -714 +714 @@
     call    InitializeNullStringsToDialogInputInDSSI
     mov     WORD [si+DIALOG_INPUT.fszTitle], g_szSelectNewDrive
-    CALL_MENU_LIBRARY GetDriveWithIoInDSSI
-    ret
+    JMP_MENU_LIBRARY GetDriveWithIoInDSSI
 
 ;--------------------------------------------------------------------