v0.0.1

new commands + demo + README update + check the release notes if you care

Author: coldmayo

README.md

@@ -20,11 +20,11 @@ I watched Star Wars Episode 9 opening night in theaters and Klaud was the main c
 * nasm
 * qemu-system-x86
 
-### From Release
+### Download From Release
 * download disk image and sh file from release
 * run run.sh
 
-### From Source
+### Download From Source
 * run make toolchain
 * run make 
 * run run.sh

demo.mp4

@@ -0,0 +1,8 @@
+# Version 0.0.1
+
+Added features:
+* klaud street dice game added
+* added echo command
+* better itoa function (supports negative numbers now)
+* better random number generator (only input is highest and lowest number)
+* added demo

release_notes/v0.0.1.md

@@ -45,6 +45,5 @@ common_interrupt_handler:               ; the common parts of the generic interr
 	; return to the code that got interrupted
 	iret
 
-no_error_code_interrupt_handler	33	; create handler for interrupt 1 (keyboard)
-no_error_code_interrupt_handler 14	; create handler for interrupt 2 (paging)
-no_error_code_interrupt_handler 0   ; create handler for interrupt 3 (timer)
+no_error_code_interrupt_handler	33	; for keyboard
+no_error_code_interrupt_handler 0   ; for timer

src/kernel/arch/i686/interupt_handler.asm

@@ -10,11 +10,9 @@
 #include "libs/strings.h"
 #include "arch/i686/serial_port.h"
 #include "keyboard.h"
-//#include "paging.h"
 
 #define INTERRUPTS_DESCRIPTOR_COUNT 256 
-#define INTERRUPTS_KEYBOARD 33 
-#define INTERRUPTS_PAGING 14 
+#define INTERRUPTS_KEYBOARD 33
 #define INTERRUPTS_TIMER 0 
 
 struct IDTDescriptor idt_descriptors[INTERRUPTS_DESCRIPTOR_COUNT];
