Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-22 10:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Add logical address in bank information

Browse Source
This commit is contained in:
Laurent Vivier 2004-02-17 22:52:33 +00:00
parent 3719ad81de
commit 6e77d82535
4 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
second/bootinfo.c
View File

@ -323,7 +323,7 @@ void bootinfo_init()
for (i = 0; i < memory_map.bank_number; i++)
{
boot_info.memory[i].addr = memory_map.bank[i].address;
boot_info.memory[i].addr = memory_map.bank[i].physAddr;
boot_info.memory[i].size = memory_map.bank[i].size;
}
boot_info.num_memory = i;

17
second/main.c
View File

@ -7,6 +7,8 @@
#include <stdio.h>
#include <malloc.h>
#include "lowmem.h"
#include "MMU.h"
#include "memory.h"
#include "uncompress.h"
#include "bootinfo.h"
@ -26,6 +28,7 @@ int main(int argc, char** argv)
char* kernel_image_start = &_kernel_start;
unsigned long kernel_image_size = &_kernel_end - &_kernel_start;
unsigned long kernel_size = (unsigned long)&_KERNEL_SIZE;
unsigned long physEntry;
int i;
printf("Early Macintosh Image LoadEr\n");
@ -35,15 +38,16 @@ int main(int argc, char** argv)
printf("Kernel image found at %p\n", kernel_image_start);
printf("Kernel image size is %ld Bytes\n", kernel_image_size);
printf("Available Memory: %ld KB\n", MemTop / 1024);
printf("Physical memory map:\n");
for (i = 0; i < memory_map.bank_number; i++)
{
printf("%d: 0x%08lx -> 0x%08lx\n", i,
memory_map.bank[i].address,
memory_map.bank[i].address + memory_map.bank[i].size);
printf("%d: 0x%08lx -> 0x%08lx mapped to 0x%08lx\n", i,
memory_map.bank[i].physAddr,
memory_map.bank[i].physAddr + memory_map.bank[i].size,
memory_map.bank[i].logiAddr);
}
while(1);
if (kernel_image_size != 0)
{
/* add KERNEL_ALIGN if we have to align
@ -70,9 +74,12 @@ while(1);
printf("\nOk, booting the kernel.\n");
logical2physical((unsigned long)kernel, &physEntry);
printf("Physical address of kernel is 0x%08lx\n", physEntry);
set_kernel_bootinfo(kernel + kernel_size);
enter_kernel(kernel, kernel_size + BI_ALLOC_SIZE);
enter_kernel((unsigned char*)physEntry, kernel_size + BI_ALLOC_SIZE);
return 0;
}

46
second/memory.c
View File

@ -12,10 +12,17 @@
#include "memory.h"
#include "lowmem.h"
extern unsigned long _start;
/* Memory Allocation information */
#define MAX_MEMORY_AREA 4096
typedef struct memory_area {
unsigned long address;
unsigned long size;
} memory_area_t;
typedef struct memory_pool {
memory_area_t area[MAX_MEMORY_AREA];
unsigned long area_number;
@ -169,9 +176,9 @@ void memory_init()
get_memory_map(&memory_map);
/* we put memory pool array at end of Memory */
/* we put memory pool array just before us */
pool = (memory_pool_t*) (MemTop - sizeof(memory_pool_t));
pool = (memory_pool_t*) (&_start - sizeof(memory_pool_t));
pool->area_number = 0;
@ -222,18 +229,19 @@ void free(void *ptr)
memory_add((unsigned long)ptr, (unsigned long)ptr + *(unsigned long*)ptr);
}
static void bank_add_mem(memory_map_t* map, unsigned long addr, unsigned long size)
static void bank_add_mem(memory_map_t* map, unsigned long logiAddr,
unsigned long physAddr, unsigned long size)
{
int i;
int j;
for (i = 0; i < map->bank_number; i++)
{
if ( (map->bank[i].address <= addr) &&
(addr < map->bank[i].address + map->bank[i].size) )
if ( (map->bank[i].physAddr <= physAddr) &&
(physAddr < map->bank[i].physAddr + map->bank[i].size) )
return; /* several logical address to one physical */
if (map->bank[i].address + map->bank[i].size == addr)
if (map->bank[i].physAddr + map->bank[i].size == physAddr)
{
map->bank[i].size += size;
@ -241,14 +249,15 @@ static void bank_add_mem(memory_map_t* map, unsigned long addr, unsigned long si
for (j = 0; j < map->bank_number; j++)
{
if (map->bank[i].address + map->bank[i].size == map->bank[j].address)
if (map->bank[i].physAddr + map->bank[i].size == map->bank[j].physAddr)
{
map->bank[i].size += map->bank[j].size;
/* remove bank */
map->bank_number--;
map->bank[j].address = map->bank[map->bank_number].address;
map->bank[j].physAddr = map->bank[map->bank_number].physAddr;
map->bank[j].logiAddr = map->bank[map->bank_number].logiAddr;
map->bank[j].size = map->bank[map->bank_number].size;
return;
}
@ -256,9 +265,10 @@ static void bank_add_mem(memory_map_t* map, unsigned long addr, unsigned long si
return;
}
else if (addr + size == map->bank[i].address)
else if (physAddr + size == map->bank[i].physAddr)
{
map->bank[i].address = addr;
map->bank[i].physAddr = physAddr;
map->bank[i].logiAddr = logiAddr;
map->bank[i].size += size;
return;
@ -270,7 +280,8 @@ static void bank_add_mem(memory_map_t* map, unsigned long addr, unsigned long si
if (map->bank_number >= MAX_MEM_MAP_SIZE)
return;
map->bank[map->bank_number].address = addr;
map->bank[map->bank_number].physAddr = physAddr;
map->bank[map->bank_number].logiAddr = logiAddr;
map->bank[map->bank_number].size = size;
map->bank_number++;
}
@ -281,12 +292,23 @@ void get_memory_map(memory_map_t* map)
unsigned long physical;
int ps = get_page_size();
#ifdef DUMP_MEMMAP
for (logical = 0; logical < MemTop ; logical += ps)
{
printf("%08lx->", logical);
if (logical2physical(logical, &physical) == 0)
printf("%08lx ", physical);
else
printf("INVALID! ");
}
while(1);
#endif
map->bank_number = 0;
for (logical = 0; logical < MemTop; logical += ps)
{
if (logical2physical(logical, &physical) == 0)
{
bank_add_mem(map, physical, ps);
bank_add_mem(map, logical, physical, ps);
}
}
}

10
second/memory.h
View File

@ -11,15 +11,17 @@
#define MAX_MEM_MAP_SIZE 26
typedef struct memory_area {
unsigned long address;
typedef struct memory_bank {
unsigned long physAddr;
unsigned long logiAddr;
unsigned long size;
} memory_area_t;
} memory_bank_t;
typedef struct memory_map {
memory_area_t bank[MAX_MEM_MAP_SIZE];
memory_bank_t bank[MAX_MEM_MAP_SIZE];
unsigned long bank_number;
} memory_map_t;
extern memory_map_t memory_map;
extern void get_memory_map(memory_map_t* map);