make VERIFYFREE work again, fix crange nit

64d15277 · Nickolai Zeldovich · 76e79edd · 64d15277 · 64d15277 · 64d15277
--- a/kernel/crange.cc
+++ b/kernel/crange.cc
@@ -91,6 +91,7 @@ range::~range()
  for (int l = 0; l < nlevel; l++) {
    next[l] = (struct range *) 0xDEADBEEF;
  }
+  destroylock(lock);
  kmalignfree(lock, CACHELINE, sizeof(struct spinlock));
  delete[] next;
 }

--- a/kernel/kalloc.cc
+++ b/kernel/kalloc.cc
@@ -296,12 +296,10 @@ verifyfree(char *ptr, u64 nbytes)
    // Search for pointers in the ptr region
    u64 x = *(uptr *)p;
    if (KBASE < x && x < KBASE+(128ull<<30)) {
-#if 0   /* maybe once this code is C++ */
      struct klockstat *kls = (struct klockstat *) x;
      if (kls->magic == LOCKSTAT_MAGIC)
        panic("LOCKSTAT_MAGIC %p(%lu):%p->%p", 
              ptr, nbytes, p, kls);
-#endif
    }
  }
 #endif

--- a/user/crange_arch.hh
+++ b/user/crange_arch.hh
@@ -55,6 +55,11 @@ initlock(spinlock *s, const char *m, int lockstat)
 }

 static inline void
+destroylock(spinlock *s)
+{
+}
+
+static inline void
 cv_wakeup(condvar *c)
 {
  pthread_cond_signal(&c->cv);