Index: arch/amd64/src/mm/page.c =================================================================== --- arch/amd64/src/mm/page.c (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ arch/amd64/src/mm/page.c (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -51,5 +51,4 @@ /* - * Identity mapping for all frames. * PA2KA(identity) mapping for all frames. */ Index: arch/ia32/src/asm.S =================================================================== --- arch/ia32/src/asm.S (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ arch/ia32/src/asm.S (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -359,6 +359,4 @@ .long utext_end - utext - -#.section K_DATA_START .global interrupt_handler_size Index: arch/ia32/src/boot/boot.S =================================================================== --- arch/ia32/src/boot/boot.S (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ arch/ia32/src/boot/boot.S (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -54,9 +54,9 @@ movw %ax, %ds movw %ax, %ss # initialize stack segment register - movl $BOOTSTRAP_OFFSET - 0x400, %esp # initialize stack pointer + movl $BOOTSTRAP_OFFSET - 0x400, %esp # initialize stack pointer call memmap_arch_init - lgdt real_bootstrap_gdtr_boot # initialize Global Descriptor Table register + lgdt real_bootstrap_gdtr_boot # initialize Global Descriptor Table register movl %cr0, %eax @@ -83,8 +83,8 @@ movw %ax, %gs movw %ax, %fs - movw %ax, %ds # kernel data + stack + movw %ax, %ds # kernel data + stack movw %ax, %ss - movb $0xd1, %al # enable A20 using the keyboard controller + movb $0xd1, %al # enable A20 using the keyboard controller outb %al, $0x64 movb $0xdf, %al @@ -97,7 +97,7 @@ rep movsb - call map_kernel # map kernel and turn paging on - - call main_bsp # never returns + call map_kernel # map kernel and turn paging on + + call main_bsp # never returns cli @@ -105,7 +105,7 @@ multiboot_image_start: - movl $BOOTSTRAP_OFFSET - 0x400, %esp # initialize stack pointer - - lgdt protected_bootstrap_gdtr - 0x80000000 # initialize Global Descriptor Table register + movl $BOOTSTRAP_OFFSET - 0x400, %esp # initialize stack pointer + + lgdt protected_bootstrap_gdtr - 0x80000000 # initialize Global Descriptor Table register movw $KDATA, %cx @@ -113,5 +113,5 @@ movw %cx, %gs movw %cx, %fs - movw %cx, %ds # kernel data + stack + movw %cx, %ds # kernel data + stack movw %cx, %ss @@ -119,5 +119,5 @@ multiboot_meeting_point: - pushl %ebx # save parameters from GRUB + pushl %ebx # save parameters from GRUB pushl %eax @@ -128,9 +128,9 @@ rep movsb - call map_kernel # map kernel and turn paging on + call map_kernel # map kernel and turn paging on popl %eax popl %ebx - cmpl $MULTIBOOT_LOADER_MAGIC, %eax # compare GRUB signature + cmpl $MULTIBOOT_LOADER_MAGIC, %eax # compare GRUB signature je valid_boot @@ -204,5 +204,5 @@ invalid_boot: - call main_bsp - BOOT_OFFSET # never returns + call main_bsp - BOOT_OFFSET # never returns cli @@ -217,11 +217,11 @@ movl %cr4, %ecx orl $(1<<4), %ecx - movl %ecx, %cr4 # turn PSE on + movl %ecx, %cr4 # turn PSE on movl $((1<<7)|(1<<0)), %eax - movl %eax, page_directory # mapping 0x00000000 => 0x00000000 + movl %eax, page_directory # mapping 0x00000000 => 0x00000000 movl $(page_directory+2048), %edx - movl %eax, (%edx) # mapping 0x80000000 => 0x00000000 + movl %eax, (%edx) # mapping 0x80000000 => 0x00000000 leal page_directory, %eax Index: arch/ia32/src/mm/page.c =================================================================== --- arch/ia32/src/mm/page.c (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ arch/ia32/src/mm/page.c (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -54,5 +54,4 @@ /* - * Identity mapping for all frames. * PA2KA(identity) mapping for all frames. */ Index: doc/TODO =================================================================== --- doc/TODO (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ doc/TODO (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -26,3 +26,2 @@ the alignment check is disabled globally + make emulated architectures also work on real hardware -+ bring in support for other architectures (e.g. PowerPC) Index: src/debug/print.c =================================================================== --- src/debug/print.c (revision ba1b7393876be73f8db9af9e629c6d11144b223f) +++ src/debug/print.c (revision b0edf3b2dee68a5024674c89cad7b78b9d0b5aa2) @@ -59,5 +59,5 @@ putchar('-'); num=num*-1.0; - } + } @@ -65,5 +65,5 @@ print_str("Inf"); return; - } + } if ((modifier=='E')||(modifier=='e')) { @@ -73,18 +73,21 @@ num = num / ((fmath_dpow(10.0,exponent))); - print_double(num,modifier+1,precision); //modifier+1 = E => F or e => f + print_double(num,modifier+1,precision); /* modifier+1 = E => F or e => f */ putchar(modifier); if (exponent<0) { putchar('-'); exponent*=-1; - } + } print_number(exponent,10); return; - } + } - //TODO: rounding constant - when we got fraction >= 0.5, we must increment last printed number - - /* Here is problem with cumulative error while printing big double values -> we will divide - the number with a power of 10, print new number with better method for small numbers and then print decimal point at correct position */ + /* TODO: rounding constant - when we got fraction >= 0.5, we must increment last printed number */ + + /* + * Here is a problem with cumulative error while printing big double values -> we will divide + * the number with a power of 10, print new number with better method for small numbers and + * then print decimal point at correct position. + */ fmath_fint(fmath_get_decimal_exponent(num),&intval); @@ -136,5 +139,5 @@ while (counter>0) { putchar(buf[--counter]); - }; + } return; } @@ -237,4 +240,14 @@ * digits). * X As with 'x', but '0x' is prefixed. + * . The decimal number following period will be treated as precision + * for printing floating point numbers. One of 'e', 'E', 'f' or 'F' + * must follow. + * e The next variant argument is treated as double precision float + * and printed in exponent notation with only one digit before decimal point + * in specified precision. The exponent sign is printed as 'e'. + * E As with 'e', but the exponent sign is printed as 'E'. + * f The next variant argument is treated as double precision float + * and printed in decimal notation in specified precision. + * F As with 'f'. * * All other characters from fmt except the formatting directives @@ -260,108 +273,103 @@ switch (c) { - - /* control character */ case '%': + precision = DEFAULT_DOUBLE_PRECISION; + if (fmt[i]=='.') { + precision=0; + c=fmt[++i]; + while((c>='0')&&(c<='9')) { + precision = precision*10 + c - '0'; + c=fmt[++i]; + } + } - precision = DEFAULT_DOUBLE_PRECISION; - if (fmt[i]=='.') { - precision=0; - c=fmt[++i]; - while((c>='0')&&(c<='9')) { - precision = precision*10 + c - '0'; - c=fmt[++i]; - } - - } - - switch (c = fmt[i++]) { - - /* percentile itself */ - case '%': - break; - - /* - * String and character conversions. - */ - case 's': - print_str(va_arg(ap, char_ptr)); - goto loop; - - case 'c': - c = (char) va_arg(ap, int); - break; - - /* - * Hexadecimal conversions with fixed width. - */ - case 'P': - print_str("0x"); - case 'p': - print_fixed_hex(va_arg(ap, __native), sizeof(__native)); - goto loop; - - case 'Q': - print_str("0x"); - case 'q': - print_fixed_hex(va_arg(ap, __u64), INT64); - goto loop; - - case 'L': - print_str("0x"); - case 'l': - print_fixed_hex(va_arg(ap, __native), INT32); - goto loop; - - case 'W': - print_str("0x"); - case 'w': - print_fixed_hex(va_arg(ap, __native), INT16); - goto loop; - - case 'B': - print_str("0x"); - case 'b': - print_fixed_hex(va_arg(ap, __native), INT8); - goto loop; - - /* - * Floating point conversions. - */ + switch (c = fmt[i++]) { + + /* percentile itself */ + case '%': + break; + + /* + * String and character conversions. + */ + case 's': + print_str(va_arg(ap, char_ptr)); + goto loop; + + case 'c': + c = (char) va_arg(ap, int); + break; + + /* + * Hexadecimal conversions with fixed width. + */ + case 'P': + print_str("0x"); + case 'p': + print_fixed_hex(va_arg(ap, __native), sizeof(__native)); + goto loop; + + case 'Q': + print_str("0x"); + case 'q': + print_fixed_hex(va_arg(ap, __u64), INT64); + goto loop; + + case 'L': + print_str("0x"); + case 'l': + print_fixed_hex(va_arg(ap, __native), INT32); + goto loop; + + case 'W': + print_str("0x"); + case 'w': + print_fixed_hex(va_arg(ap, __native), INT16); + goto loop; + + case 'B': + print_str("0x"); + case 'b': + print_fixed_hex(va_arg(ap, __native), INT8); + goto loop; + + /* + * Floating point conversions. + */ + case 'F': + print_double(va_arg(ap, double),'F',precision); + goto loop; + + case 'f': + print_double(va_arg(ap, double),'f',precision); + goto loop; - case 'F': - print_double(va_arg(ap, double),'F',precision); - goto loop; - - case 'f': - print_double(va_arg(ap, double),'f',precision); - goto loop; + case 'E': + print_double(va_arg(ap, double),'E',precision); + goto loop; + case 'e': + print_double(va_arg(ap, double),'e',precision); + goto loop; - case 'E': - print_double(va_arg(ap, double),'E',precision); - goto loop; - case 'e': - print_double(va_arg(ap, double),'e',precision); - goto loop; - - /* - * Decimal and hexadecimal conversions. - */ - case 'd': - print_number(va_arg(ap, __native), 10); - goto loop; - - case 'X': - print_str("0x"); - case 'x': - print_number(va_arg(ap, __native), 16); - goto loop; + /* + * Decimal and hexadecimal conversions. + */ + case 'd': + print_number(va_arg(ap, __native), 10); + goto loop; + + case 'X': + print_str("0x"); + case 'x': + print_number(va_arg(ap, __native), 16); + goto loop; - /* - * Bad formatting. - */ - default: - goto out; - } + /* + * Bad formatting. + */ + default: + goto out; + } default: putchar(c);