Ticket #5113: warm_boot.2.patch

src/system/boot/platform/bios_ia32/keyboard.h

@@ -29 +29 @@
 extern void clear_key_buffer(void);
 extern union key wait_for_key(void);
 extern uint32 check_for_boot_keys(void);
+extern void warm_boot(void);
 
 #ifdef __cplusplus
 }

src/system/boot/platform/bios_ia32/bios.S

@@ -231 +231 @@
     ret
 
 //--------------------------------------------------------------
+/** void warm_boot()
+ *  Warm booting computer via BIOS int 0x19. save_crx() have to be called before paging setup.
+ */
+FUNCTION(warm_boot)
+    cli
+    movl    saved_cr0,%eax
+    movl    %eax,%cr0
+    movl    saved_cr3,%eax
+    movl    %eax,%cr3
+    movl    saved_cr4,%eax
+    movl    %eax,%cr4
+    lidt    saved_idt
+    call    switch_to_real_mode
+    .byte  0xCD
+    .byte  0x19
+    ret
+//--------------------------------------------------------------
+/** void save_crx()
+ *  Save CRx registers state. Required for warm_boot.
+ */
+FUNCTION(save_crx)
+    cli
+    movl    %cr0,%eax
+    movl    %eax,saved_cr0
+    movl    %cr3,%eax
+    movl    %eax,saved_cr3
+    movl    %cr4,%eax
+    movl    %eax,saved_cr4
+    sidt    saved_idt
+    ret
+//--------------------------------------------------------------
+    .p2align 4
+saved_idt:
+    .long   0x0
+    .long   0x0
+saved_cr0:
+    .long   0x0
+saved_cr3:
+    .long   0x0
+saved_cr4:
+    .long   0x0
 
+    .p2align 4
 .globl idt_descriptor
 idt_descriptor:
     .short  0x7ff               // IDT at 0x0, default real mode location

src/system/boot/platform/bios_ia32/keyboard.cpp

@@ -69 +69 @@
             case 0x1b:  // escape
                 options |= BOOT_OPTION_DEBUG_OUTPUT;
                 break;
+            case 'w':
+            case 'W':
+                warm_boot();
             case 0:
                 // evaluate BIOS scan codes
                 // ...

src/system/boot/platform/bios_ia32/start.c

@@ -126 +126 @@
     serial_init();
     console_init();
     cpu_init();
+    save_crx();
     mmu_init();
     parse_multiboot_commandline(&args);