fix printf formats, introduce simple_cv to spin and wait for a start signal

Author: braindigitalis

include/cv.h

@@ -0,0 +1,26 @@
+#pragma once
+#include <kernel.h>
+#include <stdatomic.h>
+
+typedef struct simple_cv {
+	atomic_int waiting;
+} simple_cv_t;
+
+static inline void simple_cv_init(simple_cv_t *cv) {
+	atomic_store(&cv->waiting, 0);
+}
+
+// called by consumer
+static inline void simple_cv_wait(simple_cv_t *cv) {
+	int id = atomic_fetch_add(&cv->waiting, 1) + 1;
+
+	// spin until producer broadcasts
+	while (atomic_load(&cv->waiting) >= id) {
+		__builtin_ia32_pause();
+	}
+}
+
+// called by producer
+static inline void simple_cv_broadcast(simple_cv_t *cv) {
+	atomic_store(&cv->waiting, 0);
+}

include/kernel.h

@@ -5,15 +5,16 @@
  */
 #pragma once
 
+#define kprintf printf
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <limits.h>
-#define kprintf printf
 #include <limine.h>
 #include "idt.h"
 #include "spinlock.h"
 #include "rwlock.h"
+#include "cv.h"
 #include "printf.h"
 #include "hashmap.h"
 #include "random.h"

src/acpi.c

