fix the tripple fault (pressing 3 times enter-key)

- no more pressing 3 Times Enter-key to Start Environment
- minimize the kernel size up to 4.000 Bytes

Author: paule32

Makefile

@@ -244,7 +244,7 @@ confirm:
 # compiler flags ...
 # -----------------------------------------------------------------------------
 CFLAGS_C := -m32 -O1 -ffreestanding -Wall -Wextra \
-            -nostdlib             \
+            -nostdlib -fno-ident  \
             -nostartfiles         \
             -fno-stack-protector  \
             -fno-unwind-tables    \

build/bin/kernel.map

@@ -386,13 +386,18 @@ int ahci_init(void)
     return -1;
 // A
     //printformat("ABAR phys: 0x%x\n", g_ahci.abar);
-    
+
     g_hba = (hba_mem_t *)mmio_map(g_ahci.abar, 4096); // mind. 4KB
 //  g_hba = (hba_mem_t *)(uintptr_t)g_ahci.abar;
-    
-    //printformat("g_hba Pointer (virt): 0x%x\n", (uint32_t)g_hba);
-    gfx_printf("AHCI-Version: 0x%x, Ports Implemented: 0x%x\n",
-            g_hba->vs, g_hba->pi);
+        
+    if (graph_mode == 1) {
+        printformat("g_hba Pointer (virt): 0x%x\n", (uint32_t)g_hba);
+        printformat("AHCI-Version: 0x%x, Ports Implemented: 0x%x\n",
+        g_hba->vs, g_hba->pi);
+    }   else {
+        gfx_printf("AHCI-Version: 0x%x, Ports Implemented: 0x%x\n",
+        g_hba->vs, g_hba->pi);
+    }
 // B
     // HBA einschalten (GHC.AE = 1)
     g_hba->ghc |= (1U << 31);

src/kernel/ahci.cc

@@ -21,13 +21,6 @@
     call print_base_str
 %endmacro
 
-%macro PRINT_HINT 2
-    mov di, (%1*80 + 8)*2
-    mov si, %2
-    mov bl, 0x4F
-    call print_base_str
-%endmacro
-
 BITS 16
 ORG 0x0500          ; Stage1 springt nach 0000:0500
 
@@ -83,9 +76,6 @@ boot_menu:
     mov ax, 0xB800
     mov es, ax
     
-    ; hinweis
-    PRINT_HINT 1, note_str
-    
     ; menu bar
     mov di, (0*80 + 0) * 2
     mov ax, 0x07DB
@@ -449,22 +439,6 @@ print_base_str:
     .endeDBstr:
     ret
 
-print_hint_str:
-    push cs
-    pop ds
-    mov ax, 0xB800
-    mov es, ax
-    mov ah, bl
-    cld
-    .loop2:
-    lodsb
-    test al, al
-    jz .endeDCstr
-    stosw
-    jmp .loop2
-    .endeDCstr:
-    ret
-
 ; ------------------------------------------------------------
 ; UI: Fill screen with char in AL and attr in AH
 ; ------------------------------------------------------------
@@ -499,7 +473,7 @@ main_bootmenu_loop:
     int 0x16
     jz  main_bootmenu_loop
 
-    ; Taste lesen: AH=scancode, AL=ascii (bei Pfeiltasten AL=0 oder 0xE0)
+    ; Taste lesen: AH=bios scancode, AL=ascii (bei Pfeiltasten AL=0 oder 0xE0)
     mov ah, 0x00
     int 0x16
 
@@ -648,13 +622,14 @@ enter_text_pm:
     a20_failed:
     mov si, msgA20FAIL
     call print_string
-    hlt
+    jmp $
     
     ; -------------------------------------------------
     ; GDT laden, Protected Mode aktivieren
     ; -------------------------------------------------
     A20ok:
     cli
+
     lgdt [gdt_descriptor]
     
     mov eax, cr0
@@ -905,7 +880,7 @@ pm_entry_kernel_2:
     ;mov dword [0xB8000], 0x07420741  ; "AB"
     mov esp, 0x0009F000   ; irgendein 32-Bit-Stack im oberen Bereich
     
-    ;mov dword [0xB8000], 0x072A072A  ; "**" (2 Zeichen) weiß auf schwarz
+    mov dword [0xB8000], 0x072A072A  ; "**" (2 Zeichen) weiß auf schwarz
     
     ; entrypoint steht als dword am Anfang des
     ; geladenen kernel.bin (kernel.ld)
@@ -961,8 +936,6 @@ msgDBASEvesa1024x728:   db " Start dBase 2026 Graphics-Mode 1024x728 ... ", 0
 msgDBASE:               db " -=< dBASE 2026 >=- ",0
 msgDBASEenv:            db " Choose your Favorite Environment ", 0
 
-note_str: db "Hint:  You have to do tripple press ENTER-Key, to select Env ! ", 0
-
 share1: db "  ____  _   _    _    ____  _____      _    _    _    ____  _____  ", 0
 share2: db " / ___|| | | |  / \  |  _ \| ____|    | |  | |  / \  |  _ \| ____| ", 0
 share3: db " \___ \| |_| | / _ \ | |_) |  _|      | |/\| | / _ \ | |_) |  _|   ", 0
