5 files changed, 116 insertions, 75 deletions

diff --git a/src/generator.c b/src/generator.c
index 0a40570..3ecfe0d 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -10,71 +10,74 @@
 void gen_prologue() {
   fprintf(output, "extern printf\nextern scanf\n");
   fprintf(output, "section .data\n");
+}
+
+void gen_prologue_continue(int *bss_done) {
+  if (*bss_done != 0) return;
+
   fprintf(output, "format_int db \"%%d\",10,0\n");
   fprintf(output, "format_char db \"%%c\",10,0\n");
   fprintf(output, "format_int_in: db \"%%d\", 0\n");
   fprintf(output, "format_char_in: db \"%%c\", 0\n\n");
   fprintf(output, "section .bss\n");
+
+  fprintf(output, "globals: resq %d\n", nb_globals);
+  fprintf(output, "section .text\n\nglobal _start\n");
+  fprintf(output, "\nprinte: ;print needs an argument in rax\n");
+  fprintf(output, "push rbp\n");
+  fprintf(output, "mov rbp, rsp\n");
+  fprintf(output, "push rsi\n");
+  fprintf(output, "push rdi\n");
+  fprintf(output, "mov rsi, rax\n");
+  fprintf(output, "mov rdi, format_int\n");
+  fprintf(output, "mov rax, 0\n");
+  fprintf(output, "call printf WRT ..plt\n");
+  fprintf(output, "pop rdi\n");
+  fprintf(output, "pop rsi\n");
+  fprintf(output, "pop rbp\n");
+  fprintf(output, "ret\n");
+  fprintf(output, "\nprintc: ;print needs an argument in rax\n");
+  fprintf(output, "push rbp\n");
+  fprintf(output, "mov rbp, rsp\n");
+  fprintf(output, "push rsi\n");
+  fprintf(output, "push rdi\n");
+  fprintf(output, "mov rsi, rax\n");
+  fprintf(output, "mov rdi, format_char\n");
+  fprintf(output, "mov rax, 0\n");
+  fprintf(output, "call printf WRT ..plt\n");
+  fprintf(output, "pop rdi\n");
+  fprintf(output, "pop rsi\n");
+  fprintf(output, "pop rbp\n");
+  fprintf(output, "ret\n");
+  fprintf(output, "\nreade: ;read needs an adress in rax\n");
+  fprintf(output, "push rbp\n");
+  fprintf(output, "mov rbp, rsp\n");
+  fprintf(output, "push rsi\n");
+  fprintf(output, "push rdi\n");
+  fprintf(output, "mov rsi, rax\n");
+  fprintf(output, "mov rdi, format_int_in\n");
+  fprintf(output, "mov rax, 0\n");
+  fprintf(output, "call scanf\n");
+  fprintf(output, "pop rdi\n");
+  fprintf(output, "pop rsi\n");
+  fprintf(output, "pop rbp\n");
+  fprintf(output, "ret\n");
+  fprintf(output, "\nreadc: ;read needs an adress in rax\n");
+  fprintf(output, "push rbp\n");
+  fprintf(output, "mov rbp, rsp\n");
+  fprintf(output, "push rsi\n");
+  fprintf(output, "push rdi\n");
+  fprintf(output, "mov rsi, rax\n");
+  fprintf(output, "mov rdi, format_char_in\n");
+  fprintf(output, "mov rax, 0\n");
+  fprintf(output, "call scanf\n");
+  fprintf(output, "pop rdi\n");
+  fprintf(output, "pop rsi\n");
+  fprintf(output, "pop rbp\n");
+  fprintf(output, "ret\n");
+  *bss_done = 1;
 }
