Changeset b1cf98c in mainline for arch/ia32

Timestamp:

2005-09-13T20:02:26Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d6dcdd2e

Parents:

2e5f770

Message:

Documentation updates for amd64, mips32 and ia32.

Replace %L with %P printf() formatter in MPS and ACPI detection functions to print addresses in maximal width.

Tweak memmap.S and IA-32 and AMd64 boot.S.
Cancel unneeded instructions.
Replace cmpl $0, %ebx with testl %ebx, %ebx.
Move memmap.S data to K_DATA_START section.

Location:

arch/ia32/src

Files:

• acpi/acpi.c (modified) (3 diffs)
• boot/boot.S (modified) (2 diffs)
• boot/memmap.S (modified) (3 diffs)
• smp/mps.c (modified) (2 diffs)

arch/ia32/src/acpi/acpi.c

@@ -109 +109 @@
 
 rsdp_found:
-        printf("%L: ACPI Root System Description Pointer\n", acpi_rsdp);
+        printf("%P: ACPI Root System Description Pointer\n", acpi_rsdp);
 
         acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;
@@ -144 +144 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%L: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }
@@ -165 +165 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%L: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }

arch/ia32/src/boot/boot.S

@@ -53 +53 @@
         xorw %ax, %ax
         movw %ax, %ds
+        movw %ax, %es
         movw %ax, %ss                                                   # initialize stack segment register
         movl $BOOTSTRAP_OFFSET - 0x400, %esp                            # initialize stack pointer
@@ -86 +87 @@
         movw %ax, %ss
         
-        movb $0xd1, %al                                                 # enable A20 using the keyboard controller
+        movb $0xd1, %al                                                 # enable A20 using i8042 controller
         outb %al, $0x64
         movb $0xdf, %al

arch/ia32/src/boot/memmap.S

@@ -39 +39 @@
 
 memmap_arch_init:
-
 e820begin:
-        xorl    %ebx,%ebx       # during first call, ebx must be 0
-        movw    %bx,%ds
-        movw    %bx,%es
+        xorl    %ebx,%ebx                       # during first call, ebx must be 0
         movw    $e820table_boot,%di
         movb    $MEMMAP_E820_MAX_RECORDS,e820counter_boot
 e820loop:       
-        movl    $E820_SMAP,%edx         # control sequence "SMAP"
+        movl    $E820_SMAP,%edx                 # control sequence "SMAP"
 
-        movl    $0x0000e820,%eax        # service
+        movl    $0x0000e820,%eax                # service
         movl    $MEMMAP_E820_RECORD_SIZE,%ecx
         int     $0x15
         jc      e820err
         
-        cmpl    $E820_SMAP,%eax         # verifying BIOS
+        cmpl    $E820_SMAP,%eax                 # verifying BIOS
         jne     e820err
 
         cmpl    $MEMMAP_E820_RECORD_SIZE,%ecx
-        jne     e820err                 # bad record size - bug in bios
+        jne     e820err                         # bad record size - bug in bios
         
-        movw    %di,%ax         # next record
+        movw    %di,%ax                         # next record
         addw    $MEMMAP_E820_RECORD_SIZE,%ax
         movw    %ax,%di
                 
-        decb    e820counter_boot # buffer is full
+        decb    e820counter_boot                # buffer is full
         jz      e820end
         
-        cmpl    $0,%ebx 
-        jne     e820loop
+        testl   %ebx,%ebx       
+        jnz     e820loop
         
 e820end:
         movb    $MEMMAP_E820_MAX_RECORDS,%al
         subb    e820counter_boot,%al
-        movb    %al,e820counter_boot # store # of valid entries in e820counter
+        movb    %al,e820counter_boot            # store # of valid entries in e820counter
 
         jmp     e801begin
@@ -92 +89 @@
         jc      e801end
         
-                        # fix problem with some BIOSes which use ax:bx rather than cx:dx
+        # fix problem with some BIOSes which use ax:bx rather than cx:dx
         testw   %cx,%cx
         jnz     e801cxdx
@@ -106 +103 @@
         andl    $0xffff,%ecx
         addl    %ecx,%edx
-        addl    $0x0400,%edx  # add lower 1 MB - it's not included by e801 method
+        addl    $0x0400,%edx                    # add lower 1 MB - it's not included by e801 method
         movl    %edx,e801memorysize
 e801end:
         ret
 
-        #memory size in 1 kb chunks
+
+.section K_DATA_START
+
+#memory size in 1 kb chunks
 e801memorysize:
         .long   0
-

arch/ia32/src/smp/mps.c

@@ -186 +186 @@
         
 fs_found:
-        printf("%L: MPS Floating Pointer Structure\n", fs);
+        printf("%P: MPS Floating Pointer Structure\n", fs);
 
         frame_not_free((__address) fs);
@@ -408 +408 @@
                 switch (cur[CT_EXT_ENTRY_TYPE]) {
                         default:
-                                printf("%L: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
+                                printf("%P: skipping MP Configuration Table extended entry type %d\n", cur, cur[CT_EXT_ENTRY_TYPE]);
                                 break;
                 }