Changeset 1136 for Whitix

Timestamp:

10/14/08 19:40:04 (1 month ago)

Author:

mwhitworth

Message:

Add various stub functions, prototypes and defines.

Location:

Whitix/branches/keobject/user/libc

Files:

• include/stdarg.h (modified) (1 diff)
• include/stdint.h (modified) (1 diff)
• include/stdlib.h (modified) (1 diff)
• include/syscalls.h (modified) (2 diffs)
• include/sysdefs.h (modified) (1 diff)
• stdio/get.c (modified) (1 diff)
• stdlib/Makefile (modified) (1 diff)
• stdlib/env.c (modified) (2 diffs)
• stdlib/exit.c (modified) (2 diffs)
• string/str.c (modified) (4 diffs)

Whitix/branches/keobject/user/libc/include/stdarg.h

@@ -2 +2 @@
 #define STDC_STDARG_H
 
-typedef unsigned char* va_list;
+typedef __builtin_va_list va_list;
 
 /* Just get the memory location after the last argument */
 #define va_start(list,lastArg) \
-        (list=((va_list)&(lastArg)+va_size(lastArg)));
+        __builtin_va_start(list, lastArg)
 
 /* Must be the other way round because of the comma operator */
 #define va_arg(list,type) \
-        (list+=__va_rounded_size(type), \
-        *((type*)(list-__va_rounded_size(type))))
+        __builtin_va_arg(list, type)
 
-/* Stacks are int-aligned */
-#define __va_rounded_size(type) \
-        (((sizeof(type)+sizeof(int)-1)/sizeof(int))*sizeof(int))
-
-#define va_size(type) \
-        ((sizeof(type)+sizeof(int)-1) \
-        & ~(sizeof(int)-1))
-
-#define va_copy(dst,src) ((void)((dst)=(src)))
+#define va_copy(dst,src) __builtin_va_copy(dst, src)
 
 /* Just for a certain cleanliness */
-#define va_end(list)
+#define va_end(list) __builtin_va_end(list)
 
 #endif

Whitix/branches/keobject/user/libc/include/stdint.h

@@ -3 +3 @@
 
 typedef long int intmax_t;
+typedef unsigned long long uintmax_t;
 
 #include <inttypes.h>

Whitix/branches/keobject/user/libc/include/stdlib.h

@@ -75 +75 @@
 typedef long int int_fast32_t;
 
+#define alloca(size) __builtin_alloca(size)
+
 #endif

Whitix/branches/keobject/user/libc/include/syscalls.h

@@ -12 +12 @@
 #endif
 
-#ifndef BYTE
-typedef unsigned char BYTE;
-#endif
-
 /* Some useful structures for syscalls */
 
 struct DirEntry
 {
-        DWORD vNodeNum;
-        DWORD offset;
-        WORD length;
+        unsigned long vNodeNum;
+        unsigned long offset;
+        unsigned short length;
+        unsigned short type;
         char name[1];
 };
@@ -33 +30 @@
 struct Stat
 {
-        DWORD size;
-        DWORD vNum;
-        DWORD mode;
+        unsigned long size;
+        unsigned long vNum;
+        unsigned long mode;
         unsigned long aTime,cTime,mTime;
 };

Whitix/branches/keobject/user/libc/include/sysdefs.h

@@ -16 +16 @@
 SYSCALL(14,int,SysChangeDir,4,(char* newDir));
 SYSCALL(15,int,SysChangeRoot,4,(char* newRoot));
-SYSCALL(16,int,SysMount,16,(char* mountPoint,char* deviceName,char* fsName,void* data));
+SYSCALL(16,int,SysMount,16,(char* deviceName,char* mountName,char* fsName,void* data));
 SYSCALL(17,int,SysUnmount,4,(char* mountPoint));
 SYSCALL(18,int,SysGetDirEntries,12,(int fd,void* entries,unsigned long numBytes));

Whitix/branches/keobject/user/libc/stdio/get.c

@@ -94 +94 @@
         }else{
                 printf("ungetc: TODO\n");
+                exit(0);
         }
 

Whitix/branches/keobject/user/libc/stdlib/Makefile

@@ -1 +1 @@
 include ../make.inc
 
