| 810,14 → 810,19 |
|---|
| if (confframe >= start && confframe < start+count) { |
| for (;confframe < start+count;confframe++) { |
| addr = PFN2ADDR(confframe); |
| if (overlaps(addr, PFN2ADDR(confcount), |
| KA2PA(config.base),config.kernel_size)) |
| if (overlaps(addr, PFN2ADDR(confcount), KA2PA(config.base), config.kernel_size)) |
| continue; |
| if (config.init_addr) |
| if (overlaps(addr,PFN2ADDR(confcount), |
| KA2PA(config.init_addr), |
| config.init_size)) |
| |
| bool overlap = false; |
| count_t i; |
| for (i = 0; i < init.cnt; i++) |
| if (overlaps(addr, PFN2ADDR(confcount), KA2PA(init.tasks[i].addr), init.tasks[i].size)) { |
| overlap = true; |
| break; |
| } |
| if (overlap) |
| continue; |
| |
| break; |
| } |
| if (confframe >= start+count) |
| 989,9 → 994,10 |
|---|
| pfn_t firstframe = ADDR2PFN(KA2PA(config.base)); |
| pfn_t lastframe = ADDR2PFN(KA2PA(config.base+config.kernel_size)); |
| frame_mark_unavailable(firstframe,lastframe-firstframe+1); |
| if (config.init_size > 0) |
| frame_mark_unavailable(ADDR2PFN(KA2PA(config.init_addr)), |
| SIZE2FRAMES(config.init_size)); |
| |
| count_t i; |
| for (i = 0; i < init.cnt; i++) |
| frame_mark_unavailable(ADDR2PFN(KA2PA(init.tasks[i].addr)), SIZE2FRAMES(init.tasks[i].size)); |
| } |
| } |
| |