Template for "Ring 3 and Syscalls"

Author: Menci

include/prototypes.h

@@ -1,3 +1,7 @@
+#include "syscalls.h"
+
+extern uint32 do_syscall(uint32 id, uint32 args_count, ...);
+
 /* in file addargs.c */
 extern	status	addargs(pid32, int32, int32[], int32,char *, void *);
 
@@ -28,9 +32,13 @@ extern	syscall	close(did32);
 
 /* in file control.c */
 extern	syscall	control(did32, int32, int32, int32);
+#define syscall_control(...) \
+		do_generic_syscall(syscall, SYSCALL_CONTROL, __VA_ARGS__)
 
 /* in file create.c */
 extern	pid32	create(void *, uint32, pri16, char *, uint32, ...);
+#define syscall_create(...) \
+		do_generic_syscall(pid32, SYSCALL_CREATE, __VA_ARGS__)
 
 /* in file ctxsw.S */
 extern	void	ctxsw(void *, void *);
@@ -71,6 +79,8 @@ extern	char	*getmem(uint32);
 
 /* in file getpid.c */
 extern	pid32	getpid(void);
+#define syscall_getpid(...) \
+		do_argless_syscall(syscall, SYSCALL_GETPID)
 
 /* in file getprio.c */
 extern	syscall	getprio(pid32);
@@ -79,7 +89,7 @@ extern	syscall	getprio(pid32);
 extern	char	*getstk(uint32);
 
 /* in file getticks.c */
-extern	uint64	getticks(void);
+extern	void	getticks(uint64 *);
 
 /* in file gettime.c */
 extern	status	gettime(uint32 *);
@@ -117,6 +127,8 @@ extern	devcall	ionull(void);
 
 /* in file kill.c */
 extern	syscall	kill(pid32);
+#define syscall_kill(...) \
+		do_generic_syscall(syscall, SYSCALL_KILL, __VA_ARGS__)
 
 /* in file lexan.c */
 extern	int32	lexan(char *, int32, char *, int32 *, int32 [], int32 []);
@@ -241,6 +253,8 @@ extern	qid16	newqueue(void);
 
 /* in file open.c */
 extern	syscall	open(did32, char *, char *);
+#define syscall_open(...) \
+		do_generic_syscall(syscall, SYSCALL_OPEN, __VA_ARGS__)
 
 /* in file panic.c */
 extern	void	panic(char *);
@@ -297,15 +311,21 @@ extern	devcall	ramwrite(struct dentry *, char *, int32);
 
 /* in file read.c */
 extern	syscall	read(did32, char *, uint32);
+#define syscall_read(...) \
+		do_generic_syscall(pri16, SYSCALL_READ, __VA_ARGS__)
 
 /* in file ready.c */
 extern	status	ready(pid32);
 
 /* in file receive.c */
 extern	umsg32	receive(void);
+#define syscall_receive() \
+		do_argless_syscall(umsg32, SYSCALL_RECEIVE)
 
 /* in file recvclr.c */
 extern	umsg32	recvclr(void);
+#define syscall_recvclr() \
+		do_argless_syscall(umsg32, SYSCALL_RECVCLR)
 
 /* in file recvtime.c */
 extern	umsg32	recvtime(int32);
@@ -319,6 +339,8 @@ extern	void	restore(intmask);
 
 /* in file resume.c */
 extern	pri16	resume(pid32);
+#define syscall_resume(...) \
+		do_generic_syscall(pri16, SYSCALL_RESUME, __VA_ARGS__)
 
 /* in file seek.c */
 extern	syscall	seek(did32, uint32);
@@ -351,6 +373,11 @@ extern	syscall	signaln(sid32, int32);
 extern	syscall	sleepms(int32);
 extern	syscall	sleep(int32);
 
+#define syscall_sleepms(...) \
+		do_generic_syscall(syscall, SYSCALL_SLEEPMS, __VA_ARGS__)
+#define syscall_sleep(...) \
+		do_generic_syscall(syscall, SYSCALL_SLEEP, __VA_ARGS__)
+
 /* in file start.S */
 extern	int32	inb(int32);
 extern	int32	inw(int32);

include/stdio.h

@@ -1,5 +1,6 @@
 /* stdio.h - definintions and constants for standard I/O functions */
 
+#include "syscalls.h"
 
 /* Prototypes for formatted input functions */
 
@@ -9,6 +10,9 @@ extern	int32	sscanf(char *, char *, int32);
 extern	int32	fscanf(int32, char *, int32);
 #define	scanf(fmt, args)	fscanf(CONSOLE, fmt, args)
 
+#define syscall_fscanf(...) \
+		do_generic_syscall(int32, SYSCALL_FSCANF, __VA_ARGS__)
+#define syscall_scanf(...) syscall_fscanf(CONSOLE, __VA_ARGS__)
 
 /* Definintion of standard input/ouput/error used with shell commands */
 
