[eros-cvs] cvs commit: eros/src/base/sys/libkey lk_rng_first_subrange.c

[shap@eros.cs.jhu.edu]

shap        01/07/02 16:34:04

  Modified:    src/base/sys/kernel kern_PhysPageSource.cxx
               src/base/sys/key pk_RangeKey.cxx
               src/base/sys/libkey lk_rng_first_subrange.c
  Log:
  Find first subrange now should work for phys ranges

Revision  Changes    Path
1.2       +2 -2      eros/src/base/sys/kernel/kern_PhysPageSource.cxx

Index: kern_PhysPageSource.cxx
===================================================================
RCS file: /cvs/eros/src/base/sys/kernel/kern_PhysPageSource.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kern_PhysPageSource.cxx	2001/06/10 19:41:50	1.1
+++ kern_PhysPageSource.cxx	2001/07/02 20:34:04	1.2
@@ -67,8 +67,8 @@
  */
 PhysPageSource::PhysPageSource(PmemInfo *argPmi)
   : ObjectSource("physpage", 
-		 OID_RESERVED_PHYSRANGE + (argPmi->base * EROS_OBJECTS_PER_FRAME),
-		 OID_RESERVED_PHYSRANGE + (argPmi->bound * EROS_OBJECTS_PER_FRAME))
+		 OID_RESERVED_PHYSRANGE + ((argPmi->base / EROS_PAGE_SIZE) * EROS_OBJECTS_PER_FRAME),
+		 OID_RESERVED_PHYSRANGE + ((argPmi->bound / EROS_PAGE_SIZE) * EROS_OBJECTS_PER_FRAME))
 {
   pmi = argPmi;
 }



1.52      +0 -5      eros/src/base/sys/key/pk_RangeKey.cxx

Index: pk_RangeKey.cxx
===================================================================
RCS file: /cvs/eros/src/base/sys/key/pk_RangeKey.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- pk_RangeKey.cxx	2001/07/02 18:53:43	1.51
+++ pk_RangeKey.cxx	2001/07/02 20:34:04	1.52
@@ -136,11 +136,6 @@
       if (range >= (uint64_t) UINT32_MAX)
 	range = UINT32_MAX;
 
-      assert((range % EROS_PAGE_SIZE) == 0);
-      range /= EROS_PAGE_SIZE;
-
-      range *= EROS_OBJECTS_PER_FRAME;
-
       inv.exit.w1 = subStart;
       inv.exit.w2 = (fixreg_t) (subStart >> 32);
       inv.exit.w3 = range;



1.4       +2 -2      eros/src/base/sys/libkey/lk_rng_first_subrange.c

Index: lk_rng_first_subrange.c
===================================================================
RCS file: /cvs/eros/src/base/sys/libkey/lk_rng_first_subrange.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lk_rng_first_subrange.c	2001/07/02 18:35:35	1.3
+++ lk_rng_first_subrange.c	2001/07/02 20:34:04	1.4
@@ -49,12 +49,12 @@
   
   result = CALL(&msg);
 
-  if (*offset) {
+  if (offset) {
     *offset = msg.rcv_w2;
     *offset <<= 32;
     *offset |= (uint64_t) msg.rcv_w1;
   }
-  if (*len)
+  if (len)
     *len = msg.rcv_w3;
 
   return result;