merge with gcc 4.5.0 support and binutils per-version patches from xomb branch

newlib-files/crt0.c

@@ -1,5 +1,5 @@
 
-extern int main(int argc, char **argv, char **environ);
+extern int main(); //int argc, char **argv, char **environ);
 
 extern char __bss_start, _end; // BSS should be the last think before _end
 

newlib-files/syscalls.c

@@ -69,11 +69,23 @@ wait(int *status) {
  *           returns 0 if not. Since we're hooked up to a
  *           serial port, we'll say yes and return a 1.
  */
+
+
+int gibOpen(const char* name, unsigned int nameLen, char readOnly);
+int gibRead(int fd, void* buf, unsigned int len);
+int gibWrite(int fd, void* buf, unsigned int len);
+unsigned long long initHeap();
+
+
 int
 isatty(fd)
      int fd;
 {
-  return (1);
+	if(fd < 3){
+		return 1;
+	}else{
+		return 0;
+	}
 }
 
 
@@ -116,6 +128,12 @@ stat(const char* file, struct stat *st) {
 	return 0;
 }
 
+int
+link(char *old, char *new) {
+	errno = EMLINK;
+	return -1;
+}
+
 int
 unlink(char *name) {
 	errno = ENOENT;
@@ -123,21 +141,9 @@ unlink(char *name) {
 }
 
 
-int
-write(int file, char *ptr, int len) {
-	//XXX: write to stdout
-
-	return -1;
-}
-
 // --- Memory ---
-
-/* _end is set in the linker command file */
-extern caddr_t _end;
-
 #define PAGE_SIZE 4096ULL
 #define PAGE_MASK 0xFFFFFFFFFFFFF000ULL
-#define HEAP_ADDR (((unsigned long long)&_end + PAGE_SIZE) & PAGE_MASK)
 
 /*
  * sbrk -- changes heap size size. Get nbytes more
@@ -146,20 +152,25 @@ extern caddr_t _end;
  */
 caddr_t
 sbrk(int nbytes){
-  static caddr_t heap_ptr = NULL;
+  static unsigned long long heap_ptr = 0;
   caddr_t base;
   
   // TODO: REPLACE allocPage with a call to a page allocator
   int temp;
 
-  if(heap_ptr == NULL){
-    heap_ptr = (caddr_t)HEAP_ADDR;
+  if(heap_ptr == 0){
+    heap_ptr = initHeap();
   }
 
-  base = heap_ptr;
+  base = (caddr_t)heap_ptr;
 
-  if(((unsigned long long)heap_ptr & ~PAGE_MASK) != 0ULL){
-    temp = (PAGE_SIZE - ((unsigned long long)heap_ptr & ~PAGE_MASK));
+	if(nbytes < 0){
+		heap_ptr -= nbytes;
+		return base;
+	}
+
+  if( (heap_ptr & ~PAGE_MASK) != 0ULL){
+    temp = (PAGE_SIZE - (heap_ptr & ~PAGE_MASK));
 
     if( nbytes < temp ){
       heap_ptr += nbytes;
@@ -192,6 +203,9 @@ sbrk(int nbytes){
 
 
 // --- Other ---
+ int gettimeofday(struct timeval *p, void *z){
+	 return -1;
+ }
 
 //int times(struct tms *buf) {
 //int gettimeofday(struct timeval *p, struct timezone *z){

newlib-files/vanilla-syscalls.c

@@ -0,0 +1,210 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/fcntl.h>
+#include <sys/times.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <stdio.h>
+
+//#include <_ansi.h>
+#include <errno.h>
+
+// --- Process Control ---
+
+int
+_exit(int val){
+  exit(val);
+  return (-1);
+}
+
+int
+execve(char *name, char **argv, char **env) {
+	errno = ENOMEM;
+	return -1;
+}
+
+/*
+ * getpid -- only one process, so just return 1.
+ */
+#define __MYPID 1
+int
+getpid()
+{
+  return __MYPID;
+}
+
+
+int 
+fork(void) {
+	errno = ENOTSUP;
+	return -1;
+}
+
+
+/*
+ * kill -- go out via exit...
+ */
+int
+kill(pid, sig)
+     int pid;
+     int sig;
+{
+  if(pid == __MYPID)
+    _exit(sig);
+
+
+	errno = EINVAL;
+  return -1;
+}
+
+int
+wait(int *status) {
+	errno = ECHILD;
+	return -1;
+}
+
+// --- I/O ---
+
+/*
+ * isatty -- returns 1 if connected to a terminal device,
+ *           returns 0 if not. Since we're hooked up to a
+ *           serial port, we'll say yes and return a 1.
+ */
+int
+isatty(fd)
+     int fd;
+{
+  return (1);
+}
+
+
+int
+close(int file) {
+	return -1;
+}
+
+int
+link(char *old, char *new) {
+	errno = EMLINK;
+	return -1;
+}
+
+int
+lseek(int file, int ptr, int dir) {
+	return 0;
+}
+
+int
+open(const char *name, int flags, ...) {
+	return -1;
+}
+
+int
+read(int file, char *ptr, int len) {
+	// XXX: keyboard support
+
+	return 0;
+}
+
+int 
+fstat(int file, struct stat *st) {
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int
+stat(const char *file, struct stat *st){
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int
+unlink(char *name) {
+	errno = ENOENT;
+	return -1;
+}
+
+
+int
+write(int file, char *ptr, int len) {
+	return -1;
+}
+
+// --- Memory ---
+
+/* _end is set in the linker command file */
+extern caddr_t _end;
+
+#define PAGE_SIZE 4096ULL
+#define PAGE_MASK 0xFFFFFFFFFFFFF000ULL
+#define HEAP_ADDR (((unsigned long long)&_end + PAGE_SIZE) & PAGE_MASK)
+
+/*
+ * sbrk -- changes heap size size. Get nbytes more
+ *         RAM. We just increment a pointer in what's
+ *         left of memory on the board.
+ */
+caddr_t
+sbrk(int nbytes){
+  static caddr_t heap_ptr = NULL;
+  caddr_t base;
+  
+  int temp;
+
+  if(heap_ptr == NULL){
+    heap_ptr = (caddr_t)HEAP_ADDR;
+  }
+
+  base = heap_ptr;
+
+  if(((unsigned long long)heap_ptr & ~PAGE_MASK) != 0ULL){
+    temp = (PAGE_SIZE - ((unsigned long long)heap_ptr & ~PAGE_MASK));
+
+    if( nbytes < temp ){
+      heap_ptr += nbytes;
+      nbytes = 0;
+    }else{
+      heap_ptr += temp;
+      nbytes -= temp;
+    }
+  }
+
+  while(nbytes > PAGE_SIZE){
+    //allocPage(heap_ptr);
+		
+    nbytes -= (int) PAGE_SIZE;
+    heap_ptr = heap_ptr + PAGE_SIZE;
+  }
+  
+  if( nbytes > 0){
+    //allocPage(heap_ptr);
+
+    heap_ptr += nbytes;
+  }
+
+
+  return base;
+	/*
+  static caddr_t heap_ptr = NULL;
+  caddr_t        base;
+
+  if (heap_ptr == NULL) {
+    heap_ptr = (caddr_t)&_end;
+  }
+
+  if ((RAMSIZE - heap_ptr) >= 0) {
+    base = heap_ptr;
+    heap_ptr += nbytes;
+    return (base);
+  } else {
+    errno = ENOMEM;
+    return ((caddr_t)-1);
+		}*/
+}
+
+
+// --- Other ---
+ int gettimeofday(struct timeval *p, void *z){
+	 return -1;
+ }
+