[eros-cvs] cvs commit: eros/src/base/domain/vcsk .cvsignore Makefile vcs.map
shap@eros.cs.jhu.edu
shap@eros.cs.jhu.edu
Fri, 6 Jul 2001 17:14:13 -0400
shap 01/07/06 17:14:13
Modified: src/base/domain/constructor metacon.map
src/base/domain/directory .cvsignore Makefile directory.c
directory.map
src/base/domain/evtqueue .cvsignore Makefile evtqueue.c
evtqueue.map
src/base/domain/file .cvsignore Makefile file.c file.map
src/base/domain/keyset .cvsignore Makefile keyset.c keyset.h
keyset.map
src/base/domain/linedisc .cvsignore Makefile linedisc.c
linedisc.map linedisc_buddy.c
src/base/domain/nfile .cvsignore Makefile nfile.c nfile.map
src/base/domain/pipe .cvsignore Makefile pipe.c pipe.map
src/base/domain/sigmux .cvsignore Makefile sigmux.c
sigmux.map
src/base/domain/supernode .cvsignore Makefile supernode.c
supernode.map
src/base/domain/vcsk .cvsignore Makefile vcs.map
Log:
Hack to autogenerate the KC_ values for constituent slots so that we
don't get drift between what the image map file things and the process
thinks the constant values should be.
Revision Changes Path
1.22 +1 -1 eros/src/base/domain/constructor/metacon.map
Index: metacon.map
===================================================================
RCS file: /cvs/eros/src/base/domain/constructor/metacon.map,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- metacon.map 2001/07/06 20:08:11 1.21
+++ metacon.map 2001/07/06 21:14:11 1.22
@@ -145,7 +145,7 @@
All of this stuff needs to be revisited in light of new,
larger nodes, but that is a project for another day... */
-#define PROD_CONSTIT(c_name, slot) c_name[ProcGenKeys][1][14][slot]
+#define PROD_CONSTIT(c_name, KCname, slot) c_name[ProcGenKeys][1][14][slot]
#define PROD_KPR(c_name) c_name[ProcGenKeys][1][15][0]
#define PROD_SPACE(c_name) c_name[ProcGenKeys][1][15][1]
#define PROD_SYM(c_name) c_name[ProcGenKeys][1][15][2]
1.3 +1 -0 eros/src/base/domain/directory/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/directory/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:29:42 1.2
+++ .cvsignore 2001/07/06 21:14:11 1.3
@@ -1,3 +1,4 @@
+constituents.h
directory
core
.*.m
1.20 +4 -0 eros/src/base/domain/directory/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/directory/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 2001/04/29 19:46:59 1.19
+++ Makefile 2001/07/06 21:14:11 1.20
@@ -23,6 +23,7 @@
EROS_SRC=../../..
CROSS_BUILD=yes
+GENERATED=constituents.h
include $(EROS_SRC)/build/lib/make/makevars.mk
@@ -30,10 +31,13 @@
OPTIM=-O
OBJECTS=directory.o libc.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=directory.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+
+directory.c: constituents.h
directory: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.31 +2 -7 eros/src/base/domain/directory/directory.c
Index: directory.c
===================================================================
RCS file: /cvs/eros/src/base/domain/directory/directory.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- directory.c 2001/05/24 04:37:54 1.30
+++ directory.c 2001/07/06 21:14:11 1.31
@@ -53,6 +53,7 @@
#include <domain/domdbg.h>
#include "libc.h"
+#include "constituents.h"
#define KR_CONSTIT 1
#define KR_SELF 2
@@ -65,12 +66,6 @@
#define KR_ARG0 28
#define KR_RESUME 31
-#define KC_RETURNER 1
-#define KC_ZSF 2 /* zero space factory */
-#define KC_PROTOSPC 3
-#define KC_OSTREAM 4
-#define KC_SNODEF 5 /* supernode constructor */
-
#define dbg_init 0x1
#define dbg_op 0x2
#define dbg_link 0x4
@@ -585,7 +580,7 @@
process_swap(KR_SELF, ProcAddrSpace, KR_ARG0, KR_VOID);
DEBUG(init) kdprintf(KR_OSTREAM, "DIR: post lobotomy\n", result);
- node_copy(KR_CONSTIT, KC_SNODEF, KR_SNODE);
+ node_copy(KR_CONSTIT, KC_SNODEC, KR_SNODE);
DEBUG(init) kdprintf(KR_OSTREAM, "DIR: buying supernode\n");
result = constructor_request(KR_SNODE, KR_BANK, KR_SCHED, KR_VOID, KR_SNODE);
DEBUG(init) kdprintf(KR_OSTREAM, "DIR: Got it. Result 0x%08x\n", result);
1.14 +5 -5 eros/src/base/domain/directory/directory.map
Index: directory.map
===================================================================
RCS file: /cvs/eros/src/base/domain/directory/directory.map,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- directory.map 2001/05/26 18:13:42 1.13
+++ directory.map 2001/07/06 21:14:12 1.14
@@ -35,10 +35,10 @@
PROD_SPACE(dir_c) = small program "/eros/domain/directory";
PROD_PC(dir_c) = symbol "/eros/domain/directory" _start;
-PROD_CONSTIT(dir_c, 1) = misc Returner;
-PROD_CONSTIT(dir_c, 2) = zsf;
-PROD_CONSTIT(dir_c, 3) = protospace;
-PROD_CONSTIT(dir_c, 4) = misc Console;
-PROD_CONSTIT(dir_c, 5) = snodec;
+PROD_CONSTIT(dir_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(dir_c, KC_ZSF, 2) = zsf;
+PROD_CONSTIT(dir_c, KC_PROTOSPC, 3) = protospace;
+PROD_CONSTIT(dir_c, KC_OSTREAM, 4) = misc Console;
+PROD_CONSTIT(dir_c, KC_SNODEC, 5) = snodec;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/evtqueue/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/evtqueue/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:29:46 1.2
+++ .cvsignore 2001/07/06 21:14:12 1.3
@@ -1,2 +1,3 @@
+constituents.h
evtqueue
.*.m
1.14 +4 -0 eros/src/base/domain/evtqueue/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/evtqueue/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 2001/04/29 19:46:59 1.13
+++ Makefile 2001/07/06 21:14:12 1.14
@@ -26,14 +26,18 @@
include $(EROS_SRC)/build/lib/make/makevars.mk
+GENERATED=constituents.h
TARGETS=evtqueue
OPTIM=-O
OBJECTS=evtqueue.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=evtqueue.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+
+evtqueue.c: constituents.h
evtqueue: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.15 +1 -4 eros/src/base/domain/evtqueue/evtqueue.c
Index: evtqueue.c
===================================================================
RCS file: /cvs/eros/src/base/domain/evtqueue/evtqueue.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- evtqueue.c 2001/05/24 04:37:54 1.14
+++ evtqueue.c 2001/07/06 21:14:12 1.15
@@ -30,6 +30,7 @@
#include <domain/EventQueueKey.h>
#include <domain/ProtoSpace.h>
+#include "constituents.h"
#define KR_VOID 0
#define KR_CONSTIT 1
@@ -48,10 +49,6 @@
#define KR_RETURNER 29
#define KR_SCRATCH 30
#define KR_RESUME 31
-
-#define KC_RETURNER 1
-#define KC_PROTOSPC 2
-#define KC_OSTREAM 3
#define KI_MASTER 128 /* key info of master start key */
1.11 +3 -3 eros/src/base/domain/evtqueue/evtqueue.map
Index: evtqueue.map
===================================================================
RCS file: /cvs/eros/src/base/domain/evtqueue/evtqueue.map,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- evtqueue.map 2001/05/26 18:13:42 1.10
+++ evtqueue.map 2001/07/06 21:14:12 1.11
@@ -33,9 +33,9 @@
PROD_SPACE(evtqueue_c) = small program "/eros/domain/evtqueue";
PROD_PC(evtqueue_c) = symbol "/eros/domain/evtqueue" _start;
-PROD_CONSTIT(evtqueue_c, 1) = misc Returner;
-PROD_CONSTIT(evtqueue_c, 2) = protospace;
-PROD_CONSTIT(evtqueue_c, 3) = misc Console;
+PROD_CONSTIT(evtqueue_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(evtqueue_c, KC_PROTOSPC, 2) = protospace;
+PROD_CONSTIT(evtqueue_c, KC_OSTREAM, 3) = misc Console;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/file/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/file/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:29:47 1.2
+++ .cvsignore 2001/07/06 21:14:12 1.3
@@ -1,2 +1,3 @@
+constituents.h
file
.*.m
1.22 +3 -1 eros/src/base/domain/file/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/file/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile 2001/04/29 19:46:59 1.21
+++ Makefile 2001/07/06 21:14:12 1.22
@@ -25,12 +25,13 @@
CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk
-
+GENERATED=constituents.h
TARGETS=file
OPTIM=-O
OBJECTS=file.o
CLEANLIST=
INC=-I$(EROS_ROOT)/include
+IMGMAP=file.map
include $(EROS_SRC)/build/lib/make/makerules.mk
@@ -42,6 +43,7 @@
all: $(TARGETS)
+file.c: constituents.h
file: file.o $(DOMLIB) $(DOMCRT0)
$(DOMLINK) $(DOMLINKOPT) -o file $(DOMCRT0) file.o $(DOMLIB)
1.44 +2 -4 eros/src/base/domain/file/file.c
Index: file.c
===================================================================
RCS file: /cvs/eros/src/base/domain/file/file.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- file.c 2001/05/29 06:16:36 1.43
+++ file.c 2001/07/06 21:14:12 1.44
@@ -57,6 +57,8 @@
#include <domain/ConstructorKey.h>
#include <domain/SpaceBankKey.h>
+#include "constituents.h"
+
#define KR_CONSTIT 1
#define KR_SELF 2
#define KR_BANK 4
@@ -68,10 +70,6 @@
#define KR_TMP 9
#define KR_TMP2 10
#define KR_OSTREAM 11
-
-#define KC_RETURNER 1
-#define KC_VCSF 2 /* VCS factory */
-#define KC_OSTREAM 3 /* diagnostic stream */
#define BG_WIN_BLSS 5 /* size of the bg windows */
1.16 +4 -3 eros/src/base/domain/file/file.map
Index: file.map
===================================================================
RCS file: /cvs/eros/src/base/domain/file/file.map,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- file.map 2001/05/26 18:13:42 1.15
+++ file.map 2001/07/06 21:14:12 1.16
@@ -29,8 +29,9 @@
PROD_SPACE(file_c) = small program "/eros/domain/file";
PROD_PC(file_c) = symbol "/eros/domain/file" _start;
-PROD_CONSTIT(file_c, 1) = misc Returner;
-PROD_CONSTIT(file_c, 2) = zsf;
-PROD_CONSTIT(file_c, 3) = misc Console;
+
+PROD_CONSTIT(file_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(file_c, KC_VCSF, 2) = zsf;
+PROD_CONSTIT(file_c, KC_OSTREAM, 3) = misc Console;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/keyset/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/keyset/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:29:51 1.2
+++ .cvsignore 2001/07/06 21:14:12 1.3
@@ -1,2 +1,3 @@
+constituents.h
keyset
.*.m
1.20 +4 -0 eros/src/base/domain/keyset/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/keyset/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 2001/04/29 19:46:59 1.19
+++ Makefile 2001/07/06 21:14:12 1.20
@@ -25,6 +25,7 @@
CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk
+GENERATED=constituents.h
TARGETS=keyset
CLEANLIST=keyset
OPTIM=-O
@@ -33,6 +34,7 @@
INC=-I$(EROS_ROOT)/include
DEFS=
CFLAGS=$(DEFS)
+IMGMAP=keyset.map
include $(EROS_SRC)/build/lib/make/makerules.mk
@@ -42,6 +44,8 @@
$(GPLUS) $(DEFS) $(INC) -c -o compare_$(EROS_TARGET).o ${EROS_TARGET}/compare.S
all: $(TARGETS)
+
+keyset.c: constituents.h
keyset: $(OBJECTS) $(DOMCRT0) $(DOMLIB) compare_$(EROS_TARGET).o
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) compare_$(EROS_TARGET).o $(DOMLIB) -o $@
1.34 +1 -0 eros/src/base/domain/keyset/keyset.c
Index: keyset.c
===================================================================
RCS file: /cvs/eros/src/base/domain/keyset/keyset.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- keyset.c 2001/05/24 04:37:55 1.33
+++ keyset.c 2001/07/06 21:14:12 1.34
@@ -66,6 +66,7 @@
#include <domain/domdbg.h>
#include "keyset.h"
+#include "constituents.h"
#define Normal_KeyData (0u)
#define ReadOnly_KeyData (1u)
1.21 +0 -7 eros/src/base/domain/keyset/keyset.h
Index: keyset.h
===================================================================
RCS file: /cvs/eros/src/base/domain/keyset/keyset.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- keyset.h 2001/04/01 23:05:54 1.20
+++ keyset.h 2001/07/06 21:14:12 1.21
@@ -35,13 +35,6 @@
#define KR_SETRESUME 30
#define KR_RESUME 31 /* don't use it for anything else! */
-#define KC_RETURNER 1
-#define KC_ZSF 2 /* zero space factory */
-#define KC_PROTOSPC 3
-#define KC_OSTREAM 4
-#define KC_KEYBITS 5 /* Keybits */
-#define KC_DISCRIM 6 /* discrim */
-
struct table_entry {
uint32_t w[5]; /* 4 words of keybits, 1 word of additional data */
};
1.18 +6 -6 eros/src/base/domain/keyset/keyset.map
Index: keyset.map
===================================================================
RCS file: /cvs/eros/src/base/domain/keyset/keyset.map,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- keyset.map 2001/05/26 18:13:42 1.17
+++ keyset.map 2001/07/06 21:14:12 1.18
@@ -27,11 +27,11 @@
PROD_SPACE(keyset_c) = small program "/eros/domain/keyset";
PROD_PC(keyset_c) = symbol "/eros/domain/keyset" _start;
-PROD_CONSTIT(keyset_c, 1) = misc Returner;
-PROD_CONSTIT(keyset_c, 2) = zsf;
-PROD_CONSTIT(keyset_c, 3) = protospace;
-PROD_CONSTIT(keyset_c, 4) = misc Console;
-PROD_CONSTIT(keyset_c, 5) = misc KeyBits;
-PROD_CONSTIT(keyset_c, 6) = misc discrim;
+PROD_CONSTIT(keyset_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(keyset_c, KC_ZSF, 2) = zsf;
+PROD_CONSTIT(keyset_c, KC_PROTOSPC, 3) = protospace;
+PROD_CONSTIT(keyset_c, KC_OSTREAM, 4) = misc Console;
+PROD_CONSTIT(keyset_c, KC_KEYBITS, 5) = misc KeyBits;
+PROD_CONSTIT(keyset_c, KC_DISCRIM, 6) = misc discrim;
/* no keeper, no symbol table */
1.4 +1 -0 eros/src/base/domain/linedisc/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/linedisc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1999/04/14 22:29:55 1.3
+++ .cvsignore 2001/07/06 21:14:12 1.4
@@ -1,3 +1,4 @@
+constituents.h
linedisc
linedisc_buddy
.*.m
1.19 +4 -0 eros/src/base/domain/linedisc/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/linedisc/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile 2001/04/29 19:46:59 1.18
+++ Makefile 2001/07/06 21:14:12 1.19
@@ -26,11 +26,13 @@
include $(EROS_SRC)/build/lib/make/makevars.mk
+GENERATED=constituents.h
TARGETS=linedisc linedisc_buddy
OPTIM=-O
OBJECTS=linedisc.o linedisc_buddy.o writebuff.o util.o chars.o
CLEANLIST=test.sysimg test.sysvol
INC=-I$(EROS_ROOT)/include
+IMGMAP=linedisc.map
UTIL_OBJ=writebuff.o util.o #cmpxchg_$(EROS_TARGET).o
@@ -46,6 +48,8 @@
$(INSTALL) -m 644 linedisc.map $(EROS_ROOT)/domain
all: $(TARGETS)
+
+linedisc.c linedisc_buddy.c: constituents.h
linedisc: linedisc.o $(UTIL_OBJ)
$(DOMLINK) $(DOMLINKOPT) -o linedisc $(DOMCRT0) linedisc.o $(UTIL_OBJ) $(DOMLIB)
1.28 +1 -6 eros/src/base/domain/linedisc/linedisc.c
Index: linedisc.c
===================================================================
RCS file: /cvs/eros/src/base/domain/linedisc/linedisc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linedisc.c 2001/05/25 23:49:47 1.27
+++ linedisc.c 2001/07/06 21:14:12 1.28
@@ -28,6 +28,7 @@
#include <eros/Key.h>
#include <eros/StdKeyType.h>
+#include "constituents.h"
#include "linedisc.h"
#include "cmpxchg.h"
@@ -53,12 +54,6 @@
#define KR_ARG1 29
#define KR_ARG2 30
#define KR_RESUME 31 /* DON'T USE IT FOR ANYTHING ELSE! */
-
-#define KC_RETURNER 1
-#define KC_OSTREAM 2 /* DEBUGGING */
-#define KC_BUDDYC 3 /* buddy constructor */
-#define KC_PROTO 4
-#define KC_SLEEP 5
/* setup stack */
const uint32_t __rt_stack_pages = 0x1;
1.16 +9 -9 eros/src/base/domain/linedisc/linedisc.map
Index: linedisc.map
===================================================================
RCS file: /cvs/eros/src/base/domain/linedisc/linedisc.map,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linedisc.map 2001/05/26 18:13:43 1.15
+++ linedisc.map 2001/07/06 21:14:12 1.16
@@ -27,11 +27,11 @@
PROD_SPACE(linedisc_buddy_c) = small program "/eros/domain/linedisc_buddy";
PROD_PC(linedisc_buddy_c) = symbol "/eros/domain/linedisc_buddy" _start;
-PROD_CONSTIT(linedisc_buddy_c, 1) = misc Returner;
-PROD_CONSTIT(linedisc_buddy_c, 2) = misc Console;
+PROD_CONSTIT(linedisc_buddy_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(linedisc_buddy_c, KC_OSTREAM, 2) = misc Console;
-PROD_CONSTIT(linedisc_buddy_c, 4) = protospace;
-PROD_CONSTIT(linedisc_buddy_c, 5) = misc Sleep;
+PROD_CONSTIT(linedisc_buddy_c, KC_PROTO, 4) = protospace;
+PROD_CONSTIT(linedisc_buddy_c, KC_SLEEP, 5) = misc Sleep;
/* no keeper, no symbol table */
@@ -44,12 +44,12 @@
PROD_SPACE(linedisc_c) = small program "/eros/domain/linedisc";
PROD_PC(linedisc_c) = symbol "/eros/domain/linedisc" _start;
-PROD_CONSTIT(linedisc_c, 1) = misc Returner;
-PROD_CONSTIT(linedisc_c, 2) = misc Console;
+PROD_CONSTIT(linedisc_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(linedisc_c, KC_OSTREAM, 2) = misc Console;
-PROD_CONSTIT(linedisc_c, 3) = linedisc_buddy_c;
+PROD_CONSTIT(linedisc_c, KC_BUDDYC, 3) = linedisc_buddy_c;
hide linedisc_buddy_c; /* he's *my* buddy -- you can't have him */
-PROD_CONSTIT(linedisc_c, 4) = protospace;
-PROD_CONSTIT(linedisc_c, 5) = misc Sleep; /* to yield to buddy */
+PROD_CONSTIT(linedisc_c, KC_PROTO, 4) = protospace;
+PROD_CONSTIT(linedisc_c, KC_SLEEP, 5) = misc Sleep; /* to yield to buddy */
/* no keeper, no symbol table */
1.26 +1 -5 eros/src/base/domain/linedisc/linedisc_buddy.c
Index: linedisc_buddy.c
===================================================================
RCS file: /cvs/eros/src/base/domain/linedisc/linedisc_buddy.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- linedisc_buddy.c 2001/05/25 23:49:47 1.25
+++ linedisc_buddy.c 2001/07/06 21:14:12 1.26
@@ -27,6 +27,7 @@
#include <eros/Key.h>
#include <eros/StdKeyType.h>
+#include "constituents.h"
#include "linedisc.h"
#include "chars.h"
@@ -53,11 +54,6 @@
#define KR_ARG2 30
#define KR_RESUME 31 /* DON'T USE IT FOR ANYTHING ELSE! */
-#define KC_RETURNER 1
-#define KC_OSTREAM 2 /* DEBUGGING */
-
-#define KC_PROTO 4
-#define KC_SLEEP 5
#define BUDDY SHARED.buddy
1.3 +1 -0 eros/src/base/domain/nfile/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/nfile/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:30:00 1.2
+++ .cvsignore 2001/07/06 21:14:12 1.3
@@ -1,2 +1,3 @@
+constituents.h
nfile
.*.m
1.13 +4 -0 eros/src/base/domain/nfile/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/nfile/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile 2001/04/29 19:46:59 1.12
+++ Makefile 2001/07/06 21:14:12 1.13
@@ -26,11 +26,13 @@
include $(EROS_SRC)/build/lib/make/makevars.mk
+GENERATED=constituents.h
TARGETS=nfile
OPTIM=-O -g
OBJECTS=nfile.o
CLEANLIST=
INC=-I$(EROS_ROOT)/include
+IMGMAP=nfile.map
include $(EROS_SRC)/build/lib/make/makerules.mk
@@ -41,6 +43,8 @@
$(INSTALL) -m 755 $(TARGETS) $(EROS_ROOT)/domain
all: $(TARGETS)
+
+nfile.c: constituents.h
nfile: nfile.o $(DOMLIB) $(DOMCRT0)
$(DOMLINK) $(DOMLINKOPT) -o nfile $(DOMCRT0) nfile.o $(DOMLIB)
1.18 +1 -5 eros/src/base/domain/nfile/nfile.c
Index: nfile.c
===================================================================
RCS file: /cvs/eros/src/base/domain/nfile/nfile.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nfile.c 2001/05/29 06:16:36 1.17
+++ nfile.c 2001/07/06 21:14:12 1.18
@@ -69,8 +69,8 @@
#define DEBUG(x) if (dbg_##x & dbg_flags)
+#include "constituents.h"
-
#define KR_CONSTIT 1
#define KR_SELF 2
#define KR_DOMCRE 3
@@ -83,10 +83,6 @@
#define KR_MYSPACE 24
#define KR_SCRATCH 25
#define KR_RESUME 31
-
-#define KC_RETURNER 1
-#define KC_ZSF 2
-#define KC_OSTREAM 3
/* #define FLIP_BUF */
#ifdef FLIP_BUF
1.11 +4 -3 eros/src/base/domain/nfile/nfile.map
Index: nfile.map
===================================================================
RCS file: /cvs/eros/src/base/domain/nfile/nfile.map,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nfile.map 2001/05/26 18:13:43 1.10
+++ nfile.map 2001/07/06 21:14:12 1.11
@@ -29,8 +29,9 @@
PROD_SPACE(nfilec) = small program "/eros/domain/nfile";
PROD_PC(nfilec) = symbol "/eros/domain/nfile" _start;
-PROD_CONSTIT(nfilec, 1) = misc Returner;
-PROD_CONSTIT(nfilec, 2) = zs_c;
-PROD_CONSTIT(nfilec, 3) = misc Console;
+
+PROD_CONSTIT(nfilec, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(nfilec, KC_ZSF, 2) = zs_c;
+PROD_CONSTIT(nfilec, KC_OSTREAM, 3) = misc Console;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/pipe/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/pipe/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:30:04 1.2
+++ .cvsignore 2001/07/06 21:14:12 1.3
@@ -1,2 +1,3 @@
+constituents.h
pipe
.*.m
1.12 +4 -1 eros/src/base/domain/pipe/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/pipe/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 2001/04/29 19:46:59 1.11
+++ Makefile 2001/07/06 21:14:12 1.12
@@ -25,15 +25,18 @@
CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk
-
+GENERATED=constituents.h
TARGETS=pipe
OPTIM=-O
OBJECTS=pipe.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=pipe.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+
+pipe.c: constituents.h
pipe: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.19 +1 -4 eros/src/base/domain/pipe/pipe.c
Index: pipe.c
===================================================================
RCS file: /cvs/eros/src/base/domain/pipe/pipe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pipe.c 2001/05/24 04:37:55 1.18
+++ pipe.c 2001/07/06 21:14:12 1.19
@@ -48,6 +48,7 @@
#define CND_DEBUG(x) (dbg_##x & dbg_flags)
#define DEBUG(x) if (CND_DEBUG(x))
+#include "constituents.h"
const uint32_t __rt_stack_pointer = 0x20000;
#ifdef ALIGNED
@@ -92,10 +93,6 @@
#define KR_OSTREAM 29
#define KR_RETURNER 30
#define KR_RESUME 31
-
-#define KC_RETURNER 1
-#define KC_PROTOSPC 2
-#define KC_OSTREAM 3
#define KI_READER 1
#define KI_WRITER 2
1.10 +3 -3 eros/src/base/domain/pipe/pipe.map
Index: pipe.map
===================================================================
RCS file: /cvs/eros/src/base/domain/pipe/pipe.map,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pipe.map 2001/05/26 18:13:43 1.9
+++ pipe.map 2001/07/06 21:14:12 1.10
@@ -29,9 +29,9 @@
PROD_SPACE(pipe_c) = small program "/eros/domain/pipe";
PROD_PC(pipe_c) = symbol "/eros/domain/pipe" _start;
-PROD_CONSTIT(pipe_c, 1) = misc Returner;
-PROD_CONSTIT(pipe_c, 2) = protospace;
-PROD_CONSTIT(pipe_c, 3) = misc Console;
+PROD_CONSTIT(pipe_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(pipe_c, KC_PROTOSPC, 2) = protospace;
+PROD_CONSTIT(pipe_c, KC_OSTREAM, 3) = misc Console;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/sigmux/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/sigmux/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:30:06 1.2
+++ .cvsignore 2001/07/06 21:14:13 1.3
@@ -1,3 +1,4 @@
+constituents.h
sigmux
test.sysimg
.*.m
1.14 +3 -0 eros/src/base/domain/sigmux/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/sigmux/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile 2001/04/29 19:46:59 1.13
+++ Makefile 2001/07/06 21:14:13 1.14
@@ -26,15 +26,18 @@
include $(EROS_SRC)/build/lib/make/makevars.mk
+GENERATED=constituents.h
TARGETS=sigmux
OPTIM=-O
OBJECTS=sigmux.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=sigmux.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+sigmux.c: constituents.h
sigmux: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.13 +2 -4 eros/src/base/domain/sigmux/sigmux.c
Index: sigmux.c
===================================================================
RCS file: /cvs/eros/src/base/domain/sigmux/sigmux.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sigmux.c 2001/05/24 04:37:55 1.12
+++ sigmux.c 2001/07/06 21:14:13 1.13
@@ -30,6 +30,8 @@
#include <domain/SigMuxKey.h>
#include <domain/ProtoSpace.h>
+#include "constituents.h"
+
#define DEBUG if(0)
@@ -50,10 +52,6 @@
#define KR_RETURNER 29
#define KR_SCRATCH 30
#define KR_RESUME 31
-
-#define KC_RETURNER 1
-#define KC_PROTOSPC 2
-#define KC_OSTREAM 3
#define KI_MASTER 128 /* key info of master start key */
#define NCLIENT 16
1.12 +3 -3 eros/src/base/domain/sigmux/sigmux.map
Index: sigmux.map
===================================================================
RCS file: /cvs/eros/src/base/domain/sigmux/sigmux.map,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sigmux.map 2001/05/26 18:13:43 1.11
+++ sigmux.map 2001/07/06 21:14:13 1.12
@@ -29,9 +29,9 @@
PROD_SPACE(sigmux_c) = small program "/eros/domain/sigmux";
PROD_PC(sigmux_c) = symbol "/eros/domain/sigmux" _start;
-PROD_CONSTIT(sigmux_c, 1) = misc Returner;
-PROD_CONSTIT(sigmux_c, 2) = protospace;
-PROD_CONSTIT(sigmux_c, 3) = misc Console;
+PROD_CONSTIT(sigmux_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(sigmux_c, KC_PROTOSPC, 2) = protospace;
+PROD_CONSTIT(sigmux_c, KC_OSTREAM, 3) = misc Console;
/* no keeper, no symbol table */
1.4 +1 -0 eros/src/base/domain/supernode/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/supernode/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1999/04/14 22:30:10 1.3
+++ .cvsignore 2001/07/06 21:14:13 1.4
@@ -1,2 +1,3 @@
+constituents.h
supernode
.*.m
1.29 +4 -1 eros/src/base/domain/supernode/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/supernode/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile 2001/04/29 19:47:00 1.28
+++ Makefile 2001/07/06 21:14:13 1.29
@@ -25,15 +25,18 @@
CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk
-
+GENERATED=constituents.h
TARGETS=supernode
OPTIM=-O
OBJECTS=supernode.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=supernode.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+
+supernode.c: constituents.h
supernode: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.41 +1 -5 eros/src/base/domain/supernode/supernode.c
Index: supernode.c
===================================================================
RCS file: /cvs/eros/src/base/domain/supernode/supernode.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- supernode.c 2001/05/24 04:37:56 1.40
+++ supernode.c 2001/07/06 21:14:13 1.41
@@ -47,6 +47,7 @@
#include <domain/domdbg.h>
#include <domain/ProtoSpace.h>
+#include "constituents.h"
#define KR_VOID 0
#define KR_CONSTIT 1
@@ -62,11 +63,6 @@
#define KR_ARG0 28
#define KR_RESUME 31
-
-
-#define KC_RETURNER 1
-#define KC_OSTREAM 2
-#define KC_PROTOSPC 3
#define MAX_LEVEL 5
1.15 +4 -3 eros/src/base/domain/supernode/supernode.map
Index: supernode.map
===================================================================
RCS file: /cvs/eros/src/base/domain/supernode/supernode.map,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- supernode.map 2001/05/26 18:13:43 1.14
+++ supernode.map 2001/07/06 21:14:13 1.15
@@ -29,8 +29,9 @@
PROD_SPACE(snode_c) = small program "/eros/domain/supernode";
PROD_PC(snode_c) = symbol "/eros/domain/supernode" _start;
-PROD_CONSTIT(snode_c, 1) = misc Returner;
-PROD_CONSTIT(snode_c, 2) = misc Console;
-PROD_CONSTIT(snode_c, 4) = protospace;
+
+PROD_CONSTIT(snode_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(snode_c, KC_OSTREAM, 2) = misc Console;
+PROD_CONSTIT(snode_c, KC_PROTOSPC, 4) = protospace;
/* no keeper, no symbol table */
1.3 +1 -0 eros/src/base/domain/vcsk/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/base/domain/vcsk/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1999/04/14 22:30:12 1.2
+++ .cvsignore 2001/07/06 21:14:13 1.3
@@ -1,2 +1,3 @@
+constituents.h
vcsk
.*.m
1.20 +3 -1 eros/src/base/domain/vcsk/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/base/domain/vcsk/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 2001/04/29 19:47:00 1.19
+++ Makefile 2001/07/06 21:14:13 1.20
@@ -25,16 +25,18 @@
CROSS_BUILD=yes
include $(EROS_SRC)/build/lib/make/makevars.mk
-
+GENERATED=constituents.h
TARGETS=vcsk
OPTIM=-O
OBJECTS=vcsk.o
INC=-I$(EROS_ROOT)/include
+IMGMAP=vcs.map
include $(EROS_SRC)/build/lib/make/makerules.mk
all: $(TARGETS)
+vcsk.c: constituents.h
vcsk: $(OBJECTS) $(DOMCRT0) $(DOMLIB)
$(DOMLINK) $(DOMLINKOPT) $(DOMCRT0) $(OBJECTS) $(DOMLIB) -o $@
1.24 +10 -10 eros/src/base/domain/vcsk/vcs.map
Index: vcs.map
===================================================================
RCS file: /cvs/eros/src/base/domain/vcsk/vcs.map,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vcs.map 2001/06/10 19:41:46 1.23
+++ vcs.map 2001/07/06 21:14:13 1.24
@@ -118,22 +118,22 @@
BOOT_CONSTRUCTOR(zs_c);
-PROD_CONSTIT(zs_c, 0) = misc Console;
-PROD_CONSTIT(zs_c, 1) = misc Returner;
-PROD_CONSTIT(zs_c, 2) = zindex;
-PROD_CONSTIT(zs_c, 3) = zero_pg;
-PROD_CONSTIT(zs_c, 4) = protospace;
+PROD_CONSTIT(zs_c, KC_OSTREAM, 0) = misc Console;
+PROD_CONSTIT(zs_c, KC_RETURNER, 1) = misc Returner;
+PROD_CONSTIT(zs_c, KC_ZINDEX, 2) = zindex;
+PROD_CONSTIT(zs_c, KC_FROZEN_SEG, 3) = zero_pg;
+PROD_CONSTIT(zs_c, KC_PROTOSPC, 4) = protospace;
PROD_SPACE(zs_c) = vcsk.seg;
PROD_PC(zs_c) = vcsk.pc;
/* no keeper, no symbol table */
#define MAKE_VIRTUAL_COPIER(name, progfile) \
BOOT_CONSTRUCTOR(name); \
- PROD_CONSTIT(name, 0) = misc Console; \
- PROD_CONSTIT(name, 1) = misc Returner; \
- PROD_CONSTIT(name, 2) = zindex; \
- PROD_CONSTIT(name, 3) = sense program segtree progfile; \
- PROD_CONSTIT(name, 4) = protospace; \
+ PROD_CONSTIT(name, KC_OSTREAM, 0) = misc Console; \
+ PROD_CONSTIT(name, KC_RETURNER, 1) = misc Returner; \
+ PROD_CONSTIT(name, KC_ZINDEX, 2) = zindex; \
+ PROD_CONSTIT(name, KC_FROZEN_SEG, 3) = sense program segtree progfile; \
+ PROD_CONSTIT(name, KC_PROTOSPC, 4) = protospace; \
PROD_SPACE(name) = vcsk.seg; \
PROD_PC(name) = vcsk.pc;