ls

commit 4c8f87ce60081c7a60df9b049b38d9847220210f
parent 05bff73b2e5276bc003797f3eae3381c3db110f8
Author: kocotian <kocotian@kocotian.pl>
Date:   Sun, 28 Feb 2021 18:08:44 +0100

function expression prototype, few changes, string literal on rax

Diffstat:
M
grammar.c
 | 
42
++++++++++++++++++++++++++++++++++++------
M
lsc.c
 | 
5
++++-
M
lsc.h
 | 
6
+-----

3 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/grammar.c b/grammar.c
@@ -6,6 +6,7 @@
 #include <string.h>
 
 #include "grammar.h"
+#include "lsc.h"
 
 extern char    *contents;
 extern char    *output;
@@ -57,7 +58,7 @@ g_expression(Token *tokens, size_t toksize)
 					"section .rodata\n"
 					"\t.STR%d: db %s, 0\n"
 					"section .text\n"
-					"\tmov rsi, .STR%d\n",
+					"\tmov rax, .STR%d\n",
 					sciter, val, sciter));
 		strncat(output, buffer, outsiz);
 		free(val);
@@ -99,11 +100,39 @@ g_expression(Token *tokens, size_t toksize)
 			i += g_expression(tokens + i, toksize - i);
 			g_expecttype(tokens[i++], TokenClosingBracket);
 		} else if (tokens[i].type == TokenOpeningParenthesis) { /* function(expr) */
+			char *pfnname = malloc(tokens[i - 1].len + 1);
+			int syscallrax;
+			int ai = -1; /* arg iterator */
+
+			strncpy(pfnname, contents + tokens[i - 1].off,
+					tokens[i - 1].len);
+			pfnname[tokens[i - 1].len] = '\0';
+			if ((syscallrax = getsyscallbyname(pfnname)) < 0)
+				/* temporarily warn about undefined function; TODO */
+				errwarn("undefined function: %s", 1,
+						tokens[i - 1], pfnname);
+			free(pfnname);
+
 			do {
-				++i;
+				++ai; ++i;
 				i += g_expression(tokens + i, toksize - i);
+				val = malloc(tokens[i].len + 1);
+				strncpy(val, contents + tokens[i].off, tokens[i].len);
+				val[tokens[i].len] = '\0';
+				output = realloc(output, outsiz +=
+						snprintf(buffer, BUFSIZ, "\tmov %s, rax\n",
+							ai == 0 ? "rdi" : ai == 1 ? "rsi" :
+							ai == 2 ? "rdx" : ai == 3 ? "r10" :
+							ai == 4 ? "r8" : ai == 5 ? "r9" : "rax"));
+				strncat(output, buffer, outsiz);
+				free(val);
 			} while (tokens[i].type == TokenComma);
 			g_expecttype(tokens[i++], TokenClosingParenthesis);
+			output = realloc(output, outsiz +=
+					snprintf(buffer, BUFSIZ,
+						"\tmov rax, %d\n\tsyscall\n",
+						syscallrax));
+			strncat(output, buffer, outsiz);
 		} else {
 			if (tokens[i].type == TokenAssignmentSign) { /* expr = expr */
 				++i;
@@ -123,8 +152,8 @@ g_expression(Token *tokens, size_t toksize)
 				++i;
 			} else if (tokens[i].type == TokenLogicalNotEquSign) { /* expr != expr */
 				++i;
-			} else if (tokens[i].type == TokenComma) { /* expr, expr */
-				++i;
+			/* } else if (tokens[i].type == TokenComma) { /1* expr, expr *1/ */
+			/* 	++i; */
 			} else {
 				return i;
 			}
@@ -219,14 +248,15 @@ g_function(Token *tokens, size_t toksize)
 	} while (tokens[i].type == TokenComma);
 	g_expecttype(tokens[i++], TokenClosingParenthesis);
 
-	rb = snprintf(buffer, BUFSIZ, "%s:\n", func_name);
+	rb = snprintf(buffer, BUFSIZ, "\n%s:\n\tpush rbp\n",
+			func_name);
 	output = realloc(output, outsiz += rb);
 	strcat(output, buffer);
 	free(func_name);
 
 	i += g_statement(tokens + i, toksize - i);
 
-	rb = snprintf(buffer, BUFSIZ, "\tret\n");
+	rb = snprintf(buffer, BUFSIZ, "\tpop rbp\n\tret\n");
 	output = realloc(output, outsiz += rb);
 	strcat(output, buffer);
 
diff --git a/lsc.c b/lsc.c
@@ -23,6 +23,9 @@
 #include "lsc.h"
 #include "grammar.h"
 
+static ssize_t parseline(char *input, size_t ilen, size_t off, Token **tokens, size_t *toksiz, size_t *tokiter);
+static void usage(void);
+
 char *argv0;
 
 char *filename, *line;
@@ -34,7 +37,7 @@ size_t outsiz;
 
 int sciter; /* string const iter */
 
-static int
+int
 getsyscallbyname(char *name)
 {
 	size_t i;
diff --git a/lsc.h b/lsc.h
@@ -15,11 +15,7 @@ typedef struct {
 
 #include "util.h"
 
-static int
+int
 getsyscallbyname(char *name);
-static ssize_t
-parseline(char *input, size_t ilen, size_t off, Token **tokens, size_t *toksiz, size_t *tokiter);
-static void
-usage(void);
 
 #endif