-OBJS = alloca.o mem.o exit.o atoi.o div.o math.o system.o qsort.o env.o time.o rand.o bsearch.o
+OBJS = mem.o exit.o atoi.o div.o math.o system.o qsort.o env.o time.o rand.o bsearch.o
 
 build: $(OBJS)

Whitix/branches/keobject/user/libc/stdlib/env.c

@@ -9 +9 @@
                 return NULL;
                 
-        printf("getenv(%s)\n", name);
+//      if (!strcmp(name, "LDEMULATION"))
+//              return "elf_i386";
+                
+//      printf("getenv(%s)\n", name);
         return NULL;
 }
@@ -15 +18 @@
 int putenv(const char* name)
 {
-        printf("putenv(%s)\n", name);
+//      printf("putenv(%s)\n", name);
         return 0;
 }

Whitix/branches/keobject/user/libc/stdlib/exit.c

@@ -6 +6 @@
 {
         printf("Abnormal program termination from %#X\n",__builtin_return_address(0));
+        
+        /* FIXME: TEMP */
+        DWORD* esp;
+        
+        asm volatile("mov %%esp, %%eax" : "=a"(esp));
+        
+        int i;
+        
+        for (i=0; i<10; i++)
+        {
+                printf("%#X\n", *esp++);
+        }
+        
         SysExit(1);
 }
@@ -16 +29 @@
 int atexit(void (*function)())
 {
+        printf("atexit(%#X)\n", function);
         return 0;
 }

Whitix/branches/keobject/user/libc/string/str.c

@@ -74 +74 @@
 int strncmp(const char* s1,const char* s2,size_t num)
 {
-        char result=0;
-
-    while (num)
-        {
-                if ((result=*s1-*s2++) || !*s1++)
-                        break;
-
-                --num;
-        }
-
-    return result;
+        unsigned char c1, c2;
+
+    while (num-- > 0)
+        {
+                c1 = (unsigned char)*s1++;
+                c2 = (unsigned char)*s2++;
+                
+                if (c1 != c2)
+                        return c1-c2;
+                
+                if (c1 == '\0')
+                        return 0;
+        }
+
+    return 0;
 }
 
@@ -261 +265 @@
 void perror(const char* string)
 {
-        fprintf(stderr,"%s: %s\n",string,strerror(errno));
+        fprintf(stderr,"%s: %s (from %#X)\n",string,strerror(errno), __builtin_return_address(0));
 }
 
@@ -440 +444 @@
 }
 
-unsigned long int strtoul(const char *nptr, char **endptr, int base)
+unsigned long int strtoul(const char *str, char **endptr, int base)
+{
+        int negative=0;
+        unsigned long number = 0;
+        
+        while (isspace(str))
+                str++;
+
+        /* Optional sign */
+        switch (*str)
+        {
+                case '-':
+                        negative=1;
+                case '+':
+                        str++;
+        }
+        
+        if (!(base & ~0x10))
+        {
+                base += 10;
+                if (*str == '0')
+                {
+                        base -=2;
+                        str++;
+                        
+                        if (tolower(*str) == 'x')
+                        {
+                                ++str;
+                                base += base;
+                        }
+                }
+                
+                if (base > 16)
+                        base = 16;
+        }
+        
+        if (((unsigned)(base - 2)) < 35)
+        {
+                unsigned long cutOffDigit, cutOff; /* Use. ULONG_MAX */
+                
+                do
+                {
+                        unsigned char digit;
+                        
+                        if ((*str - '0') <= 9)
+                                digit = *str - '0';
+                        else if (*str >= 'A')
+                                digit = tolower(*str)-'a'+10;
+                        else
+                                digit = 40;
+                        
+                        if (digit >= base)
+                                break;
+                                
+                        ++str;
+                        
+                        number = number*base + digit;
+                } while(1);
+        }
+        
+        if (endptr)
+                *endptr=str;
+        
+        return negative ? (unsigned long)(-((long)number)) : number;
+}
+
+unsigned long long int strtoull(const char *nptr, char **endptr, int base)
 {
         TODO;
-}
-
-unsigned long long int strtoull(const char *nptr, char **endptr, int base)
-{
-        TODO;
+        while (1);
 }
 
@@ -743 +809 @@
 }
 
+int strcmpi(const char* s1, const char* s2)
+{
+        return strncasecmp(s1, s2, ~0);
+}
+
 size_t strxfrm(char* dest, const char* src, size_t n)
 {