i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Use symbolic names, compare != 0 and whitespace.

Browse Source 
Change-Id: I34c60b3ab8387fe57dbcd91f9b5d278468455cf6
Reviewed-on: https://review.haiku-os.org/559
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Michael Lotz
2018-09-14 10:04:54 +00:00
committed by Axel Dörfler
parent 8aea77d00f
commit 0de5a83940
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_int.cpp
+9 -9
View File
@@ -274,7 +274,7 @@ x86_page_fault_exception(struct iframe* frame)
cpu_ent* cpu = &gCPU[smp_get_current_cpu()]; cpu_ent* cpu = &gCPU[smp_get_current_cpu()];
if (cpu->fault_handler != 0) { if (cpu->fault_handler != 0) {
debug_set_page_fault_info(cr2, frame->ip, debug_set_page_fault_info(cr2, frame->ip,
(frame->error_code & 0x2) != 0 (frame->error_code & PGFAULT_W) != 0
? DEBUG_PAGE_FAULT_WRITE : 0); ? DEBUG_PAGE_FAULT_WRITE : 0);
frame->ip = cpu->fault_handler; frame->ip = cpu->fault_handler;
frame->bp = cpu->fault_handler_stack_pointer; frame->bp = cpu->fault_handler_stack_pointer;
@@ -285,7 +285,7 @@ x86_page_fault_exception(struct iframe* frame)
kprintf("ERROR: thread::fault_handler used in kernel " kprintf("ERROR: thread::fault_handler used in kernel "
"debugger!\n"); "debugger!\n");
debug_set_page_fault_info(cr2, frame->ip, debug_set_page_fault_info(cr2, frame->ip,
(frame->error_code & 0x2) != 0 (frame->error_code & PGFAULT_W) != 0
? DEBUG_PAGE_FAULT_WRITE : 0); ? DEBUG_PAGE_FAULT_WRITE : 0);
frame->ip = reinterpret_cast<uintptr_t>(thread->fault_handler); frame->ip = reinterpret_cast<uintptr_t>(thread->fault_handler);
return; return;
@@ -328,26 +328,26 @@ x86_page_fault_exception(struct iframe* frame)
"%p from ip %p\n", (void*)cr2, (void*)frame->ip); "%p from ip %p\n", (void*)cr2, (void*)frame->ip);
return; return;
} else if ((frame->error_code & PGFAULT_U) == 0 } else if ((frame->error_code & PGFAULT_U) == 0
&& (frame->error_code & PGFAULT_I) == PGFAULT_I && (frame->error_code & PGFAULT_I) != 0
&& (x86_read_cr4() & IA32_CR4_SMEP) != 0) { && (x86_read_cr4() & IA32_CR4_SMEP) != 0) {
// check that: 1. come not from userland, // check that: 1. come not from userland,
// 2. is an instruction fetch, 3. smep is enabled // 2. is an instruction fetch, 3. smep is enabled
panic("SMEP violation user-mapped address %p touched from kernel %p\n", panic("SMEP violation user-mapped address %p touched from kernel %p\n",
(void*)cr2, (void*)frame->ip); (void*)cr2, (void*)frame->ip);
} else if ((frame->flags & X86_EFLAGS_ALIGNMENT_CHECK) == 0 } else if ((frame->flags & X86_EFLAGS_ALIGNMENT_CHECK) == 0
&& (frame->error_code & PGFAULT_U) == 0 && (frame->error_code & PGFAULT_U) == 0
&& (frame->error_code & PGFAULT_P) == PGFAULT_P && (frame->error_code & PGFAULT_P) != 0
&& (x86_read_cr4() & IA32_CR4_SMAP) != 0) { && (x86_read_cr4() & IA32_CR4_SMAP) != 0) {
// check that: 1. AC flag is not set, 2. come not from userland, // check that: 1. AC flag is not set, 2. come not from userland,
// 3. is a page-protection violation, 4. smap is enabled // 3. is a page-protection violation, 4. smap is enabled
panic("SMAP violation user-mapped address %p touched from kernel %p\n", panic("SMAP violation user-mapped address %p touched from kernel %p\n",
(void*)cr2, (void*)frame->ip); (void*)cr2, (void*)frame->ip);
} }
enable_interrupts(); enable_interrupts();
vm_page_fault(cr2, frame->ip, vm_page_fault(cr2, frame->ip,
(frame->error_code & PGFAULT_W)!= 0, // write access (frame->error_code & PGFAULT_W) != 0, // write access
(frame->error_code & PGFAULT_I) != 0, // instruction fetch (frame->error_code & PGFAULT_I) != 0, // instruction fetch
(frame->error_code & PGFAULT_U) != 0, // userland (frame->error_code & PGFAULT_U) != 0, // userland
&newip); &newip);