mps br/vmem: simple-chunk-return:

tract.c -- fix more ChunkCache defects:
  - drop never-read chunkCache->pageTableBase and pageTableLimit fields: they were used for ChunkOfSeg(), back when each SegStruct was actually a PageStruct is some chunk's PageStructTable; see VMArenaChunkOfSeg() in //info.ravenbrook.com/project/mps/branch/2001-08-13/trunk/src/arenavm.chttps://github.com/Ravenbrook/mps/issues/46
  - there's no need for arena to initialise the chunk cache; this allows en/decache functions to be local to tract.c (ie. declared static)

Copied from Perforce
 Change: 170083
 ServerID: perforce.ravenbrook.com

4 files changed, 1 insertions, 9 deletions

diff --git a/mps/code/arena.c b/mps/code/arena.c
index 24d1214b97d..21c1759d74a 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -223,9 +223,6 @@ Res ArenaCreateV(Arena *arenaReturn, ArenaClass class, va_list args)
     goto failStripeSize;
   }
 
-  /* load cache */
-  ChunkEncache(arena, arena->primary);
-
   res = ControlInit(arena);
   if (res != ResOK)
     goto failControlInit;
diff --git a/mps/code/mpmst.h b/mps/code/mpmst.h
index 3163d90d0e9..23409087808 100644
--- a/mps/code/mpmst.h
+++ b/mps/code/mpmst.h
@@ -546,8 +546,6 @@ typedef struct ChunkCacheEntryStruct {
   Chunk chunk;
   Addr base;
   Addr limit;
-  Page pageTableBase;
-  Page pageTableLimit;
 } ChunkCacheEntryStruct;
 
 
diff --git a/mps/code/tract.c b/mps/code/tract.c
index 2e254779e9d..c1e9838791f 100644
--- a/mps/code/tract.c
+++ b/mps/code/tract.c
@@ -296,7 +296,7 @@ void ChunkCacheEntryInit(ChunkCacheEntry entry)
 
 /* ChunkEncache -- cache a chunk */
 
-void ChunkEncache(Arena arena, Chunk chunk)
+static void ChunkEncache(Arena arena, Chunk chunk)
 {
   /* Critical path; called by ChunkOfAddr */
   AVERT_CRITICAL(Arena, arena);
@@ -312,8 +312,6 @@ void ChunkEncache(Arena arena, Chunk chunk)
   arena->chunkCache.chunk = chunk;
   arena->chunkCache.base = chunk->base;
   arena->chunkCache.limit = chunk->limit;
-  arena->chunkCache.pageTableBase = &chunk->pageTable[0];
-  arena->chunkCache.pageTableLimit = &chunk->pageTable[chunk->pages];
 
   AVERT_CRITICAL(ChunkCacheEntry, &arena->chunkCache);
   return;
diff --git a/mps/code/tract.h b/mps/code/tract.h
index c6ac2ae3bc8..794591f9f1b 100644
--- a/mps/code/tract.h
+++ b/mps/code/tract.h
@@ -164,7 +164,6 @@ extern void ChunkFinish(Chunk chunk);
 
 extern Bool ChunkCacheEntryCheck(ChunkCacheEntry entry);
 extern void ChunkCacheEntryInit(ChunkCacheEntry entry);
-extern void ChunkEncache(Arena arena, Chunk chunk);
 
 extern Bool ChunkOfAddr(Chunk *chunkReturn, Arena arena, Addr addr);