Cleaned up a lot of printing code, renamed original print to kprint.

Author: pradosh-arduino

source/includes/graphics.h

@@ -87,19 +87,35 @@ void done(cstring message, cstring  file);
 /* Normal Hybrid printing functions ahead */
 
 /**
- * @brief Prints a char, using print(&c);
+ * @brief Prints a char, using vput(char c); Replaces '\b' with "\b \b"
  * 
  * @param c char to print
  */
 void putc(char c);
 
+/**
+ * @brief Prints a char though the standard streams.
+ * 
+ * @param c The charecter to be printed.
+ */
+void vputc(char c);
+
 /**
  * @brief Prints a value in binary format
  * 
  * @param value The value that will be printed
  */
 void printbin(uint8_t value);
 
+int format_number(
+    char *out,
+    long value,
+    int base,
+    int width,
+    bool zero,
+    bool upper
+);
+
 /**
  * @brief Prints with formatting supported.
  * 
@@ -163,21 +179,19 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
  */
 int snprintf(char *buf, size_t size, const char *fmt, ...);
 
-
 /**
- * @brief Prints a char, using print(&c);
+ * @brief RAW kernel print function for plain strings. (No Formatter & No Streams)
  * 
- * @param c char to print
- * @note Internally using Flanterm's putchar function
+ * @param msg The string.
  */
-void vputc(char c);
+void kprint(cstring msg);
 
 /**
- * @brief Print function for plain strings. (No Formatter)
+ * @brief Plain print function, goes through the stream.
  * 
- * @param msg The string.
+ * @param s Normal string to be displayed
  */
-void print(cstring msg);
+void print(cstring s);
 
 /**
  * @brief 

source/kernel/C/executables/fwde.c

@@ -57,9 +57,9 @@ void execute_fwde(int64* addr, kernel_data* data){
         entry_function execute_binary = (entry_function)local;
 
         info("Function is ready! executing it..", __FILE__);
-        print("=========================================================\n");
+        printf("=========================================================");
         execute_binary(data);
-        print("=========================================================\n");
+        printf("=========================================================");
     }else{
         error("Unsupported architecture!", __FILE__);
         return;

source/kernel/C/heap.c

@@ -18,7 +18,7 @@ uint64_t memory_used = 0;
 
 void mm_init(uintptr_t kernel_end, int64 heap_size)
 {
-    info("Initializing heap.", __FILE__);
+    info("Initializing heap", __FILE__);
 
     heap_begin = kernel_end;
     heap_end   = heap_begin + heap_size;
@@ -29,13 +29,13 @@ void mm_init(uintptr_t kernel_end, int64 heap_size)
     printf("heap begin -> 0x%X", heap_begin);
     printf("heap end   -> 0x%X", heap_end);
 
-    done("Heap initialized.", __FILE__);
+    done("Heap initialized", __FILE__);
 }
 
 void* kmalloc(size_t size)
 {
     if (size == 0) {
-        warn("kmalloc: Cannot allocate 0 bytes.", __FILE__);
+        warn("kmalloc: Cannot allocate 0 bytes", __FILE__);
         return NULL;
     }
 
@@ -87,7 +87,7 @@ void* kmalloc(size_t size)
 void kfree(void* ptr)
 {
     if (!ptr) {
-        warn("kfree: Cannot free null pointer.", __FILE__);
+        warn("kfree: Cannot free null pointer", __FILE__);
         return;
     }
 
@@ -135,4 +135,4 @@ void mm_print_out()
     debug_printf("%sMemory used :%s %u KiB\n", yellow_color, reset_color, memory_used/(1 KiB));
     debug_printf("%sMemory free :%s %u KiB\n", yellow_color, reset_color, (heap_end - last_alloc)/(1 KiB));
     debug_printf("%sHeap size   :%s %u KiB\n", yellow_color, reset_color, (heap_end - heap_begin)/(1 KiB));
-}
+}

source/kernel/C/kernel.c

@@ -123,6 +123,7 @@ void main(void) {
     stream_init();
     // Fetch the first framebuffer.
     framebuffer = framebuffer_request.response->framebuffers[0];
+    memmap = memory_map_request.response;
 
     ft_ctx = flanterm_fb_simple_init(
         framebuffer->address, framebuffer->width, framebuffer->height, framebuffer->pitch
@@ -154,6 +155,10 @@ void main(void) {
      */
     mm_init(0x1000000, 64 MiB);
 
+    // Optional method of initializing heap, TODO make an VMM & PMM
+    // void* heap_page = allocate_pages(64 MiB / PAGE_SIZE);
+    // mm_init(heap_page, 64 MiB);
+
     struct memory_context* memory = (struct memory_context*)kmalloc(sizeof(struct memory_context));
 
     acpi_init();
@@ -166,7 +171,6 @@ void main(void) {
     RTL8139 = (struct rtl8139*) kmalloc(sizeof(struct rtl8139));
 
     analyze_memory_map(memory, memory_map_request);
-    memmap = memory_map_request.response;
 
     uintptr_t page1 = allocate_page();
     uintptr_t page2 = allocate_page();
@@ -243,48 +247,16 @@ void main(void) {
     sh_exec();
 }
 
-/**
- * @brief The basic raw print function. (DO NOT HANDLE STREAMS)
- * 
- * @param msg The message to be printed
- */
-void print(cstring msg) {
-    if(!isBufferReady) return;
-    if(msg == null){
-        flanterm_write(ft_ctx, "null", 4);
-        return;
-    }
-    flanterm_write(ft_ctx, msg, strlen(msg));
-}
-
-/**
- * @brief The basic put char function.
- * 
- * @param c The char to be printed
- */
-extern void vputc(char c);
-void putc(char c){
-    if(!isBufferReady)
-        return;
-
-
-    if (c == '\b')
-    {
-        vputc('\b');
-        vputc(' ');
-    }
-
-    vputc(c);
-}
-
-/**
- * @brief ACPI Shutdown code wrapper.
- * 
- */
 void shutdown(){
+    info("shutdown has been called", __FILE__);
+    debug_printf("hhdm offset -> 0x%x", hhdm_request.response->offset);
+
     acpi_shutdown_hack(hhdm_request.response->offset, acpi_find_sdt);
 }
 
 void reboot(){
+    info("reboot has been called", __FILE__);
+    debug_printf("hhdm offset -> 0x%x", hhdm_request.response->offset);
+
     acpi_reboot(hhdm_request.response->offset);
 }