misc fixes

637baf23 · Nickolai Zeldovich · ab119414 · 637baf23 · 637baf23 · 637baf23
--- a/crange.hh
+++ b/crange.hh
@@ -172,7 +172,7 @@ struct crange_locked {
  crange_locked(crange_locked &&x);
  ~crange_locked();
-  range_iterator begin() const { return range_iterator(first_); };
+  range_iterator begin() const { return range_iterator(first_ ?: succ_); };
  range_iterator end() const { return range_iterator(succ_); };
  void replace(range *r);
 };

--- a/hwvm.cc
+++ b/hwvm.cc
@@ -218,13 +218,13 @@ tlbflush()
 {
  u64 myreq = tlbflush_req++;
-  cli();
+  pushcli();
  int myid = mycpu()->id;
  lcr3(rcr3());
  for (int i = 0; i < ncpu; i++)
    if (i != myid)
      lapic_tlbflush(i);
-  sti();
+  popcli();
  for (int i = 0; i < ncpu; i++)
    if (i != myid)

--- a/vm.cc
+++ b/vm.cc
@@ -269,8 +269,8 @@ vmap::insert(vmnode *n, uptr vma_start)
  u64 len = n->npages * PGSIZE;
  auto span = cr.search_lock(vma_start, len);
-  for (auto x __attribute__((unused)): span) {
+  for (auto e: span) {
-    cprintf("vmap::insert: overlap\n");
+    cprintf("vmap::insert: overlap 0x%lx @ 0x%lx\n", e->size, e->key);
    return -1;
  }
@@ -297,8 +297,8 @@ vmap::remove(uptr vma_start, uptr len)
  uptr vma_end = vma_start + len;
  auto span = cr.search_lock(vma_start, len);
-  for (auto x: span) {
+  for (auto e: span) {
-    if (x->key < vma_start || x->key + x->size > vma_end) {
+    if (e->key < vma_start || e->key + e->size > vma_end) {
      cprintf("vmap::remove: partial unmap not supported\n");
      return -1;
    }