Style fixes.

headers/private/kernel/arch/x86_64/descriptors.h

@@ -120,8 +120,8 @@ set_segment_descriptor(segment_descriptor* desc, uint8 type, uint8 dpl)
 	// it always treats base as 0 and does no limit checks.
 	desc->base0 = 0;
 	desc->base1 = 0;
-	desc->limit0 = 0xFFFF;
-	desc->limit1 = 0xF;
+	desc->limit0 = 0xffff;
+	desc->limit1 = 0xf;
 	desc->granularity = 1;
 
 	desc->type = type;
@@ -145,8 +145,8 @@ set_tss_descriptor(segment_descriptor* _desc, uint64 base, uint32 limit)
 	tss_descriptor* desc = (tss_descriptor*)_desc;
 
 	desc->base0 = base & 0xffffff;
-	desc->base1 = ((base) >> 24) & 0xff;
-	desc->base2 = ((base) >> 32);
+	desc->base1 = (base >> 24) & 0xff;
+	desc->base2 = (base >> 32);
 	desc->limit0 = limit & 0xffff;
 	desc->limit1 = (limit >> 16) & 0xf;
 
@@ -161,9 +161,9 @@ static inline void
 set_interrupt_descriptor(interrupt_descriptor* desc, uint64 addr, uint32 type,
 	uint16 seg, uint32 dpl, uint32 ist)
 {
-	desc->base0 = (addr & 0xFFFF);
-	desc->base1 = ((addr >> 16) & 0xFFFF);
-	desc->base2 = ((addr >> 32) & 0xFFFFFFFF);
+	desc->base0 = addr & 0xffff;
+	desc->base1 = (addr >> 16) & 0xffff;
+	desc->base2 = (addr >> 32) & 0xffffffff;
 	desc->sel = seg;
 	desc->ist = ist;
 	desc->type = type;

src/system/boot/platform/bios_ia32/long.cpp

@@ -32,7 +32,7 @@ template<typename Type>
 inline void
 fix_address(FixedWidthPointer<Type>& p)
 {
-	if(p != NULL)
+	if (p != NULL)
 		p.SetTo(fix_address(p.Get()));
 }
 
@@ -69,7 +69,7 @@ long_idt_init()
 		mmu_allocate_page(&gKernelArgs.arch_args.phys_idt);
 	gKernelArgs.arch_args.vir_idt = fix_address((addr_t)idt);
 
-	dprintf("IDT at phys 0x%lx, virt 0x%llx\n", gKernelArgs.arch_args.phys_idt,
+	dprintf("IDT at phys %#lx, virt %#llx\n", gKernelArgs.arch_args.phys_idt,
 		gKernelArgs.arch_args.vir_idt);
 
 	// The 32-bit kernel gets an IDT with the loader's exception handlers until
@@ -209,7 +209,7 @@ convert_kernel_args()
 	// converting, as the next pointer will be converted.
 	preloaded_image* image = gKernelArgs.preloaded_images;
 	fix_address(gKernelArgs.preloaded_images);
-	while (image) {
+	while (image != NULL) {
 		preloaded_image* next = image->next;
 		convert_preloaded_image(static_cast<preloaded_elf64_image*>(image));
 		image = next;
@@ -234,7 +234,7 @@ convert_kernel_args()
 	// Fix driver settings files.
 	driver_settings_file* file = gKernelArgs.driver_settings;
 	fix_address(gKernelArgs.driver_settings);
-	while (file) {
+	while (file != NULL) {
 		driver_settings_file* next = file->next;
 		fix_address(file->next);
 		fix_address(file->buffer);
@@ -249,7 +249,7 @@ long_start_kernel()
 	// Check whether long mode is supported.
 	cpuid_info info;
 	get_current_cpuid(&info, 0x80000001);
-	if ((info.regs.edx & (1<<29)) == 0)
+	if ((info.regs.edx & (1 << 29)) == 0)
 		panic("64-bit kernel requires a 64-bit CPU");
 
 	preloaded_elf64_image *image = static_cast<preloaded_elf64_image *>(
@@ -271,7 +271,7 @@ long_start_kernel()
 		+ gKernelArgs.cpu_kstack[0].size;
 	uint64 kernelArgs = (addr_t)&gKernelArgs;
 
-	dprintf("kernel entry at 0x%llx, stack 0x%llx, args 0x%llx\n", entry,
+	dprintf("kernel entry at %#llx, stack %#llx, args %#llx\n", entry,
 		stackTop, kernelArgs);
 
 	// We're about to enter the kernel -- disable console output.

src/system/boot/platform/bios_ia32/long_asm.S

@@ -20,12 +20,12 @@ FUNCTION(long_enter_kernel):
 	// address. To switch to 64-bit paging we must first disable 32-bit paging,
 	// otherwise loading the new CR3 will fault.
 	movl	%cr0, %eax
-	andl	$~(1<<31), %eax
+	andl	$~(1 << 31), %eax
 	movl	%eax, %cr0
 
 	// Enable PAE.
 	movl	%cr4, %eax
-	orl		$(1<<5), %eax
+	orl		$(1 << 5), %eax
 	movl	%eax, %cr4
 
 	// Point CR3 to the kernel's PML4.
@@ -35,13 +35,13 @@ FUNCTION(long_enter_kernel):
 	// Enable long mode by setting EFER.LME.
 	movl	$0xC0000080, %ecx
 	rdmsr
-	orl		$(1<<8), %eax
+	orl		$(1 << 8), %eax
 	wrmsr
 
 	// Re-enable paging, which will put us in compatibility mode as we are
 	// currently in a 32-bit code segment.
 	movl	%cr0, %ecx
-	orl		$(1<<31), %ecx
+	orl		$(1 << 31), %ecx
 	movl	%ecx, %cr0
 
 	// Jump into the 64-bit code segment.

src/system/kernel/arch/x86_64/arch_int.cpp

@@ -17,7 +17,7 @@
 
 typedef void interrupt_handler_function(iframe* frame);
 
-static const char *kInterruptNames[] = {
+static const char* kInterruptNames[] = {
 	/*  0 */ "Divide Error Exception",
 	/*  1 */ "Debug Exception",
 	/*  2 */ "NMI Interrupt",
@@ -64,17 +64,17 @@ static void
 invalid_exception(iframe* frame)
 {
 	char name[32];
-	panic("unhandled trap 0x%lx (%s) at ip 0x%lx\n",
+	panic("unhandled trap %#lx (%s) at ip %#lx\n",
 		frame->vector, exception_name(frame->vector, name, sizeof(name)),
 		frame->rip);
 }
 
 
 static void
-fatal_exception(iframe *frame)
+fatal_exception(iframe* frame)
 {
 	char name[32];
-	panic("fatal exception 0x%lx (%s) at ip 0x%lx, error code 0x%lx\n",
+	panic("fatal exception %#lx (%s) at ip %#lx, error code %#lx\n",
 		frame->vector, exception_name(frame->vector, name, sizeof(name)),
 		frame->rip, frame->error_code);
 }
@@ -84,7 +84,7 @@ static void
 unexpected_exception(iframe* frame)
 {
 	char name[32];
-	panic("fatal exception 0x%lx (%s) at ip 0x%lx, error code 0x%lx\n",
+	panic("fatal exception %#lx (%s) at ip %#lx, error code %#lx\n",
 		frame->vector, exception_name(frame->vector, name, sizeof(name)),
 		frame->rip, frame->error_code);
 }
@@ -96,7 +96,7 @@ page_fault_exception(iframe* frame)
 	unsigned long cr2;
 	read_cr2(cr2);
 
-	panic("page fault exception at ip 0x%lx on 0x%lx, error code 0x%lx\n",
+	panic("page fault exception at ip %#lx on %#lx, error code %#lx\n",
 		frame->rip, cr2, frame->error_code);
 }