Add FREE_FLAG

.gdbinit

@@ -1,7 +1,8 @@
 # target remote 192.168.1.110:1234
 set auto-load safe-path .
 
-target remote 192.168.2.62:1234
+#target remote 192.168.2.62:1234
+target remote 192.168.10.38:1234
 add-symbol-file ~/Kernel/kernel.elf 0x100000
 add-symbol-file ~/Userland/0000-sampleCodeModule.elf 0x400000
 

Kernel/Makefile

@@ -17,7 +17,7 @@ OBJECTS_INTERRUPTIONS=$(SOURCES_INTERRUPTIONS:.c=.o)
 OBJECTS_INTERRUPTIONS_ASM=$(SOURCES_INTERRUPTIONS_ASM:.asm=.o)
 OBJECTS_ASM=$(SOURCES_ASM:.asm=.o)
 LOADERSRC=loader.asm
-FLAGS=../flags.txt
+FLAGS=flags.txt
 
 LOADEROBJECT=$(LOADERSRC:.asm=.o)
 STATICLIBS=
@@ -33,7 +33,7 @@ $(KERNEL_ELF): $(STATICLIBS) $(ALL_OBJECTS)
 	$(LD) $(LDFLAGS) -T kernel.ld --oformat=elf64-x86-64 -o $@ $^
 
 %.o: %.c $(FLAGS)
-	$(GCC) $(GCCFLAGS) -I./include -I./drivers/include -I./interruptions/include -I./utils/include -I./tests/include $(MFLAG) $(KFLAG) -c $< -o $@
+	$(GCC) $(GCCFLAGS) -I./include -I./drivers/include -I./interruptions/include -I./utils/include -I./tests/include $(MFLAG) $(KFLAG) $(FFLAG) -c $< -o $@
 
 %.o : %.asm
 	$(ASM) $(ASMFLAGS) $< -o $@

Kernel/interruptions/systemCallsDispatcher.c