@@ -974,10 +947,6 @@ msgVESA_failModeInfo:       db "[VESA] Error: ModeInfo."   , 0
 msgVESA_failUnsupported:    db "[VESA] Error: Unsupported.", 0
 msgVESA_failSetmode:        db "[VESA] Error: SetMode."    , 0
 
-
-vessatext_a: db "vESSA 1111", 13, 10, 0
-vessatext_b: db "vESSA CCCC", 13, 10, 0
-vessatext_c: db "gugu ",      13, 10, 0
 menuFlag db 4
 
 ; Puffer für VBE Mode Info (256 Byte reichen)

src/kernel/boot/boot2.asm

@@ -30,7 +30,7 @@ extern "C" void enter_usermode(void);
 extern "C" void irq_init(void);
 extern "C" void idt_init(void);
 extern "C" void isr_init(void);
-extern "C" void gdt_init(uint32_t);
+extern "C" void gdt_init();
 extern "C" void syscall_init(void);
 extern "C" void tasking_init(void);
 
@@ -57,7 +57,7 @@ extern "C" int txt_main()
 
     paging_init();
     kheap_init();
- 
+
     //detect_memory();          // setzt max_mem
 
     uint32_t stack_top = kernel_stack_top;
@@ -66,14 +66,15 @@ extern "C" int txt_main()
     uint32_t reserved = ((uint32_t)&__end + 0xFFF) & ~0xFFF;
     if (reserved < kernel_stack_top) reserved = kernel_stack_top; // Stack schützen
     page_init(reserved);
-
+    
     // 3) aktuellen Stack als esp0 für TSS verwenden
     uint32_t esp;
     __asm__ volatile("mov %%esp, %0" : "=r"(esp));
-    gdt_init(esp);
+    gdt_init();
+
     isr_init();
     irq_init();
-    
+
     syscall_init();
     tasking_init();
 
@@ -138,8 +139,8 @@ extern "C" int vid_main()
 
     // 3) aktuellen Stack als esp0 für TSS verwenden
     uint32_t esp;
-    __asm__ volatile("mov %%esp, %0" : "=r"(esp));
-    gdt_init(esp);
+    //__asm__ volatile("mov %%esp, %0" : "=r"(esp));
+    gdt_init();
     isr_init();
     irq_init();
 

src/kernel/ckernel.cc

@@ -56,6 +56,8 @@ gdt_entry_t gdt[GDT_ENTRIES];
 gdt_ptr_t   gp;
 tss_entry_t tss_entry;
 
+extern uint32_t kernel_stack_top;
+
 static void gdt_set_gate(
          int num,
     uint32_t base,
@@ -94,11 +96,11 @@ static void write_tss(int num, uint16_t ss0, uint32_t esp0)
     tss_entry.iomap_base = sizeof(tss_entry_t);
 }
 
-void gdt_init(uint32_t kernel_stack_top)
+void gdt_init()
 {
     gp.limit = sizeof(gdt) - 1;
     gp.base  = (uint32_t)&gdt;
-    
+
     // 0: Null-Descriptor
     gdt_set_gate(0, 0, 0, 0, 0);
 

src/kernel/gdt.c

@@ -2,10 +2,10 @@
 ; DONT CHANGE THIS FILE - all modifieds will be lost.  
 ; -----------------------------------------------------
 TEST_LBA       equ 0
-BOOT2_LBA     equ  584    ; start LBA  BOOT2
+BOOT2_LBA     equ  582    ; start LBA  BOOT2
 BOOT2_SECTORS equ  2    ; 2048 *  2
 ; -----------------------------------------------------
 KERNEL_LBA     equ  552    ; start LBA  KERNEL
-KERNEL_SECTORS equ  29    ; 2048 *  29
+KERNEL_SECTORS equ  27    ; 2048 *  27
 ; -----------------------------------------------------
 VBE_INFO_ADDR   equ 0x0A00

src/kernel/lba.inc

@@ -22,13 +22,13 @@ static uint32_t page_table_next_free;
 
 static uint32_t* first_page_table;
 
-static uint32_t free_pages[PAGE_ENTRIES];
-static size_t   free_page_count = 0;
-
 # define MANAGED_MEMORY_BYTES (16 * 1024 * 1024)   // 16 MiB
 # define MAX_PAGES            (MANAGED_MEMORY_BYTES / PAGE_SIZE)
 # define BITMAP_SIZE_BYTES    (MAX_PAGES / 8)
 
+static uint32_t free_pages[MAX_PAGES];
+static size_t   free_page_count = 0;
+
 static uint8_t page_bitmap[BITMAP_SIZE_BYTES] __attribute__((aligned(16)));
 
 // Bitmap helpers
@@ -109,6 +109,7 @@ void page_allocator_add_page(uint32_t phys_addr)
     if (free_page_count < MAX_PAGES) {
         free_pages[free_page_count++] = phys_addr;
     } else {
+        printformat("FC: %d, MAX: %d\n",free_page_count, MAX_PAGES);
         // Optional: Fehlerbehandlung (kein Platz mehr im freien Stack)
     }
 }
@@ -233,4 +234,7 @@ void paging_init(void)
 
     // kleiner Flush
     asm volatile("jmp .+2");
+    
+    volatile uint16_t* vga = (volatile uint16_t*)0xB8000;
+    vga[0] = 0x0F00 | 'L';
 }