projects
/
cacao.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa78727
)
Reverts an errorous checkin
author
phil
<none@none>
Mon, 9 Nov 1998 13:44:47 +0000
(13:44 +0000)
committer
phil
<none@none>
Mon, 9 Nov 1998 13:44:47 +0000
(13:44 +0000)
mm/Makefile
patch
|
blob
|
history
mm/heap.old.c
patch
|
blob
|
history
diff --git
a/mm/Makefile
b/mm/Makefile
index cbcd56047daa130b267d5ff46d3b253e5de95ccb..28fbd07b3062e97460957f7260bb390af580ef87 100644
(file)
--- a/
mm/Makefile
+++ b/
mm/Makefile
@@
-1,12
+1,12
@@
# cacao/mm/Makefile
# cacao/mm/Makefile
-# $Id: Makefile 4
6 1998-11-09 13:43:0
7Z phil $
+# $Id: Makefile 4
7 1998-11-09 13:44:4
7Z phil $
AR = ar
COMBINE = $(AR) rcs mm.o
mm.o: actualtarget Makefile
AR = ar
COMBINE = $(AR) rcs mm.o
mm.o: actualtarget Makefile
-actualtarget:
gc2
+actualtarget:
old
clean:
rm -rf *.o *~
clean:
rm -rf *.o *~
diff --git
a/mm/heap.old.c
b/mm/heap.old.c
index 9a9d8a1b6346bb80a18cf91abd8789d019c8946d..98a8547054b67533660baa677086316bc9333c24 100644
(file)
--- a/
mm/heap.old.c
+++ b/
mm/heap.old.c
@@
-419,7
+419,7
@@
static void mark (heapblock *obj)
if ( isbitclear(startbits, blocknum) ) return;
if ( isbitset(markbits, blocknum) ) return;
if ( isbitclear(startbits, blocknum) ) return;
if ( isbitset(markbits, blocknum) ) return;
- fprintf(stderr, "mark: marking object at 0x%lx\n", obj);
+ /* fprintf(stderr, "mark: marking object at 0x%lx\n", obj); */
setbit (markbits, blocknum);
if ( isbitclear(referencebits, blocknum) ) return;
setbit (markbits, blocknum);
if ( isbitclear(referencebits, blocknum) ) return;
@@
-496,7
+496,7
@@
static void markstack () /* schani */
#else
void **top_of_stack = &dummy;
#else
void **top_of_stack = &dummy;
- fprintf(stderr, "marking stack\n");
+ /* fprintf(stderr, "marking stack\n"); */
if (top_of_stack > bottom_of_stack)
markreferences(bottom_of_stack, top_of_stack);
if (top_of_stack > bottom_of_stack)
markreferences(bottom_of_stack, top_of_stack);
@@
-598,7
+598,7
@@
static void heap_docollect ()
/* Alle vom Stack referenzierten Objekte markieren */
asm_dumpregistersandcall (markstack);
/* Alle vom Stack referenzierten Objekte markieren */
asm_dumpregistersandcall (markstack);
- fprintf(stderr, "marking references\n");
+ /* fprintf(stderr, "marking references\n"); */
/* Alle von globalen Variablen erreichbaren Objekte markieren */
p = chain_first (allglobalreferences);
while (p) {
/* Alle von globalen Variablen erreichbaren Objekte markieren */
p = chain_first (allglobalreferences);
while (p) {
@@
-839,9
+839,9
@@
void *heap_allocate (u4 bytelength, bool references, methodinfo *finalizer)
u4 freestart,freelength;
u4 length = ALIGN(bytelength, BLOCKSIZE) / BLOCKSIZE;
u4 freestart,freelength;
u4 length = ALIGN(bytelength, BLOCKSIZE) / BLOCKSIZE;
- /
/ fprintf(stderr, "heap_allocate: 0x%lx (%ld) requested, 0x%lx (%ld) aligned\n", bytelength, bytelength, length * BLOCKSIZE, length * BLOCKSIZE);
+ /
* fprintf(stderr, "heap_allocate: 0x%lx (%ld) requested, 0x%lx (%ld) aligned\n", bytelength, bytelength, length * BLOCKSIZE, length * BLOCKSIZE); */
- /
/ heap_docollect();
+ /
* heap_docollect(); */
intsDisable(); /* schani */
intsDisable(); /* schani */