@@ -3,7 +3,6 @@
 #include "systemCallsDispatcher.h"
 
 uint64_t systemCallsDispatcher(uint64_t rdi, uint64_t rsi, uint64_t rdx, uint64_t rcx, uint64_t r8, uint64_t r9) {
-    void *aux;
 
     switch (rdi) {
         case 0:
@@ -23,12 +22,17 @@ uint64_t systemCallsDispatcher(uint64_t rdi, uint64_t rsi, uint64_t rdx, uint64_
             return (uint64_t) processes();
         case 7:
             return (uint64_t) getSems();
-        case 8:
+        case 8: {
-            aux = pvPortMalloc((size_t) rsi);
+            void *aux = pvPortMalloc((size_t) rsi);
+            #ifdef FREE_EXIT
             processMallocs(aux);
+            #endif
             return (uint64_t) aux;
+        }
         case 9:
+            #ifdef FREE_EXIT
             processFrees((void *) rsi);
+            #endif
             vPortFree((void *) rsi);
             break;
         case 10:

Kernel/utils/include/memManagerBuddy.h

@@ -4,6 +4,7 @@
 #include "memManager.h"
 #include <stddef.h>
 #include <stdint.h>
+#include "lib.h"
 
 #define NODE_UNUSED 0
 #define NODE_USED 1	

Kernel/utils/include/schedulerLib.h

@@ -23,7 +23,9 @@ void unblockIO();
 char getState(int pid);
 char isForeground();
 void wait();
+#ifdef FREE_EXIT
 void processFrees(void *ptr);
 void processMallocs(void *ptr);
+#endif
 
 #endif

Kernel/utils/memManagerBuddy.c

@@ -186,7 +186,6 @@ uint64_t getSize(int level, int max_level) {
 	return (1 << (max_level - level)) * PAGE_SIZE;
 }
 
-#include <stddef.h>
 void buddy_dumpMM(int index , int level, uint64_t *size, uint64_t *used) {
 	switch (self.tree[index]) {
 	case NODE_UNUSED:

Kernel/utils/scheduler.c

@@ -23,8 +23,10 @@ typedef struct processCDT {
     int children;
     char backWait;
     uint64_t bPointer;
+    #ifdef FREE_EXIT
     void ** mmRegs;
     int mmRegsQty;
+    #endif
 } processCDT;
 
 typedef struct sleepCDT {
@@ -154,9 +156,11 @@ int enqueueProcess(void (*fn)(int, char **), char foreground, int argc, char *ar
     process->children = 0;
     process->backWait = 0;
     process->bPointer = (uint64_t) auxi;
+    #ifdef FREE_EXIT
     void * mmRegs[MAX_MALLOCS];
     process->mmRegs = mmRegs;
     process->mmRegsQty = 0;
+    #endif
 
     process->rsp = _initialize_stack_frame(fn, rbp, argc, argv);
 
@@ -349,9 +353,11 @@ char kill(int pid) {
 
     vPortFree(del->fd);
     vPortFree(del->name);
+    #ifdef FREE_EXIT
     for (int i = 0; i < del->mmRegsQty; i++) {
         vPortFree(del->mmRegs[i]);
     }
+    #endif
 
     // vPortFree((void *) ((uint64_t) del->rbp - STACK_SIZE));
     vPortFree((void *) del->bPointer);
@@ -364,8 +370,9 @@ char kill(int pid) {
     return EXIT_SUCCESS;
 }
 
+#ifdef FREE_EXIT
 void processMallocs(void *ptr) {
-    if (currentProcess == NULL)
+    if (currentProcess == NULL || currentProcess->mmRegsQty + 1 == MAX_MALLOCS)
         return;
     
     currentProcess->mmRegs[currentProcess->mmRegsQty++] = ptr;
@@ -377,13 +384,11 @@ void processFrees(void *ptr) {
     
     char flag = 0;
     for (int i = 0; i < currentProcess->mmRegsQty; i++) {
-        if (currentProcess->mmRegs[i] == ptr) {
+        if (currentProcess->mmRegs[i] == ptr)
             flag = 1;
-        }
         if (flag) {
-            if (i != currentProcess->mmRegsQty - 1) {
+            if (i != currentProcess->mmRegsQty - 1)
                 currentProcess->mmRegs[i] = currentProcess->mmRegs[i + 1];
-            }
             else currentProcess->mmRegs[i] = NULL;
         }
         
@@ -391,6 +396,7 @@ void processFrees(void *ptr) {
     if (flag)
         currentProcess->mmRegsQty--;
 }
+#endif
 
 int getFdOut() {
     if (currentProcess == NULL)

Makefile

@@ -1,25 +1,31 @@
 all:  bootloader kernel userland image
 spanish:  bootloader kernelSpanish userland imageSpanish
 buddy:  bootloader kernelBuddy userland imageBuddy
+free:  bootloader kernelFree userland imageFree
 
 bootloader:
 	cd Bootloader; make all
 
 kernel:
-	@if ! grep -q "ke" flags.txt; then\
+	@if ! grep -q "ke" Kernel/flags.txt; then\
-		echo "ke" > flags.txt;\
+		echo "ke" > Kernel/flags.txt;\
     fi
 	cd Kernel; make all
 kernelSpanish:
-	@if ! grep -q "ks" flags.txt; then\
+	@if ! grep -q "ks" Kernel/flags.txt; then\
-		echo "ks" > flags.txt;\
+		echo "ks" > Kernel/flags.txt;\
     fi
 	cd Kernel; make all KFLAG=-DSPANISH
 kernelBuddy:
-	@if ! grep -q "be" flags.txt; then\
+	@if ! grep -q "be" Kernel/flags.txt; then\
-		echo "be" > flags.txt;\
+		echo "be" > Kernel/flags.txt;\
     fi
 	cd Kernel; make all MFLAG=-DBUDDY
+kernelFree:
+	@if ! grep -q "fr" Kernel/flags.txt; then\
+		echo "fr" > Kernel/flags.txt;\
+    fi
+	cd Kernel; make all FFLAG=-DFREE_EXIT
 
 userland:
 	cd Userland; make all
@@ -30,6 +36,8 @@ imageSpanish: kernelSpanish bootloader userland
 	cd Image; make all
 imageBuddy: kernelBuddy bootloader userland
 	cd Image; make all
+imageFree: kernelFree bootloader userland
+	cd Image; make all
 
 clean:
 	cd Bootloader; make clean
@@ -43,4 +51,4 @@ test:
 	plog-converter -a '64:1,2,3;GA:1,2,3;OP:1,2,3' -t tasklist -o report.tasks PVS-Studio.log
 	cppcheck --quiet --enable=all --force --inconclusive .
 
-.PHONY: bootloader image imageSpanish imageBuddy collections kernel kernelSpanish kernelBuddy userland all clean test
+.PHONY: bootloader image imageSpanish imageBuddy imageFree collections kernel kernelSpanish kernelBuddy kernelFree userland all clean test

Readme.txt

@@ -1,31 +0,0 @@
-x64BareBones is a basic setup to develop operating systems for the Intel 64 bits architecture.
-
-The final goal of the project is to provide an entry point for a kernel and the possibility to load extra binary modules separated from the main kernel.
-
-Environment setup:
-1- Install the following packages before building the Toolchain and Kernel:
-
-nasm qemu gcc make
-
-2- Build the Toolchain
-
-Execute the following commands on the x64BareBones project directory:
-
-  user@linux:$ cd Toolchain
-  user@linux:$ make all
-
-3- Build the Kernel
-
-From the x64BareBones project directory run:
-
-  user@linux:$ make all
-
-4- Run the kernel
-
-From the x64BareBones project directory run:
-
-  user@linux:$ ./run.sh
-
-
-Author: Rodrigo Rearden (RowDaBoat)
-Collaborator: Augusto Nizzo McIntosh