diff --git a/runtime/GC/GCInterface.h b/runtime/GC/GCInterface.h deleted file mode 100644 index a62ac3c7146..00000000000 --- a/runtime/GC/GCInterface.h +++ /dev/null @@ -1,48 +0,0 @@ -/*===-- GCInterface.h - Public interface exposed by garbage collectors ----===*\ -|* -|* The LLVM Compiler Infrastructure -|* -|* This file is distributed under the University of Illinois Open Source -|* License. See LICENSE.TXT for details. -|* -|*===----------------------------------------------------------------------===*| -|* -|* This file defines the common public interface that must be exposed by all -|* LLVM garbage collectors. -|* -\*===----------------------------------------------------------------------===*/ - -#ifndef GCINTERFACE_H -#define GCINTERFACE_H - -/* llvm_cg_walk_gcroots - This function is exposed by the LLVM code generator, - * and allows us to traverse the roots on the stack. - */ -void llvm_cg_walk_gcroots(void (*FP)(void **Root, void *Meta)); - - -/* llvm_gc_initialize - This function is called to initalize the garbage - * collector. - */ -void llvm_gc_initialize(unsigned InitialHeapSize); - -/* llvm_gc_allocate - This function allocates Size bytes from the heap and - * returns a pointer to it. - */ -void *llvm_gc_allocate(unsigned Size); - -/* llvm_gc_collect - This function forces a garbage collection cycle. - */ -void llvm_gc_collect(); - -/* llvm_gc_read - This function should be implemented to include any read - * barrier code that is needed by the garbage collector. - */ -void *llvm_gc_read(void *ObjPtr, void **FieldPtr); - -/* llvm_gc_write - This function should be implemented to include any write - * barrier code that is needed by the garbage collector. - */ -void llvm_gc_write(void *V, void *ObjPtr, void **FieldPtr); - -#endif diff --git a/runtime/GC/Makefile b/runtime/GC/Makefile deleted file mode 100644 index b053e252865..00000000000 --- a/runtime/GC/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -##===- runtime/GC/Makefile ---------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../.. -PARALLEL_DIRS := SemiSpace -EXTRA_DIST := gc_exported_symbols.lst -include $(LEVEL)/Makefile.common - -# Install target for libraries: Copy into $LLVMGCCDIR/bytecode-libs -# -install:: - -clean:: diff --git a/runtime/GC/SemiSpace/Makefile b/runtime/GC/SemiSpace/Makefile deleted file mode 100644 index babcc809802..00000000000 --- a/runtime/GC/SemiSpace/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -##===- runtime/GC/SemiSpace/Makefile -----------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../../.. -BYTECODE_LIBRARY = 1 -LIBRARYNAME = gcsemispace -BYTECODE_DESTINATION = $(CFERuntimeLibDir) -EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/../gc_exported_symbols.lst - -include $(LEVEL)/Makefile.common - -CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts)) -CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts)) diff --git a/runtime/GC/SemiSpace/README.txt b/runtime/GC/SemiSpace/README.txt deleted file mode 100644 index 0ddf2e0426b..00000000000 --- a/runtime/GC/SemiSpace/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -//===----------------------------------------------------------------------===// - -Possible enhancement: If a collection cycle happens and the heap is not -compacted very much (say less than 25% of the allocated memory was freed), the -memory regions should be doubled in size. diff --git a/runtime/GC/SemiSpace/semispace.c b/runtime/GC/SemiSpace/semispace.c deleted file mode 100644 index 0ae6e11bd2e..00000000000 --- a/runtime/GC/SemiSpace/semispace.c +++ /dev/null @@ -1,127 +0,0 @@ -/*===-- semispace.c - Simple semi-space copying garbage collector ---------===*\ -|* -|* The LLVM Compiler Infrastructure -|* -|* This file is distributed under the University of Illinois Open Source -|* License. See LICENSE.TXT for details. -|* -|*===----------------------------------------------------------------------===*| -|* -|* This garbage collector is an extremely simple copying collector. It splits -|* the managed region of memory into two pieces: the current space to allocate -|* from, and the copying space. When the portion being allocated from fills up, -|* a garbage collection cycle happens, which copies all live blocks to the other -|* half of the managed space. -|* -\*===----------------------------------------------------------------------===*/ - -#include "../GCInterface.h" -#include -#include -#include - -/* AllocPtr - This points to the next byte that is available for allocation. - */ -static char *AllocPtr; - -/* AllocEnd - This points to the first byte not available for allocation. When - * AllocPtr passes this, we have run out of space. - */ -static char *AllocEnd; - -/* CurSpace/OtherSpace - These pointers point to the two regions of memory that - * we switch between. The unallocated portion of the CurSpace is known to be - * zero'd out, but the OtherSpace contains junk. - */ -static void *CurSpace, *OtherSpace; - -/* SpaceSize - The size of each space. */ -static unsigned SpaceSize; - -/* llvm_gc_initialize - Allocate the two spaces that we plan to switch between. - */ -void llvm_gc_initialize(unsigned InitialHeapSize) { - SpaceSize = InitialHeapSize/2; - CurSpace = AllocPtr = calloc(1, SpaceSize); - OtherSpace = malloc(SpaceSize); - AllocEnd = AllocPtr + SpaceSize; -} - -/* We always want to inline the fast path, but never want to inline the slow - * path. - */ -void *llvm_gc_allocate(unsigned Size) __attribute__((always_inline)); -static void* llvm_gc_alloc_slow(unsigned Size) __attribute__((noinline)); - -void *llvm_gc_allocate(unsigned Size) { - char *OldAP = AllocPtr; - char *NewEnd = OldAP+Size; - if (NewEnd > AllocEnd) - return llvm_gc_alloc_slow(Size); - AllocPtr = NewEnd; - return OldAP; -} - -static void* llvm_gc_alloc_slow(unsigned Size) { - llvm_gc_collect(); - if (AllocPtr+Size > AllocEnd) { - fprintf(stderr, "Garbage collector ran out of memory " - "allocating object of size: %d\n", Size); - exit(1); - } - - return llvm_gc_allocate(Size); -} - - -static void process_pointer(void **Root, void *Meta) { - printf("process_root[0x%p] = 0x%p\n", (void*) Root, (void*) *Root); -} - -void llvm_gc_collect() { - // Clear out the space we will be copying into. - // FIXME: This should do the copy, then clear out whatever space is left. - memset(OtherSpace, 0, SpaceSize); - - printf("Garbage collecting!!\n"); - llvm_cg_walk_gcroots(process_pointer); - abort(); -} - -/* We use no read/write barriers */ -void *llvm_gc_read(void *ObjPtr, void **FieldPtr) { return *FieldPtr; } -void llvm_gc_write(void *V, void *ObjPtr, void **FieldPtr) { *FieldPtr = V; } - - -/*===----------------------------------------------------------------------===** - * FIXME: This should be in a code-generator specific library, but for now this - * will work for all code generators. - */ -typedef struct FrameMap FrameMap; -struct FrameMap { - int32_t NumRoots; // Number of roots in stack frame. - int32_t NumMeta; // Number of metadata descriptors. May be < NumRoots. - void *Meta[]; // May be absent for roots without metadata. -}; - -typedef struct StackEntry StackEntry; -struct StackEntry { - StackEntry *Next; // Caller's stack entry. - const FrameMap *Map; // Pointer to constant FrameMap. - void *Roots[]; // Stack roots (in-place array). -}; -StackEntry *llvm_gc_root_chain; - -void llvm_cg_walk_gcroots(void (*FP)(void **Root, void *Meta)) { - StackEntry *R; - for (R = llvm_gc_root_chain; R; R = R->Next) { - unsigned i, e; - for (i = 0, e = R->Map->NumMeta; i != e; ++i) - FP(&R->Roots[i], R->Map->Meta[i]); - for (e = R->Map->NumRoots; i != e; ++i) - FP(&R->Roots[i], NULL); - } -} -/* END FIXME! */ - - diff --git a/runtime/GC/gc_exported_symbols.lst b/runtime/GC/gc_exported_symbols.lst deleted file mode 100644 index 0ed60f57ee3..00000000000 --- a/runtime/GC/gc_exported_symbols.lst +++ /dev/null @@ -1,7 +0,0 @@ -llvm_gc_initialize -llvm_gc_allocate -llvm_gc_collect -llvm_gc_write -llvm_gc_read - -llvm_gc_root_chain \ No newline at end of file diff --git a/runtime/Makefile b/runtime/Makefile index 3883041d2eb..9937c11e3bc 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -11,7 +11,7 @@ LEVEL = .. include $(LEVEL)/Makefile.config ifneq ($(wildcard $(LLVMGCC)),) -PARALLEL_DIRS := libprofile GC +PARALLEL_DIRS := libprofile else PARALLEL_DIRS := install all ::