Set pid_t type

core/process.c

@@ -5,13 +5,14 @@
 #include "list.h"
 #include "mmuContext.h"
 #include "types.h"
+#include "thread.h"
 #include "uaddrspace.h"
 
 struct process {
     char name[PROCESS_NAME_MAX_LENGTH];
     int ref;
-    int pid;
+    pid_t pid;
-    int nextTid;
+    pid_t nextTid;
     struct uAddrSpace *addrSpace;
     struct thread *thList;
 
@@ -68,7 +69,7 @@ void processListPrint()
         struct thread *th;
         int nbTh;
 
-        printf("%d %s %d %d\n", proc->pid, proc->name, processCountThread(proc), proc->ref);
+        printf("%lu %s %d %d\n", proc->pid, proc->name, processCountThread(proc), proc->ref);
         list_foreach_named(proc->thList, th, nbTh, prevInProcess, nextInProcess)
         {
             if (th == cur) {
@@ -183,10 +184,10 @@ int processInitHeap(struct process *proc, uaddr_t lastUserAddr){
     return uAddrSpaceSetHeap(proc->addrSpace, lastUserAddr, 0);
 }
 
-int processGetId(struct process *proc){
+pid_t processGetId(struct process *proc){
     return proc->pid;
 }
 
-int processGetNextTid(struct process *proc){
+pid_t processGetNextTid(struct process *proc){
     return proc->nextTid++;
 }

core/process.h

@@ -1,9 +1,11 @@
 #pragma once
-#include "thread.h"
+#include "types.h"
 
 #define PROCESS_NAME_MAX_LENGTH 32
+typedef unsigned long int pid_t;
 
 struct process;
+struct thread;
 
 int processSetup();
 struct process *processCreate(char *name);
@@ -18,5 +20,5 @@ int processRemoveThread(struct thread *th);
 struct mmu_context *processGetMMUContext(struct process *th);
 struct uAddrSpace *processGetAddrSpace(struct process *proc);
 int processInitHeap(struct process *proc, uaddr_t lastUserAddr);
-int processGetId(struct process *proc);
+pid_t processGetId(struct process *proc);
-int processGetNextTid(struct process *proc);
+pid_t processGetNextTid(struct process *proc);

core/thread.c

@@ -14,7 +14,7 @@ static struct thread *currentThread;
 static struct thread *threadWithTimeout;
 static thread_id_t nextTid; // This is the TID for kernel thread ONLY
 
-thread_id_t threadGetId(struct thread *th)
+pid_t threadGetId(struct thread *th)
 {
     return th->tid;
 }

core/uaddrspace.h

@@ -1,8 +1,9 @@
 #pragma once
 #include "mmuContext.h"
 #include "process.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "types.h"
-#include <stddef.h>
 
 struct uAddrSpace;
 struct uAddrVirtualReg;

drivers/zero.c

@@ -3,6 +3,7 @@
 #include "alloc.h"
 #include "kernel.h"
 #include "klibc.h"
+#include "mem.h"
 
 struct zeroMappedEntry {
     int refCnt;

userspace/libc.c

@@ -265,8 +265,57 @@ int puts(const char *str)
         return ret;                                                                           \
     }
 
+#define PRINT_UINT(name, type)                                                                \
+    int print##name(type integer, char *str, size_t size)                                     \
+    {                                                                                         \
+        char num[sizeof(integer) * 3];                                                        \
+        int i   = 0;                                                                          \
+        int c   = 0;                                                                          \
+        int ret = 0;                                                                          \
+                                                                                              \
+        do {                                                                                  \
+            int digit = integer % 10;                                                         \
+            num[i++]  = (digit > 0) ? digit : -digit;                                         \
+            integer   = integer / 10;                                                         \
+        } while (integer != 0);                                                               \
+                                                                                              \
+        for (i = i - 1; i >= 0; i--) {                                                        \
+            if (str) {                                                                        \
+                if (size) {                                                                   \
+                    str[c++] = num[i] + '0';                                                  \
+                    size--;                                                                   \
+                    ret++;                                                                    \
+                } else {                                                                      \
+                    return ret;                                                               \
+                }                                                                             \
+            } else {                                                                          \
+                ret++;                                                                        \
+            }                                                                                 \
+        }                                                                                     \
+        return ret;                                                                           \
+    }
+
 PRINT_INT(Int, int);
-PRINT_INT(Int64, long long int);
+PRINT_INT(Lint, long int);
+PRINT_INT(Llint, long long int);
+PRINT_UINT(Uint, unsigned int);
+PRINT_UINT(Luint, long unsigned int);
+PRINT_UINT(Lluint, long long unsigned int);
+
+#define PRINT_PART(func, type, str, size, c, ret)                                             \
+    {                                                                                         \
+        int s;                                                                                \
+        type d = va_arg(ap, type);                                                            \
+        if (str)                                                                              \
+            s = func(d, &str[c], size);                                                       \
+        else                                                                                  \
+            s = func(d, NULL, size);                                                          \
+                                                                                              \
+        size -= s;                                                                            \
+        c += s;                                                                               \
+        ret += s;                                                                             \
+        break;                                                                                \
+    }
 
 int vsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
@@ -279,19 +328,8 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap)
             case '%':
                 switch (format[i + 1]) {
                     case 'i':
-                    case 'd': {
+                    case 'd': PRINT_PART(printInt, int, str, size, c, ret)
-                        int s;
+                    case 'u': PRINT_PART(printUint, uint, str, size, c, ret)
-                        int d = va_arg(ap, int);
-                        if (str)
-                            s = printInt(d, &str[c], size);
-                        else
-                            s = printInt(d, NULL, size);
-
-                        size -= s;
-                        c += s;
-                        ret += s;
-                        break;
-                    }
                     case 'p':
                     case 'x': {
                         char val[sizeof(int) * 2];
@@ -352,24 +390,15 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap)
                         switch (format[i + 2]) {
                             case 'l':
                                 switch (format[i + 3]) {
-                                    case 'd': {
+                                    case 'i':
-                                        int s;
+                                    case 'd': PRINT_PART(printLlint, long long int, str, size, c, ret)
-                                        long long int d = va_arg(ap, long long int);
+                                    case 'u': PRINT_PART(printLluint, long long unsigned int, str, size, c, ret)
-                                        if (str)
-                                            s = printInt64(d, &str[c], size);
-                                        else
-                                            s = printInt64(d, NULL, size);
-
-                                        size -= s;
-                                        c += s;
-                                        ret += s;
-                                        break;
-                                    }
                                     case 'p':
                                     case 'x': {
                                         char val[sizeof(long long int) * 2];
                                         unsigned int valIdx = 0;
-                                        long long int d     = va_arg(ap, long long int);
+                                        unsigned long long int d =
+                                            va_arg(ap, unsigned long long int);
                                         itoa(d, val, 16);
                                         if (str) {
                                             while (val[valIdx]) {
@@ -390,17 +419,28 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap)
                                 i++;
                                 break;
                             case 'i':
-                            case 'd': {
+                            case 'd': PRINT_PART(printLint, long int, str, size, c, ret)
-                                int s;
+                            case 'u':
-                                long int d = va_arg(ap, long int);
+                                PRINT_PART(printLuint, long unsigned int, str, size, c, ret)
-                                if (str)
+                            case 'p':
-                                    s = printInt64(d, &str[c], size);
+                            case 'x': {
-                                else
+                                char val[sizeof(int) * 2];
-                                    s = printInt64(d, NULL, size);
+                                unsigned int valIdx = 0;
-
+                                unsigned long int d = va_arg(ap, unsigned long int);
-                                size -= s;
+                                itoa(d, val, 16);
-                                c += s;
+                                if (str) {
-                                ret += s;
+                                    while (val[valIdx]) {
+                                        if (size) {
+                                            str[c++] = val[valIdx++];
+                                            size--;
+                                            ret++;
+                                        } else {
+                                            return ret;
+                                        }
+                                    }
+                                } else {
+                                    ret += strlen(val);
+                                }
                                 break;
                             }
                         }

userspace/main_user.c

@@ -123,7 +123,7 @@ int func_munmap()
 
 static void *print_hello(void *arg) {
         (void)arg;
-        printf("Hello World from thread %d\n", gettid());
+        printf("Hello World from thread %lu\n", gettid());
         usleep(100);
 
         return NULL;

userspace/unistd.h

@@ -3,4 +3,4 @@
 typedef unsigned int useconds_t;
 int usleep(useconds_t usec);
 
-typedef int pid_t;
+typedef unsigned long int pid_t;