@@ -23,6 +27,10 @@ extern	int32	fprintf(int, char *, ...);
 extern	int32	printf(const char *, ...);
 extern	int32	sprintf(char *, char *, ...);
 
+#define syscall_fprintf(...) \
+		do_generic_syscall(int32, SYSCALL_FPRINTF, __VA_ARGS__)
+#define syscall_printf(...) \
+		do_generic_syscall(int32, SYSCALL_PRINTF, __VA_ARGS__)
 
 /* Prototypes for character input and output functions */
 

include/syscalls.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "valen.h"
+
+#define do_argless_syscall(rettype, id) \
+		((rettype)do_syscall(id, 0))
+#define do_generic_syscall(rettype, id, ...) \
+		((rettype)do_syscall(id, va_args_len(__VA_ARGS__), __VA_ARGS__))
+
+#define SYSCALL_CREATE		1
+#define SYSCALL_RESUME		2
+#define SYSCALL_RECVCLR		3
+#define SYSCALL_RECEIVE		4
+#define SYSCALL_SLEEPMS		5
+#define SYSCALL_SLEEP		6
+#define SYSCALL_FPRINTF		7
+#define SYSCALL_PRINTF		8
+#define SYSCALL_FSCANF		9
+#define SYSCALL_READ		10
+#define SYSCALL_OPEN		11
+#define SYSCALL_CONTROL		12
+#define SYSCALL_KILL		13
+#define SYSCALL_GETPID		14

include/valen.h

@@ -0,0 +1,26 @@
+#pragma once
+
+// Count a __VA_ARGS__
+// From: https://stackoverflow.com/questions/2124339/c-preprocessor-va-args-number-of-arguments
+#define PP_NARG(...) \
+         PP_NARG_(__VA_ARGS__,PP_RSEQ_N())
+#define PP_NARG_(...) \
+         PP_ARG_N(__VA_ARGS__)
+#define PP_ARG_N( \
+          _1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \
+         _11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \
+         _21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \
+         _31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \
+         _41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \
+         _51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \
+         _61,_62,_63,N,...) N
+#define PP_RSEQ_N() \
+         63,62,61,60,                   \
+         59,58,57,56,55,54,53,52,51,50, \
+         49,48,47,46,45,44,43,42,41,40, \
+         39,38,37,36,35,34,33,32,31,30, \
+         29,28,27,26,25,24,23,22,21,20, \
+         19,18,17,16,15,14,13,12,11,10, \
+         9,8,7,6,5,4,3,2,1,0
+
+#define va_args_len PP_NARG

shell/shell.c

