Mps: properly fix mps_arena_has_addr for configura

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

3 files changed, 51 insertions, 13 deletions

diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index e3c05b740b8..bac9c888113 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -33,7 +33,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu
      mpsicv.exe lockutw3.exe lockcov.exe poolncv.exe locv.exe qs.exe apss.exe \
      finalcv.exe finaltest.exe arenacv.exe bttest.exe teletest.exe protcv.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
-     locbwcss.exe locusss.exe \
+     walkt0.exe locbwcss.exe locusss.exe \
      replay.exe replaysw.exe eventcnv.exe \
      mmdw.lib mmsw.lib mps.lib mpsplan.lib:
 !IFDEF VARIETY
@@ -224,6 +224,10 @@ $(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \
         $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
         $(TESTLIBOBJ)
 
+$(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \
+        $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \
+        $(TESTLIBOBJ)   
+
 $(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ)
         $(ECHO) $@
         $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
diff --git a/mps/code/global.c b/mps/code/global.c
index 051ba680480..0a209dee8b5 100644
--- a/mps/code/global.c
+++ b/mps/code/global.c
@@ -37,8 +37,8 @@ static Bool arenaRingInit = FALSE;
 static RingStruct arenaRing;       /* <design/arena/#static.ring> */
 
 /* forward declarations */
-void arenaEnterLock(Arena, void (*)(Lock));
-void arenaLeaveLock(Arena, void (*)(Lock));
+void arenaEnterLock(Arena, int);
+void arenaLeaveLock(Arena, int);
 
 /* ArenaControlPool -- get the control pool */
 
@@ -424,21 +424,33 @@ void (ArenaEnter)(Arena arena)
 #else
 void ArenaEnter(Arena arena)
 {
-  arenaEnterLock(arena, LockClaim);
+  arenaEnterLock(arena, 0);
 }
 #endif
 
-void arenaEnterLock(Arena arena, void (*lock)(Lock))
+void arenaEnterLock(Arena arena, int recursive)
 {
+  Lock lock;
+
   /* This check is safe to do outside the lock.  Unless the client
      is also calling ArenaDestroy, but that's a protocol violation by
      the client if so. */
   AVER(CHECKT(Arena, arena));
 
   StackProbe(StackProbeDEPTH);
-  lock(ArenaGlobals(arena)->lock);
+  lock = ArenaGlobals(arena)->lock;
+  if(recursive) {
+        LockClaimRecursive(lock);
+  } else {
+        LockClaim(lock);
+  }
   AVERT(Arena, arena); /* can't AVER it until we've got the lock */
-  ShieldEnter(arena);
+  if(recursive) {
+        /* already in shield */
+  } else {
+        ShieldEnter(arena);
+  }
+  return;
 }
 
 /* Same as ArenaEnter, but for the few functions that need to be
@@ -447,7 +459,7 @@ void arenaEnterLock(Arena arena, void (*lock)(Lock))
 
 void ArenaEnterRecursive(Arena arena)
 {
-  arenaEnterLock(arena, LockClaimRecursive);
+  arenaEnterLock(arena, 1);
 }
 
 /* ArenaLeave -- leave the state where you can look at MPM data structures */
@@ -461,21 +473,35 @@ void (ArenaLeave)(Arena arena)
 #else
 void ArenaLeave(Arena arena)
 {
-  arenaLeaveLock(arena, LockReleaseMPM);
+  arenaLeaveLock(arena, 0);
 }
 #endif
 
-void arenaLeaveLock(Arena arena, void (*unlock)(Lock))
+void arenaLeaveLock(Arena arena, int recursive)
 {
+  Lock lock;
+
   AVERT(Arena, arena);
-  ShieldLeave(arena);
+
+  lock = ArenaGlobals(arena)->lock;
+
+  if(recursive) {
+        /* no need to leave shield */
+  } else {
+    ShieldLeave(arena);
+  }
   ProtSync(arena);              /* <design/prot/#if.sync> */
-  unlock(ArenaGlobals(arena)->lock);
+  if(recursive) {
+    LockReleaseRecursive(lock);
+  } else {
+        LockReleaseMPM(lock);
+  }
+  return;
 }
 
 void ArenaLeaveRecursive(Arena arena)
 {
-  arenaLeaveLock(arena, LockReleaseRecursive);
+  arenaLeaveLock(arena, 1);
 }
 
 /* mps_exception_info -- pointer to exception info
diff --git a/mps/code/walkt0.c b/mps/code/walkt0.c
index 5009c1590f5..f11379dec77 100644
--- a/mps/code/walkt0.c
+++ b/mps/code/walkt0.c
@@ -81,6 +81,11 @@ static void stepper(mps_addr_t object, mps_fmt_t format,
 {
     mps_arena_t arena = p;
 
+    UNUSED(format);
+    UNUSED(pool);
+    UNUSED(pool);
+    UNUSED(s);
+
     if(!mps_arena_has_addr(arena, object)) {
       printf("Stepper got called with object at address %p,\n"
        "which is not managed by the arena!\n", (void *)object);
@@ -155,6 +160,9 @@ int main(int argc, char **argv)
     mps_thr_t thread;
     void *r;
 
+    UNUSED(argc);
+    UNUSED(argv);
+
     die(mps_arena_create(&arena, mps_arena_class_vm(),
                          testArenaSIZE),
         "arena_create");