sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-17 18:11:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

[bios] Do not enable interrupts when printing to the console

Browse Source 
There seems to be no reason for the sti/cli pair used around each call
to INT 10.  Remove these instructions, so that printing debug messages
from within an ISR does not temporarily reenable interrupts.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2016-07-03 12:50:19 +01:00
parent c9f6a86059
commit c22da4b8ba
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/arch/x86/interface/pcbios/bios_console.c
View File

@@ -98,9 +98,7 @@ static void bios_handle_cup ( struct ansiesc_context *ctx __unused,
if ( cy < 0 ) if ( cy < 0 )
cy = 0; cy = 0;
__asm__ __volatile__ ( REAL_CODE ( "sti\n\t" __asm__ __volatile__ ( REAL_CODE ( "int $0x10\n\t" )
"int $0x10\n\t"
"cli\n\t" )
: : "a" ( 0x0200 ), "b" ( 1 ), : : "a" ( 0x0200 ), "b" ( 1 ),
"d" ( ( cy << 8 ) | cx ) ); "d" ( ( cy << 8 ) | cx ) );
} }
@@ -118,9 +116,7 @@ static void bios_handle_ed ( struct ansiesc_context *ctx __unused,
/* We assume that we always clear the whole screen */ /* We assume that we always clear the whole screen */
assert ( params[0] == ANSIESC_ED_ALL ); assert ( params[0] == ANSIESC_ED_ALL );
__asm__ __volatile__ ( REAL_CODE ( "sti\n\t" __asm__ __volatile__ ( REAL_CODE ( "int $0x10\n\t" )
"int $0x10\n\t"
"cli\n\t" )
: : "a" ( 0x0600 ), "b" ( bios_attr << 8 ), : : "a" ( 0x0600 ), "b" ( bios_attr << 8 ),
"c" ( 0 ), "c" ( 0 ),
"d" ( ( ( console_height - 1 ) << 8 ) | "d" ( ( ( console_height - 1 ) << 8 ) |
@@ -188,9 +184,7 @@ static void bios_handle_dectcem_set ( struct ansiesc_context *ctx __unused,
/* Get character height */ /* Get character height */
get_real ( height, BDA_SEG, BDA_CHAR_HEIGHT ); get_real ( height, BDA_SEG, BDA_CHAR_HEIGHT );
__asm__ __volatile__ ( REAL_CODE ( "sti\n\t" __asm__ __volatile__ ( REAL_CODE ( "int $0x10\n\t" )
"int $0x10\n\t"
"cli\n\t" )
: : "a" ( 0x0100 ), : : "a" ( 0x0100 ),
"c" ( ( ( height - 2 ) << 8 ) | "c" ( ( ( height - 2 ) << 8 ) |
( height - 1 ) ) ); ( height - 1 ) ) );
@@ -207,9 +201,7 @@ static void bios_handle_dectcem_reset ( struct ansiesc_context *ctx __unused,
unsigned int count __unused, unsigned int count __unused,
int params[] __unused ) { int params[] __unused ) {
__asm__ __volatile__ ( REAL_CODE ( "sti\n\t" __asm__ __volatile__ ( REAL_CODE ( "int $0x10\n\t" )
"int $0x10\n\t"
"cli\n\t" )
: : "a" ( 0x0100 ), "c" ( 0x2000 ) ); : : "a" ( 0x0100 ), "c" ( 0x2000 ) );
} }
@@ -243,7 +235,6 @@ static void bios_putchar ( int character ) {
/* Print character with attribute */ /* Print character with attribute */
__asm__ __volatile__ ( REAL_CODE ( "pushl %%ebp\n\t" /* gcc bug */ __asm__ __volatile__ ( REAL_CODE ( "pushl %%ebp\n\t" /* gcc bug */
"sti\n\t"
/* Skip non-printable characters */ /* Skip non-printable characters */
"cmpb $0x20, %%al\n\t" "cmpb $0x20, %%al\n\t"
"jb 1f\n\t" "jb 1f\n\t"
@@ -264,7 +255,6 @@ static void bios_putchar ( int character ) {
"xorw %%bx, %%bx\n\t" "xorw %%bx, %%bx\n\t"
"movb $0x0e, %%ah\n\t" "movb $0x0e, %%ah\n\t"
"int $0x10\n\t" "int $0x10\n\t"
"cli\n\t"
"popl %%ebp\n\t" /* gcc bug */ ) "popl %%ebp\n\t" /* gcc bug */ )
: "=a" ( discard_a ), "=b" ( discard_b ), : "=a" ( discard_a ), "=b" ( discard_b ),
"=c" ( discard_c ) "=c" ( discard_c )