From 06eccf0f75af29a211c24ef4f7bad4b24b775eea Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 8 Mar 2002 23:20:52 +0000 Subject: [PATCH] Checkin library infrastructure for building stuff to be linked with gccld llvm-svn: 1842 --- llvm/runtime/GCCLibraries/libc/Makefile | 6 + llvm/runtime/GCCLibraries/libc/README.txt | 4 + llvm/runtime/GCCLibraries/libc/atox.c | 116 +++++++++++++++++ llvm/runtime/GCCLibraries/libc/io.c | 18 +++ llvm/runtime/GCCLibraries/libc/memory.c | 16 +++ llvm/runtime/GCCLibraries/libc/string.c | 127 +++++++++++++++++++ llvm/runtime/GCCLibraries/libgcc/Makefile | 6 + llvm/runtime/GCCLibraries/libgcc/__main.c | 5 + llvm/runtime/GCCLibraries/libm/Makefile | 6 + llvm/runtime/GCCLibraries/libm/temp.c | 0 llvm/runtime/GCCLibraries/libmalloc/Makefile | 6 + llvm/runtime/GCCLibraries/libmalloc/dummy.c | 0 llvm/runtime/GCCLibraries/libucb/Makefile | 6 + llvm/runtime/GCCLibraries/libucb/dummy.c | 0 llvm/runtime/Makefile | 11 +- llvm/runtime/Makefile.libs | 36 ++++++ 16 files changed, 362 insertions(+), 1 deletion(-) create mode 100644 llvm/runtime/GCCLibraries/libc/Makefile create mode 100644 llvm/runtime/GCCLibraries/libc/README.txt create mode 100644 llvm/runtime/GCCLibraries/libc/atox.c create mode 100644 llvm/runtime/GCCLibraries/libc/io.c create mode 100644 llvm/runtime/GCCLibraries/libc/memory.c create mode 100644 llvm/runtime/GCCLibraries/libc/string.c create mode 100644 llvm/runtime/GCCLibraries/libgcc/Makefile create mode 100644 llvm/runtime/GCCLibraries/libgcc/__main.c create mode 100644 llvm/runtime/GCCLibraries/libm/Makefile create mode 100644 llvm/runtime/GCCLibraries/libm/temp.c create mode 100644 llvm/runtime/GCCLibraries/libmalloc/Makefile create mode 100644 llvm/runtime/GCCLibraries/libmalloc/dummy.c create mode 100644 llvm/runtime/GCCLibraries/libucb/Makefile create mode 100644 llvm/runtime/GCCLibraries/libucb/dummy.c create mode 100644 llvm/runtime/Makefile.libs diff --git a/llvm/runtime/GCCLibraries/libc/Makefile b/llvm/runtime/GCCLibraries/libc/Makefile new file mode 100644 index 000000000000..dbe590bc3959 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/Makefile @@ -0,0 +1,6 @@ +LEVEL = ../../.. + +LIBNAME = c + +include ../Makefile.libs + diff --git a/llvm/runtime/GCCLibraries/libc/README.txt b/llvm/runtime/GCCLibraries/libc/README.txt new file mode 100644 index 000000000000..c29ebc6e42bf --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/README.txt @@ -0,0 +1,4 @@ +This directory contains source files to build the LLVM version of libc. + +Currently it is hacked together on a by-demand basis, but someday a proper +port of libc would be very nice. diff --git a/llvm/runtime/GCCLibraries/libc/atox.c b/llvm/runtime/GCCLibraries/libc/atox.c new file mode 100644 index 000000000000..202f5ad1a1f5 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/atox.c @@ -0,0 +1,116 @@ +//===-- atox.c - Ascii string parsers for LLVM libc Library -------*- C -*-===// +// +// A lot of this code is ripped gratuitously from glibc and libiberty. +// +//===----------------------------------------------------------------------===// + + +#define isspace(x) ((x) == ' ' || (x) == '\t' || (x) == '\n') +#define isdigit(x) ((x) >= '0' && (x) <= '9') +#define isupper(x) ((x) >= 'A' && (x) <= 'Z') +#define islower(x) ((x) >= 'a' && (x) <= 'z') +#define isalpha(x) (isupper(x) || islower(x)) + +#ifndef ULONG_MAX +#define ULONG_MAX ((unsigned long)(~0L)) /* 0xFFFFFFFF */ +#endif + +#ifndef LONG_MAX +#define LONG_MAX ((long)(ULONG_MAX >> 1)) /* 0x7FFFFFFF */ +#endif + +#ifndef LONG_MIN +#define LONG_MIN ((long)(~LONG_MAX)) /* 0x80000000 */ +#endif + +/* + * Convert a string to a long integer. + * + * Ignores `locale' stuff. Assumes that the upper and lower case + * alphabets and digits are each contiguous. + */ +long strtol(const char *nptr, char **endptr, int base) { + register const char *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, any, cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. + * If base is 0, allow 0x for hex and 0 for octal, else + * assume decimal; if base is already 16, allow 0x. + */ + do { + c = *s++; + } while (isspace(c)); + if (c == '-') { + neg = 1; + c = *s++; + } else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + + /* + * Compute the cutoff value between legal numbers and illegal + * numbers. That is the largest legal value, divided by the + * base. An input number that is greater than this value, if + * followed by a legal input character, is too big. One that + * is equal to this value may be valid or not; the limit + * between valid and invalid numbers is then based on the last + * digit. For instance, if the range for longs is + * [-2147483648..2147483647] and the input base is 10, + * cutoff will be set to 214748364 and cutlim to either + * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated + * a value > 214748364, or equal but the next digit is > 7 (or 8), + * the number is too big, and we will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long)base; + cutoff /= (unsigned long)base; + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) { + acc = neg ? LONG_MIN : LONG_MAX; + } else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = (char *) (any ? s - 1 : nptr); + return (acc); +} + + +/* Convert a string to an int. */ +int atoi(const char *nptr) { + return (int)strtol(nptr, 0, 10); +} + +/* Convert a string to a long int. */ +long int atol(const char *nptr) { + return strtol(nptr, 0, 10); +} diff --git a/llvm/runtime/GCCLibraries/libc/io.c b/llvm/runtime/GCCLibraries/libc/io.c new file mode 100644 index 000000000000..e09283ada5a6 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/io.c @@ -0,0 +1,18 @@ +//===-- io.c - IO routines for LLVM libc Library ------------------*- C -*-===// +// +// A lot of this code is ripped gratuitously from glibc and libiberty. +// +//===----------------------------------------------------------------------===// + +int putchar(int); + +// The puts() function writes the string pointed to by s, followed by a +// NEWLINE character, to the standard output stream stdout. On success the +// number of characters written is returned; otherwise they return EOF. +// +int puts(const char *S) { + const char *Str = S; + while (*Str) putchar(*Str++); + putchar('\n'); + return Str+1-S; +} diff --git a/llvm/runtime/GCCLibraries/libc/memory.c b/llvm/runtime/GCCLibraries/libc/memory.c new file mode 100644 index 000000000000..404c81a86393 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/memory.c @@ -0,0 +1,16 @@ +//===-- memory.c - String functions for the LLVM libc Library ----*- C -*-===// +// +// A lot of this code is ripped gratuitously from glibc and libiberty. +// +//===----------------------------------------------------------------------===// + +#include + +void *malloc(unsigned); +void free(void *); +void *memset(void *, int, unsigned); + +void *calloc(size_t nelem, size_t elsize) { + void *Result = malloc(nelem*elsize); + return memset(Result, 0, nelem*elsize); +} diff --git a/llvm/runtime/GCCLibraries/libc/string.c b/llvm/runtime/GCCLibraries/libc/string.c new file mode 100644 index 000000000000..f697dd4d19ad --- /dev/null +++ b/llvm/runtime/GCCLibraries/libc/string.c @@ -0,0 +1,127 @@ +//===-- string.c - String functions for the LLVM libc Library -----*- C -*-===// +// +// A lot of this code is ripped gratuitously from glibc and libiberty. +// +//===----------------------------------------------------------------------===// + +#include +void *malloc(unsigned); +void free(void *); + +unsigned strlen(const char *Str) { + int Count = 0; + while (*Str) { ++Count; ++Str; } + return Count; +} + +char *strdup(const char *str) { + int Len = strlen(str); + char *Result = (char*)malloc((Len+1)*sizeof(char)); + memcpy(Result, str, Len+1); + return Result; +} + +char *strcpy(char *s1, const char *s2) { + while ((*s1++ = *s2++)); + return s1; +} + + +/* Compare S1 and S2, returning less than, equal to or + greater than zero if S1 is lexicographically less than, + equal to or greater than S2. */ +int strcmp (const char *p1, const char *p2) { + register const unsigned char *s1 = (const unsigned char *) p1; + register const unsigned char *s2 = (const unsigned char *) p2; + unsigned char c1, c2; + + do + { + c1 = (unsigned char) *s1++; + c2 = (unsigned char) *s2++; + if (c1 == '\0') + return c1 - c2; + } + while (c1 == c2); + + return c1 - c2; +} + +// http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/generic/?cvsroot=glibc + +typedef unsigned int op_t; +#define OPSIZ 4 + +void *memset (void *dstpp, int c, size_t len) { + long long int dstp = (long long int) dstpp; + + if (len >= 8) + { + size_t xlen; + op_t cccc; + + cccc = (unsigned char) c; + cccc |= cccc << 8; + cccc |= cccc << 16; + if (OPSIZ > 4) + /* Do the shift in two steps to avoid warning if long has 32 bits. */ + cccc |= (cccc << 16) << 16; + + /* There are at least some bytes to set. + No need to test for LEN == 0 in this alignment loop. */ + while (dstp % OPSIZ != 0) + { + ((unsigned char *) dstp)[0] = c; + dstp += 1; + len -= 1; + } + + /* Write 8 `op_t' per iteration until less than 8 `op_t' remain. */ + xlen = len / (OPSIZ * 8); + while (xlen > 0) + { + ((op_t *) dstp)[0] = cccc; + ((op_t *) dstp)[1] = cccc; + ((op_t *) dstp)[2] = cccc; + ((op_t *) dstp)[3] = cccc; + ((op_t *) dstp)[4] = cccc; + ((op_t *) dstp)[5] = cccc; + ((op_t *) dstp)[6] = cccc; + ((op_t *) dstp)[7] = cccc; + dstp += 8 * OPSIZ; + xlen -= 1; + } + len %= OPSIZ * 8; + + /* Write 1 `op_t' per iteration until less than OPSIZ bytes remain. */ + xlen = len / OPSIZ; + while (xlen > 0) + { + ((op_t *) dstp)[0] = cccc; + dstp += OPSIZ; + xlen -= 1; + } + len %= OPSIZ; + } + + /* Write the last few bytes. */ + while (len > 0) + { + ((unsigned char *) dstp)[0] = c; + dstp += 1; + len -= 1; + } + + return dstpp; +} + +void *memcpy(void *dstpp, const void *srcpp, size_t len) { + char *dstp = (char*)dstpp; + char *srcp = (char*) srcpp; + unsigned i; + + for (i = 0; i < len; ++i) + dstp[i] = srcp[i]; + + return dstpp; +} diff --git a/llvm/runtime/GCCLibraries/libgcc/Makefile b/llvm/runtime/GCCLibraries/libgcc/Makefile new file mode 100644 index 000000000000..fd565288eb5f --- /dev/null +++ b/llvm/runtime/GCCLibraries/libgcc/Makefile @@ -0,0 +1,6 @@ +LEVEL = ../../.. + +LIBNAME = gcc + +include ../Makefile.libs + diff --git a/llvm/runtime/GCCLibraries/libgcc/__main.c b/llvm/runtime/GCCLibraries/libgcc/__main.c new file mode 100644 index 000000000000..346b53623a43 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libgcc/__main.c @@ -0,0 +1,5 @@ + + +void __main() { +} + diff --git a/llvm/runtime/GCCLibraries/libm/Makefile b/llvm/runtime/GCCLibraries/libm/Makefile new file mode 100644 index 000000000000..f3085ded5def --- /dev/null +++ b/llvm/runtime/GCCLibraries/libm/Makefile @@ -0,0 +1,6 @@ +LEVEL = ../../.. + +LIBNAME = m + +include ../Makefile.libs + diff --git a/llvm/runtime/GCCLibraries/libm/temp.c b/llvm/runtime/GCCLibraries/libm/temp.c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/llvm/runtime/GCCLibraries/libmalloc/Makefile b/llvm/runtime/GCCLibraries/libmalloc/Makefile new file mode 100644 index 000000000000..9d56de0eae0a --- /dev/null +++ b/llvm/runtime/GCCLibraries/libmalloc/Makefile @@ -0,0 +1,6 @@ +LEVEL = ../../.. + +LIBNAME = malloc + +include ../Makefile.libs + diff --git a/llvm/runtime/GCCLibraries/libmalloc/dummy.c b/llvm/runtime/GCCLibraries/libmalloc/dummy.c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/llvm/runtime/GCCLibraries/libucb/Makefile b/llvm/runtime/GCCLibraries/libucb/Makefile new file mode 100644 index 000000000000..247caeaf06d1 --- /dev/null +++ b/llvm/runtime/GCCLibraries/libucb/Makefile @@ -0,0 +1,6 @@ +LEVEL = ../../.. + +LIBNAME = ucb + +include ../Makefile.libs + diff --git a/llvm/runtime/GCCLibraries/libucb/dummy.c b/llvm/runtime/GCCLibraries/libucb/dummy.c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/llvm/runtime/Makefile b/llvm/runtime/Makefile index 5bf2cbf32713..2fad2286f876 100644 --- a/llvm/runtime/Makefile +++ b/llvm/runtime/Makefile @@ -1,4 +1,13 @@ +# Libraries Makefile: Build all subdirectories automatically -all:: +LEVEL = ../.. +DIRS := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */)))) + +include ${LEVEL}/Makefile.common + +# Install target for libraries: Copy into the gcc install directory in chris's +# tree... +# +install:: clean:: diff --git a/llvm/runtime/Makefile.libs b/llvm/runtime/Makefile.libs new file mode 100644 index 000000000000..b5e21c28d843 --- /dev/null +++ b/llvm/runtime/Makefile.libs @@ -0,0 +1,36 @@ +# test/Libraries/Makefile.libs +# +# This makefile should be used by subdirectories, which are libraries that are +# to be compiled to llvm bytecode and linked together with a specified name. +# +# Variables to be defined before including this makefile: +# +# 1. LEVEL - Must be set as per normal semantics: The depth from the top of tree +# 2. LIBNAME - Name of library to link together. Forms lib.bc +# + +DESTLIBDIR := $(LEVEL)/test/Libraries/Output +DESTLIBNAME := $(LEVEL)/test/Libraries/Output/lib$(LIBNAME).bc + +all:: $(DESTLIBNAME) + +include $(LEVEL)/test/Makefile.tests + +# Figure out what object files we want to build... +LObjs := $(sort $(addsuffix .bc, $(basename $(Source)))) +LObjects := $(addprefix Output/,$(LObjs)) + +.PRECIOUS: $(LObjects) + +# Link the library, then perform postlink optimization... +$(DESTLIBNAME): $(DESTLIBDIR)/.dir $(LObjects) + $(LLINK) -f $(LObjects) | \ + $(LOPT) -f -cleangcc -raise -constprop -dce -o $@ + +# Install target for libraries: Copy into the gcc install directory in chris's +# tree... +# +INSTALL_DIR := /home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/ + +install:: $(DESTLIBNAME) + cp $(DESTLIBNAME) $(INSTALL_DIR) \ No newline at end of file