[eros-cvs] cvs commit: eros/src/base/domain/spacebank primebank.map spacebank.h

[shap@eros.cs.jhu.edu]

shap        01/07/06 14:20:59

  Modified:    src/base/domain/spacebank primebank.map spacebank.h
  Log:
  Tmp keys really should not overlap, huh?

Revision  Changes    Path
1.35      +2 -6      eros/src/base/domain/spacebank/primebank.map

Index: primebank.map
===================================================================
RCS file: /cvs/eros/src/base/domain/spacebank/primebank.map,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- primebank.map	2001/07/06 17:38:25	1.34
+++ primebank.map	2001/07/06 18:20:59	1.35
@@ -72,22 +72,18 @@
 
 spacebank brand = start spacebank 65535;
 
-/* constituants node */
-prime_constit = new node;
-prime_constit[0] = misc ProcessTool;
+CONSTIT(spacebank, KC_DOMTOOL, 0) = misc ProcessTool;
 
 /* Note that this layout violates the constructor logic's expectation,
    which is okay, because space banks are not built by constructors. */
-spacebank key reg  1 = prime_constit;
-hide prime_constit;
 
 spacebank key reg  2 = spacebank; /* domain key to spacebank */
-spacebank key reg  3 = misc Console;
 
 spacebank key reg 10 = prime range;   /* superrange */
 spacebank key reg 11 = misc Returner; /* returner   */
 
 spacebank key reg 17 = volsize;
+spacebank key reg 21 = misc Console;
 hide volsize; /* for my eyes only */
 
 run spacebank;



1.22      +4 -4      eros/src/base/domain/spacebank/spacebank.h

Index: spacebank.h
===================================================================
RCS file: /cvs/eros/src/base/domain/spacebank/spacebank.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- spacebank.h	2001/07/06 17:38:25	1.21
+++ spacebank.h	2001/07/06 18:20:59	1.22
@@ -55,8 +55,6 @@
 #define  KC_DOMTOOL      0      /* Domain tool -- for validating
 				   spacebank keys. */
 
-#define KR_OSTREAM     3        /* only used for debugging */
-
 #define KR_NU5         5
 
 #define KR_WALK0       8        /* reserved for internal use by malloc */
@@ -72,8 +70,10 @@
 
 #define KR_VOLSIZE    17
 #define KR_TMP        18
-#define KR_TMP2       18
-#define KR_TMP3       19
+#define KR_TMP2       19
+#define KR_TMP3       20
+#define KR_OSTREAM    21        /* only used for debugging */
+
 
 /* NOTE: On startup, KR_ARG0 holds a node key to the prime space bank
    key's node. */