* Implemented some functions of string lib

* Moved reboot function to its own file
* Updated Makefile
* Removed system.c
* Updated system.h

Author: Arun007coder

Makefile

@@ -31,7 +31,8 @@ ISOFILE=$(PROJECT).iso
 
 OBJECTS= 	$(SRCDIR)/boot/boot.o \
 			$(SRCDIR)/drivers/io/ports.o \
-			$(SRCDIR)/common/system.o \
+			$(SRCDIR)/drivers/power/reboot.o \
+			$(SRCDIR)/common/libs/string.o \
 			$(SRCDIR)/drivers/video/vga_text.o \
 			$(SRCDIR)/drivers/io/serial.o \
 			$(SRCDIR)/kernel/kernel.o

docs/changelog.txt

@@ -19,4 +19,11 @@
 * Implemented scrolling
 * Updated Makefile
 * Incremented kernel version
-* Added new welcome message
+* Added new welcome message
+
+26-03-2023: 10:37 PM IST v0.23.03.2ALPR
+* Implemented some functions of string lib
+* Moved reboot function to its own file
+* Updated Makefile
+* Removed system.c
+* Updated system.h

src/common/libs/string.c

@@ -0,0 +1,145 @@
+#include "string.h"
+
+int strlen(const char* s)
+{
+    int ret = 0;
+    for(ret = 0; s[ret] != '\0'; ret++);
+    return ret;
+}
+
+int memcmp(uint8_t* data1, uint8_t* data2, int n)
+{
+    while(n--)
+    {
+        if(*data1 != *data2)
+            return 0;
+        
+        data1++;
+        data2++;
+    }
+    return 1;
+}
+
+void* memcpy(void* dst, const void* src, int n)
+{
+    char* ret = (char*)dst;
+    char* d = (char*)dst;
+    char* s = (char*)src;
+
+    while(n--)
+    {
+        *d = *s;
+        d++;
+        s++;
+    }
+
+    return ret;
+}
+
+void* memset(void* dst, char val, int n)
+{
+    char* ret = (char*)dst;
+    char* d = (char*)dst;
+
+    while(n--)
+    {
+        *d++ = val;
+    }
+
+    return (void*)ret;
+}
+
+int strcpy(char* dst, const char* src)
+{
+    int n = strlen(src);
+    int ret = n;
+
+    while(n--)
+    {
+        *dst++ = *src++;
+    }
+    return ret;
+}
+
+char* strncpy(char* dst, const char* src, int n)
+{
+    unsigned count;
+    if((dst == (char*)NULL) || (src == (char*)NULL))
+    {
+        return (dst == NULL);
+    }
+
+    if(n > 255)
+    {
+        n = 255;
+    }
+
+    for(count = 0; (int)count < n; count++)
+    {
+        dst[count] = src[count];
+
+        if(src[count] == '\0')
+            break;
+    }
+
+    if(count >= 255)
+    {
+        return (dst == NULL);
+    }
+}
+
+int strcmp(const char* dst, char* src)
+{
+    int i = 0;
+    while(dst[i] == src[i])
+    {
+        if(src[i++] == 0)
+            return 0;
+    }
+
+    return 1;
+}
+
+int strncmp(const char *s1, const char *s2, int c)
+{
+    int result = 0;
+
+    while (c)
+    {
+        result = *s1 - *s2++;
+
+        if ((result != 0) || (*s1++ == 0))
+        {
+            break;
+        }
+
+        c--;
+    }
+
+    return result;
+}
+
+char* strstr(const char* in, const char* str)
+{
+    char c;
+    size_t len;
+
+    c = *str;
+    if(!c)
+        return (char*)in;
+
+    len = strlen(str);
+
+    do
+    {
+        char sc;
+        do
+        {
+            sc = *in++;
+            if (!sc)
+                return (char *)0;
+        } while (sc != c);
+    } while (strncmp(in, str, len) != 0);
+
+    return (char *)(in - 1);
+}

src/common/system.c src/drivers/power/reboot.csrc/common/system.c renamed to src/drivers/power/reboot.c

@@ -1,7 +1,7 @@
-#include "system.h"
-#include "ports.h"
+#include "power.h"
 
 void reboot()
 {
     outb(0x64, 0xFE);
+    khalt;
 }

src/include/power.h

@@ -0,0 +1,9 @@
+#ifndef __POWER_H__
+#define __POWER_H__
+
+#include "system.h"
+#include "ports.h"
+
+void reboot();
+
+#endif /*__POWER_H__*/

src/include/string.h

@@ -0,0 +1,39 @@
+#ifndef __STRING_H__
+#define __STRING_H__
+
+#include "system.h"
+
+int memcmp(uint8_t *data1, uint8_t *data2, int n); //* Implemented
+void *memcpy(void *dst, const void *src, int n);   //* Implemented
+
+uint16_t *memsetw(uint16_t *dest, uint16_t val, uint32_t count);
+uint16_t *memsetdw(uint32_t *dest, uint32_t val, uint32_t count);
+void *memset(void *dst, char val, int n);          //* Implemented
+
+int strlen(const char *s); //* Implemented
+
+char *strncpy(char *destString, const char *sourceString, int maxLength); //* Implmented
+int strcpy(char *dst, const char *src); //* Implemented
+
+int strcmp(const char *dst, char *src); //* Implemented
+int strncmp(const char *s1, const char *s2, int c); //* Implemented
+
+char *strstr(const char *in, const char *str); //* Implemented
+void strcat(void *dest, const void *src);
+
+char* itoa_r(unsigned long int n, int base);
+void itoa(char *buf, unsigned long int n, int base);
+int atoi(char *string);
+
+int isspace(char c);
+int isprint(char c);
+
+char *strdup(const char *src);
+char *strndup(const char *src, uint32_t len);
+char *strsep(char **stringp, const char *delim);
+
+void stoc(size_t n, char* buffer);
+char* stoc_r(size_t n);
+uint32_t chbc(char* str, char c);
+
+#endif /*__STRING_H__*/

src/include/system.h

@@ -15,6 +15,8 @@ void kernel_panic(char* message);
 
 #define KERNEL_START 0x100000
 #define KERNEL_END  k_end
+
+#define NULL (void*)0
 /*
 * version system
 * REVN.YY.MM.RELN(STATUS)
@@ -28,4 +30,6 @@ void kernel_panic(char* message);
 
 void reboot();
 
+typedef uint32_t size_t;
+
 #endif

src/kernel/kernel.c

@@ -6,18 +6,22 @@
 void kernelmain(const multiboot_info_t* info, uint32_t multiboot_magic)
 {
     init_serial(COM1, 1);
+
     init_text();
     text_chcolor(VGA_LIGHT_GREEN, VGA_BLACK);
     text_clear();
+
     if(multiboot_magic != 0x2BADB002)
     {
         serial_puts("multiboot bootloader magic is invalid\n");
         return;
     }
+
     text_puts("Hello World!\n");
     text_puts("multiboot bootloader magic is valid...\n");
     text_puts("Kernel version is: ");
     text_puts(KERNEL_VERSION);
     text_putc('\n');
+
     khalt;
 }