Changeset 42744880 in mainline for arch

Timestamp:

2006-02-08T22:29:20Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

85dc2e7

Parents:

89298e3

Message:

Convert size_t, count_t and index_t to 64-bits on 64-bit architectures.
Change some pfn_t usages to count_t, size_t and index_t.

Location:

arch

Files:

• amd64/_link.ld.in (modified) (1 diff)
• amd64/src/asm_utils.S (modified) (1 diff)
• amd64/src/boot/boot.S (modified) (2 diffs)
• ia32/src/mm/frame.c (modified) (4 diffs)
• mips32/src/drivers/arc.c (modified) (1 diff)
• sparc64/_link.ld.in (modified) (1 diff)
• sparc64/src/mm/frame.c (modified) (1 diff)

arch/amd64/_link.ld.in

@@ -39 +39 @@
                 QUAD(kdata_end - kdata_start + (unmapped_kdata_end - unmapped_kdata_start));
                 hardcoded_unmapped_ktext_size = .;
-                LONG(unmapped_ktext_end - unmapped_ktext_start);
+                QUAD(unmapped_ktext_end - unmapped_ktext_start);
                 hardcoded_unmapped_kdata_size = .;
-                LONG(unmapped_kdata_end - unmapped_kdata_start);
+                QUAD(unmapped_kdata_end - unmapped_kdata_start);
                 *(COMMON);              /* global variables */
 

arch/amd64/src/asm_utils.S

@@ -219 +219 @@
 .global interrupt_handler_size
 
-interrupt_handler_size: .long (h_end-h_start)/IDT_ITEMS
+interrupt_handler_size: .quad (h_end-h_start)/IDT_ITEMS

arch/amd64/src/boot/boot.S

@@ -165 +165 @@
                 
                 xorq %rdx, %rdx
+                movq %rdx, %rcx
                 movl 24(%ebx), %esi                                             # mbi->mods_addr
                 movl 0(%esi), %edx                                              # mods->mod_start
@@ -172 +173 @@
                 
                 mods_invalid:
-                movl %ecx, init_size
+                movq %rcx, init_size
                 movq %rdx, init_addr
                 

arch/ia32/src/mm/frame.c

@@ -42 +42 @@
 #include <console/kconsole.h>
 
-
 size_t hardcoded_unmapped_ktext_size = 0;
 size_t hardcoded_unmapped_kdata_size = 0;
@@ -51 +50 @@
 {
         int i;
-        pfn_t start, size,conf;
+        pfn_t start, conf;
+        size_t size;
 
         for (i = 0; i < e820counter; i++) {
@@ -57 +57 @@
                         start = ADDR2PFN(ALIGN_UP(e820table[i].base_address,
                                                   FRAME_SIZE));
-                        size = SIZE2PFN(ALIGN_DOWN(e820table[i].size,
+                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size,
                                                    FRAME_SIZE));
                         if (minconf < start || minconf >= start+size)
@@ -63 +63 @@
                         else
                                 conf = minconf;
-                        zone_create(start,size, conf, 0);
+                        zone_create(start, size, conf, 0);
                         if (last_frame < ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE))
                                 last_frame = ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);

arch/mips32/src/drivers/arc.c

@@ -306 +306 @@
                         
                         zone_create(ADDR2PFN(base),
-                                    SIZE2PFN(ALIGN_DOWN(basesize,FRAME_SIZE)),
+                                    SIZE2FRAMES(ALIGN_DOWN(basesize,FRAME_SIZE)),
                                     ADDR2PFN(base),0);
                 }

arch/sparc64/_link.ld.in

@@ -27 +27 @@
                 *(.sbss);
                 hardcoded_ktext_size = .;
-                LONG(ktext_end - ktext_start);  
+                QUAD(ktext_end - ktext_start);  
                 hardcoded_kdata_size = .;
-                LONG(kdata_end - kdata_start);
+                QUAD(kdata_end - kdata_start);
                 hardcoded_load_address = .;
                 QUAD(0x4000);

arch/sparc64/src/mm/frame.c

@@ -30 +30 @@
 #include <mm/frame.h>
 #include <config.h>
+#include <align.h>
 
 void frame_arch_init(void)
 {
-        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+        zone_create(0, config.memory_size >> FRAME_WIDTH, ADDR2PFN(ALIGN_UP(config.base + config.kernel_size + CONFIG_STACK_SIZE, FRAME_SIZE)), 0);
 
         /*