From f9c835b9d641b520473e9773665b76b56f373f09 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Wed, 14 Dec 2022 18:33:51 +0000 Subject: [PATCH] Removed unused function and error message --- arch/x86_64/start_32.S | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/arch/x86_64/start_32.S b/arch/x86_64/start_32.S index 062c963..dd50cbd 100644 --- a/arch/x86_64/start_32.S +++ b/arch/x86_64/start_32.S @@ -22,9 +22,6 @@ no_long_mode_err: .asciz "This system is not 64-bit. Press any key to reboot." -unsupported_cpu_err: - .asciz "Your CPU is not supported by Magenta. Press any key to reboot." - /******* LONG MDOE BOOSTRAP GDT @@ -70,7 +67,8 @@ bootstrap_stack_top: .long FLAGS .long CHECKSUM -# Print an error message and wait for RETURN if the system's CPU doesn't support long mode. +# Print an error message, wait for RETURN, and +# reboot if the system's CPU doesn't support long mode. no_long_mode: # print error message mov $no_long_mode_err, %esi @@ -99,34 +97,6 @@ no_long_mode: cli hlt -# Print an error message and wait for RETURN if the system's CPU isn't supported. -unsupported_cpu: - # print error message - mov $unsupported_cpu_err, %esi - - mov $0xb8000, %edi -1: - movsb - movb $12, (%edi) - incl %edi - cmpb $0, (%esi) - jne 1b - -2: - inb $0x64, %al - test $0x01, %al - jz 3f - inb $0x60, %al - jmp 2b - -3: - inb $0x64, %al - test $0x01, %al - jz 3b - - int $0xff - cli - hlt .global init_page_tables .type init_page_tables, @function