Changeset 203dcd45 in mainline for arch/ia32/src/boot/boot.S

Timestamp:

2006-05-05T13:56:13Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4c89b09

Parents:

de07bcf

Message:

VESA detection failure fix.

(Some headers)

File:

• arch/ia32/src/boot/boot.S (modified) (2 diffs)

arch/ia32/src/boot/boot.S

@@ -398 +398 @@
         ljmpl $KTEXT,$(vesa_init_protect-vesa_init+VESA_INIT_SEGMENT<<4);
 
-vesa_init_protect:      
-.code32
-        ret;
 
 0:      #Error no Prefered mode found
-
         mov $0x111,%cx;
         push %di;
@@ -413 +409 @@
         cmp $VESA_OK,%al;
         jnz 1f;
-        jmp 2b;
+        jz 2b;    /* Force relative jump */
 
 1:mov $0x0003,%ax;
         int $0x10;
         mov $0xffffffff,%edi; /* EGA text mode used, because of problems with VESA */
-        jmp 8;
-
+        xor %ax,%ax
+        jz 8b;    /* Force relative jump */
+
+vesa_init_protect:      
+.code32
+        ret;
 
 vesa_idt: