diff --git a/kernel/src/glue/v4-powerpc/space-swtlb.cc b/kernel/src/glue/v4-powerpc/space-swtlb.cc index 4bb43c3c..59257419 100644 --- a/kernel/src/glue/v4-powerpc/space-swtlb.cc +++ b/kernel/src/glue/v4-powerpc/space-swtlb.cc @@ -127,9 +127,9 @@ void SECTION(".init.memory") space_t::init_kernel_mappings() //initialize translation table for (i=0; i < TRANSLATION_TABLE_ENTRIES; ++i) { - transTable[i].s0addr = 0; - transTable[i].physaddr = 0; - transTable[i].size = 0; + transtable[i].s0addr = 0; + transtable[i].physaddr = 0; + transtable[i].size = 0; } } @@ -366,9 +366,9 @@ paddr_t space_t::sigma0_translate(addr_t addr, pgent_t::pgsize_e size) word_t i; paddr_t paddr = (paddr_t)addr; for (i = 0; i < TRANSLATION_TABLE_ENTRIES; ++i) { - if ((transTable[i].size > 0) && ((word_t)addr >= transTable[i].s0addr) && ((word_t)addr <= transTable[i].s0addr + transTable[i].size - 1)) { - paddr = transTable[i].physaddr + (word_t)addr_offset(addr, -transTable[i].s0addr); - transTable[i].size = 0; + if ((transtable[i].size > 0) && ((word_t)addr >= transtable[i].s0addr) && ((word_t)addr <= transtable[i].s0addr + transtable[i].size - 1)) { + paddr = transtable[i].physaddr + (word_t)addr_offset(addr, -transtable[i].s0addr); + transtable[i].size = 0; break; } } diff --git a/kernel/src/glue/v4-powerpc/space.cc b/kernel/src/glue/v4-powerpc/space.cc index 8e907f58..79f8ff7f 100644 --- a/kernel/src/glue/v4-powerpc/space.cc +++ b/kernel/src/glue/v4-powerpc/space.cc @@ -58,7 +58,7 @@ EXTERN_KMEM_GROUP(kmem_space); space_t *kernel_space = NULL; //translation table -struct transTable_t transTable[TRANSLATION_TABLE_ENTRIES]; +struct transtable_t transtable[TRANSLATION_TABLE_ENTRIES]; void space_t::allocate_tcb(addr_t addr) { @@ -321,15 +321,15 @@ word_t space_t::space_control (word_t ctrl, fpage_t kip_area, fpage_t utcb_area, #endif if (ctrl & (1 << 29)) { for (i = 0; i < TRANSLATION_TABLE_ENTRIES; ++i) { - if (transTable[i].size > 0) + if (transtable[i].size > 0) continue; oldctrl |= 1 << 29; physaddr = redirector_tid.get_raw(); physaddr <<= 32; physaddr |= utcb_area.raw; - transTable[i].physaddr = physaddr; - transTable[i].s0addr = kip_area.mem.x.base << 10; - transTable[i].size = 1UL << kip_area.mem.x.size; + transtable[i].physaddr = physaddr; + transtable[i].s0addr = kip_area.mem.x.base << 10; + transtable[i].size = 1UL << kip_area.mem.x.size; break; } } diff --git a/kernel/src/glue/v4-powerpc/space.h b/kernel/src/glue/v4-powerpc/space.h index 6f559489..8dbe4226 100644 --- a/kernel/src/glue/v4-powerpc/space.h +++ b/kernel/src/glue/v4-powerpc/space.h @@ -57,11 +57,11 @@ //translation table (actual declaration in space.cc) #define TRANSLATION_TABLE_ENTRIES 32 -extern struct transTable_t { +extern struct transtable_t { word_t s0addr; paddr_t physaddr; word_t size; -} transTable[TRANSLATION_TABLE_ENTRIES]; +} transtable[TRANSLATION_TABLE_ENTRIES]; class utcb_t; class tcb_t;