# HG changeset patch # User Paul Boddie # Date 1462392461 -7200 # Node ID dcf9647a9edceb7652c36373d4fe2ea4ac7afdfe # Parent 59eede5312e3e83c144f43ecd95ecb4d8a9afd94 Reordered function definitions. diff -r 59eede5312e3 -r dcf9647a9edc stage2/cpu.c --- a/stage2/cpu.c Wed May 04 22:04:37 2016 +0200 +++ b/stage2/cpu.c Wed May 04 22:07:41 2016 +0200 @@ -85,17 +85,6 @@ } } -void map_page_index(u32 virtual, u32 physical, u32 pagesize, u8 flags, u8 asid, u32 index) -{ - u32 start = (virtual & 0xffffe000) | asid; /* VPN2 | ASID*/ - u32 lower = ((physical & 0xfffff000) >> 6) | flags; - u32 upper = (((physical + pagesize) & 0xfffff000) >> 6) | flags; - u32 pagemask = ((pagesize - 1) & 0xfffff000) << 1; - - map_page_set_index(index); - map_page_index_op(lower, upper, start, pagemask); -} - void init_page_table(u32 page_table, u32 virtual, u32 physical, u32 pagesize, u8 flags, u8 asid) { u32 lower = ((physical & 0xfffff000) >> 6) | flags; @@ -153,3 +142,14 @@ map_page_op(lower, upper, start, pagemask); } + +void map_page_index(u32 virtual, u32 physical, u32 pagesize, u8 flags, u8 asid, u32 index) +{ + u32 start = (virtual & 0xffffe000) | asid; /* VPN2 | ASID*/ + u32 lower = ((physical & 0xfffff000) >> 6) | flags; + u32 upper = (((physical + pagesize) & 0xfffff000) >> 6) | flags; + u32 pagemask = ((pagesize - 1) & 0xfffff000) << 1; + + map_page_set_index(index); + map_page_index_op(lower, upper, start, pagemask); +} diff -r 59eede5312e3 -r dcf9647a9edc stage2/cpu.h --- a/stage2/cpu.h Wed May 04 22:04:37 2016 +0200 +++ b/stage2/cpu.h Wed May 04 22:07:41 2016 +0200 @@ -6,8 +6,8 @@ void flush_cache_all(); void init_registers(u32 *, u32, void (*)(), u32[], u8); void init_tlb(); +void init_page_table(u32, u32, u32, u32, u8, u8); void map_page(u32, u32, u32, u8, u8); -void init_page_table(u32, u32, u32, u32, u8, u8); void map_page_index(u32, u32, u32, u8, u8, u32); #endif /* __CPU_H__ */