Changeset ef5de6d in mainline for kernel/arch/ia64/src/mm

Timestamp:

2008-12-31T13:13:26Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2f08ff55

Parents:

f58321c4

Message:

Remove most of the ia64 dead / commented out code.

Location:

kernel/arch/ia64/src/mm

Files:

• frame.c (modified) (2 diffs)
• tlb.c (modified) (4 diffs)

kernel/arch/ia64/src/mm/frame.c

@@ -41 +41 @@
 #include <macros.h>
 
-/*
- * This is Ski-specific and certainly not sufficient
- * for real ia64 systems that provide memory map.
- */
-#define MEMORY_SIZE     (256 * 1024 * 1024)
-#define MEMORY_BASE     (0 * 64 * 1024 * 1024)
-
 #define KERNEL_RESERVED_AREA_BASE (0x4400000)
 #define KERNEL_RESERVED_AREA_SIZE (16*1024*1024)
@@ -84 +77 @@
                 }
                 
-                //zone_create(MEMORY_BASE >> FRAME_WIDTH, SIZE2FRAMES(MEMORY_SIZE), (MEMORY_SIZE) >> FRAME_WIDTH, 0);
-        
                 /*
                 * Blacklist ROM regions.

kernel/arch/ia64/src/mm/tlb.c

@@ -136 +136 @@
                 break;
         case 1: /*cnt 4-15*/
-                /*cnt=((cnt-1)/4)+1;*/
                 ps = PAGE_WIDTH+2;
                 va &= ~((1<<ps)-1);
                 break;
         case 2: /*cnt 16-63*/
-                /*cnt=((cnt-1)/16)+1;*/
                 ps = PAGE_WIDTH+4;
                 va &= ~((1<<ps)-1);
                 break;
         case 3: /*cnt 64-255*/
-                /*cnt=((cnt-1)/64)+1;*/
                 ps = PAGE_WIDTH+6;
                 va &= ~((1<<ps)-1);
                 break;
         case 4: /*cnt 256-1023*/
-                /*cnt=((cnt-1)/256)+1;*/
                 ps = PAGE_WIDTH+8;
                 va &= ~((1<<ps)-1);
                 break;
         case 5: /*cnt 1024-4095*/
-                /*cnt=((cnt-1)/1024)+1;*/
                 ps = PAGE_WIDTH+10;
                 va &= ~((1<<ps)-1);
                 break;
         case 6: /*cnt 4096-16383*/
-                /*cnt=((cnt-1)/4096)+1;*/
                 ps = PAGE_WIDTH+12;
                 va &= ~((1<<ps)-1);
@@ -167 +161 @@
         case 7: /*cnt 16384-65535*/
         case 8: /*cnt 65536-(256K-1)*/
-                /*cnt=((cnt-1)/16384)+1;*/
                 ps = PAGE_WIDTH+14;
                 va &= ~((1<<ps)-1);
                 break;
         default:
-                /*cnt=((cnt-1)/(16384*16))+1;*/
                 ps=PAGE_WIDTH+18;
                 va&=~((1<<ps)-1);
                 break;
         }
-        /*cnt+=(page!=va);*/
         for(; va<(page+cnt*(PAGE_SIZE)); va += (1<<ps)) {
                 asm volatile (
@@ -503 +494 @@
                         uint64_t io_page=(va &  ((1<<IO_PAGE_WIDTH)-1)) >> (USPACE_IO_PAGE_WIDTH);
                         if(is_io_page_accessible(io_page)){
-                                //printf("Insert %llX\n",va);
-
                                 uint64_t page,frame;
 
@@ -522 +511 @@
                                 entry.pl = PL_USER;
                                 entry.ar = AR_READ | AR_WRITE;
-                                entry.ppn = frame >> PPN_SHIFT;    //MUSIM spocitat frame
+                                entry.ppn = frame >> PPN_SHIFT;
                                 entry.ps = USPACE_IO_PAGE_WIDTH;
         
-                                dtc_mapping_insert(page, TASK->as->asid, entry); //Musim zjistit ASID
+                                dtc_mapping_insert(page, TASK->as->asid, entry);
                                 return 1;
                         }else {