@@ -59,7 +59,7 @@ void init_uacpi(void) {
 	uint64_t end_tsc = rdtsc();
 	tsc_per_sec = end_tsc - start_tsc;
 	mhz = tsc_per_sec / 1000000;
-	dprintf("mhz = %llu, tsc_per_sec = %llu\n", mhz, tsc_per_sec);
+	dprintf("mhz = %lu, tsc_per_sec = %lu\n", mhz, tsc_per_sec);
 
 	dprintf("init_uacpi uacpi_initialize(0)\n");
 	uacpi_context_set_log_level(UACPI_LOG_INFO);
@@ -148,7 +148,7 @@ void init_acpi() {
 		if (*ptr == 'A' && *(ptr + 1) == 'P' && *(ptr + 2) == 'I' && *(ptr + 3) == 'C') {
 			// found MADT
 			lapic_ptr = (uint64_t) (*((uint32_t *) (ptr + 0x24)));
-			kprintf("Detected: 32-Bit Local APIC [base: %llx]\n", lapic_ptr);
+			kprintf("Detected: 32-Bit Local APIC [base: %lx]\n", lapic_ptr);
 			ptr2 = ptr + *((uint32_t *) (ptr + 4));
 			// iterate on variable length records
 			for (ptr += 44; ptr < ptr2; ptr += ptr[1]) {
@@ -166,7 +166,7 @@ void init_acpi() {
 						mmio[0] = 0x01;
 						uint32_t count = ((mmio[0x10 / 4]) & 0xFF) + 1;
 						ioapic_gsi_count[numioapic] = count;
-						kprintf("Detected: IOAPIC [base: %llx; id: %d gsi base: %d gsi count: %d]\n",
+						kprintf("Detected: IOAPIC [base: %lx; id: %d gsi base: %d gsi count: %d]\n",
 							ioapic_ptr[numioapic], ioapic_ids[numioapic],
 							ioapic_gsi_base[numioapic], count);
 						numioapic++;
@@ -186,7 +186,7 @@ void init_acpi() {
 					}
 					case 5:
 						lapic_ptr = *((uint64_t *) (ptr + 4));
-						kprintf("Detected: 64-Bit Local APIC [base: %llx]\n", lapic_ptr);
+						kprintf("Detected: 64-Bit Local APIC [base: %lx]\n", lapic_ptr);
 						break;             // found 64 bit LAPIC
 				}
 			}

src/ahci.c

@@ -115,7 +115,6 @@ int storage_device_ahci_block_read(void* dev, uint64_t start, uint32_t bytes, un
 	if (!sd) {
 		return 0;
 	}
-	dprintf("storage_device_ahci_block_read bytes=%d\n", bytes);
 	uint32_t divided_length = bytes / sd->block_size;
 	ahci_hba_mem_t* abar = (ahci_hba_mem_t*)sd->opaque2;
 	ahci_hba_port_t* port = &abar->ports[sd->opaque1];
@@ -129,8 +128,6 @@ int storage_device_ahci_block_read(void* dev, uint64_t start, uint32_t bytes, un
 
 	size_t max_per_read = AHCI_DEV_SATAPI ? 1 : 16;
 
-	dprintf("divided length: %d\n", divided_length);
-
 	if (divided_length < max_per_read) {
 		return check_type(port) == AHCI_DEV_SATAPI ? ahci_atapi_read(port, start, divided_length, (uint16_t*)buffer, abar) : ahci_read(port, start, divided_length, (uint16_t*)buffer, abar);
 	}
@@ -296,7 +293,7 @@ bool ahci_read(ahci_hba_port_t *port, uint64_t start, uint32_t count, uint16_t *
 		spin++;
 	}
 	if (spin == 1000000) {
-		dprintf("Port hung (start %llx count %llx)\n", start, count);
+		dprintf("Port hung (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -309,14 +306,14 @@ bool ahci_read(ahci_hba_port_t *port, uint64_t start, uint32_t count, uint16_t *
 		if ((port->ci & (1<<slot)) == 0) 
 			break;
 		if (port->is & HBA_PxIS_TFES) { // Task file error
-			dprintf("Read disk error (start %llx count %llx)\n", start, count);
+			dprintf("Read disk error (start %lx count %x)\n", start, count);
 			return false;
 		}
 	}
 
 	// Check again
 	if (port->is & HBA_PxIS_TFES) {
-		dprintf("Read disk error (start %llx count %llx)\n", start, count);
+		dprintf("Read disk error (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -414,8 +411,6 @@ bool ahci_atapi_read(ahci_hba_port_t *port, uint64_t start, uint32_t count, uint
 		return false;
 	}
 
-	dprintf("ahci_atapi_read %d %d %016x\n", start, count, buf);
-
 	ahci_hba_cmd_header_t* cmdheader = (ahci_hba_cmd_header_t*)(uint64_t)(port->clb);
 	cmdheader += slot;
 
@@ -463,7 +458,7 @@ bool ahci_atapi_read(ahci_hba_port_t *port, uint64_t start, uint32_t count, uint
 	};
 
 	if (spin == 1000000) {
-		dprintf("Port hung [atapi] (start %llx count %llx)\n", start, count);
+		dprintf("Port hung [atapi] (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -472,13 +467,13 @@ bool ahci_atapi_read(ahci_hba_port_t *port, uint64_t start, uint32_t count, uint
 	while(true) {
 		if ((port->ci & (1<<slot)) == 0) break;
 		if (port->is & HBA_PxIS_TFES) {
-			dprintf("Read disk error [atapi] (start %llx count %llx)\n", start, count);
+			dprintf("Read disk error [atapi] (start %lx count %x)\n", start, count);
 			return false;
 		}
 	}
 
 	if (port->is & HBA_PxIS_TFES) {
-		dprintf("Read disk error [atapi] (start %llx count %llx)\n", start, count);
+		dprintf("Read disk error [atapi] (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -548,7 +543,7 @@ bool ahci_write(ahci_hba_port_t *port, uint64_t start, uint32_t count, char *buf
 		spin++;
 	}
 	if (spin == 1000000) {
-		dprintf("Port hung [write] (start %llx count %llx)\n", start, count);
+		dprintf("Port hung [write] (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -559,14 +554,14 @@ bool ahci_write(ahci_hba_port_t *port, uint64_t start, uint32_t count, char *buf
 		if ((port->ci & (1<<slot)) == 0)
 		break;
 		if (port->is & HBA_PxIS_TFES) { // Task file error
-			dprintf("Write disk error (start %llx count %llx)\n", start, count);
+			dprintf("Write disk error (start %lx count %x)\n", start, count);
 			return false;
 		}
 	}
 
 	// Check again
 	if (port->is & HBA_PxIS_TFES) {
-		dprintf("Write disk error (start %llx count %llx)\n", start, count);
+		dprintf("Write disk error (start %lx count %x)\n", start, count);
 		return false;
 	}
 
@@ -595,7 +590,7 @@ void init_ahci()
 
 	ahci_base = pci_mem_base(ahci_base);
 	uint32_t irq_num = pci_setup_interrupt("AHCI", ahci_device, logical_cpu_id(), ahci_handler, ahci_base);
-	dprintf("AHCI base MMIO: %08x INT %d\n", ahci_base, irq_num);
+	dprintf("AHCI base MMIO: %lx INT %d\n", ahci_base, irq_num);
 
 	probe_port((ahci_hba_mem_t*)ahci_base, ahci_device);
 }

src/ap.c

@@ -9,6 +9,7 @@ volatile struct limine_smp_request smp_request = {
 extern volatile idt_ptr_t idt64;
 
 atomic_size_t aps_online = 0;
+simple_cv_t boot_condition;
 
 void kmain_ap(struct limine_smp_info *info)
 {
@@ -19,9 +20,7 @@ void kmain_ap(struct limine_smp_info *info)
 	kprintf("CPU: %u online; ID: %u\n", info->processor_id, info->lapic_id);
 	atomic_fetch_add(&aps_online, 1);
 
-	for(;;) {
-		_mm_pause();
-	}
+	simple_cv_wait(&boot_condition);
 	/**
 	 * @todo Insert cpu-local scheduler loop here.
 	 * Each AP will run its own list of executing BASIC processes. Accessing
@@ -41,4 +40,6 @@ void kmain_ap(struct limine_smp_info *info)
 	 *    state, so we dont have to peek at another scheduler instance's command queue to
 	 *    see if a process ours is waiting on still lives.
 	 */
+	 dprintf("Got start signal on cpu #%d\n", info->processor_id);
+	 wait_forever();
 }

src/basic/array.c

@@ -61,7 +61,7 @@ const char* basic_get_string_array_variable(const char* var, int64_t index, stru
 			return "";
 		}
 	}
-	dprintf("Invalid string array variable '%s' index '%d'\n", var, index);
+	dprintf("Invalid string array variable '%s' index '%ld'\n", var, index);
 	tokenizer_error_print(ctx, "No such array variable");
 	return "";
 }
@@ -82,7 +82,7 @@ int64_t basic_get_int_array_variable(const char* var, int64_t index, struct basi
 			return cur->values[index];
 		}
 	}
-	dprintf("Invalid int array variable '%s' index '%d'\n", var, index);
+	dprintf("Invalid int array variable '%s' index '%ld'\n", var, index);
 	tokenizer_error_print(ctx, "No such array variable");
 	return 0;
 }
@@ -105,7 +105,7 @@ bool basic_get_double_array_variable(const char* var, int64_t index, struct basi
 			return true;
 		}
 	}
-	dprintf("Invalid float array variable '%s' index '%d'\n", var, index);
+	dprintf("Invalid float array variable '%s' index '%ld'\n", var, index);
 	tokenizer_error_print(ctx, "No such array variable");
 	*ret = 0;
 	return false;

src/basic/console.c

@@ -4,6 +4,9 @@
  */
 #include <kernel.h>
 
+extern spinlock_t console_spinlock;
+extern spinlock_t debug_console_spinlock;
+
 int64_t basic_get_text_max_x(struct basic_ctx* ctx)
 {
 	return get_text_width();
@@ -122,7 +125,11 @@ void print_statement(struct basic_ctx* ctx)
 	accept_or_return(PRINT, ctx);
 	const char* out = printable_syntax(ctx);
 	if (out) {
+		lock_spinlock(&console_spinlock);
+		lock_spinlock(&debug_console_spinlock);
 		putstring((console*)ctx->cons, out);
+		unlock_spinlock(&console_spinlock);
+		unlock_spinlock(&debug_console_spinlock);
 	}
 }
 

src/basic/function.c

@@ -283,7 +283,7 @@ int64_t basic_eval_int_fn(const char* fn_name, struct basic_ctx* ctx)
 		while (extract_comma_list(def, ctx));
 		struct basic_ctx* atomic = basic_clone(ctx);
 		atomic->fn_type = RT_INT;
-		dprintf("Function eval, jump to line %d\n", def->line);
+		dprintf("Function eval, jump to line %ld\n", def->line);
 		jump_linenum(def->line, atomic);
 
 		while (!basic_finished(atomic)) {

src/basic/string.c

@@ -19,7 +19,7 @@ char* basic_str(struct basic_ctx* ctx)
 	PARAMS_GET_ITEM(BIP_INT);
 	PARAMS_END("STR$","");
 	char res[MAX_STRINGLEN];
-	snprintf(res, MAX_STRINGLEN, "%lld", intval);
+	snprintf(res, MAX_STRINGLEN, "%ld", intval);
 	return gc_strdup(res);
 }
 

src/basic/tokenizer.c

@@ -333,7 +333,7 @@ void tokenizer_error_print(struct basic_ctx* ctx, const char* error)
 				set_video_auto_flip(true);
 			}
 			setforeground(current_console, COLOUR_LIGHTRED);
-			kprintf("Error on line %d: %s\n", ctx->current_linenum, error);
+			kprintf("Error on line %ld: %s\n", ctx->current_linenum, error);
 			setforeground(current_console, COLOUR_WHITE);
 			ctx->ended = true;
 		}