RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:07:35 +00:00
Code Issues Activity Actions

Kernel: Fix incorrect indentation

Browse source 
Looks like a tab and some other things snuck in. :)
This commit is contained in:
Gunnar Beutner 2021-07-05 16:53:02 +02:00 • committed by Gunnar Beutner
parent f998cc156f
commit 8aafbd917a
2 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Arch/x86/common/Interrupts.cpp
View file

@ -45,7 +45,7 @@ static EntropySource s_entropy_source_interrupts { EntropySource::Static::Interr
#define EH_ENTRY(ec, title) \ #define EH_ENTRY(ec, title) \
extern "C" void title##_asm_entry(); \ extern "C" void title##_asm_entry(); \
extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \ extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \
NAKED void title##_asm_entry(){ \ NAKED void title##_asm_entry() { \
asm( \ asm( \
" pusha\n" \ " pusha\n" \
" pushl %ds\n" \ " pushl %ds\n" \
@ -64,13 +64,14 @@ static EntropySource s_entropy_source_interrupts { EntropySource::Static::Interr
" cld\n" \ " cld\n" \
" call enter_trap_no_irq \n" \ " call enter_trap_no_irq \n" \
" call " #title "_handler\n" \ " call " #title "_handler\n" \
" jmp common_trap_exit \n"); \ " jmp common_trap_exit \n" \
); \
} }
#define EH_ENTRY_NO_CODE(ec, title) \ #define EH_ENTRY_NO_CODE(ec, title) \
extern "C" void title##_asm_entry(); \ extern "C" void title##_asm_entry(); \
extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \ extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \
NAKED void title##_asm_entry(){ \ NAKED void title##_asm_entry() { \
asm( \ asm( \
" pushl $0x0\n" \ " pushl $0x0\n" \
" pusha\n" \ " pusha\n" \
@ -90,14 +91,15 @@ static EntropySource s_entropy_source_interrupts { EntropySource::Static::Interr
" cld\n" \ " cld\n" \
" call enter_trap_no_irq \n" \ " call enter_trap_no_irq \n" \
" call " #title "_handler\n" \ " call " #title "_handler\n" \
" jmp common_trap_exit \n"); \ " jmp common_trap_exit \n" \
); \
} }
#elif ARCH(X86_64) #elif ARCH(X86_64)
#define EH_ENTRY(ec, title) \ #define EH_ENTRY(ec, title) \
extern "C" void title##_asm_entry(); \ extern "C" void title##_asm_entry(); \
extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \ extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \
NAKED void title##_asm_entry(){ \ NAKED void title##_asm_entry() { \
asm( \ asm( \
" pushq %r15\n" \ " pushq %r15\n" \
" pushq %r14\n" \ " pushq %r14\n" \
@ -124,13 +126,14 @@ static EntropySource s_entropy_source_interrupts { EntropySource::Static::Interr
" lea 0x8(%rsp), %rdi \n" \ " lea 0x8(%rsp), %rdi \n" \
" call " #title "_handler\n" \ " call " #title "_handler\n" \
" addq $0x8, %rsp\n" /* undo alignment */ \ " addq $0x8, %rsp\n" /* undo alignment */ \
" jmp common_trap_exit \n"); \ " jmp common_trap_exit \n" \
); \
} }
#define EH_ENTRY_NO_CODE(ec, title) \ #define EH_ENTRY_NO_CODE(ec, title) \
extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \ extern "C" void title##_handler(TrapFrame*) __attribute__((used)); \
extern "C" void title##_asm_entry(); \ extern "C" void title##_asm_entry(); \
NAKED void title##_asm_entry(){ \ NAKED void title##_asm_entry() { \
asm( \ asm( \
" pushq $0x0\n" \ " pushq $0x0\n" \
" pushq %r15\n" \ " pushq %r15\n" \
@ -156,7 +159,8 @@ static EntropySource s_entropy_source_interrupts { EntropySource::Static::Interr
" call enter_trap_no_irq \n" \ " call enter_trap_no_irq \n" \
" movq %rsp, %rdi \n" \ " movq %rsp, %rdi \n" \
" call " #title "_handler\n" \ " call " #title "_handler\n" \
" jmp common_trap_exit \n"); \ " jmp common_trap_exit \n" \
); \
} }
#endif #endif

3
Kernel/Arch/x86/i386/Processor.cpp
View file

@ -30,7 +30,8 @@ NAKED void thread_context_first_enter(void)
" call context_first_init \n" " call context_first_init \n"
" addl $" __STRINGIFY(ENTER_THREAD_CONTEXT_ARGS_SIZE) ", %esp \n" " addl $" __STRINGIFY(ENTER_THREAD_CONTEXT_ARGS_SIZE) ", %esp \n"
" movl %ebx, 0(%esp) \n" // push pointer to TrapFrame " movl %ebx, 0(%esp) \n" // push pointer to TrapFrame
" jmp common_trap_exit \n"); " jmp common_trap_exit \n"
);
// clang-format on // clang-format on
} }