@@ -43,9 +41,8 @@ void interrupts_init_descriptor(int index, unsigned int address)
 
 void interrupts_install_idt()
 {
-	interrupts_init_descriptor(INTERRUPTS_KEYBOARD, (unsigned int) interrupt_handler_33);
-	interrupts_init_descriptor(INTERRUPTS_PAGING, (unsigned int) interrupt_handler_14);
 	interrupts_init_descriptor(INTERRUPTS_TIMER,(unsigned int) interrupt_handler_0);
+	interrupts_init_descriptor(INTERRUPTS_KEYBOARD, (unsigned int) interrupt_handler_33);
 
 	idt.address = (int) &idt_descriptors;
 	idt.size = sizeof(struct IDTDescriptor) * INTERRUPTS_DESCRIPTOR_COUNT;
@@ -103,10 +100,9 @@ void interrupt_handler(__attribute__((unused)) struct cpu_state cpu, unsigned in
 			pic_acknowledge(interrupt);
 
 			break;
-		
-		case INTERRUPTS_PAGING:
-			break;
 		case INTERRUPTS_TIMER:
+			printf("penis");
+			pic_acknowledge(interrupt);
 			break;
 		default:
 			break;

src/kernel/interrupts.c

@@ -38,6 +38,8 @@ void help() {
         "Commands:\r\n"
         "klaud: Everything starts with Klaud.\r\n"
         "klaud ascii: prints ascii picture of Klaud.\r\n"
+        "klaud echo <phrase>: returns whatever you say back\r\n"
+        "klaud dice <bet value (int)>: gamble all your money away by playing dice with klaud\r\n"
         "klaud live-slug-reaction: ascii art of the 'live slug reaction' meme\r\n"
         "klaud shrine: Klaud shrine in ascii art for your Klaud worshiping needs\r\n"
         "klaud rizz: rizz up Klaud and see what he says\r\n"

src/kernel/libs/asciiArt.c

@@ -17,7 +17,7 @@ void makeLine(int numSyl,int * struc) {
     int syl = numSyl;
     int i;
     for (i=0;syl!=0;i++) {
-        int newWord = rand(33)%(((syl)+1)-1) + 1;
+        int newWord = randint(syl,1);
         if (newWord != 0) {
             syl = syl-newWord;
             struc[i] = abs(newWord);
@@ -48,7 +48,7 @@ void makeLine(int numSyl,int * struc) {
                 }
             }
             //printf("\n");
-            int randNum = abs(rand(32)%((2+1)-0) + 0);
+            int randNum = abs(randint(2,0));
             //printf("%d",randNum);
             if (j%2==0) {printf("%s ",noun[ops[randNum]]);}
             else {printf("%s ",verb[ops[randNum]]);}
@@ -63,7 +63,7 @@ void makeLine(int numSyl,int * struc) {
                     l++;
                 }
             }
-            int randNum = abs(rand(32)%((2+1)-0) + 0);
+            int randNum = abs(randint(2,0));
             //printf("%d",randNum);
             printf("%s ",noun[ops[randNum]]);
         }

src/kernel/libs/haikuu.c

@@ -350,7 +350,7 @@ void append(char s[], char n) {
     s[len+1] = '\0';
 }
 
-// random number from 1 to 10
+// random number
 
 int rand(uint32_t *state) {
     	// Precomputed parameters for Schrage's method
@@ -370,6 +370,10 @@ int rand(uint32_t *state) {
 	return *state = result;
 }
 
+int randint(int hi, int lo) {
+    return rand(32)%((hi+1)-lo) + lo;
+}
+
 char * slice_str(const char * str, char * buffer, int start, int end)
 {
     int j = 0;

src/kernel/libs/stdio.c

@@ -61,10 +61,26 @@ int convert(char s[])
     return num;
 }
 
-char * itoa (int val, int base) {
-	static char buf[32] = {0};
-    int i = 30;
-    for(; val && i ; --i, val /= base)
-        buf[i] = "0123456789abcdef"[val % base];
-    return &buf[i+1];
+char *itoa(int nbr, int base)
+{
+    static char rep[] = "0123456789";
+    static char buff[65];
+    char        *ptr;
+    int         neg;
+
+    ptr = &buff[64];
+    *ptr = '\0';
+    neg = nbr;
+    if (nbr < 0)
+        nbr *= -1;
+    if (nbr == 0)
+        *--ptr = rep[nbr % 10];
+    while (nbr != 0)
+    {
+        *--ptr = rep[nbr % 10];
+        nbr /= 10;
+    }
+    if (neg < 0)
+        *--ptr = '-';
+    return (ptr);
 }

src/kernel/libs/strings.c

@@ -69,13 +69,16 @@ void __attribute__((section(".entry"))) start(uint16_t bootDrive)
     for (;;);
 }
 
-// look at all these if statements. very disgusting 
+// user input function. This could rank in my top 10 ugliest pieces of code to date. I'm
+// sure as hell not fixing it lmao
 
 void user_input(char *input) {
     int len = strlen(input);
     char buffer[len + 1];
     static char rizz[6];
     static char dice[6];
+    static char umoney[6];
+    static char kmoney[6];
     if (strcmp(rizz,"True") == 0) {
         int score = rizzScore(input);
         printf("\n");
@@ -89,6 +92,29 @@ void user_input(char *input) {
         printf(" he said in his native language\n");
         memcpy(rizz,"False",strlen("False")+1);
         printf("> ");
+    } else if (strcmp(dice,"True") == 0) {
+        if (strcmp(input,"exit") != 0) {
+            int score = convert(umoney);
+            int bscore = convert(kmoney);
+            int mroll = randint(6,1) + randint(6,1);
+            int kroll = randint(6,1) + randint(6,1);
+            if (mroll >= kroll) {
+                score = score + convert(input);
+                bscore = bscore - convert(input);
+            } else {
+                score = score - convert(input);
+                bscore = bscore + convert(input);
+            }
+            memcpy(umoney,itoa(score,10),6);
+            memcpy(kmoney,itoa(bscore,10),6);
+            printf("your roll: %d, klaud roll: %d\n",mroll,kroll);
+            printf("your money: %s, klaud money: %s\n",umoney,kmoney);
+            printf("Type 'exit' to leave the game\nPlace bet>");
+        } else {
+            memcpy(dice,"False",strlen("False")+1);
+            clrscr();
+            printf("> ");
+        }
     } else if (strlen(input) <= 4) {
         printf("Every command starts with klaud, try again");
         printf("\n> ");
@@ -168,12 +194,23 @@ void user_input(char *input) {
                 "Chewbacca was the person who convinced Klaud to join the Resistance"
             };
             int arrMax = *(&factList + 1) - factList;
-            int randNum = rand(32)%((arrMax+1)-0) + 0;
+            int randNum = randint(arrMax,0);
             if (randNum == 12) {randNum = 11;}   // im not sure why this works but oh well
             printf("%s\n> ",factList[randNum]);
         } else if (strcmp(slice_str(input,buffer,0,9),"klaud plot")==0) {
             graph(slice_str(input,buffer,11,len),22);
             printf("> ");
+        } else if (strcmp(slice_str(input,buffer,0,9),"klaud echo")==0) {
+            printf("'%s' Klaud said in his native language",slice_str(input,buffer,11,len));
+            printf("\n> ");
+        } else if (strcmp(slice_str(input,buffer,0,9),"klaud dice")==0) {
+            memcpy(dice,"True",strlen("True")+1);
+            memcpy(umoney,"500",strlen("500")+1);
+            memcpy(kmoney,"500",strlen("500")+1);
+            clrscr();
+            klaud_ascii();
+            printf("your money:%s, klaud money: %s",umoney,kmoney);
+            printf("\nPlace bet>");
         } else {
             printf("You said: %s, which is not a certified Klaud command. Use the klaud --help command.",input);
             printf("\n> ");