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

Style fixes.

Browse Source
This commit is contained in:
Alex Smith
2012-06-27 15:48:39 +01:00
parent c9f6d2271f
commit 0705884ac4
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/x86_64/descriptors.h
+7 -7
View File
@@ -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. // it always treats base as 0 and does no limit checks.
desc->base0 = 0; desc->base0 = 0;
desc->base1 = 0; desc->base1 = 0;
desc->limit0 = 0xFFFF; desc->limit0 = 0xffff;
desc->limit1 = 0xF; desc->limit1 = 0xf;
desc->granularity = 1; desc->granularity = 1;
desc->type = type; desc->type = type;
@@ -145,8 +145,8 @@ set_tss_descriptor(segment_descriptor* _desc, uint64 base, uint32 limit)
tss_descriptor* desc = (tss_descriptor*)_desc; tss_descriptor* desc = (tss_descriptor*)_desc;
desc->base0 = base & 0xffffff; desc->base0 = base & 0xffffff;
desc->base1 = ((base) >> 24) & 0xff; desc->base1 = (base >> 24) & 0xff;
desc->base2 = ((base) >> 32); desc->base2 = (base >> 32);
desc->limit0 = limit & 0xffff; desc->limit0 = limit & 0xffff;
desc->limit1 = (limit >> 16) & 0xf; desc->limit1 = (limit >> 16) & 0xf;
@@ -161,9 +161,9 @@ static inline void
set_interrupt_descriptor(interrupt_descriptor* desc, uint64 addr, uint32 type, set_interrupt_descriptor(interrupt_descriptor* desc, uint64 addr, uint32 type,
uint16 seg, uint32 dpl, uint32 ist) uint16 seg, uint32 dpl, uint32 ist)
{ {
desc->base0 = (addr & 0xFFFF); desc->base0 = addr & 0xffff;
desc->base1 = ((addr >> 16) & 0xFFFF); desc->base1 = (addr >> 16) & 0xffff;
desc->base2 = ((addr >> 32) & 0xFFFFFFFF); desc->base2 = (addr >> 32) & 0xffffffff;
desc->sel = seg; desc->sel = seg;
desc->ist = ist; desc->ist = ist;
desc->type = type; desc->type = type;
src/system/boot/platform/bios_ia32/long.cpp
+4 -4
View File
@@ -69,7 +69,7 @@ long_idt_init()
mmu_allocate_page(&gKernelArgs.arch_args.phys_idt); mmu_allocate_page(&gKernelArgs.arch_args.phys_idt);
gKernelArgs.arch_args.vir_idt = fix_address((addr_t)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); gKernelArgs.arch_args.vir_idt);
// The 32-bit kernel gets an IDT with the loader's exception handlers until // 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. // converting, as the next pointer will be converted.
preloaded_image* image = gKernelArgs.preloaded_images; preloaded_image* image = gKernelArgs.preloaded_images;
fix_address(gKernelArgs.preloaded_images); fix_address(gKernelArgs.preloaded_images);
while (image) { while (image != NULL) {
preloaded_image* next = image->next; preloaded_image* next = image->next;
convert_preloaded_image(static_cast<preloaded_elf64_image*>(image)); convert_preloaded_image(static_cast<preloaded_elf64_image*>(image));
image = next; image = next;
@@ -234,7 +234,7 @@ convert_kernel_args()
// Fix driver settings files. // Fix driver settings files.
driver_settings_file* file = gKernelArgs.driver_settings; driver_settings_file* file = gKernelArgs.driver_settings;
fix_address(gKernelArgs.driver_settings); fix_address(gKernelArgs.driver_settings);
while (file) { while (file != NULL) {
driver_settings_file* next = file->next; driver_settings_file* next = file->next;
fix_address(file->next); fix_address(file->next);
fix_address(file->buffer); fix_address(file->buffer);
@@ -271,7 +271,7 @@ long_start_kernel()
+ gKernelArgs.cpu_kstack[0].size; + gKernelArgs.cpu_kstack[0].size;
uint64 kernelArgs = (addr_t)&gKernelArgs; 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); stackTop, kernelArgs);
// We're about to enter the kernel -- disable console output. // We're about to enter the kernel -- disable console output.
src/system/kernel/arch/x86_64/arch_int.cpp
+4 -4
View File
@@ -64,7 +64,7 @@ static void
invalid_exception(iframe* frame) invalid_exception(iframe* frame)
{ {
char name[32]; 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->vector, exception_name(frame->vector, name, sizeof(name)),
frame->rip); frame->rip);
} }
@@ -74,7 +74,7 @@ static void
fatal_exception(iframe* frame) fatal_exception(iframe* frame)
{ {
char name[32]; 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->vector, exception_name(frame->vector, name, sizeof(name)),
frame->rip, frame->error_code); frame->rip, frame->error_code);
} }
@@ -84,7 +84,7 @@ static void
unexpected_exception(iframe* frame) unexpected_exception(iframe* frame)
{ {
char name[32]; 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->vector, exception_name(frame->vector, name, sizeof(name)),
frame->rip, frame->error_code); frame->rip, frame->error_code);
} }
@@ -96,7 +96,7 @@ page_fault_exception(iframe* frame)
unsigned long cr2; unsigned long cr2;
read_cr2(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); frame->rip, cr2, frame->error_code);
} }