@@ -83,23 +83,23 @@ process	shell (
 
 	/* Print shell banner and startup message */
 
-	fprintf(dev, "\n\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	syscall_fprintf(dev, "\n\n%s%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 		SHELL_BAN0,SHELL_BAN1,SHELL_BAN2,SHELL_BAN3,SHELL_BAN4,
 		SHELL_BAN5,SHELL_BAN6,SHELL_BAN7,SHELL_BAN8,SHELL_BAN9);
 
-	fprintf(dev, "%s\n\n", SHELL_STRTMSG);
+	syscall_fprintf(dev, "%s\n\n", SHELL_STRTMSG);
 
 	/* Continually prompt the user, read input, and execute command	*/
 
 	while (TRUE) {
 
 		/* Display prompt */
 
-		fprintf(dev, SHELL_PROMPT);
+		syscall_fprintf(dev, SHELL_PROMPT);
 
 		/* Read a command */
 
-		len = read(dev, buf, sizeof(buf));
+		len = syscall_read(dev, buf, sizeof(buf));
 
 		/* Exit gracefully on end-of-file */
 
@@ -122,14 +122,14 @@ process	shell (
 		/* Handle parsing error */
 
 		if (ntok == SYSERR) {
-			fprintf(dev,"%s\n", SHELL_SYNERRMSG);
+			syscall_fprintf(dev,"%s\n", SHELL_SYNERRMSG);
 			continue;
 		}
 
 		/* If line is empty, go to next input line */
 
 		if (ntok == 0) {
-			fprintf(dev, "\n");
+			syscall_fprintf(dev, "\n");
 			continue;
 		}
 
@@ -150,7 +150,7 @@ process	shell (
 		if ( (ntok >=3) && ( (toktyp[ntok-2] == SH_TOK_LESS)
 				   ||(toktyp[ntok-2] == SH_TOK_GREATER))){
 			if (toktyp[ntok-1] != SH_TOK_OTHER) {
-				fprintf(dev,"%s\n", SHELL_SYNERRMSG);
+				syscall_fprintf(dev,"%s\n", SHELL_SYNERRMSG);
 				continue;
 			}
 			if (toktyp[ntok-2] == SH_TOK_LESS) {
@@ -166,18 +166,18 @@ process	shell (
 		if ( (ntok >=3) && ( (toktyp[ntok-2] == SH_TOK_LESS)
 				   ||(toktyp[ntok-2] == SH_TOK_GREATER))){
 			if (toktyp[ntok-1] != SH_TOK_OTHER) {
-				fprintf(dev,"%s\n", SHELL_SYNERRMSG);
+				syscall_fprintf(dev,"%s\n", SHELL_SYNERRMSG);
 				continue;
 			}
 			if (toktyp[ntok-2] == SH_TOK_LESS) {
 				if (inname != NULL) {
-				    fprintf(dev,"%s\n", SHELL_SYNERRMSG);
+				    syscall_fprintf(dev,"%s\n", SHELL_SYNERRMSG);
 				    continue;
 				}
 				inname = &tokbuf[tok[ntok-1]];
 			} else {
 				if (outname != NULL) {
-				    fprintf(dev,"%s\n", SHELL_SYNERRMSG);
+				    syscall_fprintf(dev,"%s\n", SHELL_SYNERRMSG);
 				    continue;
 				}
 				outname = &tokbuf[tok[ntok-1]];
@@ -194,7 +194,7 @@ process	shell (
 			}
 		}
 		if ((ntok == 0) || (i < ntok)) {
-			fprintf(dev, SHELL_SYNERRMSG);
+			syscall_fprintf(dev, SHELL_SYNERRMSG);
 			continue;
 		}
 
@@ -224,15 +224,15 @@ process	shell (
 		/* Handle command not found */
 
 		if (j >= ncmd) {
-			fprintf(dev, "command %s not found\n", tokbuf);
+			syscall_fprintf(dev, "command %s not found\n", tokbuf);
 			continue;
 		}
 
 		/* Handle built-in command */
 
 		if (cmdtab[j].cbuiltin) { /* No background or redirect. */
 			if (inname != NULL || outname != NULL || backgnd){
-				fprintf(dev, SHELL_BGERRMSG);
+				syscall_fprintf(dev, SHELL_BGERRMSG);
 				continue;
 			} else {
 				/* Set up arg vector for call */
@@ -254,25 +254,25 @@ process	shell (
 		/* Open files and redirect I/O if specified */
 
 		if (inname != NULL) {
-			stdinput = open(NAMESPACE,inname,"ro");
+			stdinput = syscall_open(NAMESPACE,inname,"ro");
 			if (stdinput == SYSERR) {
-				fprintf(dev, SHELL_INERRMSG, inname);
+				syscall_fprintf(dev, SHELL_INERRMSG, inname);
 				continue;
 			}
 		}
 		if (outname != NULL) {
-			stdoutput = open(NAMESPACE,outname,"w");
+			stdoutput = syscall_open(NAMESPACE,outname,"w");
 			if (stdoutput == SYSERR) {
-				fprintf(dev, SHELL_OUTERRMSG, outname);
+				syscall_fprintf(dev, SHELL_OUTERRMSG, outname);
 				continue;
 			} else {
-				control(stdoutput, F_CTL_TRUNC, 0, 0);
+				syscall_control(stdoutput, F_CTL_TRUNC, 0, 0);
 			}
 		}
 
 		/* Spawn child thread for non-built-in commands */
 
-		child = create(cmdtab[j].cfunc,
+		child = syscall_create(cmdtab[j].cfunc,
 			SHELL_CMDSTK, SHELL_CMDPRIO,
 			cmdtab[j].cname, 2, ntok, &tmparg);
 
@@ -281,7 +281,7 @@ process	shell (
 		if ((child == SYSERR) ||
 		    (addargs(child, ntok, tok, tlen, tokbuf, &tmparg)
 							== SYSERR) ) {
-			fprintf(dev, SHELL_CREATMSG);
+			syscall_fprintf(dev, SHELL_CREATMSG);
 			continue;
 		}
 
@@ -290,18 +290,18 @@ process	shell (
 		proctab[child].prdesc[0] = stdinput;
 		proctab[child].prdesc[1] = stdoutput;
 
-		msg = recvclr();
-		resume(child);
+		msg = syscall_recvclr();
+		syscall_resume(child);
 		if (! backgnd) {
-			msg = receive();
+			msg = syscall_receive();
 			while (msg != child) {
-				msg = receive();
+				msg = syscall_receive();
 			}
 		}
     }
 
     /* Terminate the shell process by returning from the top level */
 
-    fprintf(dev,SHELL_EXITMSG);
+    syscall_fprintf(dev,SHELL_EXITMSG);
     return OK;
 }