-void gen_prologue_continue(int *bss_done) {
-  if (*bss_done == 0) {
-    fprintf(output, "globals: resq %d\n", nb_globals);
-    fprintf(output, "section .text\n\nglobal _start\n");
-    fprintf(output, "\nprinte: ;print needs an argument in rax\n");
-    fprintf(output, "push rbp\n");
-    fprintf(output, "mov rbp, rsp\n");
-    fprintf(output, "push rsi\n");
-    fprintf(output, "push rdi\n");
-    fprintf(output, "mov rsi, rax\n");
-    fprintf(output, "mov rdi, format_int\n");
-    fprintf(output, "mov rax, 0\n");
-    fprintf(output, "call printf WRT ..plt\n");
-    fprintf(output, "pop rdi\n");
-    fprintf(output, "pop rsi\n");
-    fprintf(output, "pop rbp\n");
-    fprintf(output, "ret\n");
-    fprintf(output, "\nprintc: ;print needs an argument in rax\n");
-    fprintf(output, "push rbp\n");
-    fprintf(output, "mov rbp, rsp\n");
-    fprintf(output, "push rsi\n");
-    fprintf(output, "push rdi\n");
-    fprintf(output, "mov rsi, rax\n");
-    fprintf(output, "mov rdi, format_char\n");
-    fprintf(output, "mov rax, 0\n");
-    fprintf(output, "call printf WRT ..plt\n");
-    fprintf(output, "pop rdi\n");
-    fprintf(output, "pop rsi\n");
-    fprintf(output, "pop rbp\n");
-    fprintf(output, "ret\n");
-    fprintf(output, "\nreade: ;read needs an adress in rax\n");
-    fprintf(output, "push rbp\n");
-    fprintf(output, "mov rbp, rsp\n");
-    fprintf(output, "push rsi\n");
-    fprintf(output, "push rdi\n");
-    fprintf(output, "mov rsi, rax\n");
-    fprintf(output, "mov rdi, format_int_in\n");
-    fprintf(output, "mov rax, 0\n");
-    fprintf(output, "call scanf\n");
-    fprintf(output, "pop rdi\n");
-    fprintf(output, "pop rsi\n");
-    fprintf(output, "pop rbp\n");
-    fprintf(output, "ret\n");
-    fprintf(output, "\nreadc: ;read needs an adress in rax\n");
-    fprintf(output, "push rbp\n");
-    fprintf(output, "mov rbp, rsp\n");
-    fprintf(output, "push rsi\n");
-    fprintf(output, "push rdi\n");
-    fprintf(output, "mov rsi, rax\n");
-    fprintf(output, "mov rdi, format_char_in\n");
-    fprintf(output, "mov rax, 0\n");
-    fprintf(output, "call scanf\n");
-    fprintf(output, "pop rdi\n");
-    fprintf(output, "pop rsi\n");
-    fprintf(output, "pop rbp\n");
-    fprintf(output, "ret\n");
-    *bss_done = 1;
-  }
-}
+
 void gen_const_declaration() {
   fprintf(output, "\n_start:\n");
   fprintf(output, "push rbp\nmov rbp, rsp\n\n");
@@ -90,6 +93,20 @@ void gen_const_declaration() {
   fun_display_table();
 }
 
+void gen_const(const char name[], int value, Scope scope) {
+  switch (scope) {
+  case LOCAL:
+    loc_addConst(name);
+    fprintf(output, "push %d\n", value);
+    return;
+
+  case GLOBAL:
+    glo_addConst(name);
+    fprintf(output, "%s: db QWORD %d\n", name, value);
+    return;
+  }
+}
+
 Type gen_function_declaration(const char name[], int return_type) {
   fprintf(output, "\n%s:\npush rbp\nmov rbp,rsp\n", name);
   return return_type;
diff --git a/src/generator.h b/src/generator.h
index 41a769a..6c132fd 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -7,6 +7,7 @@
 #define __GENERATOR_H__
 
 #include <stdio.h>
+#include <stdbool.h>
 #include "symbol_table.h"
 
 typedef enum scope {
@@ -21,10 +22,13 @@ FILE *output;
 void gen_prologue();
 void gen_prologue_continue(int *bss_done);
 void gen_const_declaration();
+void gen_const(const char name[], int value, Scope scope);
+
 Type gen_function_declaration(const char name[], int return_type);
 void gen_function_end_declaration(const char name[], int return_type, int nb_param);
 void gen_function_return(Type expect, Type actual);
 Type gen_function_call(const char name[], int nb_param);
+
 void gen_declaration(const char name[], int type, Scope scope);
 void gen_check(const char name[], Scope scope);
 
diff --git a/src/symbol_table.c b/src/symbol_table.c
index 483de4c..08124ac 100644
--- a/src/symbol_table.c
+++ b/src/symbol_table.c
@@ -66,7 +66,7 @@ int fun_lookup(const char name[], int nb_param) {
   return -1;
 }
 
-void glo_addVar(const char name[], int type) {
+static void glo_add(const char name[], int type, bool read_only) {
   int count;
   for (count = 0; count < glo_symbol_table.size; count++) {
     if (!strcmp(glo_symbol_table.entries[count].name, name)) {
@@ -82,8 +82,16 @@ void glo_addVar(const char name[], int type) {
   }
   strcpy(glo_symbol_table.entries[glo_symbol_table.size - 1].name, name);
   glo_symbol_table.entries[glo_symbol_table.size - 1].type = type;
-  glo_symbol_table.entries[glo_symbol_table.size - 1].addr =
-      (glo_symbol_table.size - 1) * 8;
+  glo_symbol_table.entries[glo_symbol_table.size - 1].addr = (glo_symbol_table.size - 1) * 8;
+  glo_symbol_table.entries[glo_symbol_table.size - 1].read_only = read_only;
+}
+
+void glo_addVar(const char name[], int type) {
+  glo_add(name, type, false);
+}
+
+void glo_addConst(const char name[]) {
+  glo_add(name, INT, true);
 }
 
 // Verifies that the variable exists and returns the type
@@ -125,7 +133,7 @@ void glo_display_table() {
   fprintf(output, "\n");
 }
 
-void loc_addVar(const char name[], int type) {
+static void loc_add(const char name[], int type, bool read_only) {
   int count;
   for (count = 0; count < loc_symbol_table.size; count++) {
     if (!strcmp(loc_symbol_table.entries[count].name, name)) {
@@ -141,8 +149,16 @@ void loc_addVar(const char name[], int type) {