adding terminal command and make asm work

Author: AdeRegt

SanderOSUSB.0

@@ -1,7 +1,7 @@
 #include "../kernel.h"
 
 #define MAX_COMMAND_SIZE 10
-#define MAX_COMMAND_STACK 5
+#define MAX_COMMAND_STACK 10
 #define MAX_COMMAND_COMMAND_SIZE 50
 
 struct terminal_cmd{
@@ -14,8 +14,19 @@ struct terminal_cmd term_commands[MAX_COMMAND_STACK];
 char* read_line(int maxsize){
 	char* buffer = (char*) malloc(maxsize);
 	int i = 0;
+    int* curhi = curget();
 	for(i = 0 ; i < maxsize ; i++){
-		buffer[i] = (char)getch();
+        char deze = (char)getch();
+        if(deze=='\b'){
+            buffer[i] = 0;
+            buffer[i-1] = 0;
+            i -= 2;
+            curset(curhi[0]+i+1,curhi[1]);
+		    putc(' ');
+            curset(curhi[0]+i+1,curhi[1]);
+            continue;
+        }
+		buffer[i] = deze;
 		putc(buffer[i]);
 		if(buffer[i]=='\n'){
 			break;
@@ -84,6 +95,8 @@ void tty_dir(char* argv){
     printf("DIR %s : %s \n",cmd,dir(cmd));
 }
 
+volatile char* last_tty_command;
+
 void tty_exec(char* argv){
     char* cmd;
     char* tuv = getcwd();
@@ -99,13 +112,16 @@ void tty_exec(char* argv){
     int exparam = 0;
     for(int i = 0 ; i < strlen(cmd) ; i++){
         if(cmd[i]==' '){
-            exparam = i+1;
+            exparam = i;
+            break;
         }
     }
     if(exparam==0){
         exparam = strlen(cmd);
     }
     cmd[exparam] = 0;
+    last_tty_command = (char*)cmd+exparam+1;
+
     unsigned char* buffer = (unsigned char*)0x2000;
 	if(fexists((unsigned char *)cmd) && fread(cmd,buffer)){
         if(iself(buffer)){
@@ -179,7 +195,7 @@ int handle_tty_command(char* prompt){
 }
 
 void tty_loop(){
-    setpwd("@");
+    setpwd("A@PRGS");
     while(1){
         printf("[%s]-> ",getcwd());
         char* prompt = read_line(MAX_COMMAND_COMMAND_SIZE);

boot/pxe/pxeentry.bin

@@ -1841,6 +1841,13 @@ int init_graph_vga(unsigned int width, unsigned int height,int chain4)
 	return 1;
 }
 
+int* curget(){
+	int *elf = (int*)malloc(sizeof(int)*2);
+	elf[0] = curx;
+	elf[1] = cury;
+	return elf;
+}
+
 void curset(int x,int y){
 	curx = x;
 	cury = y;

cdrom.iso

@@ -128,23 +128,25 @@ typedef struct {
 
 #define MAX_FILE_SYMBOLS 10
 FileSymbol filesymboltable[MAX_FILE_SYMBOLS];
+extern volatile char* last_tty_command;
 
 void special_handler(Register *r){
 	outportb(0xA0,0x20);
 	outportb(0x20,0x20);// printf("OKE: eax=%x \n",r->eax);__asm__ __volatile__("cli\nhlt"); for(;;);
 	debugf("INT0x80: EIP=%x \n",r->eip);
 
 	if(r->eax==0x01){ // EXIT
-    		printf("INT0x80: PROGRAM FINISHED\n");
-			if(isGraphicsMode()){
-				if(r->ebx){
-					r->eip = (unsigned long)exit_program_and_wait_for_keypress;
-				}else{
-					r->eip = (unsigned long)browser;
-				}
+		printf("INT0x80: PROGRAM FINISHED\n");
+		debugf("INT0x80: PROGRAM FINISHED\n");
+		if(isGraphicsMode()){
+			if(r->ebx){
+				r->eip = (unsigned long)exit_program_and_wait_for_keypress;
 			}else{
-				r->eip = (unsigned long)tty_loop;
+				r->eip = (unsigned long)browser;
 			}
+		}else{
+			r->eip = (unsigned long)tty_loop;
+		}
 	}
 	else if(r->eax==0x03){ // F-READ
 		debugf("INT0x80: READ\n");
@@ -423,6 +425,27 @@ void special_handler(Register *r){
 		create_tcp_session(getOurIpAsLong(),((unsigned long*)addr)[0],port & 0xFFFF,port & 0xFFFF,func);
 		r->eax = 0;
 	}
+	else if(r->eax==0xCB){ // PRGS::ARG
+		debugf("INT0x80: GETPARAMS\n");
+		int argcount = 0; // we always start with 1, this is the object itself
+		unsigned long *args = (unsigned long *)malloc(sizeof(unsigned long)*10);
+		args[argcount++] = (unsigned long)"example"; // example -m 10 test test
+		if(strlen((char*)last_tty_command)){
+			args[argcount++] = (unsigned long) (last_tty_command);
+			int z = strlen((char*)last_tty_command);
+			for(int i = 0 ; i < z ; i++){
+				if(last_tty_command[i]==' '){
+					last_tty_command[i] = 0;
+					args[argcount++] = (unsigned long) (last_tty_command+i+1);
+				}
+			}
+		}
+		for(int i = 0 ; i < argcount ; i++){
+			debugf("INT0x80: serving on arg %x the value %s \n",i,(char*)args[i]);
+		}
+		r->eax = (unsigned long)args; // arguments
+		r->ebx = argcount; // argumentcount
+	}
 	else{
 		printf("INT0x80: UNKNOWN SYSCALL %x \n",r->eax);
 		debugf("INT0x80: UNKNOWN SYSCALL %x \n",r->eax);

include/symbols.h

@@ -150,6 +150,7 @@ void drawcharraw(unsigned char c, int offsetX, int offsetY, int fgcolor, int bgc
  **/
 unsigned char getch();
 void curset(int x,int y);
+int* curget();
 void setForeGroundBackGround(unsigned char fg,unsigned char bg);
 
 char* vsprintf(char* format,va_list arg);

kernel.bin

@@ -9,9 +9,18 @@
 section '.text' executable
 	
 _start:
-	push _char_c
-	push 5
+;	push _char_c
+;	push 5
+	; get params
+	mov eax,0xCB
+	int 0x80
+	push eax 
+	push ebx
+	; call main
 	call main
+	; quit
+	mov eax,0x01
+	int 0x80
 	ret
 
 filenamebuffer: db 'A@PRGS/TEGT.ASM', 0