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

clean code

Browse Source
This commit is contained in:
Laurent Vivier 2004-03-06 00:25:37 +00:00
parent 1f262e1f13
commit 873dec41fc
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
second/MMU040.c
View File

@ -91,10 +91,9 @@ static int isTTSegment(unsigned long addr)
int MMU040_logical2physicalAttr(unsigned long logicalAddr, unsigned long *physicalAddr, unsigned long *attr) int MMU040_logical2physicalAttr(unsigned long logicalAddr, unsigned long *physicalAddr, unsigned long *attr)
{ {
int rootIndex;
int ptrIndex;
int pageIndex;
unsigned long TC; unsigned long TC;
int rootIndex, ptrIndex, pageIndex;
unsigned long pageOffst;
unsigned long rootTable, ptrTable, pageTable; unsigned long rootTable, ptrTable, pageTable;
unsigned long rootEntry, tableEntry, pageEntry; unsigned long rootEntry, tableEntry, pageEntry;
@ -110,17 +109,10 @@ int MMU040_logical2physicalAttr(unsigned long logicalAddr, unsigned long *physic
return 0; return 0;
} }
rootIndex = (logicalAddr & 0xFE000000) >> 25;
ptrIndex = (logicalAddr & 0x01FC0000) >> 18;
pageIndex = IS_8K_PAGE(TC) ? (logicalAddr & 0x0003E000) >> 13 :
(logicalAddr & 0x0003F000) >> 12;
TRACE("root idx: %d ptr idx: %d page idx: %d\n", rootIndex, ptrIndex,
pageIndex);
MMU040_get_SRP(&rootTable); MMU040_get_SRP(&rootTable);
TRACE("SRP: %ld\n", rootTable); TRACE("SRP: %ld\n", rootTable);
rootIndex = (logicalAddr & 0xFE000000) >> 25;
rootEntry = MMU040_read_phys(rootTable + 4 * rootIndex); rootEntry = MMU040_read_phys(rootTable + 4 * rootIndex);
TRACE("Root Entry: %08lx\n", rootEntry); TRACE("Root Entry: %08lx\n", rootEntry);
@ -130,6 +122,7 @@ int MMU040_logical2physicalAttr(unsigned long logicalAddr, unsigned long *physic
} }
ptrTable = GET_RP_ADDR(rootEntry); ptrTable = GET_RP_ADDR(rootEntry);
ptrIndex = (logicalAddr & 0x01FC0000) >> 18;
tableEntry = MMU040_read_phys(ptrTable + 4 * ptrIndex); tableEntry = MMU040_read_phys(ptrTable + 4 * ptrIndex);
TRACE("table Entry: %08lx\n", tableEntry); TRACE("table Entry: %08lx\n", tableEntry);
@ -138,15 +131,28 @@ int MMU040_logical2physicalAttr(unsigned long logicalAddr, unsigned long *physic
return -1; return -1;
} }
pageTable = ( IS_8K_PAGE(TC) ? GET_TD_8K_ADDR(tableEntry) :
GET_TD_4K_ADDR(tableEntry) );
pageEntry = MMU040_read_phys(pageTable + 4 * pageIndex);
if (IS_8K_PAGE(TC)) if (IS_8K_PAGE(TC))
*physicalAddr = pageEntry & 0xFFFFE000; {
pageTable = GET_TD_8K_ADDR(tableEntry);
pageIndex = (logicalAddr & 0x0003E000) >> 13;
pageEntry = MMU040_read_phys(pageTable + 4 * pageIndex);
pageOffst = logicalAddr & 0x00001FFF;
*physicalAddr = (pageEntry & 0xFFFFE000) + pageOffst;
}
else else
*physicalAddr = pageEntry & 0xFFFFF000; {
pageTable = GET_TD_4K_ADDR(tableEntry);
pageIndex = (logicalAddr & 0x0003F000) >> 12;
pageEntry = MMU040_read_phys(pageTable + 4 * pageIndex);
pageOffst = logicalAddr & 0x00000FFF;
*physicalAddr = (pageEntry & 0xFFFFF000) + pageOffst;
}
*attr = pageEntry & 0x000004FF; *attr = pageEntry & 0x000004FF;